XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(custom): 商家详情整改增加未登录引导弹窗
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
YuanHuakk
2025-06-18 21:43:16 +08:00
parent 6f5d722e6e
commit 8ca7001e3f
12 changed files with 57 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/Cart.vue
View File

@@ -202,7 +202,7 @@ defineExpose({
<!-- <view>购物车数量: {{ cartInfo.count }}</view> -->
<view class="cardImg">
<image
src="http://p1.meituan.net/csc/929f447a96a44b09a09b2e0055433222717.png">
src="https://p1.meituan.net/csc/929f447a96a44b09a09b2e0055433222717.png">
</image>
<view class="count-text" v-if="cartInfo.count > 0">
<text>{{ cartInfo.count }}</text>
@@ -233,7 +233,7 @@ defineExpose({
<!-- <Del2 color="#666666" /> -->
<image
class="w-[20px] h-[20px]"
src="http://p0.meituan.net/csc/db4d11fd744b69435c6ffdc6bfc868c5684.png" />
src="https://p0.meituan.net/csc/db4d11fd744b69435c6ffdc6bfc868c5684.png" />
<text class="text-[20px]" style="color: #666666">清空购物车</text>
</view>
</view>
@@ -316,7 +316,7 @@ $h-border-radius: 50px;
position: absolute;
top: -10px;
right: -10px;
background-image: url('http://p0.meituan.net/csc/80b0e11d4270d09324df0b802d4c479b986.png');
background-image: url('https://p0.meituan.net/csc/80b0e11d4270d09324df0b802d4c479b986.png');
background-size: 100% 100%;
// padding: 0 8px;
width: 35px;

4
src/pages/admin/verify/index.vue
View File

@@ -4,7 +4,7 @@
<image
class="image"
@tap="scanCode"
src="http://p1.meituan.net/csc/696924dda634f05689dabdfbb18e88cc13551.png" />
src="https://p1.meituan.net/csc/696924dda634f05689dabdfbb18e88cc13551.png" />
<view class="mt-2 text-[#7A7A7A]">扫描二维码核销</view>
</view>
<view class="bg-white p-2">
@@ -154,7 +154,7 @@ const toDetailPage = (item: any) => {
<style lang="scss">
page {
background-color: #f5f5f5;
background-image: url('http://p0.meituan.net/csc/e6ff5582788af2023f49241afe22fc89391851.png');
background-image: url('https://p0.meituan.net/csc/e6ff5582788af2023f49241afe22fc89391851.png');
background-repeat: no-repeat;
background-size: 100% 25%;
}

2
src/pages/admin/withdrawal/index.scss
View File

@@ -41,7 +41,7 @@
.card {
margin: 20px auto;
background-image: url('http://p0.meituan.net/csc/902ecf4ba9765a8200817d58a3a5a655172781.png');
background-image: url('https://p0.meituan.net/csc/902ecf4ba9765a8200817d58a3a5a655172781.png');
background-size: 100% 100%;
width: 95%;
height: 250px;

2
src/pages/admin/withdrawal/index.vue
View File

@@ -156,7 +156,7 @@ Taro.useReachBottom(() => {
<!-- <view class="flex items-center" @click="visible1 = true">
<image
class="w-[26px] h-[26px]"
src="http://p1.meituan.net/csc/5437a800f4ed4a49f14984494c1c3077994.png"></image>
src="https://p1.meituan.net/csc/5437a800f4ed4a49f14984494c1c3077994.png"></image>
<view class="text-[#EC4443] text-[26px] ml-1">提现疑问</view>
</view> -->
</view>

2
src/pages/game/gamehome/index.vue
View File

@@ -21,7 +21,7 @@ const list = ref<any[]>([]);
Taro.useDidShow(() => {
const token = Taro.getStorageSync('token');
// url.value = 'http://huakk.jdt168.com/#/pages/index/index';
// url.value = 'https://huakk.jdt168.com/#/pages/index/index';
if (token) {
// url.value = `${process.env.TARO_APP_GAME}${Taro.getStorageSync('token')}`;
getUserInfo();

2
src/pages/hotGoods/index/index.vue
View File

@@ -5,7 +5,7 @@
<view class="item">
<view @click="hotGoodsDetail">
<IconFont
name="http://article.biliimg.com/bfs/article/131eda0add8662808d97ffb1191d19bf3e420647.png"
name="https://article.biliimg.com/bfs/article/131eda0add8662808d97ffb1191d19bf3e420647.png"
size="40" />
<view>我的订单</view>
</view>

16
src/pages/mer/mer_detail/index.vue
View File

@@ -54,12 +54,12 @@
<view @click="clickMap">
<image
class="w-[50px] h-[50px]"
src="http://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
src="https://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
</view>
<view @click="clickPhone">
<image
class="w-[50px] h-[50px]"
src="http://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
src="https://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
</view>
</view>
</view>
@@ -161,12 +161,12 @@ Taro.useLoad(opt => {
});
Taro.useDidShow(() => {
if (!Taro.getStorageSync('token')) {
Taro.navigateTo({
url: '/pages/users/login/index?isBack=1',
});
return;
}
// if (!Taro.getStorageSync('token')) {
// Taro.navigateTo({
// url: '/pages/users/login/index?isBack=1',
// });
// return;
// }
Taro.getLocation({
type: 'wgs84',
success: res => {

4
src/pages/user/index.scss
View File

@@ -2,7 +2,7 @@
box-sizing: border-box;
// background-color: #f8f8f8;
height: 100%;
background-image: url('http://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png');
background-image: url('https://p0.meituan.net/csc/f44bb11463e3c538c307d7ce4b303bec33520.png');
background-size: 100% 500px;
background-repeat: no-repeat;
position: relative;
@@ -103,7 +103,7 @@
}
.user-acc {
background-image: url('http://p0.meituan.net/csc/a74c44a7af541f01efbcc6fb023e6e09132712.png');
background-image: url('https://p0.meituan.net/csc/a74c44a7af541f01efbcc6fb023e6e09132712.png');
background-size: 100% 100%;
background-repeat: no-repeat;
width: 90%;

28
src/pages/user/index.vue
View File

@@ -72,7 +72,7 @@
class="mt-[30px] flex flex-col items-center"
@click="toOrderList(1)">
<IconFont
name="http://p0.meituan.net/csc/9943f6c938fc0e310141a2b99d5bde6617483.png"
name="https://p0.meituan.net/csc/9943f6c938fc0e310141a2b99d5bde6617483.png"
size="42" />
<view class="mt-[15px] text-[25px] text-[#333333]">待付款</view>
</view>
@@ -80,7 +80,7 @@
class="mt-[30px] flex flex-col items-center"
@click="toOrderList(2)">
<IconFont
name="http://p0.meituan.net/csc/5306d094d7b4b61848dd21c86b693a9515523.png"
name="https://p0.meituan.net/csc/5306d094d7b4b61848dd21c86b693a9515523.png"
size="42" />
<view class="mt-[15px] text-[25px] text-[#333333]">待使用</view>
</view>
@@ -88,7 +88,7 @@
class="mt-[30px] flex flex-col items-center"
@click="toOrderList(3)">
<IconFont
name="http://p0.meituan.net/csc/32ea9bbf51e3bbb0cbd75bc0fea97ca815779.png"
name="https://p0.meituan.net/csc/32ea9bbf51e3bbb0cbd75bc0fea97ca815779.png"
size="42" />
<view class="mt-[15px] text-[25px] text-[#333333]">已使用</view>
</view>
@@ -96,7 +96,7 @@
class="mt-[30px] flex flex-col items-center"
@click="toOrderList(4)">
<IconFont
name="http://p0.meituan.net/csc/2e0dee89e9a3e3f2e7bf65db355fa11c11630.png"
name="https://p0.meituan.net/csc/2e0dee89e9a3e3f2e7bf65db355fa11c11630.png"
size="42" />
<view class="mt-[15px] text-[25px] text-[#333333]">已失效</view>
</view>
@@ -135,7 +135,7 @@
@click="toPage('/pages/admin/add_order/index')">
<IconFont
size="42"
name="http://p0.meituan.net/csc/72a389ac6a441061fd534b96644c431b7839.png"></IconFont>
name="https://p0.meituan.net/csc/72a389ac6a441061fd534b96644c431b7839.png"></IconFont>
<view class="label">后结点单</view>
</view>
<view
@@ -144,7 +144,7 @@
@click="toPage('/pages/admin/verify/index')">
<IconFont
size="42"
name="http://p1.meituan.net/csc/c236a8b7a73178da25218e1fb59a96f06610.png"></IconFont>
name="https://p1.meituan.net/csc/c236a8b7a73178da25218e1fb59a96f06610.png"></IconFont>
<view class="label">订单核销</view>
</view>
<view
@@ -153,7 +153,7 @@
@click="toPage('/pages/admin/order_manage/index')">
<IconFont
size="42"
name="http://p0.meituan.net/csc/bd9aca457a109b4d69a692a9109a73ed9045.png"></IconFont>
name="https://p0.meituan.net/csc/bd9aca457a109b4d69a692a9109a73ed9045.png"></IconFont>
<view class="label">订单管理</view>
</view>
<view
@@ -162,7 +162,7 @@
@click="toPage('/pages/admin/withdrawal/index')">
<IconFont
size="42"
name="http://p0.meituan.net/csc/f85d7dc1bf9eda8977e9089b260a586b7440.png"></IconFont>
name="https://p0.meituan.net/csc/f85d7dc1bf9eda8977e9089b260a586b7440.png"></IconFont>
<view class="label">余额提现</view>
</view>
</view>
@@ -284,33 +284,33 @@ const userMenuList = ref([
{
label: '账户明细',
url: '/pages/users/account/index',
icon: 'http://p0.meituan.net/csc/104f787b7cc5582868be46ff52475ecf7084.png',
icon: 'https://p0.meituan.net/csc/104f787b7cc5582868be46ff52475ecf7084.png',
},
{
label: '后结订单',
url: '/pages/users/pending_order/index',
icon: 'http://p0.meituan.net/csc/68d3f1f1ea375897a2b918851199b6546322.png',
icon: 'https://p0.meituan.net/csc/68d3f1f1ea375897a2b918851199b6546322.png',
},
{
label: '我的推广',
url: '/pages/users/distribution/index',
icon: 'http://p0.meituan.net/csc/950814cc0ed1289f170e8612fab597cd5310.png',
icon: 'https://p0.meituan.net/csc/950814cc0ed1289f170e8612fab597cd5310.png',
},
{
label: '联系客服',
type: 333,
url: '/pages/users/account/index',
icon: 'http://p0.meituan.net/csc/ddd4b6ff4271ec05ced60db0aee1e9548383.png',
icon: 'https://p0.meituan.net/csc/ddd4b6ff4271ec05ced60db0aee1e9548383.png',
},
{
label: '设置',
url: '/pages/users/setting/index',
icon: 'http://p0.meituan.net/csc/1d8e6b328d384ff042c282976b82feec6005.png',
icon: 'https://p0.meituan.net/csc/1d8e6b328d384ff042c282976b82feec6005.png',
},
{
label: '关于我们',
url: '',
icon: 'http://p0.meituan.net/csc/3e772eca05bd56104e8a0a5c6cffe56c7447.png',
icon: 'https://p0.meituan.net/csc/3e772eca05bd56104e8a0a5c6cffe56c7447.png',
},
]);

4
src/pages/users/order_list_detail/index.vue
View File

@@ -77,11 +77,11 @@
<image
@tap="toPhone()"
class="w-[50px] h-[50px]"
src="http://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
src="https://p0.meituan.net/csc/ab0493b124a6bb858bf82a2340767c0d919.png" />
<image
@tap="toAdder()"
class="w-[50px] h-[50px] ml-2"
src="http://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
src="https://p1.meituan.net/csc/92ee8512c90527169b44e07fd11d250d924.png" />
</view>
</view>
</view>

4
src/utils/js_sdk/u-charts.min.js vendored
View File

@@ -2,7 +2,7 @@
* uCharts (R)
* 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360/快手）、Vue、Taro等支持canvas的框架平台
* Copyright (C) 2021 QIUN (R) 秋云 https://www.ucharts.cn All rights reserved.
* Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
* Licensed ( https://www.apache.org/licenses/LICENSE-2.0 )
* 复制使用请保留本段注释，感谢支持开源！
*
* uCharts (R) 官方网站
@@ -12,7 +12,7 @@
* https://gitee.com/uCharts/uCharts
*
* uni-app插件市场地址：
* http://ext.dcloud.net.cn/plugin?id=271
* https://ext.dcloud.net.cn/plugin?id=271
*
*/
'use strict';

23
src/utils/request.ts
View File

@@ -28,7 +28,7 @@ const request = (
token: Taro.getStorageSync('token') || '',
},
success: ({ data }) => {
if (data.code !== 200) {
if (data.code !== 200 && data.code !== 401) {
if (!IGNORED_TIPS.includes(url)) {
Taro.showToast({
title: data.msg,
@@ -36,9 +36,26 @@ const request = (
});
}
reject(data);
} else {
resolve(data);
return;
}
if (data.code === 401) {
Taro.showModal({
title: '提示',
content: '你当前未登录,是否前往登录',
confirmText: '去登录',
cancelText: '取消',
success: ({ confirm }) => {
if (confirm) {
Taro.reLaunch({
url: '/pages/users/login/index',
});
}
},
});
reject(data);
return;
}
resolve(data);
},
fail: err => {
reject(err);