Merge remote-tracking branch 'origin/master'

pages.json

@@ -45,6 +45,14 @@
 				}
 			}
 		},
+		{
+			"path": "pages/realName/agreement",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": false		
+			}
+		},
 		{
 			"path": "pages/cameraContext/cameraContext",
 			"style": {

pages/cameraContext/cameraContext.vue

@@ -40,10 +40,8 @@
 export default {
   data() {
     return {
-      ctx: null,
       isAnimate: false,
-      tempVideoPath: "",
-      data: {}
+      tempVideoPath: ""
     };
   },
   onLoad() {
@@ -54,7 +52,6 @@ export default {
       this.ctx.startRecord({
         success: res => {
           this.isAnimate = true;
-          console.log(this.$refs);
           setTimeout(() => {
             this.ctx.stopRecord({
               success: res => {
@@ -74,10 +71,10 @@ export default {
           console.log("手动停止录像", res);
           this.tempVideoPath = res.tempVideoPath;
           this.isAnimate = false;
-          this.$refs.countDown.reset();
         },
         fail: function(error) {
           console.log(error);
+          this.isAnimate = false;
           uni.showModal({
             content: "停止录像失败",
             showCancel: false

pages/realName/FDDRegister.vue

@@ -12,14 +12,15 @@ export default {
     };
   },
   onLoad() {
-    uni.getStorage({
-      key: "fddUrl",
-      success: res => {
-        this.$nextTick(() => {
-          this.fddUrl = res.data;
-        });
-      }
-    });
+    // uni.getStorage({
+    //   key: "fddUrl",
+    //   success: res => {
+    //     this.$nextTick(() => {
+    //       this.fddUrl = res.data;
+    //     });
+    //   }
+    // });
+    this.fddUrl = uni.getStorageSync("fddUrl");
   },
   methods: {
     handleMessage(e) {

pages/realName/realName.vue

@@ -75,7 +75,8 @@
                     <u-checkbox name="yes" shape="circle" activeColor="#76C458"></u-checkbox>
                     <view class="know">
                         已阅读并同意
-                        <text @click="agreementHandle('service')">《用户协议》&《集保东西用户协议》</text>
+                        <text @click="agreementHandle('service')">《软件许可及服务协议》</text>
+                        <text @click="agreementHandle('privacy')">&《隐私保护政策》</text>
                     </view>
                 </u-checkbox-group>
             </view>
@@ -101,11 +102,11 @@ export default {
             isChecked: false
         };
     },
-   async onLoad(options) {
+    async onLoad(options) {
         if (options.tempVideoPath) {
-            this.isfinish = JSON.parse(options.isfinish) || false  
-            this.video  = await this.uploadFilePromise(options.tempVideoPath)
-            console.log('this.video',this.video)
+            this.isfinish = JSON.parse(options.isfinish) || false
+            this.video = await this.uploadFilePromise(options.tempVideoPath)
+            console.log('this.video', this.video)
             const data = {
                 num: uni.getStorageSync("info").name || '',
                 name: uni.getStorageSync("info").num || '',
@@ -262,7 +263,7 @@ export default {
             }
         },
         async fddRealName() {
-            if(!this.num||!this.name)return this.$common.msgToast('姓名和身份证号不能为空')
+            if (!this.num || !this.name) return this.$common.msgToast('姓名和身份证号不能为空')
             const data = {
                 num: this.num,
                 name: this.name,
@@ -279,15 +280,10 @@ export default {
                 mobile
             })
             if (res.status === 0) {
-                uni.setStorage({
-                    key: "fddUrl",
-                    data: res.data?.url,
-                    success: function () {
-                        uni.navigateTo({
+                uni.setStorageSync("fddUrl",res.data?.url);
+                uni.navigateTo({
                             url: "/pages/realName/FDDRegister",
                         });
-                    },
-                });
             } else {
                 this.$common.msgToast(res.msg)
             }
@@ -300,7 +296,12 @@ export default {
                     this.$common.msgToast(res.msg)
                 }
             })
-        }
+        },
+        agreementHandle(type) {
+            uni.navigateTo({
+                url: "/pages/realName/agreement?type=" + type,
+            });
+        },
     }
 };
 </script>