From 7a2d58754d4393d07087a864047f46594faa1ce4 Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Tue, 24 Sep 2024 21:30:53 +0800
Subject: [PATCH 1/3] 1

---
 .gitignore            |  5 +++-
 config.js             |  3 ++-
 pages/my/cardRoll.vue | 53 +++++++++++++++++++++++---------------
 pages/my/my.vue       | 35 ++++++++++++++++++++-----
 pages/my/myEquity.vue | 60 +++++++++++++++++++++----------------------
 pages/my/myInfo.vue   | 33 +++++++++++++++---------
 6 files changed, 118 insertions(+), 71 deletions(-)

diff --git a/.gitignore b/.gitignore
index f836e84..212723c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 /unpackage/
 unpackage/*
-unpackage
\ No newline at end of file
+unpackage
+.idea/lanan-repair.iml
+.idea/modules.xml
+.idea/vcs.xml
diff --git a/config.js b/config.js
index 6059c44..5e8c27b 100644
--- a/config.js
+++ b/config.js
@@ -1,7 +1,8 @@
 // 应用全局配置
 module.exports = {
 	//baseUrl: 'https://www.nuoyunr.com/admin-api',
-	baseUrl: 'https://3w823u8516.vicp.fun',
+	// baseUrl: 'https://3w823u8516.vicp.fun',
+	baseUrl: 'http://192.168.1.4:48080',
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'https://www.nuoyunr.com/minio',
 	//wsUrl: 'wss://www.nuoyunr.com/admin-api',
diff --git a/pages/my/cardRoll.vue b/pages/my/cardRoll.vue
index 4345bc3..0997643 100644
--- a/pages/my/cardRoll.vue
+++ b/pages/my/cardRoll.vue
@@ -1,38 +1,45 @@
 <template>
 	<view class="container">
-		<v-navigation-bar title-color="#333" background-color="#fff" title="卡卷包">
+		<v-navigation-bar title-color="#333" background-color="#fff" title="卡券包">
 		</v-navigation-bar>
-		<view class="tabbar">
-			<view v-for="item in tabList" :key="item.value" class="tabItem" :class="{active: activeKey === item.value}">
-				{{item.title}}
-				<view v-if="activeKey === item.value" class="activeLine">
+<!--		<view class="tabbar">-->
+<!--			<view v-for="item in tabList" :key="item.value" class="tabItem" :class="{active: activeKey === item.value}">-->
+<!--				{{item.title}}-->
+<!--				<view v-if="activeKey === item.value" class="activeLine">-->
 
-				</view>
-			</view>
-		</view>
+<!--				</view>-->
+<!--			</view>-->
+<!--		</view>-->
 		<view class="body">
 			<view class="cardItem">
-				<view class="cardItemTop">
+				<view class="cardItemTop" v-for="item in customInfo.couponList">
 					<!-- <image class="cardImg" src="" mode="aspectFill"></image> -->
 					<view class="cardImg">
-						<view class="cardImgText">车辆保养卡</view>
+						<view v-if="item.couponType == 'lbq'" class="cardImgText">礼包券</view>
+						<view v-if="item.couponType == 'byk'" class="cardImgText">保养卡</view>
 						<image class="cardImgBg" src="../../static/images/cardRollBg.png" mode="aspectFit"></image>
 					</view>
 					<view class="cardInfo">
-						<view class="cardName">车辆保养卡</view>
-						<view class="cardEndDate">2024-09-20</view>
+						<view class="cardName">{{ item.couponName }}</view>
+<!--						<view class="cardEndDate">2024-09-20</view>-->
 					</view>
-					<view class="cardInfoRight">
+					<view v-if="item.outRule != 'mehx'" class="cardInfoRight">
 						<view class="cardNum">
-							<text class="cardNumValue">4</text>次
+							<text class="cardNumValue">{{ item.balance }}</text>次
 						</view>
 						<view class="cardLabel">可用次数</view>
 					</view>
+          <view v-if="item.outRule == 'mehx'" class="cardInfoRight">
+            <view class="cardNum">
+              <text class="cardNumValue">{{ item.balance }}</text>元
+            </view>
+            <view class="cardLabel">余额</view>
+          </view>
 				</view>
-				<view class="cardItemBottom">
-					<view class="useSm">使用说明</view>
-					<view class="useBtn">去使用</view>
-				</view>
+<!--				<view class="cardItemBottom">-->
+<!--					<view class="useSm">使用说明</view>-->
+<!--					<view class="useBtn">去使用</view>-->
+<!--				</view>-->
 			</view>
 		</view>
 	</view>
@@ -47,9 +54,10 @@
 		},
 		data() {
 			return {
+        customInfo:{},
 				tabList: [{
 						value: 0,
-						title: '优惠卷'
+						title: '礼包券'
 					},
 					{
 						value: 1,
@@ -58,7 +66,12 @@
 				],
 				activeKey: 0
 			};
-		}
+		},
+    onLoad(data) {
+      //当前登录用户信息
+      this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
+      console.log(this.customInfo,66)
+    },
 	}
 </script>
 
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 4a88b3d..191108d 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -1,21 +1,21 @@
 <template>
 	<view class="container">
 		<view class="body">
-			<VNavigationBar titleColor="rgba(0,0,0,0.9)" leftTitle="true" backgroundColor="transparent" title=" ">
+			<VNavigationBar titleColor="rgba(0,0,0,0.9)" :leftTitle="true" backgroundColor="transparent" title=" ">
 			</VNavigationBar>
 			<view class="body-top">
 				<image class="userBmg" src="../../static/images/image1.png" mode="widthFix"></image>
 				<view class="userInfo">
 					<image class="avatar" src="../../static/images/avatar.png" mode="aspectFit"></image>
-					<text class="userName">用户昵称</text>
+					<text class="customInfo">{{customInfo.cusName}}</text>
 				</view>
 
 			</view>
 			<view class="level">
 				<image class="levelIcon" src="" mode="aspectFit"></image>
 				<view class="levelInfo">
-					<text class="levelNum">Lv.2</text>
-					<text class="levelQy">当前可享受4项权益</text>
+					<text class="levelNum">{{customInfo.levelName}}</text>
+					<!-- <text class="levelQy">当前可享受4项权益</text> -->
 				</view>
 				<view class="showQyBtn" @click="showEquity">
 					查看权益
@@ -64,17 +64,23 @@
 <script>
 	import VNavigationBar from '@/components/VNavigationBar.vue'
 	import tabBarVue from '@/components/tabBar/tabBar.vue'
-
+	import request from "@/utils/request";
 	export default {
 		components: {
 			tabBarVue,
 			VNavigationBar
 		},
+
+		onLoad(data) {
+			this.getServer()
+		},
 		data() {
 			return {
+				//用户信息
+				customInfo:{},
 				menuCard1: [
 					{ title: '我的资料', icon: require('@/static/icons/my-menu-icon1.png'), path: '/pages/my/myInfo' },
-					{ title: '我的卡券', icon: require('@/static/icons/my-menu-icon5.png'), path: "/pages/my/cardRoll" },	
+					{ title: '我的卡券', icon: require('@/static/icons/my-menu-icon5.png'), path: "/pages/my/cardRoll" },
 					{ title: '我的评价', icon: require('@/static/icons/my-menu-icon3.png'), path: '/pages/my/evaluate' },
 				],
 				menuCard2: [
@@ -94,7 +100,22 @@
 				uni.navigateTo({
 					url: '/pages/my/myEquity'
 				})
-			}
+			},
+			//获取当前登录用户信息
+			async getServer() {
+				const res = await request({
+					url: "/userClient/customer/getUserCustomer",
+					method: 'get',
+					params:{}
+				})
+				this.customInfo = res.data
+        uni.setStorageSync('customerInfo', JSON.stringify(this.customInfo))
+        // JSON.parse(JSON.stringify(files))
+        // const a = uni.getStorageSync('customerInfo')
+        // console.log(JSON.parse(a),115)
+
+
+      }
 		}
 	}
 </script>
diff --git a/pages/my/myEquity.vue b/pages/my/myEquity.vue
index e4c3ef6..ff2a87d 100644
--- a/pages/my/myEquity.vue
+++ b/pages/my/myEquity.vue
@@ -8,19 +8,21 @@
 					当前等级
 				</view>
 				<view class="levelNum">
-					Lv.2
+          {{ customInfo.levelName }}
 				</view>
 			</view>
 			<view class="equityTitle">
 				<image class="leftIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image>
-				<view class="">尊享<text class="colorTitle">4项</text>权益</view>
+<!--				<view class="">尊享<text class="colorTitle">4项</text>权益</view>-->
+				<view class="">尊享权益</view>
 				<image class="rightIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image>
 			</view>
 			<view class="card2">
-				<view v-for="(item, index) in equityList" :key="index" class="cardItem">
-					<view class="dian"></view>
-					<text>{{ item.title }}</text>
-				</view>
+<!--				<view v-for="(item, index) in equityList" :key="index" class="cardItem">-->
+<!--					<view class="dian"></view>-->
+<!--					<text>{{ customInfo.userEquity }}</text>-->
+<!--				</view>-->
+        <text>{{ customInfo.userEquity }}</text>
 			</view>
 			<view class="equityTitle">
 				<image class="leftIcon" src="../../static/icons/my-icon1.png" mode="aspectFit"></image>
@@ -40,10 +42,10 @@
 				<view v-for="(item, index) in levelEquityList" :key="index" class="card3Tr">
 					<view class="card3Td">
 						<image class="levelIcon" src="../../static/icons/my-icon2.png" mode="aspectFit"></image>
-						<text>LV.{{item.level}}</text>
+						<text>{{item.name}}</text>
 					</view>
 					<view class="card3Td">
-						{{ item.desc }}
+						{{ item.userEquity }}
 					</view>
 				</view>
 			</view>
@@ -54,12 +56,14 @@
 
 <script>
 	import VNavigationBar from '@/components/VNavigationBar.vue'
+  import request from "@/utils/request";
 	export default {
 		components: {
 			VNavigationBar,
 		},
 		data() {
 			return {
+        customInfo:{},
 				equityList: [{
 						title: '进店送'
 					},
@@ -73,29 +77,25 @@
 						title: '赠送全车360'
 					},
 				],
-				levelEquityList: [{
-						level: '1',
-						desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
-					},
-					{
-						level: '2',
-						desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
-					},
-					{
-						level: '3',
-						desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
-					},
-					{
-						level: '4',
-						desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
-					},
-					{
-						level: '5',
-						desc: '进店送精美礼品一份\n赠送原车配套空气滤芯一个\n赠送198空调雾化杀菌除味一次\n赠送全车360安全检测'
-					},
-				]
+				levelEquityList: []
 			};
-		}
+		},
+    onLoad(data) {
+		  //当前登录用户信息
+      this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
+      this.getMemberList()
+    },
+    methods:{
+      async getMemberList() {
+        await request({
+          url: '/userClient/customer/allMember',
+          method: 'get'
+        }).then((res) => {
+          this.levelEquityList = res.data
+        })
+
+      }
+  }
 	}
 </script>
 
diff --git a/pages/my/myInfo.vue b/pages/my/myInfo.vue
index 8f197c1..614921e 100644
--- a/pages/my/myInfo.vue
+++ b/pages/my/myInfo.vue
@@ -2,21 +2,26 @@
 	<view class="container">
 		<VNavigationBarVue titleColor="#333" backgroundColor="#fff" title="我的资料"></VNavigationBarVue>
 		<view class="body">
+<!--			<view class="formItem">-->
+<!--				<text class="formLabel">头像</text>-->
+<!--				<image class="avatar" src="../../static/images/avatar.png" mode="aspectFit"></image>-->
+<!--			</view>-->
 			<view class="formItem">
-				<text class="formLabel">头像</text>
-				<image class="avatar" src="../../static/images/avatar.png" mode="aspectFit"></image>
-			</view>
-			<view class="formItem">
-				<text class="formLabel">昵称</text>
-				<text class="formValue">用户昵称</text>
-				<image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>
-				
+				<text class="formLabel">姓名</text>
+				<text class="formValue">{{ customInfo.cusName }}</text>
+<!--				<image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>-->
+
 			</view>
 			<view class="formItem">
 				<text class="formLabel">手机号</text>
-				<text class="formValue">157****9706</text>
-				<image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>
+				<text class="formValue">{{ customInfo.phoneNumber }}</text>
+<!--				<image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>-->
 			</view>
+      <view class="formItem">
+        <text class="formLabel">联系地址</text>
+        <text class="formValue">{{ customInfo.address }}</text>
+        <!--				<image class="formBtn" src="../../static/icons/homeInfoMore.png" mode="aspectFit"></image>-->
+      </view>
 		</view>
 	</view>
 </template>
@@ -29,9 +34,13 @@
 		},
 		data() {
 			return {
-
+        customInfo:{}
 			};
-		}
+		},
+    onLoad(data) {
+      //当前登录用户信息
+      this.customInfo = JSON.parse(uni.getStorageSync('customerInfo'))
+    },
 	}
 </script>
 

From bb36b77a08f289833aac1748caad6f248a706e35 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 24 Sep 2024 21:32:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=A7=9F=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/login.js | 2 +-
 config.js    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/login.js b/api/login.js
index ad6984e..1cdb90e 100644
--- a/api/login.js
+++ b/api/login.js
@@ -82,7 +82,7 @@ export function loginAppuserName(data) {
 // 使用租户域名（标识），获得租户编号
 export function getTenantIdByWebsite(website) {
   return request({
-    url: '/system/tenant/getListByWebsite',
+    url: '/admin-api/system/tenant/getListByWebsite',
     method: 'get',
     params: {
       website
diff --git a/config.js b/config.js
index 68a2155..25c6b22 100644
--- a/config.js
+++ b/config.js
@@ -1,9 +1,9 @@
 // 应用全局配置
 module.exports = {
 	//baseUrl: 'https://www.nuoyunr.com/admin-api',
-	// baseUrl: 'https://3w823u8516.vicp.fun',
+	baseUrl: 'https://3w823u8516.vicp.fun',
 	// baseUrl: 'http://192.168.1.4:48080',
-	baseUrl: 'http://localhost:48080',
+	// baseUrl: 'http://localhost:48080',
 	imagesUrl: 'http://shequ.0315e.com/static/images/pages/',
 	baseImageUrl: 'http://122.51.230.86:9000/',
 	//wsUrl: 'wss://www.nuoyunr.com/admin-api',

From e703bb0f1e212efcd13711fe76e62c96d1eb8aa6 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Tue, 24 Sep 2024 21:33:41 +0800
Subject: [PATCH 3/3] 1

---
 .gitignore       | 3 ++-
 .idea/.gitignore | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 .idea/.gitignore

diff --git a/.gitignore b/.gitignore
index f836e84..35afcea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /unpackage/
 unpackage/*
-unpackage
\ No newline at end of file
+unpackage
+.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 10b731c..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/