cxc/yshopb2c-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gaoxs
2020-10-20 11:09:25 +08:00
parent edb04ebb20 03146c01d4
commit 3385695788
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/css/style.less
View File

@ -6313,7 +6313,7 @@ page {
margin: 0.25*100rpx auto 0 auto; margin: 0.25*100rpx auto 0 auto;
padding: 0.53*100rpx 0 0.58*100rpx 0; padding: 0.53*100rpx 0 0.58*100rpx 0;
left: 50%; left: 50%;
margin-left: -3.55*100rpx; //margin-left: -3.55*100rpx;
} }
.cash-audit .pictrue { .cash-audit .pictrue {

4
config/index.js
View File

@ -1,7 +1,7 @@
// export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api'; // 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 = '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_API_URL = 'https://h5api.xinxintuan.co/api';
export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static'; export const VUE_APP_RESOURCES_URL = 'https://wx.yixiang.co/static';

5
pages/activity/DargainDetails/index.vue
View File

@ -267,7 +267,10 @@
// 查看商品 // 查看商品
openAlone: function () { openAlone: function () {
this.$yrouter.push({ this.$yrouter.push({
path: "/detail/" + this.goodsDetail.productId path: "/pages/shop/GoodsCon/index",
query: {
id: this.goodsDetail.productId
}
}); });
}, },
// 砍价完成，去支付 // 砍价完成，去支付

4
pages/activity/SeckillDetails/index.vue
View File

@ -10,8 +10,8 @@
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<view class="times"> <view class="times">
<view>距秒杀结束仅剩</view> <view>距秒杀结束仅剩</view>
<count-down :isDay="false" :tipText="false" :dayText="false" :hourText="' : '" :minuteText="' : '" <count-down :isDay="false" :tipText="' '" :dayText="' '" :hourText="' : '" :minuteText="' : '"
:secondText="false" :datatime="datatime"></count-down> :secondText="' '" :datatime="datatime"></count-down>
</view> </view>
<view class="iconfont icon-jiantou"></view> <view class="iconfont icon-jiantou"></view>
</view> </view>

7
utils/request.js
View File

@ -41,6 +41,13 @@ fly.interceptors.response.use(
console.log('————————') console.log('————————')
handleLoginFailure(); handleLoginFailure();
return Promise.reject({ msg: "未登录", toLogin: true }); 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); return Promise.reject(error);
} }