Ver Fonte

Merge branch 'develop' of http://git.chelingzhu.com/chelingzhu-web/zxyj-mini-html into develop

lilei há 4 anos atrás
pai
commit
0269a57453
2 ficheiros alterados com 18 adições e 18 exclusões
  1. 17 18
      pages/toOrder/editAddress.vue
  2. 1 0
      pages/toOrder/index.vue

+ 17 - 18
pages/toOrder/editAddress.vue

@@ -7,8 +7,8 @@
 			<u-form-item label="电话" required prop="receiverPhone">
 				<u-input placeholder="请输入电话" :maxlength="11" type="number" v-model="form.receiverPhone" />
 			</u-form-item>
-			<u-form-item label="省市区" required prop="area">
-				<u-input v-model="form.area" placeholder="请选择省市区" @click="show = true" type="select" />
+			<u-form-item label="省市区" required prop="receiveAreasName">
+				<u-input v-model="form.receiveAreasName" placeholder="请选择省市区" @click="show = true" type="select" />
 				<u-picker v-model="show" @confirm="chooseArea" mode="region"></u-picker>
 			</u-form-item>
 			<u-form-item label="详细地址" required prop="receiveAddress">
@@ -32,10 +32,11 @@
 				form: {
 					receiverName: '',
 					receiverPhone: '',
-					area: '', // 地址名称
-					receiveAreas: '', // 地址编码
+					receiveAreasName: '', // 地址名称
 					receiveAddress: '' // 详细地址
 				},
+				receiveAreas: '', //地址编码
+				areaName: '', //地址
 				rules: {
 					receiverName: [
 						{ 
@@ -53,7 +54,7 @@
 							trigger: ['change','blur'],
 						}
 					],
-					area: [
+					receiveAreasName: [
 						{
 							required: true, 
 							message: '请选择省市区', 
@@ -61,23 +62,16 @@
 						}
 					],
 					receiveAddress: [
-						{
-							required: true, 
-							max: 100, 
-							message: '请输入详细地址,最多100个字', 
-							trigger: ['change','blur']
-						}
 					]
 				}
 			};
 		},
 		onLoad(option) {
 			this.form = this.$store.state.vuex_OrderAddress
-			if (this.form.area) {
+			if (this.form.receiveAreasName) {
 				uni.setNavigationBarTitle({
 					title: '修改地址'
 				})
-				this.form.area = this.form.receiveAreasName.replace(',','-')
 			} else {
 				uni.setNavigationBarTitle({
 					title: '新增地址'
@@ -89,9 +83,13 @@
 				this.$refs.uForm.validate(valid => {
 					if (valid) {
 						console.log('验证通过');
-						let params = this.form
-						params.receiveAreasName = params.area.replace('-',',')
-						delete params.area
+						let params = {
+							receiverName: this.form.receiverName,
+							receiverPhone: this.form.receiverPhone,
+							receiveAreasName: this.areaName, // 地址名称
+							receiveAreas: this.receiveAreas, 
+							receiveAddress: this.form.receiveAddress // 详细地址
+						}
 						saveAddress(params).then(res=>{
 							if(res.status == 200) {
 								uni.showToast({
@@ -116,8 +114,9 @@
 			// 选择地址
 			chooseArea(e){
 				console.log(e)
-				this.form.area = e.province.label + '-' + e.city.label + '-' + e.area.label
-				this.form.receiveAreas = e.province.value + ',' + e.city.value + ',' + e.area.value
+				this.form.receiveAreasName = e.province.label + '-' + e.city.label + '-' + e.area.label
+				this.areaName = e.province.label + ',' + e.city.label + ',' + e.area.label
+				this.receiveAreas = e.province.value + ',' + e.city.value + ',' + e.area.value
 			}
 		},
 		// 必须要在onReady生命周期,因为onLoad生命周期组件可能尚未创建完毕

+ 1 - 0
pages/toOrder/index.vue

@@ -410,6 +410,7 @@ page{
 		.footer{
 			width: 80%;
 			border-bottom: 1px solid #b1b1b1;
+			margin-bottom: 30upx;
 		}
 	}
 }