服务协议

myPages/serviceObjectFaceAuth/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="container" :style="{'height':height}">
+  <view class="container" :style="{'height':'100vh'}">
     <!-- 提示内容 -->
 
     <view class="h-title">
@@ -27,6 +27,13 @@
       <text>下一步</text>
     </view>
 
+    <view class="btnTitle flex-row">
+      <u-icon v-if="selectIcon" name="checkmark-circle-fill" color="#FFE52C" size="18" @click="selectChange"></u-icon>
+      <u-icon v-else name="/static/order/ud9.png" color="#FFE52C" size="18" @click="selectChange"></u-icon>
+      <text :style="{'margin-left':'10rpx'}">请阅读并同意</text>
+      <text :style="{'color':'red'}" @click="goTermsOfService">《人脸识别服务协议》</text>
+    </view>
+
   </view>
 </template>
 
@@ -36,6 +43,7 @@
     },
     data() {
       return {
+        selectIcon:false,
         ossId:'',
         facePhotoUrl:'',
         height:'',
@@ -52,12 +60,19 @@
     },
     onLoad(option) {
 
-      let sysInfo= uni.getSystemInfoSync()
-      this.height = sysInfo.screenHeight + 'px'
 
     },
     methods: {
 
+      goTermsOfService(){
+        uni.navigateTo({
+          url:'/myPages/TermsOfService/index?name='+'人脸识别服务协议'+'&type=' + 6
+        })
+      },
+
+      selectChange(){
+        this.selectIcon = !this.selectIcon
+      },
 
       // 连接已上传的图片地址
       verifyImgUpload(){
@@ -74,6 +89,11 @@
       verifyFace(){
         let that  = this;
 
+        if(!this.selectIcon){
+          uni.$u.toast('请阅读并同意《人脸识别服务协议》')
+         return;
+        }
+
         // 验证图片是否全上传
         if(!that.verifyImgUpload()){
           return;
@@ -259,4 +279,14 @@
       line-height: 42px;
       text-align: center;
   }
+
+  .btnTitle{
+    font-size: 24rpx;
+    font-weight: 400;
+    color: #333333;
+    line-height: 50px;
+    padding-left: 32rpx;
+  }
+
+  @import '/common/css/common.css';
 </style>

myPages/transactionPassword/index.vue

@@ -4,26 +4,25 @@
             <u--form
                     labelPosition="left"
                     :model="reqParm"
-                    ref="form1"
-            >
-                <u-form-item
-                        labelWidth="auto"
-                        labelAlign="right"
-                        prop="tradPassword"
-                        borderBottom
-                >
-                    <u--input
-                            v-model="reqParm.tradPassword"
-                            disabledColor="#ffffff"
-                            placeholder="请输入账号密码"
-                            border="bottom"
-                            type="password"
-                            maxlength="6"
-                    ></u--input>
-                </u-form-item>
+                    ref="form1">
+<!--                <u-form-item-->
+<!--                        labelWidth="auto"-->
+<!--                        labelAlign="right"-->
+<!--                        prop="tradPassword"-->
+<!--                        borderBottom-->
+<!--                >-->
+<!--                    <u&#45;&#45;input-->
+<!--                            v-model="reqParm.tradPassword"-->
+<!--                            disabledColor="#ffffff"-->
+<!--                            placeholder="请输入账号密码"-->
+<!--                            border="bottom"-->
+<!--                            type="password"-->
+<!--                            maxlength="6"-->
+<!--                    ></u&#45;&#45;input>-->
+<!--                </u-form-item>-->
                 <u--textarea v-model="reqParm.refundReason" placeholder="请在此处输入退款原因" ></u--textarea>
             </u--form>
-            <view @click="submitData" class="op-btn">
+            <view @click="orderRechargeRefund" class="op-btn">
                 <text>提交</text>
             </view>
         </view>
@@ -42,15 +41,15 @@
                     tradPassword: '',
                     refundReason: ''
                 },
-                rules: {
-                    tradPassword: {
-                        required: true,
-                        min: 6,
-                        max: 6,
-                        message: '请输入6位密码',
-                        trigger: ['blur', 'change'],
-                    }
-                },
+                // rules: {
+                //     tradPassword: {
+                //         required: true,
+                //         min: 6,
+                //         max: 6,
+                //         message: '请输入6位密码',
+                //         trigger: ['blur', 'change'],
+                //     }
+                // },
             };
         },
         onLoad(option) {
@@ -62,30 +61,29 @@
             this.$refs.form1.setRules(this.rules)
         },
         methods: {
-            submitData() {
-                let that = this;
-                // 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
-                this.$refs.form1.validate().then(res => {
-                    that.orderRechargeRefund();
-                }).catch(errors => {
-                    uni.$u.toast('校验失败,请认真填写')
-                })
-
-            },
+            // submitData() {
+            //     let that = this;
+            //     // 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
+            //     this.$refs.form1.validate().then(res => {
+            //         that.orderRechargeRefund();
+            //     }).catch(errors => {
+            //         uni.$u.toast('校验失败,请认真填写')
+            //     })
+            //
+            // },
             // 退款
             orderRechargeRefund(){
                 this.$api.orderRechargeRefund(this.reqParm).then((res)=>{
                     uni.showToast({
                         title: '已提交申请，请耐心等待'
                     })
-                    uni.navigateTo({
-                        url: '/myPages/rechargeRecord/index'
-                    });
-                }).catch((err) =>{
-                    uni.showToast({
-                        title: err.msg
-                    })
-                });
+                    setTimeout(()=>{
+                        uni.navigateBack({
+                            url: '/myPages/rechargeRecord/index'
+                        });
+                    },2000)
+
+                })
             },
         }
     };
