From 672023729e9f8b618a11566e2f10dd2126ba3c56 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Wed, 30 Sep 2020 10:11:23 +0800
Subject: [PATCH 1/3] index.js

---
 config/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/index.js b/config/index.js
index c54667e..f4a122b 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,8 +1,8 @@
 
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
-export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
+//export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api';
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api';
-// export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
+ export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://h5api.xinxintuan.co/api';
 export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';
 

From e4517efe645368a9978f636ed47d7f57e2c19b39 Mon Sep 17 00:00:00 2001
From: hupeng <guchengwuyue@163.com>
Date: Mon, 12 Oct 2020 10:53:46 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=92=E6=9D=80?=
 =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E3=80=81=E7=A0=8D=E4=BB=B7=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=B8=8D=E8=B7=B3=E8=BD=AC=E3=80=81=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/style.less                   | 2 +-
 pages/activity/DargainDetails/index.vue | 5 ++++-
 pages/activity/SeckillDetails/index.vue | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/assets/css/style.less b/assets/css/style.less
index d002810..9a360f4 100644
--- a/assets/css/style.less
+++ b/assets/css/style.less
@@ -6313,7 +6313,7 @@ page {
   margin: 0.25*100rpx auto 0 auto;
   padding: 0.53*100rpx 0 0.58*100rpx 0;
   left: 50%;
-  margin-left: -3.55*100rpx;
+  //margin-left: -3.55*100rpx;
 }
 
 .cash-audit .pictrue {
diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue
index 7794230..a361e4b 100644
--- a/pages/activity/DargainDetails/index.vue
+++ b/pages/activity/DargainDetails/index.vue
@@ -267,7 +267,10 @@
       // 查看商品
       openAlone: function () {
         this.$yrouter.push({
-          path: "/detail/" + this.goodsDetail.productId
+          path: "/pages/shop/GoodsCon/index",
+          query: {
+            id: this.goodsDetail.productId
+          }
         });
       },
       // 砍价完成，去支付
diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue
index cc45195..f339365 100644
--- a/pages/activity/SeckillDetails/index.vue
+++ b/pages/activity/SeckillDetails/index.vue
@@ -10,8 +10,8 @@
       <view class="acea-row row-middle">
         <view class="times">
           <view>距秒杀结束仅剩</view>
-          <count-down :isDay="false" :tipText="false" :dayText="false" :hourText="' : '" :minuteText="' : '"
-            :secondText="false" :datatime="datatime"></count-down>
+          <count-down :isDay="false" :tipText="' '" :dayText="' '" :hourText="' : '" :minuteText="' : '"
+            :secondText="' '" :datatime="datatime"></count-down>
         </view>
         <view class="iconfont icon-jiantou"></view>
       </view>

From 03146c01d46963d54e74654fad6780ab86fbe1d0 Mon Sep 17 00:00:00 2001
From: "LIONCITYS\\lioncity" <18026623439@163.com>
Date: Mon, 19 Oct 2020 09:59:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=90=E6=B5=81?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/request.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/request.js b/utils/request.js
index 0732c76..1147e3f 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -41,6 +41,13 @@ fly.interceptors.response.use(
       console.log('————————')
       handleLoginFailure();
       return Promise.reject({ msg: "未登录", toLogin: true });
+    }
+	if (error.response.data.status == 5109) {
+      uni.showToast({
+        title: error.response.data.msg,
+        icon: "none",
+        duration: 2000
+      });
     }
     return Promise.reject(error);
   }