From 81a47fbab41efc21f04019130c294973f906acf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Thu, 21 Oct 2021 10:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E5=B1=8F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=97=B6=E9=95=BF=EF=BC=8C=E4=BC=98=E5=8C=96=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E7=9A=84=E5=88=86=E4=BA=AB=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BC=98=E5=8C=96=E9=82=AE=E5=AF=84=E3=80=81?=
 =?UTF-8?q?=E8=87=AA=E6=8F=90=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index/index.vue               |  4 ++--
 pages/index/openScreenAd/openScreenAd.vue |  3 ++-
 pages/order/confirm/confirm.vue           | 14 ++++++++++++++
 pages/shop/goodsdetail.vue                | 17 +++++++++++++++--
 4 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/pages/index/index/index.vue b/pages/index/index/index.vue
index 64bcf1f..ab57041 100644
--- a/pages/index/index/index.vue
+++ b/pages/index/index/index.vue
@@ -289,7 +289,7 @@
 			//获取直播房间号
 			getLiveRoom(){
 				this.$http.get({
-					api: '/api/live'
+					api: 'api/live'
 				}).then(res => {
 					console.log('=======',res.data.data)
 					if(res.data.data != null) {
@@ -300,7 +300,7 @@
 			},
 			getAlertAd(){
 				this.$http.get({
-					api: '/api/ad'
+					api: 'api/ad'
 				}).then(res => {
 					let alert = res.data.data.alert;
 					this.alert = alert;
diff --git a/pages/index/openScreenAd/openScreenAd.vue b/pages/index/openScreenAd/openScreenAd.vue
index 20ea8a0..92147fd 100644
--- a/pages/index/openScreenAd/openScreenAd.vue
+++ b/pages/index/openScreenAd/openScreenAd.vue
@@ -30,10 +30,11 @@
 		methods: {
 			getAd(){
 				this.$http.get({
-					api: '/api/ad'
+					api: 'api/ad'
 				}).then(res => {
 					this.full = res.data.data.full;
 					if(this.$isRight(res.data.data.full)){
+						this.num = Number(res.data.data.full.duration) || 5;
 						this.startTime();
 					}else{
 						this.next();
diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue
index a8dce23..76e93dd 100644
--- a/pages/order/confirm/confirm.vue
+++ b/pages/order/confirm/confirm.vue
@@ -232,6 +232,11 @@
 						let detail = res.data.data;
 						this.order_detail = detail;
 						this.address = res.data.data.address;
+						
+						if(!detail.order.brand.express && detail.order.brand.pick_self){
+							this.mode = 1; // 只有自提时，切换显示到自提
+						}
+						
 						if(this.$isRight(detail.coupons)){
 							this.coupon_index = 0;
 						}
@@ -282,6 +287,15 @@
 			},
 			// 切换订单是邮寄还是自提
 			switchMode(mode){
+				let detail = this.order_detail;
+				if(detail.order.brand.express && !detail.order.brand.pick_self && mode == 1){
+					this.$msg('该订单只能邮寄哦');
+					return;
+				}else if(!detail.order.brand.express && detail.order.brand.pick_self && mode == 0){
+					this.$msg('该订单只能自提哦');
+					return;
+				}
+				
 				this.mode = mode;
 				this.calcAmount();
 			},
diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue
index 0ebf85c..522769d 100644
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@@ -47,13 +47,19 @@
 						</view>
 						<lf-price :iftext="false" :price="seckill.seckill_price || 0" v-else-if="type == 'seckill'"></lf-price>
 						<lf-price :iftext="false" :price="goods_detail.sell_price || 0" v-else></lf-price>
-						<text class="lf-iconfont icon-fenxiang lf-font-40" @click="shareGraphic()"></text>
+						<button class="share-btn" open-type="share">
+							<text class="lf-iconfont icon-fenxiang lf-font-40"></text>
+						</button>
 					</view>
 					<view class="lf-row-between lf-font-24 lf-m-t-20 lf-p-b-20">
 						<view class="lf-font-bold lf-font-32 lf-color-222">{{ goods_detail.name }}</view>
 					</view>
 					<view class="lf-row-between lf-font-24 lf-p-b-30">
-						<view class="lf-font-28 lf-color-777 lf-row-between">可自提/可邮寄</view>
+						<view class="lf-font-28 lf-color-777 lf-row-between">
+							<text v-if="brand_detail.express && !brand_detail.pick_self">可邮寄</text>
+							<text v-else-if="!brand_detail.express && brand_detail.pick_self">可自提</text>
+							<text v-else-if="brand_detail.express && brand_detail.pick_self">可自提/可邮寄</text>
+						</view>
 					</view>
 				</view>
 				<!-- 商品优惠 -->
@@ -1348,4 +1354,11 @@
 	
 	  }
 	}
+	
+	.share-btn{
+		margin: 0;
+		padding: 0;
+		line-height: 1;
+		background-color: transparent;
+	}
 </style>
\ No newline at end of file