Merge remote-tracking branch 'origin/master'

manifest.json

@@ -2,8 +2,8 @@
     "name" : "库比森轮胎-经销商端",
     "appid" : "__UNI__D89E6F8",
     "description" : "",
-    "versionName" : "1.0.14",
-    "versionCode" : 1014,
+    "versionName" : "1.0.20",
+    "versionCode" : 1020,
     "transformPx" : false,
     "ios" : {
         "bundleIdentifer" : "uni.app.UNID89E6F8" // 替换为你的 Bundle ID

pages/home/claim/details.vue

@@ -146,7 +146,7 @@
 		</view> -->
 		<view v-if="form.claimSourceType==1" class="nav-bottom-height">
 		</view>
-		<view v-if="form.claimSourceType==1" class="goods-nav-bottom">
+		<view v-show="!keyboardShow" v-if="form.claimSourceType==1" class="goods-nav-bottom">
 			<uni-goods-nav v-if="!form.id" :fill="true" :options="[]" :buttonGroup="buttonGroup"
 				@buttonClick="buttonClick" />
 			<uni-goods-nav v-if="form.auditStatus==0" :fill="true" :options="[]" :buttonGroup="buttonGroup2"
@@ -174,6 +174,7 @@
 	export default {
 		data() {
 			return {
+				keyboardShow:false,
 				buttonGroup: [{
 					text: '保存',
 					backgroundColor: '#03803B',
@@ -234,6 +235,20 @@
 				this.getDetail(option.id)
 			}
 		},
+		onShow() {
+			// 监听键盘高度变化
+			uni.onKeyboardHeightChange((res) => {
+				// 根据键盘高度调整布局
+				if (res.height > 0) {
+					this.keyboardShow = true
+				} else {
+					this.keyboardShow = false
+				}
+			});
+		},
+		onUnload() {
+			uni.offKeyboardHeightChange();
+		},
 		methods: {
 			buttonClick(e) {
 				if (e.index == 0) {

pages/home/store/details.vue

@@ -265,12 +265,21 @@
 		</view> -->
 		<view v-if="form.enableOrNot!=1" class="nav-bottom-height">
 		</view>
-		<view v-if="form.enableOrNot!=1&&!popupShow" class="goods-nav-bottom">
+		<view v-show="!keyboardShow" v-if="form.enableOrNot!=1&&!popupShow" class="goods-nav-bottom">
 			<uni-goods-nav v-if="form.checkStatus=='录入'||form.checkStatus=='审核驳回'" :fill="true" :options="[]"
 				:buttonGroup="buttonGroup" @buttonClick="buttonClick" />
 			<uni-goods-nav v-if="!(form.checkStatus=='录入'||form.checkStatus=='审核驳回')" :fill="true" :options="[]"
 				:buttonGroup="buttonGroup2" @buttonClick="buttonClick2" />
 		</view>
+		<u-modal :show="modalShow" confirmText="通过" cancelText="驳回" :showCancelButton="true" confirmColor="#18bc37"
+			cancelColor="#e43d33" :closeOnClickOverlay="true" @close="modalShow=false" @confirm="approval(1)"
+			@cancel="approval(2)">
+			<view style="height: 120rpx;display: flex;align-items: center;">
+				<text style="font-size: 34rpx;">
+					是否通过审核?
+				</text>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
@@ -297,15 +306,17 @@
 	export default {
 		data() {
 			return {
+				keyboardShow:false,
+				modalShow: false,
 				popupShow: false,
 				buttonGroup: [{
-						text: '通过',
-						backgroundColor: '#18bc37',
+						text: '保存',
+						backgroundColor: '#03803B',
 						color: '#fff'
 					},
 					{
-						text: '驳回',
-						backgroundColor: '#e64340',
+						text: '审批',
+						backgroundColor: '#18bc37',
 						color: '#fff'
 					}
 				],
@@ -400,7 +411,19 @@
 				this.getDetail(option.id)
 			}
 		},
+		onShow() {
+			// 监听键盘高度变化
+			uni.onKeyboardHeightChange((res) => {
+				// 根据键盘高度调整布局
+				if (res.height > 0) {
+					this.keyboardShow=true
+				} else {
+					this.keyboardShow=false
+				}
+			});
+		},
 		onUnload() {
+			uni.offKeyboardHeightChange();
 			uni.$off();
 		},
 		methods: {
@@ -410,10 +433,90 @@
 			},
 			buttonClick(e) {
 				if (e.index == 0) {
-					this.approval(1)
+					this.submit()
+					// this.approval(1)
 				}
 				if (e.index == 1) {
-					this.approval(2)
+					if (!this.form.cname) {
+						uni.showToast({
+							title: '请输入店铺名称',
+							icon: 'none'
+						});
+						return
+					}
+					if (this.form.corpsFilesList.filter(item => item.isDeleted == 0).length == 0) {
+						uni.showToast({
+							title: '请上传店面照片',
+							icon: 'none'
+						});
+						return
+					}
+
+					if (!this.form.contacts) {
+						uni.showToast({
+							title: '请输入联系人',
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.form.contactsPhone) {
+						uni.showToast({
+							title: '请输入电话',
+							icon: 'none'
+						});
+						return
+					}
+					if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(this.form.contactsPhone)) {
+						uni.showToast({
+							title: '请输入正确电话',
+							icon: 'none'
+						});
+						return;
+					}
+					if (!this.form.salesmanName) {
+						uni.showToast({
+							title: '请选择业务员',
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.form.deliveryWarehouseName) {
+						uni.showToast({
+							title: '请选择发货仓库',
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.form.priceSystem) {
+						uni.showToast({
+							title: '请选择商城价格',
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.form.address) {
+						uni.showToast({
+							title: '请选择所属区域',
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.form.detailedAddress) {
+						uni.showToast({
+							title: '请输入详细地址',
+							icon: 'none'
+						});
+						return
+					}
+					if (!this.form.corpsTypeId) {
+						uni.showToast({
+							title: '请选择店面分类',
+							icon: 'none'
+						});
+						return
+					}
+					this.modalShow = true
+					// this.approval(2)
 				}
 			},
 			buttonClick2(e) {
@@ -795,84 +898,7 @@
 					});
 			},
 			async approval(type) {
-				if (!this.form.cname) {
-					uni.showToast({
-						title: '请输入店铺名称',
-						icon: 'none'
-					});
-					return
-				}
-				if (this.form.corpsFilesList.filter(item => item.isDeleted == 0).length == 0) {
-					uni.showToast({
-						title: '请上传店面照片',
-						icon: 'none'
-					});
-					return
-				}
-
-				if (!this.form.contacts) {
-					uni.showToast({
-						title: '请输入联系人',
-						icon: 'none'
-					});
-					return
-				}
-				if (!this.form.contactsPhone) {
-					uni.showToast({
-						title: '请输入电话',
-						icon: 'none'
-					});
-					return
-				}
-				if (!/^[1][3,4,5,7,8,9][0-9]{9}$/.test(this.form.contactsPhone)) {
-					uni.showToast({
-						title: '请输入正确电话',
-						icon: 'none'
-					});
-					return;
-				}
-				if (!this.form.salesmanName) {
-					uni.showToast({
-						title: '请选择业务员',
-						icon: 'none'
-					});
-					return
-				}
-				if (!this.form.deliveryWarehouseName) {
-					uni.showToast({
-						title: '请选择发货仓库',
-						icon: 'none'
-					});
-					return
-				}
-				if (!this.form.priceSystem) {
-					uni.showToast({
-						title: '请选择商城价格',
-						icon: 'none'
-					});
-					return
-				}
-				if (!this.form.address) {
-					uni.showToast({
-						title: '请选择所属区域',
-						icon: 'none'
-					});
-					return
-				}
-				if (!this.form.detailedAddress) {
-					uni.showToast({
-						title: '请输入详细地址',
-						icon: 'none'
-					});
-					return
-				}
-				if (!this.form.corpsTypeId) {
-					uni.showToast({
-						title: '请选择店面分类',
-						icon: 'none'
-					});
-					return
-				}
+				this.modalShow = false
 				let obj = await this.convertData(this.$deepClone(this.form))
 				console.log(obj)
 				let _this = this

pages/login/index.vue

@@ -47,11 +47,11 @@
 
 
 		</view>
-		<view class="pact">
+		<view class="pact"  v-show="!keyboardShow">
 			<view class="pact-a">
 				<radio value="pactChecked" activeBackgroundColor="#3ba662" activeBorderColor="#3ba662"
 					borderColor="#3ba662" color="#fff" @click="pactChange" />
-				<view>我已阅读并同意<text @click="toPact">《用户协议》</text>和<text @click="toPact">《隐私协议》</text></view>
+				<view>我已阅读并同意<text>《用户协议》</text>和<text>《隐私协议》</text></view>
 			</view>
 		</view>
 	</view>
@@ -66,6 +66,7 @@
 	export default {
 		data() {
 			return {
+				keyboardShow:false,
 				loading: false,
 				pactChecked: false,
 				second: 60, //默认60秒
@@ -77,27 +78,22 @@
 			};
 		},
 		onLoad() {
-			this.checkNetworkPermission();
 		},
-		methods: {
-			async checkNetworkPermission() {
-				try {
-					const status = await uni.getNetworkType();
-					console.log('网络状态:', status);
-				} catch (error) {
-					console.error('网络权限检测失败:', error);
-					uni.showModal({
-						title: '网络权限未授权',
-						content: '请开启网络权限以正常使用应用功能',
-						confirmText: '去设置',
-						success: (res) => {
-							if (res.confirm) {
-								uni.openSetting();
-							}
-						}
-					});
+		onShow() {
+			// 监听键盘高度变化
+			uni.onKeyboardHeightChange((res) => {
+				// 根据键盘高度调整布局
+				if (res.height > 0) {
+					this.keyboardShow=true
+				} else {
+					this.keyboardShow=false
 				}
-			},
+			});
+		},
+		onUnload() {
+		  uni.offKeyboardHeightChange();
+		},
+		methods: {
 			pactChange() {
 				this.pactChecked = true
 			},

static/customicons.css

@@ -1,15 +1,18 @@
 @font-face {
-  font-family: "customicons"; /* Project id 2878519 */
-  src:url('/static/customicons.ttf') format('truetype');
+	font-family: "customicons";
+	/* Project id 2878519 */
+	src: url('/static/customicons.ttf') format('truetype');
 }
+
 .nav-bottom-height {
 	height: calc(50px + env(safe-area-inset-bottom)) !important;
 }
+
 .goods-nav-bottom {
-	// display: flex;
-	// flex-direction: column;
+	/* display: flex; */
+	/* flex-direction: column; */
 	position: fixed;
-	z-index:1000;
+	z-index: 1000;
 	left: 0;
 	right: 0;
 	/* #ifdef H5 */
@@ -18,21 +21,23 @@
 	/* #endif */
 	bottom: 0;
 	/* #ifndef APP-PLUS */
-	bottom: env(safe-area-inset-bottom);
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
 	/* #endif */
 }
+
 .customicons {
-  font-family: "customicons" !important;
+	font-family: "customicons" !important;
 }
 
 .youxi:before {
-  content: "\e60e";
+	content: "\e60e";
 }
 
 .wenjian:before {
-  content: "\e60f";
+	content: "\e60f";
 }
 
 .zhuanfa:before {
-  content: "\e610";
-}
+	content: "\e610";
+}

unpackage/debug/.roid.ins

@@ -0,0 +1 @@
+forceInstall