Parcourir la source

支付流程”
git commit -m 支付流程”

liujiaxin il y a 1 jour
Parent
commit
77853314b5

+ 4 - 2
pages_shopping/live/confirmCreateOrder.vue

@@ -161,7 +161,8 @@
 				confirmParam: [],
 				type: '',
 				isFirstLoad: true,
-				recordId:null
+				recordId:null,
+				selected:false,
 			}
 		},
 
@@ -187,6 +188,7 @@
 				this.address = e;
 				this.addressId = e.addressId;
 				this.cityId = e.cityId;
+				this.selected=true
 			});
 		},
 		mounted() {
@@ -221,7 +223,7 @@
 							if (res.data && !this.address) {
 								this.address = res.data;
 							}
-							if (res.data && res.data.cityId) {
+							if (res.data && res.data.cityId&&!this.selected) {
 								this.cityId = res.data.cityId;
 							}
 							if (this.type == 'win') {

+ 1 - 1
pages_shopping/live/storeOrderDetail.vue

@@ -250,7 +250,7 @@
 			<view class="btn pay" v-if="order.status==1" @click="pay()">立即付款</view>
 			<!-- <view class="btn cancel"  v-if="(order.status==0||order.status==1)&&order.isPrescribe==1&&prescribe==null"  @click="addPrescribe()">开处方</view> -->
 			<view class="btn cancel"
-				v-if="item.status !== -1 && item.status !== -3&& item.status !== 1&& item.status !==-2"
+				v-if="order.status !== -1 && order.status !== -3&& order.status !== 1&& order.status !==-2"
 				@click="refund()">申请售后</view>
 			<view class="btn pay" v-if="order.status>=2&&order.deliveryId!=null" @click="express()">查看物流</view>
 			<view class="btn pay" v-if="order.status==2&&order.payType!=1&&order.isPayRemain==0&&order.deliverySn=='SF'"