Merge branch 'master' of https://git.dayouqiantu.cn/uniapp/yshop-uniapp

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 {

config/index.js

@@ -1,7 +1,7 @@
 
 // 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';

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
+          }
         });
       },
       // 砍价完成，去支付

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>

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);
   }