订气选择地址验证

components/firmTree.vue

@@ -80,8 +80,8 @@
 
 	.name_tree_item {
 		color: #303133;
-		font-size: 30rpx;
-		font-weight: 600;
+		font-size: 28rpx;
+		font-weight: 500;
 	}
 
 	.distance_title {

pages/home/company.vue

@@ -96,7 +96,8 @@
 		padding-bottom: 20rpx;
 		border-bottom: 2rpx solid transparent;
 		border-image: linear-gradient(to bottom, transparent 50%, #e7e6e4 50%) 0 0 100% 0;
-		font-size: 26rpx;
-		color: #909399;
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #000;
 	}
 </style>

pages/index/codeTracing.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="card_code_tracing">
 		<view class="details_title">二维码溯源</view>
-		<view class="details_title1">高频编码 <span class="line_title">*</span></view>
+		<view class="details_title1">钢瓶编号 <span class="line_title">*</span></view>
 		<view class="card_search">
 			<view class="card_input">
 				<u-search :showAction="true" v-model="frequencyCoding" actionText="搜索" :animation="true"
@@ -86,7 +86,7 @@
 					title: '检测机构',
 					field: 'check_organization',
 				}, {
-					title: '高频编码',
+					title: '钢瓶编号',
 					field: 'uid',
 				}, {
 					title: '检测结果',

pages/mine/addAddress.vue

@@ -66,12 +66,18 @@
 						message: '请输入姓名',
 						trigger: ['blur', 'change']
 					},
-					'phone': {
+					'phone': [{
 						type: 'string',
 						required: true,
 						message: '请输入手机号码',
 						trigger: ['blur', 'change']
-					},
+					}, {
+						validator: (rule, value, callback) => {
+							return uni.$u.test.mobile(value);
+						},
+						message: '手机号码不正确',
+						trigger: ['change', 'blur'],
+					}],
 					'region': {
 						type: 'string',
 						required: true,

pages/mine/index.vue

@@ -16,11 +16,11 @@
 			<view class="option_title">个人资料</view>
 			<u-icon name="arrow-right" size="20"></u-icon>
 		</view> -->
-		<view class="space_between card_mine_option" @click="changePassword">
+		<view class="space_between card_mine_option frame" @click="changePassword">
 			<view class="option_title">修改密码</view>
 			<u-icon name="arrow-right" size="20"></u-icon>
 		</view>
-		<view class="space_between card_mine_option" @click="goAddress">
+		<view class="space_between card_mine_option frame" @click="goAddress">
 			<view class="option_title">地址管理</view>
 			<u-icon name="arrow-right" size="20"></u-icon>
 		</view>
@@ -28,7 +28,7 @@
 			<view class="option_title">我的安全检查</view>
 			<u-icon name="arrow-right" size="20"></u-icon>
 		</view> -->
-		<view class="space_between card_mine_option" @click="goSet">
+		<view class="space_between card_mine_option frame" @click="goSet">
 			<view class="option_title">系统设置</view>
 			<u-icon name="arrow-right" size="20"></u-icon>
 		</view>
@@ -149,8 +149,26 @@
 	.card_mine_option {
 		margin: 40rpx 0rpx;
 		padding-bottom: 30rpx;
-		border-bottom: 2rpx solid transparent;
-		border-image: linear-gradient(to bottom, transparent 50%, #e7e6e4 50%) 0 0 100% 0;
+		// border-bottom: 2rpx solid transparent;
+		// border-image: linear-gradient(to bottom, transparent 50%, #e7e6e4 50%) 0 0 100% 0;
+	}
+	.frame {
+		position: relative; //重要
+	}
+
+	.frame::after {
+		position: absolute;
+		content: '';
+		border-bottom: 2rpx solid #e7e6e4;
+		// border-radius: 16rpx;
+		width: 200%;
+		height: 200%;
+		top: 0;
+		left: 0;
+		transform: scale(0.5);
+		transform-origin: 0 0;
+		pointer-events: none;
+		/* 使伪元素不会阻止鼠标事件 */
 	}
 
 	.option_title {

pages/mine/system.vue

@@ -3,7 +3,7 @@
 	<view>
 		<u-navbar title="系统设置" autoBack placeholder></u-navbar>
 		<view class="card_system">
-			<view class="space_between card_mine_option" @click="logOut">
+			<view class="space_between card_mine_option frame" @click="logOut">
 				<view class="option_title">退出登录</view>
 				<u-icon name="arrow-right" size="20"></u-icon>
 			</view>
@@ -50,10 +50,29 @@
 
 	.card_mine_option {
 		margin: 40rpx 0rpx;
-		border-bottom: 2rpx solid #E4E7ED;
+		// border-bottom: 2rpx solid #E4E7ED;
 		padding-bottom: 30rpx;
 	}
 
+	.frame {
+		position: relative; //重要
+	}
+
+	.frame::after {
+		position: absolute;
+		content: '';
+		border-bottom: 2rpx solid #e7e6e4;
+		// border-radius: 16rpx;
+		width: 200%;
+		height: 200%;
+		top: 0;
+		left: 0;
+		transform: scale(0.5);
+		transform-origin: 0 0;
+		pointer-events: none;
+		/* 使伪元素不会阻止鼠标事件 */
+	}
+
 	.option_title {
 		font-size: 32rpx;
 		font-weight: bold;

pages/order/booking.vue

@@ -230,40 +230,48 @@
 				const areaty = this.cityScreening(this.addInfo.area, this.areaData)
 				const addressty = cityty + areaty + this.addInfo.address
 				params.address = addressty
-				this.loading = true
-				if (!this.revamp) {
-					this.$api.post('/api/applet/order', params).then(res => {
-						if (res.code == 200) {
-							uni.navigateTo({
-								url: '/pages/indexRouter'
-							})
-							uni.$emit('booking');
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							});
-						}
-						this.loading = false
-					})
+				if (this.addInfo.id) {
+					this.loading = true
+					if (!this.revamp) {
+						this.$api.post('/api/applet/order', params).then(res => {
+							if (res.code == 200) {
+								uni.navigateTo({
+									url: '/pages/indexRouter'
+								})
+								uni.$emit('booking');
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								});
+							}
+							this.loading = false
+						})
+					} else {
+						params.id = this.orderData.id
+						this.$api.put('/api/applet/order', params).then(res => {
+							if (res.code == 200) {
+								uni.navigateTo({
+									url: '/pages/indexRouter'
+								})
+								uni.$emit('booking');
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								});
+							}
+							this.loading = false
+						})
+					}
 				} else {
-					params.id = this.orderData.id
-					this.$api.put('/api/applet/order', params).then(res => {
-						if (res.code == 200) {
-							uni.navigateTo({
-								url: '/pages/indexRouter'
-							})
-							uni.$emit('booking');
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							});
-						}
-						this.loading = false
-					})
+					uni.showToast({
+						title: '请选择收货地址',
+						icon: 'none',
+						duration: 2000
+					});
 				}
 			},
 			// 获取商品列表

