From 6fcfe40675f7eb14e820b9d7f13f73a87540999b Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 16:34:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0
---
manifest.json | 2 +-
pages/home/components/home-top-flow.vue | 8 +-------
plugins/http.js | 35 ++++++++++++++++++++---------------
sub_pages/customer/trade/trade.vue | 6 +++---
sub_pages/customer/trade/detail.vue | 4 +++-
5 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/manifest.json b/manifest.json
index 782394c..2848179 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx6d0ecc4e18710458",
+ "appid" : "wx1441324401626290",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages/home/components/home-top-flow.vue b/pages/home/components/home-top-flow.vue
index a94f900..7e55261 100644
--- a/pages/home/components/home-top-flow.vue
+++ b/pages/home/components/home-top-flow.vue
@@ -14,19 +14,13 @@
{{ item.name || '-' }}
<!-- <span v-if="item.categoryStr" class="m-l-10">{{item.categoryStr || '-'}}</span> -->
- <!-- #ifdef PUB_CUSTOMER_DEV -->
<view class="price component-price-new">
<span class="tip">会员价</span>￥<span class="p">{{item.priceMember||item.price}}</span>/扎
<view class="component-price-old">
￥{{item.price}}/扎
</view>
</view>
- <!-- #endif -->
- <!-- #ifndef PUB_CUSTOMER_DEV -->
- <view class="price">
- ￥{{ item.price || 0 }}/扎
- </view>
- <!-- #endif -->
+
</view>
<view class="tags" v-if="item.tags">
<view class="tag red" v-for="(tag,k) of item.tagArr" :class="[k===0?'red':'green']" :key="tag">{{
diff --git a/plugins/http.js b/plugins/http.js
index bd19a45..bfc3dd2 100644
--- a/plugins/http.js
+++ b/plugins/http.js
@@ -52,7 +52,7 @@
dataType: options.dataType ? options.dataType : 'json',
data: options.data || null,
header,
- success: (res) => {
+ success: async (res) => {
if (!options.ignore) {
message.hideLoading()
}
@@ -87,13 +87,13 @@
validmsg = res.data.msg
message.showToast(res.data.data)
}
- if(validmsg){
+ if (validmsg) {
//兼容安卓手机提醒过快问题
setTimeout(() => {
message.showToast(validmsg)
}, 200)
}
-
+
reject({
@@ -107,13 +107,10 @@
} else if (res.data.code === '401' || res.data && res.data.code &&
res.data.code.startsWith('401')) {
console.log('resp', res)
+ // storage.removeItem('token')
+ await store.dispatch('logout')
message.showToast('登录信息失效')
- storage.removeItem('token')
- reject({
- data: null,
- code: 401,
- msg: 'Unauthorized'
- })
+
// #ifdef PUB_CUSTOMER
uni.reLaunch({
url: '/pages/user/supplier-user'
@@ -124,6 +121,11 @@
url: '/pages/login/supplier-login'
})
// #endif
+ reject({
+ data: null,
+ code: 401,
+ msg: 'Unauthorized'
+ })
} else {
if (res.data.data && typeof res.data.data === 'string') {
@@ -148,13 +150,11 @@
// commit('updat')
// store.commit('updateLogin', false)
console.log('401', res)
- message.showToast('登录信息失效')
storage.removeItem('token')
- reject({
- data: null,
- code: 401,
- msg: 'Unauthorized'
- })
+ await store.dispatch('logout')
+ message.showToast('登录信息失效')
+
+
// #ifdef PUB_CUSTOMER
uni.reLaunch({
url: '/pages/user/supplier-user'
@@ -165,6 +165,11 @@
url: '/pages/login/supplier-login'
})
// #endif
+ reject({
+ data: null,
+ code: 401,
+ msg: 'Unauthorized'
+ })
} else if (res.statusCode === 403) {
message.showToast('请求被拒绝')
diff --git a/sub_pages/customer/trade/detail.vue b/sub_pages/customer/trade/detail.vue
index b8ad709..9643c11 100644
--- a/sub_pages/customer/trade/detail.vue
+++ b/sub_pages/customer/trade/detail.vue
@@ -76,9 +76,11 @@
<view class="price m-r-a component-price-new">
<span class="tip">会员价</span><span class="num p">{{ dto.priceMember || dto.price || '-' }}</span>
元/扎
+
</view>
<view class="price m-r-a component-price-old">
- <span class="num">{{ dto.price || '-' }}</span>
+ <!-- <span class="num">{{ dto.price || '-' }}</span> -->
+ {{ dto.price || '-' }}
元/扎
</view>
</view>
diff --git a/sub_pages/customer/trade/trade.vue b/sub_pages/customer/trade/trade.vue
index 340c74e..32be55a 100644
--- a/sub_pages/customer/trade/trade.vue
+++ b/sub_pages/customer/trade/trade.vue
@@ -60,10 +60,10 @@
<view class="title">{{item.name}}</view>
<view class="price">
- <view>会员价</view>
+ <!-- <view>会员价</view> -->
<view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view>
</view>
- <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view>
+ <!-- <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view> -->
<view class="desc">在售 {{item.stock||'0'}} 扎</view>
@@ -463,7 +463,7 @@
.price {
font-weight: 400;
- font-size: 24rpx;
+ font-size: 28rpx;
color: #CF0000;
line-height: 34rpx;
text-align: center;
--
Gitblit v1.9.3