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

shuishen

2022-02-21 bd43cf042d48087d2f75237c0fe27ffb56fed5f4

 pages/registerUser/registerUser.vue

@@ -285,36 +285,39 @@
            faceco: '#000',
            faceMsg: '',
            roleList: [{
                  label: '群众',
                  value: "1416225849858883585"
               },{
                  label: '民警',
                  value: 1417092295132561409
                  value: "1417092295132561409"
               },
               {
                  label: '治保会队伍',
                  value: 1424615693403414529
                  value: "1495714130024673282"
               },
               {
                  label: '内保干部队伍',
                  value: 1424615773594312705
                  value: "1495714221926068225"
               },
               {
                  label: '治安巡防队伍',
                  value: 1424615835435130881
                  value: "1495714272471625729"
               },
               {
                  label: '信息员队伍',
                  value: 1424615909959524354
                  value: "1495714309071122434"
               },
               {
                  label: '保安员队伍',
                  value: 1424615972718895106
                  value: "1495714343888039937"
               },
               {
                  label: '警务辅助队伍',
                  value: 1424616047083905026
                  value: "1495714378025480193"
               },
               {
                  label: '平安志愿者',
                  value: 1494565079268491266
                  value: "1416225906918195201"
               }
            ],
            region: [{
@@ -393,17 +396,51 @@
                     return

                  }

                  that.$refs.uForm.validate(valid => {
                     if (valid) {
                        var d = that.form;
                        uni.navigateTo({
                           url: '/pages/registerUser/idphoto?data= ' +
                              encodeURIComponent(JSON.stringify(
                                 d))
						
                  var that = this;
                  var d = that.form;
                  var url = that.$store.state.piAPI + '/zc/inster',
                     data = {
                        // deptid: ,
                        password: d.pass,
                        password2: d.passTwo,
                        phone: d.phone,
                        sex: d.sex == '男' ? 1 : 2,
                        sname: d.name,
                        username: d.user,
                        deptid:d.objId,
                        parentId:d.jsid,
                        jurisdiction:d.xqobjId,
                        cardid:d.carId
                     }
                  uni.request({
                     url: url,
                     method: 'POST',
                     data: data,
                     success: (res) => {
                        uni.showToast({
                           title: '注册成功，请等待审核',
                           icon:'none',
                           duration: 2000
                        });
                        setTimeout(function(){
                           uni.navigateTo({
                              url: '/pages/loging/loging'
                           })
                        },2000);
                     }
                  });

                  // that.$refs.uForm.validate(valid => {
                  //    if (valid) {
                  //       var d = that.form;
                  //       uni.navigateTo({
                  //          url: '/pages/registerUser/idphoto?data= ' +
                  //             encodeURIComponent(JSON.stringify(
                  //                d))
                  //       });
                  //    }
                  // });
               }
            });