购买页修改为最新的设计图

pagesMy/set.vue

@@ -23,10 +23,22 @@
 	export default {
 		data(){
 			return {
-				
+				userBrief:''
 			}
 		},
+		onLoad() {
+			if(uni.getStorageSync('userInfo')){
+				const id = JSON.parse(uni.getStorageSync('userInfo')).id
+				this.getMyInfo(id)
+			} 
+		},
 		methods:{
+			getMyInfo(userId){
+				this.$api.get(`/wx/myCount/${userId}`,this.params).then(({data:res})=>{
+					if(res.code!==0) return this.$showToast(res.msg)
+					this.userBrief = res.data.userBrief||'';
+				})
+			},
 			turnPage(url){
 				uni.navigateTo({
 					url

pagesPublish/rechargeCenter.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="default_page adffc" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
+	<view class="default_page adffc" :style="{'height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='PERILL团队发展动态评估' bgColor="transparent"></cus-header>
 		<view class="info adfac">
 			<view class="info-left">
@@ -19,25 +19,79 @@
 					v-for="(item,index) in tabList" :key="index" @click="changeTab(index)">{{item}}</view>
 			</view>
 			<template v-if="tindex===0">
-				<template v-if="priceList.length">
-					<view style="flex: 1;overflow-y: auto;">
-						<view class="box-price adf">
-							<view class="box-price-pre adffcac" :class="{'active':pindex===index}"
-								v-for="(item,index) in priceList" :key="index" @click="changePrice(item,index)">
-								<view class="box-price-pre-once" v-if="index===0">限时优惠</view>
-								<view class="box-price-pre-times">{{item.frequency<11?(item.frequency+'次'):'超过10次'}}</view>
-								<view class="box-price-pre-money"><span>￥</span>{{item.price}}<span v-if="item.frequency>10"></span><span style="font-size: 36rpx;">/次</span></view>
-								<view class="box-price-pre-bottom">
-									{{item.frequency==1?'首次登录赠送1次':(item.frequency>10?('超过10次，￥'+item.price+'/次'):('￥'+(item.price/item.frequency)+'/次'))}}
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="box-other adfacjb" v-if="frequency>10">
-						<view class="box-other-left">其他次数</view>
-						<view class="box-other-right">
-							<cus-number-box :min="min" :number="otherTimes" @valChange="valueChange"></cus-number-box>
-						</view>
+				<template v-if="priceData">
+					<view style="flex: 1;overflow-y: auto;margin-top: 20rpx;">
+						<div class="box-yhj">
+							<div class="box-yhj-top">
+								<div class="box-yhj-top-xs">限时优惠价</div>
+								<div class="box-yhj-top-nr adffcac">
+									<div class="box-yhj-top-nr-title">PERILL团队发展动态评估(基础版)</div>
+									<div class="box-yhj-top-nr-price">￥{{priceData.discountPrice||priceData.price}}</div>
+										<div class="box-yhj-top-nr-yj" v-if="priceData.discountPrice">原价 ￥{{priceData.price}}/次</div>
+										<div class="box-yhj-top-nr-yj" style="margin-top: 50rpx;" v-else></div>
+									</div>
+									<div class="box-yhj-top-tip" v-if="priceData.discountPrice">活动有效期：{{priceData.startDate||''}} ~ {{priceData.endDate||''}}</div>
+									<div class="box-yhj-top-tip" v-else></div>
+							</div>
+							<div class="box-yhj-title">内容配置对比</div>
+							<div class="box-yhj-table">
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1"></div>
+									<div class="box-yhj-table-pre-qy qy2 active title adfacjc">基础版(个人版)</div>
+									<div class="box-yhj-table-pre-qy qy3 title adfacjc">专业版(团队版-36)</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">评估人数</div>
+									<div class="box-yhj-table-pre-qy qy2 adfacjc active nr">仅限个人角度进行评估</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">团队整体评估<br>成员人数可多至20人</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">陈述</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">36道专业陈述</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">36道专业陈述</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">评估状态</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">评估团队当前状态</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">评估团队当前状态</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">未来发展</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">6个维度整体评估报告</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">评估团队未来发展容量</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">评估结果</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">——</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">每个维度独立评估结果</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">评估建议</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">——</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">每个维度独立评估建议</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">计划</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">——</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">团队发展计划</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">教练建议</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">——</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">教练专业建议(书面）</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">发送报告</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">——</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">可向指定人员发送报告</div>
+								</div>
+								<div class="box-yhj-table-pre adf">
+									<div class="box-yhj-table-pre-qy qy1">线上课</div>
+									<div class="box-yhj-table-pre-qy qy2 active nr">——</div>
+									<div class="box-yhj-table-pre-qy qy3 adffcac nr">送1节小鹅通团队教练线上课</div>
+								</div>
+							</div>
+						</div>
 					</view>
 				</template>
 				<template v-else>
@@ -48,26 +102,81 @@
 				</template>
 			</template>
 			<template v-if="tindex===1">
-				<template v-if="priceList2.length">
-					<view style="flex: 1;overflow-y: auto;">
-						<view class="box-price adf">
-							<view class="box-price-pre adffcac" :class="{'active':pindex===index}"
-								v-for="(item,index) in priceList2" :key="index" @click="changePrice(item,index)">
-								<view class="box-price-pre-times">{{item.frequency<11?(item.frequency+'次'):'超过10次'}}</view>
-								<view class="box-price-pre-money"><span>￥</span>{{item.price}}<span v-if="item.frequency>10">/次</span></view>
-								<view class="box-price-pre-bottom">
-									{{item.frequency>10?('超过10次，￥'+item.price+'/次'):('￥'+(item.price/item.frequency)+'/次')}}
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="box-other adfacjb" v-if="frequency>10">
-						<view class="box-other-left">其他次数</view>
-						<view class="box-other-right">
-							<cus-number-box :min="min" :number="otherTimes" @valChange="valueChange"></cus-number-box>
+				<template v-if="priceData">
+					<view style="flex: 1;overflow-y: auto;margin-top: 20rpx;">
+							<div class="box-yhj">
+								<div class="box-yhj-top">
+									<div class="box-yhj-top-xs">限时优惠价</div>
+									<div class="box-yhj-top-nr adffcac">
+										<div class="box-yhj-top-nr-title">PERILL团队发展动态评估(专业版)</div>
+										<div class="box-yhj-top-nr-price">￥{{priceData.discountPrice||priceData.price}}</div>
+										<div class="box-yhj-top-nr-yj" v-if="priceData.discountPrice">原价 ￥{{priceData.price}}/次</div>
+										<div class="box-yhj-top-nr-yj" style="margin-top: 50rpx;" v-else></div>
+									</div>
+									<div class="box-yhj-top-tip" v-if="priceData.discountPrice">活动有效期：{{priceData.startDate||''}} ~ {{priceData.endDate||''}}</div>
+									<div class="box-yhj-top-tip" v-else></div>
+								</div>
+								<div class="box-yhj-title">内容配置对比</div>
+								<div class="box-yhj-table">
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1"></div>
+										<div class="box-yhj-table-pre-qy qy2 title adfacjc">基础版(个人版)</div>
+										<div class="box-yhj-table-pre-qy qy3 active title adfacjc">专业版(团队版-36)</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">评估人数</div>
+										<div class="box-yhj-table-pre-qy qy2 adfacjc nr">仅限个人角度进行评估</div>
+										<div class="box-yhj-table-pre-qy qy3 adffcac active nr">团队整体评估<br>成员人数可多至20人</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">陈述</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">36道专业陈述</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">36道专业陈述</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">评估状态</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">评估团队当前状态</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">评估团队当前状态</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">未来发展</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">6个维度整体评估报告</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">评估团队未来发展容量</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">评估结果</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">——</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">每个维度独立评估结果</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">评估建议</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">——</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">每个维度独立评估建议</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">计划</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">——</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">团队发展计划</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">教练建议</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">——</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">教练专业建议(书面）</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">发送报告</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">——</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">可向指定人员发送报告</div>
+									</div>
+									<div class="box-yhj-table-pre adf">
+										<div class="box-yhj-table-pre-qy qy1">线上课</div>
+										<div class="box-yhj-table-pre-qy qy2 nr">——</div>
+										<div class="box-yhj-table-pre-qy qy3 active adffcac nr">送1节小鹅通团队教练线上课</div>
+									</div>
+								</div>
+							</div>
 						</view>
-					</view>
-				</template>
+					</template>
 				<template v-else>
 					<view class="box-empty adffcacjc">
 						<image :src="imgBase+'recharge_empty.png'"></image>
@@ -76,18 +185,10 @@
 				</template>
 			</template>
 			<template v-if="tindex<2">
-				<view class="box-memo">
-					<view class="box-memo-title">服务条款说明</view>
-					<view class="box-memo-p">
-						1、未激活的问卷：付费后使用有效期1年，过期将不能使用。<br/>
-						2、已进行中问卷：创建者可以设置答题截止时间，修改时间，以支持少数用户延期做问卷。<br/>
-						3、其他次数不能低于10次。
-					</view>
-				</view>
 				<view class="box-btn adfacjb">
 					<view class="box-btn-left adfac">
 						<view class="box-btn-left-text">实付</view>
-						<view class="box-btn-left-money adfac"><span>￥</span>{{sumPrice}}<span style="margin-left: 9rpx;">/{{times}}次</span></view>
+						<view class="box-btn-left-money adfac"><span>￥</span>{{sumPrice}}</view>
 					</view>
 					<view class="box-btn-right" @click="confirmBuy">确认协议并购买</view>
 				</view>
@@ -132,6 +233,7 @@
 				sumPrice:0,
 				productId:'',
 				orderNo:'',
+				priceData:null,
 			}
 		},
 		onLoad(options) {
@@ -172,8 +274,12 @@
 			getList(type){
 				this.$api.get(`/core/v2/queproduct/listByType/${type}`).then(({data:res})=>{
 					if(res.code!==0) return this.$showToast(res.msg)
-					if(type==1) this.priceList = res.data
-					else if(type==2) this.priceList2 = res.data
+					this.priceData = res.data[0]||null
+					if(this.priceData){
+						this.priceData.startDate = this.priceData.beginAt?new Date(this.priceData.beginAt).Format('yyyy年MM月dd日'):'';
+						this.priceData.endDate = this.priceData.endAt?new Date(this.priceData.endAt).Format('yyyy年MM月dd日'):'';
+						this.sumPrice = this.priceData.discountPrice||this.priceData.price||0;
+					}
 				})
 			},
 			changePrice(item,index){
@@ -314,6 +420,127 @@
 				}
 			}
 		
+			&-yhj{
+				margin-top: 29rpx;
+				&-top{
+					width: 100%;
+					background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/bug_yhj_box_bg.png') no-repeat;
+					background-size: 100% 100%;
+					position: relative;
+					border-radius: 16rpx;
+					&-xs{
+						width: 144rpx;
+						height: 40rpx;
+						background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/buy_yhj_bg.png') no-repeat;
+						background-size: 100% 100%;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #FFFFFF;
+						line-height: 40rpx;
+						text-align: center;
+						position: absolute;
+						left: 0;
+						top: -6rpx;
+					}
+					&-nr{
+						padding: 34rpx 0 26rpx;
+						&-title{
+							font-family: PingFangSC, PingFang SC;
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #955A1D;
+							line-height: 30rpx;
+							text-align: center;
+						}
+						&-price{
+							font-family: D-DINCondensed, D-DINCondensed;
+							font-weight: bold;
+							font-size: 54rpx;
+							color: #795021;
+							line-height: 59rpx;
+							text-align: center;
+							margin-top: 10rpx;
+						}
+						&-yj{
+							font-family: PingFangSC, PingFang SC;
+							font-weight: 400;
+							font-size: 24rpx;
+							color: #955A1D;
+							line-height: 30rpx;
+							text-align: center;
+							margin-top: 8rpx;
+							text-decoration: line-through;
+						}
+					}
+					&-tip{
+						width: 100%;
+						padding: 11rpx 16rpx;
+						min-height: 50rpx;
+						background: url('https://gitee.com/hw_0302/chuang-heng-wechat-images/raw/master/buy_yhj_tip_bg.png') no-repeat;
+						font-family: PingFangSC, PingFang SC;
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #795021;
+						line-height: 33rpx;
+						border-radius: 0 0 16rpx 16rpx;
+						box-sizing: border-box;
+					}
+				}
+				&-title{
+					font-family: PingFang-SC, PingFang-SC;
+					font-weight: bold;
+					font-size: 32rpx;
+					color: #002846;
+					line-height: 40rpx;
+					margin-top: 49rpx;
+				}
+				&-table{
+					width: 100%;
+					margin-top: 39rpx;
+					border-radius: 24rpx 24rpx 0 0;
+					border: 1rpx solid #E2E2E2;
+					&-pre{
+						border-bottom: 1rpx solid #E2E2E2;
+						&:last-child{
+							border: none;
+						}
+						&-qy{
+							padding: 25rpx 16rpx;
+							box-sizing: border-box;
+							border-right:  1rpx solid #E2E2E2;
+							font-family: PingFangSC, PingFang SC;
+							font-weight: 400;
+							font-size: 24rpx;
+							line-height: 40rpx;
+							&:last-child{
+								border: none;
+							}
+							&.qy1{
+								flex: 1;
+								display: flex;
+								align-items: center;
+							}
+							&.qy2,&.qy3{
+								width: 283rpx;
+							}
+							&.title{
+								font-weight: bold;
+								font-size: 28rpx;
+							}
+							&.nr{
+								font-weight: bold;
+								font-size: 24rpx;
+								text-align: center;
+							}
+							&.active{
+								background: #FFFBEE;
+							}
+						}
+					}
+				}
+			}
+		
 			&-price{
 				margin-top: 34rpx;
 				justify-content: space-between;