From bb28bdc45eb8f12e7bdd5897434207694393126c Mon Sep 17 00:00:00 2001
From: PQZ <pangqingzhou@gmail.com>
Date: Mon, 7 Apr 2025 16:57:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E9=80=9A=E4=BC=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/business/base.js              |  18 +++++
 config.js                         |   2 +-
 pages/mine/member/member-card.vue | 116 ++++++++++++------------------
 3 files changed, 65 insertions(+), 71 deletions(-)

diff --git a/api/business/base.js b/api/business/base.js
index 1b28335..ef0e4c3 100644
--- a/api/business/base.js
+++ b/api/business/base.js
@@ -16,3 +16,21 @@ export function treeCity() {
 		method: 'get',
 	})
 }
+
+//------------------会员权益-----------------------
+// 会员卡数组
+export function baseCardList(params) {
+	return request({
+		url: '/base/card/baseCardList',
+		method: 'get',
+		params:params
+	})
+}
+// 权益数组
+export function rightList(params) {
+	return request({
+		url: '/base/rights/rightList',
+		method: 'get',
+		params:params
+	})
+}
diff --git a/config.js b/config.js
index b9e4484..990cf51 100644
--- a/config.js
+++ b/config.js
@@ -1,6 +1,6 @@
 // 应用全局配置
 module.exports = {
-	baseUrl: 'http://192.168.1.17:8080',
+	baseUrl: 'http://192.168.1.4:8080',
 	// baseUrl: 'http://localhost:8080',
 	// 应用信息
 	appInfo: {
diff --git a/pages/mine/member/member-card.vue b/pages/mine/member/member-card.vue
index f331216..9ab6f0e 100644
--- a/pages/mine/member/member-card.vue
+++ b/pages/mine/member/member-card.vue
@@ -40,7 +40,7 @@
 			<view class="rights-box">
 				<view class="rights-item title">
 					<view class="title-left">会员权益</view>
-					<view class="value-item" v-for="(item,index) in cardList">{{item.name}}</view>
+					<view class="value-item" v-for="(item,index) in cardList">{{item.cardName}}</view>
 				</view>
 				<view class="rights-item item-bg" v-for="(item,index) in rightsList">
 					<view class="title-left">{{item.name}}</view>
@@ -62,72 +62,6 @@
 						</view>
 					</view>
 				</view>
-				<view class="rights-item item-bg" v-for="(item,index) in rightsList">
-					<view class="title-left">{{item.name}}</view>
-					<view :class="[i==cardList.length-1?'value-item yellow-bg':'value-item']"
-						v-for="(card,i) in cardList">
-						<view v-if="'02'==item.rightsType">
-							<!-- 数量限制 -->
-							<text v-if="0==item.cardRights[card.id]">无限</text>
-							<text v-else>{{item.cardRights[card.id]}}条</text>
-						</view>
-						<view v-else-if="'01'==item.rightsType">
-							<!-- 是否支持 -->
-							<text v-if="0==item.cardRights[card.id]">-</text>
-							<view v-else>
-								<uni-icons v-if="i==cardList.length-1" color="#3A3A38" type="checkmarkempty"
-									size="18"></uni-icons>
-								<uni-icons v-else color="#E8CEAD" type="checkmarkempty" size="18"></uni-icons>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="rights-item item-bg" v-for="(item,index) in rightsList">
-					<view class="title-left">{{item.name}}</view>
-					<view :class="[i==cardList.length-1?'value-item yellow-bg':'value-item']"
-						v-for="(card,i) in cardList">
-						<view v-if="'02'==item.rightsType">
-							<!-- 数量限制 -->
-							<text v-if="0==item.cardRights[card.id]">无限</text>
-							<text v-else>{{item.cardRights[card.id]}}条</text>
-						</view>
-						<view v-else-if="'01'==item.rightsType">
-							<!-- 是否支持 -->
-							<text v-if="0==item.cardRights[card.id]">-</text>
-							<view v-else>
-								<uni-icons v-if="i==cardList.length-1" color="#3A3A38" type="checkmarkempty"
-									size="18"></uni-icons>
-								<uni-icons v-else color="#E8CEAD" type="checkmarkempty" size="18"></uni-icons>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="rights-item item-bg" v-for="(item,index) in rightsList">
-					<view class="title-left">{{item.name}}</view>
-					<view :class="[i==cardList.length-1?'value-item yellow-bg':'value-item']"
-						v-for="(card,i) in cardList">
-						<view v-if="'02'==item.rightsType">
-							<!-- 数量限制 -->
-							<text v-if="0==item.cardRights[card.id]">无限</text>
-							<text v-else>{{item.cardRights[card.id]}}条</text>
-						</view>
-						<view v-else-if="'01'==item.rightsType">
-							<!-- 是否支持 -->
-							<text v-if="0==item.cardRights[card.id]">-</text>
-							<view v-else>
-								<uni-icons v-if="i==cardList.length-1" color="#3A3A38" type="checkmarkempty"
-									size="18"></uni-icons>
-								<uni-icons v-else color="#E8CEAD" type="checkmarkempty" size="18"></uni-icons>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="rights-item item-bg">
-					<view class="title-left">每日报名上限</view>
-					<view class="value-item">20条</view>
-					<view class="value-item">无限</view>
-					<view class="value-item yellow-bg">无限</view>
-				</view>
 			</view>
 		</view>
 	</view>
@@ -135,6 +69,10 @@
 
 <script>
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
+  import {
+    baseCardList,
+    rightList
+  } from '@/api/business/base.js'
 
 	export default {
 		components: {
@@ -148,6 +86,8 @@
 				chooseCardIndex: 0,
 				//当前选中的会员卡付款下标
 				choosePriceIndex: 0,
+        //用户类型
+        userType:'02',
 				// 会员卡数组
 				memberCardList: [{
 					id: "1",
@@ -193,13 +133,13 @@
 				//权益对比的数组
 				cardList: [{
 					id: '1',
-					name: '非会员'
+					cardName: '非会员'
 				}, {
 					id: '2',
-					name: '箐英'
+          cardName: '箐英'
 				}, {
 					id: '3',
-					name: '钻石'
+          cardName: '钻石'
 				}],
 				rightsList: [{
 					name: "每日解锁通告上限",
@@ -222,7 +162,43 @@
 				}]
 			}
 		},
+    onShow(){
+		  this.initData()
+    },
 		methods: {
+		  /**初始化*/
+		  initData(){
+		    this.getCardList();
+		    this.getRightsList();
+      },
+
+      /**获取会员卡列表*/
+      getCardList(){
+        baseCardList({userType:this.userType}).then(res => {
+          this.memberCardList = res.data
+        }).catch((e) => {
+          uni.showToast({
+            icon: 'error',
+            duration: 2000,
+            title: e
+          });
+        })
+      },
+      /**权益列表*/
+      getRightsList(){
+        rightList({userType:this.userType}).then(res => {
+          this.cardList = res.data.cardList
+          this.rightsList = res.data.rightsList
+          console.log(this.cardList,'cardList')
+          console.log(this.rightsList,'rightsList')
+        }).catch((e) => {
+          uni.showToast({
+            icon: 'error',
+            duration: 2000,
+            title: e
+          });
+        })
+      },
 			/**
 			 * 菜单点击
 			 * @param {Object} index