Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/cart/cart.vue

@@ -10,7 +10,7 @@
       "
 		>
 			<Text class="grid-text">商品库存有限，请尽快下单哦</Text>
-			<Text @click="edit" v-if="editType == false" class="grid-text_r">编辑</Text>
+			<Text @click="edit" v-if="editType == false && list[0].GoodsList.length>0" class="grid-text_r">编辑</Text>
 			<Text @click="edit" v-if="editType == true" class="grid-text_r">完成</Text>
 		</view>
 		<view style="width: 100%; height: 30rpx; background: #f7f7f7; margin: 20rpx 0;"></view>

pages/order-submit/order-submit.vue

@@ -72,7 +72,8 @@
 			<view class="filed">
 				<view class="left">优惠券</view>
 				<view class="right">
-					<text class="content" v-if="mchs[0].coupon.user_coupon_id == 0">选择优惠券</text>
+					<text class="content" v-if="mchs[0].coupon.user_coupon_id == 0 && couponList.length>0">选择优惠券</text>
+					<text class="content" v-else-if="couponList.length==0">暂无优惠券</text>
 					<text class="content" v-else :style="{ color: mc }">已优惠{{ mchs[0].coupon.coupon_discount }}元</text>
 					<u-icon name="ellipsis" size="36" v-if="couponList.length > 0" @click="showCouponHandler"></u-icon>
 				</view>
@@ -126,7 +127,7 @@
 			</view>
 			<view class="right">
 				<u-button
-					:disabled="mchs[0].address_enable"
+					:disabled="!address_enable"
 					size="80"
 					:ripple="true"
 					shape="circle"
@@ -174,6 +175,7 @@ export default {
 	},
 	data() {
 		return {
+			address_enable:'',
 			payExit: false,
 			payBtn: false,
 			formData: {
@@ -499,6 +501,7 @@ export default {
 
 					if (res.resultCode == 1) {
 						this.address = res.data.address;
+						this.address_enable=res.data.address_enable;
 						this.mchs = res.data.mch_list;
 						this.payInfo.GoodsName = this.mchs[0].goods_list[0].name;
 						this.ds = res.data;