Merge branch 'master' of http://192.168.0.105:10010/r/qfqk-android

liuyg

2022-02-22 c6bc487ee4bda719081c46a3b1e66acf17ea9c13

 pages/registerUser/idphoto.nvue

@@ -21,13 +21,13 @@
            <cover-image class="outline-img" src="/static/live-camera/outline/portrait.png" style=""></cover-image>
         </cover-view>
      </view>
		

      <view class="menu">
         <!--底部菜单区域背景-->
         <cover-image class="menu-mask" src="/static/live-camera/bar.png"></cover-image>
         <button v-if="buttonShow" class="submit" style="background: #14b9c8;"; @click="again">
         <button v-if="buttonShow" class="submit" style="background: #14b9c8;" ; @click="again">
            <text style='color: #FFF'>重新识别</text>
            </button>
         </button>
         <!--返回键-->
         <!-- <cover-image class="menu-back" @tap="back" src="/static/live-camera/back.png"></cover-image> -->
         <!--快门键-->
@@ -56,9 +56,9 @@
            //倒计时
            second: 0,
            ifPhoto: false,
            faceNext:false,
            buttonShow:false,
            dataForm:"",
            faceNext: false,
            buttonShow: false,
            dataForm: "",
         };
      },
      onLoad(e) {
@@ -160,13 +160,15 @@
               }
            }, 1000);
         },
         again(){
         again() {
            this.getCount();
         },
         //人脸验证
         FaceVerification(res){
         FaceVerification(res) {
            var that = this;
            uni.showLoading({title: '人脸验证中'});
            uni.showLoading({
               title: '人脸验证中'
            });
            var url = that.$store.state.piAPI + 'blade-user/faceCompare',
               data = {
                  "name": that.dataForm.name,
@@ -213,7 +215,7 @@
            });
         },
         //帐号注册
         insterAccounts(d){
         insterAccounts(d) {
            var that = this;
            var url = that.$store.state.piAPI + '/zc/inster',
               data = {
@@ -224,10 +226,11 @@
                  sex: d.sex == '男' ? 1 : 2,
                  sname: d.name,
                  username: d.user,
                  deptid:d.objId,
                  parentId:d.jsid,
                  jurisdiction:d.xqobjId,
                  cardid:d.carId
                  deptid: d.objId,
                  parentId: d.jsid,
                  jurisdiction: d.xqobjId,
                  cardid: d.carId,
                  address: d.address
               }
            uni.request({
               url: url,
@@ -236,14 +239,14 @@
               success: (res) => {
                  uni.showToast({
                     title: '注册成功，请等待审核',
                     icon:'none',
                     icon: 'none',
                     duration: 2000
                  });
                  setTimeout(function(){
                  setTimeout(function() {
                     uni.navigateTo({
                        url: '/pages/loging/loging'
                     })
                  },2000);
                  }, 2000);
               }
            });
         },
@@ -252,7 +255,6 @@
</script>

<style lang="scss">
	
   .submit {
      margin: 30rpx 50rpx 0;
      border: none;
@@ -262,6 +264,7 @@
      box-sizing: border-box;
      border-radius: 15rpx;
   }

   .live-camera {
      .preview {
         justify-content: center;
@@ -296,6 +299,7 @@
            }
         }
      }

      .title {
         font-size: 35rpx;
         background-color: #0BB9C8;