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

liuyg

2022-03-11 3cd3f10c65f219955991138068b5176e9d67a54a

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

 pages/grabOrders/grabOrdersMain/business.vue

@@ -121,11 +121,11 @@
          img: "/static/workbench/task9.png",
          url: "",
        },
        // {
        //   title: "模拟考试",
        //   img: "/static/workbench/task5.png",
        //   url: "/pages/exam/startexam",
        // }
        {
          title: "模拟考试",
          img: "/static/workbench/task5.png",
          url: "/pages/exam/startexam",
        }
      ],
    };
  },
@@ -133,13 +133,13 @@
    this.getNum();
  },
  onLoad() {
    if (this.$store.state.billFlag == true) {
      this.dataTwo.push({
        title: "模拟考试",
        img: "/static/workbench/task5.png",
        url: "/pages/exam/startexam",
      });
    }
    // if (this.$store.state.billFlag == true) {
    //   this.dataTwo.push({
    //     title: "模拟考试",
    //     img: "/static/workbench/task5.png",
    //     url: "/pages/exam/startexam",
    //   });
    // }
  },
  onBackPress(e) {
    console.log("监听返回按钮事件2", e);

 pages/home/home.vue

@@ -301,6 +301,12 @@
                        type: 'warning',
                    })
                    return;
                }else if (index == 3) {
                    this.$refs.uToast.show({
                        title: '功能研发中',
                        type: 'warning',
                    })
                    return;
                } else {
                    uni.navigateTo({
                        url: url
@@ -333,7 +339,8 @@
                    method: 'GET',
                    data: {
                        current: this.page,
                        size: this.pagesize
                        size: this.pagesize,
                        rolename: this.$store.state.UserData.role_name
                    },
                    success: (res) => {
                        if (res.data.code == 200) {

 pages/registerUser/registerUser.vue

@@ -176,7 +176,7 @@
                        title: '手机号',
                        img: 'phone-fill',
                        froms: 'phone',
                        requireds: false,
                        requireds: true,
                        placeholder: '请输入真实手机号'
                    },
                    // {
@@ -258,6 +258,24 @@
                        // 可以单个或者同时写两个触发验证方式 
                        trigger: ['change', 'blur'],
                    }],
                    phone: [{
                        required: true,
                        message: '请输入正确的手机号',
                        // 可以单个或者同时写两个触发验证方式 
                        trigger: ['change', 'blur'],
                    }, {
                        validator: (rule, value, callback) => {
                            var phone = /^1(3\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\d|9[0-35-9])\d{8}$/;

                            if (phone.test(value)) {
                                this.form.phone = value;
                                return true
                            } else {
                                return callback(new Error('手机号格式不正确'));
                            }
                        },
                        trigger: ['change', 'blur'],
                    }],
                    jobUnit: [{
                        required: false,
                        message: '请输入单位名称',