Compare commits

..

No commits in common. "26563409c9737e627bb9d27b1da301ad1170059c" and "a99c3884e2fa41c28577a230837bea8fee017dc1" have entirely different histories.

4 changed files with 27 additions and 55 deletions

View File

@ -20,12 +20,12 @@ function request(url, method = 'GET', data = {}) {
header, header,
success(res) { success(res) {
if (res.data.code) { if (res.data.code) {
if (res.data.code == 10103 || res.data.code == 10101) { if (res.data.code == 10103 || res.data.code == 10104) {
wx.removeStorageSync('access_token'); wx.removeStorageSync('access_token');
// wx.navigateTo({ // wx.navigateTo({
// url: '/pages/login/index', // url: '/pages/login/login',
// }); // });
// reject(res.data); reject(res.data);
return; return;
} }
wx.showToast({ wx.showToast({

View File

@ -216,7 +216,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="logout-btn" @click="logout">退出登录</view> <view class="logout-btn">退出登录</view>
</view> </view>
<view class="quick-card"> <view class="quick-card">
<view class="quick-title">快捷功能</view> <view class="quick-title">快捷功能</view>
@ -797,12 +797,6 @@ export default {
uni.navigateTo({ uni.navigateTo({
url: '/pages/my/editInfo/index' url: '/pages/my/editInfo/index'
}); });
},
logout() {
wx.removeStorageSync('access_token');
uni.reLaunch({
url: '/pages/login/index'
});
} }
} }
}; };

View File

@ -605,22 +605,11 @@ export default {
// //
goToCart() { goToCart() {
const token = await uni.getStorageSync('access_token')
if (!token) {
uni.navigateTo({
url: '/pages/login/index'
})
return
}
uni.navigateTo({ uni.navigateTo({
url: '/pages/shoppingCart/index' url: '/pages/shoppingCart/index'
}); });
}, },
async fetchCartSelectedCount() { async fetchCartSelectedCount() {
const token = await uni.getStorageSync('access_token')
if (!token) {
return
}
try { try {
const res = await request('xcx/carts', 'GET', { page: 1, page_size: 99 }); const res = await request('xcx/carts', 'GET', { page: 1, page_size: 99 });
const list = res.list || res.data || res || []; const list = res.list || res.data || res || [];

View File

@ -19,8 +19,7 @@
<view class="item-price-row"> <view class="item-price-row">
<view class="item-price"> <view class="item-price">
<text class="price-symbol"></text> <text class="price-symbol"></text>
<text class="price-value">{{ formatPrice(item.price) || formatPrice(item.sku_price) <text class="price-value">{{ formatPrice(item.price) || formatPrice(item.sku_price) }}</text>
}}</text>
</view> </view>
<view class="item-count"> <view class="item-count">
<view class="count-btn" @click="decreaseCount(index)">-</view> <view class="count-btn" @click="decreaseCount(index)">-</view>
@ -102,23 +101,13 @@ export default {
} }
}, },
onLoad() { onLoad() {
this.getUserIsLogin(); this.loadCartList();
}, },
onShow() { onShow() {
this.getUserIsLogin();
},
methods: {
async getUserIsLogin() {
const token = await uni.getStorageSync('access_token')
if (token) {
// //
this.loadCartList(); this.loadCartList();
} else {
uni.navigateTo({
url: '/pages/login/index'
})
}
}, },
methods: {
formatPrice(value) { formatPrice(value) {
if(!value) { if(!value) {
return 0.00; return 0.00;