@@ -95,6 +93,7 @@
     .h-content{
         // margin-top: 100px;
         background: #fff;
+        padding-top: 20px;
         padding-left: 12px;
         padding-right: 12px;
         padding-bottom: 100px;

orderPages/bookService/index.vue

@@ -88,9 +88,15 @@
     <view :style="{'height':'236rpx'}"></view>
 
     <view class="flex-col  group2 ">
-      <view class="btnTitle">
-        <text>提交订单之前需支付预约服务费用</text>
+      <view class="btnTitle flex-row">
+        <u-icon v-if="selectIcon" name="checkmark-circle-fill" color="#FFE52C" size="18" @click="selectChange"></u-icon>
+        <u-icon v-else name="/static/order/ud9.png" color="#FFE52C" size="18" @click="selectChange"></u-icon>
+        <text :style="{'margin-left':'10rpx'}">请阅读并同意</text>
+        <text :style="{'color':'red'}" @click="goTermsOfService">《预约需知》</text>
       </view>
+<!--      <view class="btnTitle">-->
+<!--        <text>提交订单之前需支付预约服务费用</text>-->
+<!--      </view>-->
       <view class="btn flex-row justify-between">
         <view>
           <text class="title">待支付</text>
@@ -207,8 +213,8 @@ export default {
       price: '0',
       //订单编号
       orderNo: '',
-      subOrderNo: ''
-
+      subOrderNo: '',
+      selectIcon:true
     }
   },
   onLoad() {
@@ -230,6 +236,16 @@ export default {
 
   methods: {
 
+    goTermsOfService(){
+      uni.navigateTo({
+          url:'/myPages/TermsOfService/index?name='+'预约需知'+'&type=' + 5
+      })
+    },
+
+    selectChange(){
+        this.selectIcon = !this.selectIcon
+    },
+
     payItem(num) {
       if (this.userInfo.balance < this.price) {
         return
@@ -240,6 +256,10 @@ export default {
     //提交订单
     commitOrder() {
 
+      if(!this.selectIcon){
+        uni.$u.toast('请阅读并同意《预约需知》')
+        return;
+      }
 
       if (!this.serviceObject) {
         uni.$u.toast('请选择服务对象')

storePages/rights/index.rpx.scss

@@ -1,9 +1,13 @@
 
 .page{
   background: #F7F7F7;
-  padding: 0 32rpx;
   border-top: 1px solid #F7F7F7 ;
 }
+
+.centent{
+  padding: 0 32rpx;
+
+}
 .btn{
   height: 84rpx;
   background: #FFE05C;
@@ -187,3 +191,11 @@
   color: #8f939c;
   margin-top: 20rpx;
 }
+.btnTitle{
+  font-size: 24rpx;
+  font-weight: 400;
+  color: #333333;
+  line-height: 50px;
+  background: #FFFFFF;
+  padding-left: 32rpx;
+}

storePages/rights/index.vue

@@ -1,46 +1,56 @@
 <template>
-	<view class="page" :style="{'height':windowHeight}">
-
-		<view class="flex-col" v-if="equityList.length === 0">
-			<view class="flex-row justify-center">
-				<image class="empty" src="/static/imageIcon/empty.png" mode="widthFix"></image>
-			</view>
-			<view class="emptyText flex-row justify-center">
-				<text>暂无内容</text>
+	<view class="page" :style="{'height':equityList.length >0 ?windowHeight : windowHeight1}">
+		<view class="centent">
+			<view class="flex-col" v-if="equityList.length === 0">
+				<view class="flex-row justify-center">
+					<image class="empty" src="/static/imageIcon/empty.png" mode="widthFix"></image>
+				</view>
+				<view class="emptyText flex-row justify-center">
+					<text>暂无内容</text>
+				</view>
 			</view>
-		</view>
 
-		<scroll-view v-else scroll-y :style="{'height':windowHeight}">
-			<view  class="row-list flex-row justify-start" v-for="(item,index) in equityList" :key="index">
-				<view class="h-text flex-col justify-center ">
-					<view class="money">
-						<text>￥{{item.salePrice}}</text>
+			<scroll-view v-else scroll-y :style="{'height':windowHeight}">
+				<view  class="row-list flex-row justify-start" v-for="(item,index) in equityList" :key="index">
+					<view class="h-text flex-col justify-center ">
+						<view class="money">
+							<text>￥{{item.salePrice}}</text>
+						</view>
+						<!--				<view class="desc">-->
+						<!--					<text>{{item.title}}</text>-->
+						<!--				</view>-->
 					</view>
-					<!--				<view class="desc">-->
-					<!--					<text>{{item.title}}</text>-->
-					<!--				</view>-->
-				</view>
 
-				<view class="h-center-content flex-col justify-around">
-					<view class="h-value">
-						<text>{{item.title}}</text>
-					</view>
-					<view class="title">
-						使用项目：{{item.serviceProjectName || ''}}
-					</view>
-					<view class="title">
-						有效天数：{{item.effectiveDays}}
+					<view class="h-center-content flex-col justify-around">
+						<view class="h-value">
+							<text>{{item.title}}</text>
+						</view>
+						<view class="title">
+							使用项目：{{item.serviceProjectName || ''}}
+						</view>
+						<view class="title">
+							有效天数：{{item.effectiveDays}}
+						</view>
 					</view>
-				</view>
 
-				<view class="h-right-content flex-col justify-center ">
-					<view class="btn" @click="payRights(item)">
-						<text>购买</text>
+					<view class="h-right-content flex-col justify-center ">
+						<view class="btn" @click="payRights(item)">
+							<text>购买</text>
+						</view>
 					</view>
+
 				</view>
+			</scroll-view>
 
-			</view>
-		</scroll-view>
+
+		</view>
+
+		<view class="btnTitle flex-row"  v-if="equityList.length > 0">
+			<u-icon v-if="selectIcon" name="checkmark-circle-fill" color="#FFE52C" size="18" @click="selectChange"></u-icon>
+			<u-icon v-else name="/static/order/ud9.png" color="#FFE52C" size="18" @click="selectChange"></u-icon>
+			<text :style="{'margin-left':'10rpx'}">请阅读并同意</text>
+			<text :style="{'color':'red'}" @click="goTermsOfService">《娇骄儿88卡权益服务协议》</text>
+		</view>
 
 		<uni-popup ref="popup" :catchtouchmove="true" :animation="false" type="bottom">
 
@@ -105,7 +115,9 @@
 	export default {
 		data() {
 			return {
+				selectIcon:'',
 				windowHeight:'',
+				windowHeight1:'',
 				show:false,
 				curServiceTab:1,
 				orderRights:{},
@@ -119,7 +131,8 @@
 		},
 		onLoad(option) {
 			let sysInfo = uni.getSystemInfoSync()
-			this.windowHeight =sysInfo.windowHeight  +'px'//除标题栏栏外的屏幕可用高度
+			this.windowHeight =sysInfo.windowHeight -50  +'px'//除标题栏栏外的屏幕可用高度
+			this.windowHeight1 =sysInfo.windowHeight  +'px'//除标题栏栏外的屏幕可用高度
 			this.userInfo = uni.getStorageSync('userInfo')
 			this.listServiceObject()
 			this.equityCardList()
@@ -127,6 +140,16 @@
 
 		methods: {
 
+			goTermsOfService(){
+				uni.navigateTo({
+					url:'/myPages/TermsOfService/index?name='+'娇骄儿88卡权益服务协议'+'&type=' + 4
+				})
+			},
+
+			selectChange(){
+				this.selectIcon = !this.selectIcon
+			},
+
 			commonGeneralOrder(){
 				this.$refs.popup.close()
 				this.$api.commonGeneralOrder({
@@ -244,6 +267,10 @@
 			},
 
 			payRights(item){
+				if(!this.selectIcon){
+					uni.$u.toast('请阅读并同意《娇骄儿88卡权益服务协议》')
+					return;
+				}
 				this.show =true
 				this.orderRights = item
 			}