完善会员开通信息

apis/interfaces/vip.js

@@ -29,8 +29,24 @@ const payInfo = (orderId) => {
 	})
 }
 
+// 会员开通协议
+const agreement = () => {
+	return request({
+		url: 'cms/pages/1'
+	})
+}
+
+// 成长体系
+const growth = () => {
+	return request({
+		url: 'cms/pages/2'
+	})
+}
+
 export {
 	vip,
 	vipPay,
-	payInfo
+	payInfo,
+	agreement,
+	growth
 }

pages.json

@@ -111,7 +111,7 @@
 				"navigationBarBackgroundColor": "#FFFFFF",
 				"enablePullDownRefresh": false
 			}
-        },{
+		}, {
 			"path": "pages/order/logistics",
 			"name": "OrderLogistics",
 			"style": {
@@ -295,7 +295,8 @@
 		}, {
 			"path": "pages/vip/agreement",
 			"style": {
-                "navigationBarTitleText": "共力会员协议"
+				"navigationBarTitleText": "共力会员协议",
+				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		}, {
 			"path": "pages/team/index",
@@ -370,8 +371,8 @@
 			"style": {
 				"navigationBarTitleText": "-"
 			}
-        },{
+		}, {
-            "path" : "pages/feedback/feedback",
+			"path": "pages/feedback/feedback",
 			"name": "Feedback",
 			"style": {
 				"navigationBarTitleText": "意见反馈",
@@ -390,6 +391,13 @@
 					}
 				}
 			}
+		}, {
+			"path": "pages/vip/growth",
+			"style": {
+				"navigationBarTitleText": "成长体系",
+				"navigationBarBackgroundColor": "#FFFFFF",
+				"enablePullDownRefresh": false
+			}
 		}
 	],
 	"tabBar": {

pages/invitation/invitation.vue

@@ -69,10 +69,10 @@
 							provider: 'weixin',
 							scene	: 'WXSceneSession',
 							type 	: 0,
-							href	: 'https://www.baidu.com',
+							href	: 'https://www.baidu.com?invite_code=',
 							title	: '共力生态',
 							summary	: '共力生态 共力 共赢 共享 带你进入web3.0！',
-							imageUrl: 'https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/10/e763ae96ce9d0b4407b68e66963c7cb2.jpg',
+							imageUrl: 'https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/11/3b7e6e330f465ecbf136d15def1039fd.jpg',
 							fail(err) {
 								uni.showToast({
 									title: err.errMsg,
@@ -88,7 +88,7 @@
 							type 	: 0,
 							href	: 'https://www.baidu.com',
 							title	: '共力生态 共力 共赢 共享',
-							imageUrl: 'https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/10/e763ae96ce9d0b4407b68e66963c7cb2.jpg',
+							imageUrl: 'https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/11/3b7e6e330f465ecbf136d15def1039fd.jpg',
 							fail(err) {
 								uni.showToast({
 									title: err.errMsg,

pages/vip/agreement.vue

@@ -1,19 +1,32 @@
 <template>
-	<view>
+	<view class="agreement">
-		会员开通协议
+		<rich-text :nodes="content"></rich-text>
 	</view>
 </template>
 
 <script>
+	import { agreement } from '@/apis/interfaces/vip.js'
 	export default {
 		data() {
 			return {
-				
+				content: ''
 			};
+		},
+		created() {
+			agreement().then(res => {
+				this.content = res.content
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
 		}
 	}
 </script>
 
 <style lang="scss">
-
+	.agreement{
+		padding: $padding;
+	}
 </style>

pages/vip/growth.vue

@@ -0,0 +1,32 @@
+<template>
+	<view class="growth">
+		<rich-text :nodes="content"></rich-text>
+	</view>
+</template>
+
+<script>
+	import { growth } from '@/apis/interfaces/vip.js'
+	export default {
+		data() {
+			return {
+				content: ''
+			};
+		},
+		created() {
+			growth().then(res => {
+				this.content = res.content
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		}
+	}
+</script>
+
+<style lang="scss">
+	.growth{
+		padding: $padding;
+	}
+</style>

pages/vip/vip.vue

@@ -13,14 +13,14 @@
 					<view class="vip-lv">{{identity.identity_text}}</view>
 					<block>
 						<view class="vip-progress">
-							<view class="vip-progress-loding" style="width: 50%;"></view>
+							<view class="vip-progress-loding" :style="'width:' + firstRule.rate + '%'"></view>
 						</view>
 						<view class="vip-loding">
-							<view>0/0共分</view>
+							<view>{{firstRule.current}}/{{firstRule.need}}{{firstRule.title}}</view>
 						</view>
 					</block>
 				</view>
-				<navigator class="vip-more" hover-class="none">成长体系<uni-icons size="14" type="forward" color="#9f5529"></uni-icons></navigator>
+				<navigator class="vip-more" url="/pages/vip/growth" hover-class="none">成长体系<uni-icons size="14" type="forward" color="#9f5529"></uni-icons></navigator>
 			</view>
 		</view>
 		<view class="vip-content">
@@ -34,10 +34,10 @@
 			</block>
 			<view class="vip-content-title">会员特权</view>
 			<view class="vip-privilege">
-				<view class="vip-privilege-item" v-for="(item, index) in 8" :key="index">
+				<view class="vip-privilege-item" v-for="(item, index) in rights" :key="index">
-					<image class="vip-privilege-icon" src="" mode="widthFix"></image>
+					<image class="vip-privilege-icon" :src="item.cover" mode="widthFix"></image>
-					<view class="vip-privilege-text">特权名称{{index}}</view>
+					<view class="vip-privilege-text">{{item.name}}</view>
-					<view class="vip-privilege-sub">特权名称{{index}}</view>
+					<view class="vip-privilege-sub">{{item.remark}}</view>
 				</view>
 			</view>
 			<view class="vip-content-title">会员折扣说明</view>
@@ -82,7 +82,14 @@
 				// 会员折扣说明
 				prices: [],
 				// 是否可续费
-				isOpen: true
+				isOpen: true,
+				// 卡片信息
+				firstRule: {
+					title : '-',
+					need  : '-',
+					current: '-',
+					rate: 0
+				}
 			};
 		},
 		onShow() {
@@ -92,6 +99,7 @@
 			// 获取会员信息
 			getVipInfo(){
 				vip().then(res =>{
+					this.firstRule = res.first_rule
 					this.isOpen = res.is_open
 					this.prices = res.prices
 					this.rights = res.rights