pages/order/delivery.vue

@@ -3,7 +3,7 @@
 	<view>
 		<u-navbar :title="navTitle" autoBack placeholder @leftClick="leftClick"></u-navbar>
 		<view class="card_order_details">
-			<view class="details_title">高频编码 <span class="line_title">*</span></view>
+			<view class="details_title">钢瓶编号 <span class="line_title">*</span></view>
 			<view class="card_search">
 				<view class="card_sweep" @click="sweep">
 					<u-icon name="scan" size="36"></u-icon>
@@ -16,7 +16,7 @@
 			<view v-if="selectiveType != '99' && selectiveType != '100'">
 				<view class="card_frequency" v-if="selectiveType != 'inspect'">
 					<view class="card_high space_between">
-						<view class="card_frequency_title">高频编码列表</view>
+						<view class="card_frequency_title">钢瓶编号列表</view>
 						<view class="card_bottle">已扫<span>{{list.length}}</span>瓶</view>
 					</view>
 					<view style="width: 100%;" v-if="list.length > 0">
@@ -105,7 +105,7 @@
 							}
 						})
 					} else {
-						uni.$u.toast('请先扫高频编码')
+						uni.$u.toast('请先扫钢瓶编号')
 					}
 				} else {
 					if (this.list.length > 0) {
@@ -128,7 +128,7 @@
 							}
 						})
 					} else {
-						uni.$u.toast('请先扫高频编码')
+						uni.$u.toast('请先扫钢瓶编号')
 					}
 				}
 			},

pages/register.vue

@@ -116,6 +116,9 @@
 							this.formList.phone = ''
 							this.formList.password = ''
 							this.formList.verifyCode = ''
+							uni.navigateBack({
+								delta: 1
+							});
 						} else {
 							this.formList.phone = ''
 							this.formList.password = ''

unpackage/dist/build/web/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>气瓶安全追溯</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.1cc77ee3.js></script><script src=./static/js/index.b7c4d6b0.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=./static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=./static/js/chunk-vendors.db133935.js></script><script src=./static/js/index.e4a3c8d4.js></script></body></html>