From 78af96cecd0855a659ff9b63b7528fb9d3e74561 Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Mon, 25 Mar 2024 09:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E5=91=98=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/list.vue   |  1 -
 pages/member/index.vue |  2 +-
 pages/serve/index.vue  | 26 +++++++++++++++++++++++---
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/pages/goods/list.vue b/pages/goods/list.vue
index c18bd83..7a04e61 100644
--- a/pages/goods/list.vue
+++ b/pages/goods/list.vue
@@ -249,7 +249,6 @@
 			this.setShowView()
 			// 设置微信公众号链接分享卡片内容
 			this.setWxofficialShareData()
-				console.log(111,options.categoryId!= 'undefined')
 			if(options.categoryId != 'undefined'){
 				this.getGoodsTypeList(options.categoryId)
 			}
diff --git a/pages/member/index.vue b/pages/member/index.vue
index 6963749..132c9a0 100644
--- a/pages/member/index.vue
+++ b/pages/member/index.vue
@@ -110,7 +110,7 @@
 							￥{{item.price}}
 						</view>
 						<view class="avePrice">
-							￥{{Number(item.price)/Number(item.month)}}/月
+							￥{{(Number(item.price)/Number(item.month)).toFixed(2)}}/月
 						</view>
 					</view>
 				</view>
diff --git a/pages/serve/index.vue b/pages/serve/index.vue
index 85685d5..1beb3d1 100644
--- a/pages/serve/index.vue
+++ b/pages/serve/index.vue
@@ -49,7 +49,8 @@
 					开通立享多重特权
 				</view>
 				<view class="opera">
-					<text class="price">￥<text class="number">99</text>年</text>
+					<text class="price" v-if="userInfo.user_id && packageList.price">￥<text class="number">{{packageList.price}}</text>/{{packageList.month}}月</text>
+					<text class="price" v-else>￥<text class="number">99</text>年</text>
 					<view class="operaBtn" @click="openPage1()">
 						立即开通
 					</view>
@@ -61,32 +62,51 @@
 </template>
 <script>
     import * as newFunApi from '@/api/newFun'
+	import * as member from '@/api/member/index.js';
 	export default{
 		data (){
 			return{
 				list: [],
 				userInfo: {},
+				packageList: {},
 				timestamp: new Date().getTime(),
 			}
 		},
 		mounted() {
 			this.getList();
+			
 		},
 		onShow() {
 			this.userInfo = uni.getStorageSync("userInfo")?uni.getStorageSync("userInfo"): ""
+			if(uni.getStorageSync("userInfo").user_id){
+				this.getMemberList();
+			}
 		},
 		methods:{
 			openPage1(){
-				if(!uni.getStorageSync("AccessToken")){
+				if(!uni.getStorageSync("userInfo").user_id){
 					uni.navigateTo({
 						url: "/pages/login/index"
 					})
 					return ;
 				}
 				uni.navigateTo({
-					url: "/pages/member/index"
+					url: "/pages/member/index?type=hy"
 				})
 			},
+			getMemberList() {
+				const that = this;
+				const params = {
+					client: 'MP-WEIXIN'
+				}
+				member.info(params)
+					.then(res => {
+						if (res.status == 200) {
+							that.packageList = res.data.list.list&& res.data.list.list.length >0?res.data.list.list[0]:[];
+							console.log(that.packageList)
+						}
+					})
+			},
 			openPage(a){
 				uni.navigateTo({
 					url: "/pages/activity/intimate?index="+a