From 2a14ce699b427e403de4a0691dc050c3a5ada946 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 28 Jun 2024 11:24:16 +0800
Subject: [PATCH] add

---
 api/api.js                  |  6 ++++++
 config/app.js               |  4 ++--
 pageQuota/vipUser/index.vue | 21 +++++++++++++++------
 pages/index/index.vue       |  9 ++++++---
 pages/login/login.vue       |  8 ++++----
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/api/api.js b/api/api.js
index 701edeb..73fb5d1 100644
--- a/api/api.js
+++ b/api/api.js
@@ -6,4 +6,10 @@ export const goodListApi = (data) => {
 
 export const goodClassListApi = (data) => {
 	return request.get('/goods/goodsclass/lists', data);
+}
+
+
+
+export const getPush = (data) => {
+	return request.get('/push', data);
 }
\ No newline at end of file
diff --git a/config/app.js b/config/app.js
index 3500d16..a484fa4 100644
--- a/config/app.js
+++ b/config/app.js
@@ -2,8 +2,8 @@ let BASE_URL
 let WSS_URL
 import store from "@/store/user.js"
 // 环境
-// let env = "dev"
-let env = "prod"
+let env = "dev"
+// let env = "prod"
 // let env = "release";
 // let env = "local";
 
diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index ef01bb8..5e39365 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -6,9 +6,6 @@
 					<up-form-item label="手机号" borderBottom>
 						<up-input v-model="storePhone" placeholder="请输入门店手机号"></up-input>
 					</up-form-item>
-					<!-- <up-form-item label="角色" borderBottom>
-						<uni-data-select v-model="Role" :localdata="range" :clear='false'></uni-data-select>
-					</up-form-item> -->
 				</up-form>
 			</view>
 		</up-modal>
@@ -347,7 +344,8 @@
 		// label_name: "",
 		// label_id: "4",
 		// user_ship: '1',
-		// code: ''
+		// price: 0.02,
+		// code: '12'
 	})
 
 	const tofixedPrice = () => {
@@ -481,7 +479,10 @@
 	const user_channel = connection.subscribe(`wechat_mmp_${userInfo.id}`);
 	user_channel.on('message', function(data) {
 		try {
+			uni.hideLoading({});
+			console.log(timerInvol)
 			clearTimeout(timerInvol);
+			console.log("清除" + timerInvol)
 			paySuccessToTabs2()
 		} catch (error) {}
 	});
@@ -501,7 +502,16 @@
 		if (Role.value == 1) {
 			// formData.recharge_type = 'INDUSTRYMEMBERS'
 			// formData.user_ship = 1
-			// vipRechargeApi(formData).then(res => {})
+			// vipRechargeApi(formData).then(res => {
+			// 	uni.showLoading({
+			// 		title: '支付中...'
+			// 	});
+			// 	timerInvol = setTimeout(() => {
+			// 		uni.hideLoading();
+			// 		uni.$u.toast('支付超时');
+			// 		console.log("支付超时")
+			// 	}, 10000)
+			// })
 			// return
 			uni.scanCode({
 				success: function(res) {
@@ -538,7 +548,6 @@
 				}).then(res => {
 					timerInvol = setTimeout(() => {
 						uni.hideLoading();
-						if (currentTab.value == 2) return;
 						uni.$u.toast('支付超时');
 					}, 30000)
 				})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ff84b16..cb5f161 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,9 +24,12 @@
 				<view class="store-info">
 					<view style="display: flex;font-size: 30rpx;font-weight: bold;">
 						<text v-if="userStore.userInfo.user_ship == 1 || shareInfo.store_id"
-							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{
-								(shareInfo.real_name || (
-									userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }}</text>
+							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">
+							<text v-if="userStore.userInfo.user_ship == 1">
+								{{ (userStore.userInfo.real_name || userStore.userInfo.nickname) + '的供销个人门店' }}</text>
+							<text v-else>
+								{{(shareInfo.real_name || (userStore.userInfo.real_name || userStore.userInfo.nickname)) + '的供销个人门店' }}</text>
+						</text>
 						<text v-else
 							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{
 								STORE_INFO.store_name }}</text>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b0e743c..7beb209 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -13,13 +13,13 @@
 			<block v-if="showWeixin">
 				<up-transition :show="showWeixin">
 					<view class="btn">
-						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon name="weixin-fill"
-								color="#fff" size="28"></up-icon>微信快捷登录</up-button>
+						<up-button @click="weixinLogin" color="#20B128" size="large"><up-icon color="#fff"
+								size="28"></up-icon>微信快捷登录</up-button>
 					</view>
-					<!-- 	<view class="btn">
+					<view class="btn">
 						<up-button @click="navgo('/pages/login/test')" color="#20B128" size="large"><up-icon
 								name="account-fill" color="#fff" size="28"></up-icon>手机号快捷登录</up-button>
-					</view> -->
+					</view>
 					<!-- <view class="btn">
             <up-button @click="officialCode" color="#20B128" size="large"><up-icon name="weixin-fill" color="#fff"
                 size="28"></up-icon>公众号授权</up-button>