|
|
@@ -30,23 +30,23 @@
|
|
|
<div class="tui-title">所在城市</div>
|
|
|
<div
|
|
|
class="tui-input"
|
|
|
- v-if="form.receiveProvince || form.receiveCity"
|
|
|
- >{{ form.receiveProvince + '-' + form.receiveCity }}</div>
|
|
|
+ v-if="form.province || form.city"
|
|
|
+ >{{ form.province + '-' + form.city }}</div>
|
|
|
<div class="tui-placeholder" v-else>请选择</div>
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="selRegionFn">
|
|
|
<div class="tui-title">详细地址</div>
|
|
|
- <div class="tui-input" v-if="form.receiveAddress">{{ form.receiveAddress }}</div>
|
|
|
+ <div class="tui-input" v-if="form.address">{{ form.address }}</div>
|
|
|
<div class="tui-placeholder" v-else>请选择地址</div>
|
|
|
</tui-list-cell>
|
|
|
<tui-list-cell class="line-cell" :hover="false">
|
|
|
<div class="tui-title">门牌号</div>
|
|
|
<input
|
|
|
- v-model="form.receiveFloor"
|
|
|
+ v-model="form.floor"
|
|
|
placeholder-class="phcolor"
|
|
|
placeholder-style="color:#ccc"
|
|
|
class="tui-input"
|
|
|
- name="receiveFloor"
|
|
|
+ name="floor"
|
|
|
placeholder="楼号门牌号（选填）"
|
|
|
/>
|
|
|
</tui-list-cell>
|
|
|
@@ -176,7 +176,7 @@
|
|
|
<app-area-sel
|
|
|
:isFocus="false"
|
|
|
:show.sync="showRegion"
|
|
|
- :city="form.receiveCity"
|
|
|
+ :city="form.city"
|
|
|
@change="changeAreaFn" />
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -211,10 +211,10 @@ export default {
|
|
|
form: {
|
|
|
receiveUserName: "", // 收花人姓名；到店自提的姓名
|
|
|
receiveMobile: "", // 收花人手机；到店自提的电话；
|
|
|
- receiveProvince: "", // 收花人省份
|
|
|
- receiveCity: "", // 收花人城市
|
|
|
- receiveAddress: "", // 收花人城市
|
|
|
- receiveFloor: "", // 收花人门楼号和牌号
|
|
|
+ province: "", // 收花人省份
|
|
|
+ city: "", // 收花人城市
|
|
|
+ address: "", // 收花人城市
|
|
|
+ floor: "", // 收花人门楼号和牌号
|
|
|
showAddress: "", // 收花人完整地址，从腾讯地图接口获取
|
|
|
bookMobile: "", // 订花人手机号
|
|
|
reachDate: 0, // 配送时间
|
|
|
@@ -238,16 +238,16 @@ export default {
|
|
|
watch: {
|
|
|
orderShop(val) {
|
|
|
console.log("val", val);
|
|
|
- this.form.receiveProvince = val.shop.province ? val.shop.province : "";
|
|
|
- this.form.receiveCity = val.shop.city ? val.shop.city : "";
|
|
|
+ this.form.province = val.shop.province ? val.shop.province : "";
|
|
|
+ this.form.city = val.shop.city ? val.shop.city : "";
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
|
if (!this.$util.isEmpty(this.orderShop)) {
|
|
|
- this.form.receiveProvince = this.orderShop.shop.province
|
|
|
+ this.form.province = this.orderShop.shop.province
|
|
|
? this.orderShop.shop.province
|
|
|
: "";
|
|
|
- this.form.receiveCity = this.orderShop.shop.city
|
|
|
+ this.form.city = this.orderShop.shop.city
|
|
|
? this.orderShop.shop.city
|
|
|
: "";
|
|
|
}
|
|
|
@@ -259,7 +259,7 @@ export default {
|
|
|
},
|
|
|
// 选择地址
|
|
|
selRegionFn() {
|
|
|
- if (!this.form.receiveCity) {
|
|
|
+ if (!this.form.city) {
|
|
|
this.$msg("请先选择地址！");
|
|
|
return false;
|
|
|
}
|
|
|
@@ -267,7 +267,7 @@ export default {
|
|
|
},
|
|
|
changeAreaFn(e) {
|
|
|
console.log("changeAreaFn", e);
|
|
|
- this.form.receiveAddress = e.title;
|
|
|
+ this.form.address = e.title;
|
|
|
this.form.showAddress = e.address;
|
|
|
this.region.latitude = e.location.lat;
|
|
|
this.region.longitude = e.location.lng;
|
|
|
@@ -291,9 +291,9 @@ export default {
|
|
|
this.$refs.simpleAddress.open();
|
|
|
},
|
|
|
onCityConfirm(e) {
|
|
|
- this.form.receiveAddress = e.label;
|
|
|
- this.form.receiveProvince = e.provinceName;
|
|
|
- this.form.receiveCity = e.cityName;
|
|
|
+ this.form.address = e.label;
|
|
|
+ this.form.province = e.provinceName;
|
|
|
+ this.form.city = e.cityName;
|
|
|
},
|
|
|
// 获取微信手机号
|
|
|
getWxMobile(e) {
|
shish