浏览代码

最新优化

htc 13 小时之前
父节点
当前提交
2fd0409fef
共有 12 个文件被更改,包括 544 次插入54 次删除
  1. 2 2
      http/baseApi.js
  2. 12 0
      pages.json
  3. 5 4
      pages/dialog.vue
  4. 6 6
      pages/home.vue
  5. 10 5
      pages/login.vue
  6. 4 1
      pages/publish.vue
  7. 4 1
      pages/registerInfo.vue
  8. 18 3
      pagesHome/questionnaire.vue
  9. 155 0
      pagesMy/privacyPolicy.vue
  10. 276 0
      pagesMy/serviceAgreement.vue
  11. 6 4
      pagesMy/set.vue
  12. 46 28
      pagesPublish/rechargeCenter.vue

+ 2 - 2
http/baseApi.js

@@ -1,6 +1,6 @@
-// const BaseApi = 'https://transcend.ringzle.com/chuangheng-app/app' //线上
+const BaseApi = 'https://transcend.ringzle.com/chuangheng-app/app' //线上
 // const BaseApi = 'https://wxapp.transcend-intl.cn/chuangheng-app/app' //生产
-const BaseApi = 'http://192.168.2.19:9023/chuangheng-app/app' //李勇
+// const BaseApi = 'http://192.168.2.19:9023/chuangheng-app/app' //李勇
 // const BaseApi = 'http://192.168.2.16:9023/chuangheng-app/app' //严总
 
 export {

+ 12 - 0
pages.json

@@ -236,6 +236,18 @@
 					"style": {
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "serviceAgreement",
+					"style": {
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "privacyPolicy",
+					"style": {
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		}

+ 5 - 4
pages/dialog.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
-		<u-navbar title="创衡汇教练AI智能体" bgColor="#FFFFFF" :titleStyle="{'font-size':'32rpx','font-weight':'bold','color':'#002846'}">
+		<u-navbar title="创衡汇教练AI智能体" bgColor="transparent" :titleStyle="{'font-size':'32rpx','font-weight':'bold','color':'#002846'}">
 			<view class="u-nav-slot" slot="left" style="display: flex;background-color: transparent;">
 				<image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/16/ef50e3e8-d0f9-41dd-a4ec-546b157a1de9.png" style="width: 45rpx;height: 45rpx;" @tap="toBack"></image>
 				<!-- <image src="https://transcend.ringzle.com/xiaozhi-app/profile/2025/06/16/e536bf8e-3b33-4ea8-b60b-7154c6353bec.png" style="width: 42rpx;height: 42rpx;margin-left: 40rpx;" @tap="startNewDialog"></image> -->
@@ -339,14 +339,14 @@
 				font-family: PingFang-SC, PingFang-SC;
 				font-weight: bold;
 				font-size: 36rpx;
-				color: #252525;
+				color: #002846;
 				line-height: 36rpx;
 				margin-top: 36rpx;
 				&.tip{
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
 					font-size: 26rpx;
-					color: #646464;
+					color: #667E90;
 					line-height: 40rpx;
 					margin-top: 20rpx;
 				}
@@ -372,7 +372,7 @@
 						font-family: PingFang-SC, PingFang-SC;
 						font-weight: bold;
 						font-size: 30rpx;
-						color: #505050;
+						color: #002846;
 						line-height: 48rpx;
 						margin-left: 20rpx;
 					}
@@ -381,6 +381,7 @@
 					padding: 30rpx 32rpx;
 					margin-top: 20rpx;
 					background: #FFFFFF;
+					color: #002846;
 					border-radius: 4rpx 24rpx 24rpx 24rpx;
 					.dac_think{
 						image{

+ 6 - 6
pages/home.vue

@@ -58,14 +58,14 @@
 			<view class="common-title">常用功能</view>
 			<view class="common-menu adf">
 				<view class="common-menu-pre adffcac">
-					<image :src="imgBase+'home_img_pinggu.png'"></image>
+					<image :src="imgBase+'home_img_pinggu.png'" @click="toTurn('/pagesHome/questionnaire?type=receive')"></image>
 					<text>PREILL评估</text>
 				</view>
 				<view class="common-menu-pre adffcac" @click="toTurn('/pagesHome/report')">
 					<image :src="imgBase+'home_img_baogao.png'"></image>
 					<text>PREILL报告</text>
 				</view>
-				<view class="common-menu-pre adffcac" @click="toTurn('/pagesHome/questionnaire')">
+				<view class="common-menu-pre adffcac" @click="toTurn('/pagesHome/questionnaire?type=create')">
 					<image :src="imgBase+'home_img_guanli.png'"></image>
 					<text>问卷管理</text>
 				</view>
@@ -223,7 +223,7 @@
 				width: calc(50% - 11rpx);
 				background: #FFFFFF;
 				border-radius: 24rpx;
-				padding: 36rpx 24rpx 26rpx;
+				padding: 54rpx 24rpx 52rpx;
 				box-sizing: border-box;
 				&-title{
 					font-family: PingFang-SC, PingFang-SC;
@@ -244,14 +244,14 @@
 					margin-top: 24rpx;
 				}
 				&-state{
-					margin-top: 40rpx;
+					margin-top: 46rpx;
 					&-pre{
 						padding-left: 16rpx;
 						position: relative;
 						font-family: PingFangSC, PingFang SC;
 						font-weight: 400;
 						font-size: 24rpx;
-						color: #657588;
+						color: #335368;
 						line-height: 20rpx;
 						span{
 							color: #1D2129;
@@ -284,7 +284,7 @@
 					}
 				}
 				&-progress{
-					margin-top: 20rpx;
+					margin-top: 24rpx;
 					width: 100%;
 					height: 10rpx;
 					background: #DFE5EE;

+ 10 - 5
pages/login.vue

@@ -23,10 +23,10 @@
 			<view class="c_bottom">
 				<button class="zt_btn" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">手机号一键登录</button>
 				<view class="qx_btn" style="margin-top: 40rpx;" @tap="codeLogin" v-if="!channelType">授权码登录</view>
-				<view class="agree adfacjc" @click="changeAgree">
+				<view class="agree adfacjc" @click.prevent="changeAgree">
 					<image :src="imgBase+'not_select.png'" v-if="!agree"></image>
 					<image :src="imgBase+'selected.png'" v-else></image>
-					<view class="text">已阅读并同意我们的<span>“服务协议与隐私政策”</span></view>
+					<view class="text">已阅读并同意我们的<span @click.stop="turnPage('/pagesMy/serviceAgreement')">“服务协议”</span><span @click.stop="turnPage('/pagesMy/privacyPolicy')">“隐私政策”</span></view>
 				</view>
 			</view>
 		</view>
@@ -166,7 +166,12 @@
 			},
 			changeAgree(){
 				this.agree = !this.agree
-			}
+			},
+			turnPage(url){
+				uni.navigateTo({
+					url
+				})
+			},
 		}
 	}
 </script>
@@ -205,7 +210,7 @@
 					font-family: PingFang-SC, PingFang-SC;
 					font-weight: bold;
 					font-size: 48rpx;
-					color: #252525;
+					color: #002846;
 					line-height: 67rpx;
 					margin-top: 36rpx;
 				}
@@ -213,7 +218,7 @@
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;
 					font-size: 30rpx;
-					color: #646464;
+					color: #667E90;
 					line-height: 47rpx;
 					margin-top: 20rpx;
 				}

