From 6f7eed451f90af88a019b559e83e660a5dbfb252 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Mon, 17 Jun 2024 18:47:06 +0800
Subject: [PATCH] add

---
 pageQuota/vipUser/index.vue | 25 +++++++++++++++++--------
 pages/index/index.vue       |  4 +++-
 pages/my/my.vue             |  7 ++++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/pageQuota/vipUser/index.vue b/pageQuota/vipUser/index.vue
index 4ab3535..8dea01c 100644
--- a/pageQuota/vipUser/index.vue
+++ b/pageQuota/vipUser/index.vue
@@ -67,11 +67,11 @@
 				<uni-table stripe emptyText="暂无更多数据" width="100%">
 					<!-- 表头行 -->
 					<uni-tr>
-						<uni-th width="10" align="center">序号</uni-th>
-						<uni-th width="25" align="center">行业会员</uni-th>
-						<uni-th width="25" align="center">经营资金</uni-th>
-						<uni-th width="30" align="center">开通时间</uni-th>
-						<uni-th width="20" align="center">状态</uni-th>
+						<uni-th width="20" align="center">序号</uni-th>
+						<uni-th width="50" align="center">行业会员</uni-th>
+						<uni-th width="50" align="center">经营资金</uni-th>
+						<uni-th width="50" align="center">开通时间</uni-th>
+						<uni-th width="50" align="center">状态</uni-th>
 					</uni-tr>
 					<!-- 表格数据行 -->
 					<uni-tr v-for="(item,index) in lists" :key="index">
@@ -162,7 +162,7 @@
 
 
 	const showModa = ref(true)
-	const storePhone = ref('')
+	const storePhone = ref('15699996666')
 	const confirmStore = () => {
 		getStoreByPhone({
 			phone: storePhone.value
@@ -194,7 +194,7 @@
 		village: "",
 		brigade: "",
 		real_name: "",
-		auth_code: "130600111488101385",
+		auth_code: "",
 		// auth_code: "",
 		address: ""
 	})
@@ -309,6 +309,8 @@
 					uni.$u.toast('操作成功');
 					currentTab.value = 2
 				})
+				getCount()
+				getLists()
 			}
 		});
 	}
@@ -337,7 +339,6 @@
 
 
 	const upadtaStatus = (item) => {
-		console.log(item)
 		updataOrderApi({
 			order_no: item.order_id,
 			recharge: 1
@@ -472,4 +473,12 @@
 			color: #20B128;
 		}
 	}
+
+	.uni-table-th {
+		padding: 10rpx 0 !important;
+	}
+
+	.uni-table-td {
+		padding: 10rpx 0 !important;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 367c878..47cd6db 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -24,7 +24,7 @@
 				<view class="store-info" @click="navgo('/multipleShop/index/index')">
 					<view style="display: flex;font-size: 30rpx;font-weight: bold;">
 						<text
-							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{shareInfo.real_name?(shareInfo.real_name + '-' + STORE_INFO.name):STORE_INFO.name}}</text>
+							style="max-width: 400rpx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">{{shareInfo.real_name?(shareInfo.real_name + '的' + STORE_INFO.name):STORE_INFO.name}}</text>
 						<up-icon name="arrow-right"></up-icon>
 					</view>
 					<view style="display: flex;font-size: 24rpx;color:#777777 ;">
@@ -260,6 +260,8 @@
 	})
 
 	const navgo = (url) => {
+		if (shareInfo.value.real_name) return
+
 		uni.navigateTo({
 			url
 		})
diff --git a/pages/my/my.vue b/pages/my/my.vue
index c8ec06c..70fa08d 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -53,7 +53,12 @@
 			</view>
 			<view class="rest-item">
 				<view class="rest-item-num">{{userInfo.return_money}}</view>
-				<view class="rest-item-txt">待返还金额</view>
+				<view class="rest-item-txt">返还金</view>
+			</view>
+
+			<view class="rest-item">
+				<view class="rest-item-num">{{userInfo.integral}}</view>
+				<view class="rest-item-txt">礼品券</view>
 			</view>
 		</view>