+ 4 - 1
pages/publish.vue

@@ -11,7 +11,7 @@
 				<image class="list-item-right" :src="imgBase+'publish_arrow_right.png'" v-if="item.type<3"></image>
 			</div>
 		</div>
-		<div class="dialog adffcacjc" v-if="buyShow">
+		<div class="dialog adffcac" v-if="buyShow">
 			<div class="dialog-box adffcac" :class="{'zyb':type==2}">
 				<image :src="imgBase+'new_free_close.png'" @click="buyShow=false"></image>
 				<div class="dialog-box-list adf">
@@ -163,6 +163,9 @@
 			bottom: 0;
 			z-index: 1000;
 			background: rgba(0, 0, 0, .6);
+			padding-bottom: 140rpx;
+			box-sizing: border-box;
+			justify-content: flex-end;
 			
 			&-box{
 				width: calc(100% - 48rpx);

+ 4 - 1
pages/registerInfo.vue

@@ -33,7 +33,8 @@
 					userId:'',
 					mobile:'',
 					realName:'',
-					email:''
+					email:'',
+					
 				}
 			}
 		},
@@ -56,6 +57,8 @@
 				})
 			},
 			postRegisterRecord(){
+				if(uni.getStorageSync('shareUserId')) this.info.referrerId = uni.getStorageSync('shareUserId');
+				if(uni.getStorageSync('shareTQId')) this.info.teamQuestionnaireId = uni.getStorageSync('shareTQId');
 				this.$api.post('/core/register/record',{
 					channelType:this.info.channelType||'common',
 					referrerId:this.info.referrerId||'',

+ 18 - 3
pagesHome/questionnaire.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="default_page adffc" :style="{'height':h+'px', 'padding-top':mt+'px'}">
-		<cus-header title='我的问卷' bgColor="transparent"></cus-header>
+		<cus-header :title='title' bgColor="transparent"></cus-header>
 		<image class="top_bg" :src="imgBase+'questionnaire_top_bg.png'" mode="widthFix"></image>
-		<view class="tab adfac">
+		<!-- <view class="tab adfac">
 			<view class="tab-pre" :class="{'active':tindex===0}" @click="changeTab(0)">我收到的</view>
 			<view class="tab-pre" :class="{'active':tindex===1}" @click="changeTab(1)">我创建的</view>
-		</view>
+		</view> -->
 		<view class="query adfacjb">
 			<u-icon name="search" size="38rpx" color="#B3BFC8"></u-icon>
 			<view class="query-inp">
@@ -31,6 +31,7 @@
 		components:{ ReceiveList, CreateList },
 		data(){
 			return {
+				title:'问卷管理',
 				tindex:0,
 				keyword:'',
 				receiveList:[],
@@ -47,6 +48,20 @@
 				this.getCreateList();
 			}
 		},
+		onLoad(options) {
+			if(options.type==='receive'){
+				this.title = 'PREILL评估';
+				this.tindex = 0;
+				this.receiveList = [];
+				this.getReceiveList();
+			} 
+			else if(options.type==='create'){
+				this.title = '问卷管理';
+				this.tindex = 1;
+				this.createList = [];
+				this.getCreateList();
+			} 
+		},
 		methods:{
 			changeTab(index){
 				if(this.tindex===index) return

+ 155 - 0
pagesMy/privacyPolicy.vue

@@ -0,0 +1,155 @@
+<template>
+	<view class="default_page" :style="{'min-height':h+'px', 'padding-top':mt+'px'}">
+		<cus-header title='隐私政策'></cus-header>
+		<u-parse :content="content"></u-parse>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				content:`<div class=WordSection1 style='layout-grid:15.6pt;margin-top: 50rpx;font-size: 26rpx;color: #002846;line-height: 42rpx;'>
+				<p class=MsoNormal align=center style='text-align:center;'><b><span
+				lang=ZH-CN style='font-size:16.0pt;font-family:"Microsoft JhengHei UI",sans-serif;font-size: 40rpx;font-weight: bold;line-height: 56rpx;'>隐私政策</span></b></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt;margin-top:36rpx;'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>本应用非常重视用户隐私政策并严格遵守相关的法律规定。请您仔细阅读《隐私政策》后再继续使用。</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>如果您继续使用我们的服务,表示您已经充分阅读和理解我们协议的全部内容。</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>本小程序尊重并保护所有使用服务用户的个人隐私权。</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>为了给您提供更准确、更优质的服务,本应用会按照本隐私权政策的规定使用和披露您的个人信息。</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>除本隐私权政策另有规定外,在未征得您事先许可的情况下,本应用不会将这些信息对外披露或向第三方提供。</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>本应用会不时更新本隐私权政策。您在同意本应用服务使用协议之时,即视为您已经同意本隐私权政策全部内容。</span></p>
+				
+				<p class=MsoNormal style='margin-left:0in;text-indent:21.0pt;font-size: 32rpx;font-weight: bold;line-height: 45rpx;margin:36rpx 0 20rpx;'><span
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>1. </span><span
+				lang=ZH-CN style='font-family:"Microsoft JhengHei UI",sans-serif'>适用范围</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(a)
+				<span lang=ZH-CN>在您注册本应用小程序帐号时,您根据小程序要求提供的个人注册信息。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(b)
+				<span lang=ZH-CN>在您使用本应用网络服务,或访问本应用平台网页时,本应用自动接收并记录的您的浏览器和计算机上的信息,包括但不限于您的</span>IP<span
+				lang=ZH-CN>地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(c)
+				<span lang=ZH-CN>本应用通过合法途径从商业伙伴处取得的用户个人数据。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(d)
+				<span lang=ZH-CN>本应用严禁用户发布不良信息,如裸露、色情和亵渎内容,发布的内容我们会进行审核,一经发现不良信息,会禁用该用户的所有权限,予以封号处理。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt;font-size: 32rpx;font-weight: bold;line-height: 45rpx;margin:36rpx 0 20rpx;'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>2.
+				<span lang=ZH-CN>信息使用</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(a)
+				<span lang=ZH-CN>本应用不会向任何无关第三方提供、出售、出租、分享或交易您的个人登录信息。如果我们存储发生维修或升级,我们会事先发出推送消息来通知您,请您提前允许本应用消息通知。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(b)
+				<span lang=ZH-CN>本应用亦不允许任何第三方以任何手段收集、编辑、出售或者无偿传播您的个人信息。任何本应用平台用户如从事上述活动,一经发现,本应用有权立即终止与该用户的服务协议。包括但不限于您的</span>IP<span
+				lang=ZH-CN>地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(c)
+				<span lang=ZH-CN>为服务用户的目的,本应用可能通过使用您的个人信息,向您提供您感兴趣的信息,包括但不限于向您发出产品和服务信息,或者与本应用合作伙伴共享信息以便他们向您发送有关其产品和服务的信息。(后者需要您的事先同意)</span>        
+				</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt;font-size: 32rpx;font-weight: bold;line-height: 45rpx;margin:36rpx 0 20rpx;'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>3.
+				<span lang=ZH-CN>信息披露</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>在如下情况下,本应用将依据您的个人意愿或法律的规定全部或部分的披露您的个人信息:</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(a)
+				<span lang=ZH-CN>未经您事先同意,我们不会向第三方披露。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(b)
+				<span lang=ZH-CN>为提供您所要求的产品和服务,而必须和第三方分享您的个人信息。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(c)
+				<span lang=ZH-CN>根据法律的有关规定,或者行政或司法机构的要求,向第三方或者行政、司法机构披露。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(d)
+				<span lang=ZH-CN>如您出现违反中国有关法律、法规或者本应用服务协议或相关规则的情况,需要向第三方披露。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(e)
+				<span lang=ZH-CN>如您是适格的知识产权投诉人并已提起投诉,应被投诉人要求,向被投诉人披露,以便双方处理可能的权利纠纷</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt;font-size: 32rpx;font-weight: bold;line-height: 45rpx;margin:36rpx 0 20rpx;'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>4.
+				<span lang=ZH-CN>信息存储和交换</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>本应用收集的有关您的信息和资料将保存在本应用及(或)其关联公司的服务器上,这些信息和资料可能传送至您所在国家、地区或本应用收集信息和资料所在地的境外并在境外被访问、存储和展示。</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt;font-size: 32rpx;font-weight: bold;line-height: 45rpx;margin:36rpx 0 20rpx;'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>5.
+				Cookie<span lang=ZH-CN>的使用</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(a)
+				<span lang=ZH-CN>在您未拒绝接受</span>cookies<span lang=ZH-CN>的情况下,本应用会在您的计算机上设定或取用</span>cookies<span
+				lang=ZH-CN>,以便您能登录或使用依赖于</span>cookies<span lang=ZH-CN>的本应用平台服务或功能。本应用使用</span>cookies<span
+				lang=ZH-CN>可为您提供更加周到的个性化服务,包括推广服务。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(b)
+				<span lang=ZH-CN>您有权选择接受或拒绝接受</span>cookies<span lang=ZH-CN>。您可以通过修改浏览器设置的方式拒绝接受</span>cookies<span
+				lang=ZH-CN>。但如果您选择拒绝接受</span>cookies<span lang=ZH-CN>,则您可能无法登录或使用依赖于</span>cookies<span
+				lang=ZH-CN>的本应用网络服务或功能</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(c)
+				<span lang=ZH-CN>通过本应用所设</span>cookies<span lang=ZH-CN>所取得的有关信息,将适用本政策。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt;font-size: 32rpx;font-weight: bold;line-height: 45rpx;margin:36rpx 0 20rpx;'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>6.<span
+				lang=ZH-CN>本隐私政策的更改</span>  </span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(a)
+				<span lang=ZH-CN>如果决定更改隐私政策,我们会在本政策中、本公司网站中以及我们认为适当的位置发布这些更改,以便您了解我们如何收集、使用您的个人信息,哪些人可以访问这些信息,以及在什么情况下我们会透露这些信息。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>(b)
+				<span lang=ZH-CN>本公司保留随时修改本政策的权利,因此请经常查看。如对本政策作出重大更改,本公司会通过网站通知的形式告知。</span></span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>请您妥善保护自己的个人信息,仅在必要的情形下向他人提供。如您发现自己的个人信息泄密,尤其是本应用用户名及密码发生泄露,请您立即联络本应用客服,以便本应用采取相应措施。</span></p>
+				
+				<p class=MsoNormal style='text-indent:21.0pt'><span lang=ZH-CN
+				style='font-family:"Microsoft JhengHei UI",sans-serif'>感谢您花时间了解我们的隐私政策!我们将尽全力保护您的个人信息和合法权益,再次感谢您的信任!</span></p>
+				
+<p class='MsoNormal text' style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>    
+</span></p>
+
+<p class='MsoNormal text' style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>     
+</span></p>
+
+<p class='MsoNormal text' style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>     
+</span></p>
+
+<p class='MsoNormal text' style='text-indent:21.0pt'><span style='font-family:"Microsoft JhengHei UI",sans-serif'>&nbsp;</span></p>
+
+<b><span style='font-size:16.0pt;font-family:"Microsoft JhengHei UI",sans-serif'><br
+clear=all style='page-break-before:always'>
+</span></b>
+
+<p class='MsoNormal text' style='text-indent:32.0pt'><b><span style='font-size:16.0pt;
+font-family:"Microsoft JhengHei UI",sans-serif'>&nbsp;</span></b></p>
+				</div>`
+			}
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.default_page{
+		background: #FFFFFF;
+		padding: 50rpx 30rpx;
+		box-sizing: border-box;
+	}
+</style>

文件差异内容过多而无法显示
+ 276 - 0
pagesMy/serviceAgreement.vue


+ 6 - 4
pagesMy/set.vue

@@ -2,11 +2,11 @@
 	<view class="default_page" :style="{'height':h+'px', 'padding-top':mt+'px'}">
 		<cus-header title='设置'></cus-header>
 		<div class="box">
-			<div class="box-item adfacjb" @click="turnPage('')">
+			<div class="box-item adfacjb" @click="turnPage('/pagesMy/serviceAgreement')">
 				<div class="box-item-left">服务协议</div>
 				<image class="box-item-right" :src="imgBase+'my_arrow_right.png'"></image>
 			</div>
-			<div class="box-item adfacjb" @click="turnPage('')">
+			<div class="box-item adfacjb" @click="turnPage('/pagesMy/privacyPolicy')">
 				<div class="box-item-left">隐私政策</div>
 				<image class="box-item-right" :src="imgBase+'my_arrow_right.png'"></image>
 			</div>
@@ -23,8 +23,10 @@
 			}
 		},
 		methods:{
-			turnPage(){
-				
+			turnPage(url){
+				uni.navigateTo({
+					url
+				})
 			},
 			exitLogin(){
 				uni.clearStorageSync();

+ 46 - 28
pagesPublish/rechargeCenter.vue

@@ -19,41 +19,57 @@
 					v-for="(item,index) in tabList" :key="index" @click="changeTab(index)">{{item}}</view>
 			</view>
 			<template v-if="tindex===0">
-				<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></view>
-						<view class="box-price-pre-bottom">
-							{{item.frequency==1?'首次登录赠送1次':(item.frequency>10?('超过10次,¥'+item.price+'/次'):('¥'+(item.price/item.frequency)+'/次'))}}
+				<template v-if="priceList.length">
+					<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></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 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>
 					</view>
-				</view>
+				</template>
+				<template v-else>
+					<view class="box-empty adffcacjc">
+						<image :src="imgBase+'recharge_empty.png'"></image>
+						<p>暂无定价,请等待相关人员配置~</p>
+					</view>
+				</template>
 			</template>
 			<template v-if="tindex===1">
-				<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==1?'首次登录赠送1次':(item.frequency>10?('超过10次,¥'+item.price+'/次'):('¥'+(item.price/item.frequency)+'/次'))}}
+				<template v-if="priceList2.length">
+					<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==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 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>
 					</view>
-				</view>
+				</template>
+				<template v-else>
+					<view class="box-empty adffcacjc">
+						<image :src="imgBase+'recharge_empty.png'"></image>
+						<p>暂无定价,请等待相关人员配置~</p>
+					</view>
+				</template>
 			</template>
 			<template v-if="tindex<2">
 				<view class="box-memo">
@@ -285,6 +301,8 @@
 				margin-top: 34rpx;
 				justify-content: space-between;
 				flex-wrap: wrap;
+				flex: 1;
+				overflow-y: auto;
 				&-pre{
 					width: calc(50% - 10rpx);
 					margin-top: 16rpx;
@@ -387,7 +405,7 @@
 			}
 		
 			&-btn{
-				margin-top: 206rpx;
+				margin-top: 40rpx;
 				width: 100%;
 				height: 100rpx;
 				background: linear-gradient(to right, #242424 0%, #575757 50%);