代码提交

common/betone_components/betone-list.vue

@@ -103,14 +103,14 @@
         <betone-modal :title="'关闭原因'" :confirmText="'确认'" v-model="cloneVisible" @cancel="cloneVisible = false"
             @confirm="confirmCloseSub">
             <view class="modal-text">
-                <betone-new-input v-model="closeReason" placeholder="请输入" style="margin-bottom: 32rpx" />
+                <u-input :border="true"  v-model="closeReason" placeholder="请输入" style="margin-bottom: 32rpx" />
             </view>
         </betone-modal>
 
         <!-- 维修人员驳回 -->
         <betone-modal v-model="turnShow" :title="'驳回原因'" @confirm="turnFn" @cancel="turnShow = false">
             <view class="modal-text">
-                <betone-new-input v-model="repaiRejectReason" placeholder="请输入" style="margin-bottom: 32rpx" />
+                <u-input :border="true"  v-model="repaiRejectReason" placeholder="请输入" style="margin-bottom: 32rpx" />
             </view>
         </betone-modal>
 

common/betone_components/betone-new-input.vue

@@ -132,7 +132,7 @@ export default {
       smsTxtr: "重新发送",
       isCountdown: true,
       tips: "",
-      seconds: 10,
+      seconds: 60,
     };
   },
   watch: {

common/betone_components/betone-pop.vue

@@ -10,13 +10,13 @@
     >
       <view class="pop-content" :style="{width: width}">
         <view class="pop-title" v-if="title">{{ title }}</view>
-        <view class="pop-icon" v-if="icon">
+        <!-- <view class="pop-icon" v-if="icon">
           <u-image
             :width="iconSize"
             mode="widthFix"
             :src="`/static/img/betone-sp-component/pop/${icon}.svg`"
           ></u-image>
-        </view>
+        </view> -->
         <slot></slot>
       </view>
     </u-popup>

common/betone_components/betone-tabbar.vue

@@ -5,9 +5,9 @@
       inactive-color="#999999"
       :border-top="borderTop"
       :list="list"
-      :height="154"
+      :height="124"
       :mid-button-size="170"
-      :icon-size="60"
+      :icon-size="50"
       @change="tabbatChange"
       v-model="current"
     ></u-tabbar>

pages.json

@@ -10,113 +10,6 @@
                 "navigationBarTextStyle": "white"
             }
         },
-        {
-            "path": "pages/my/my",
-            "style": {
-                "navigationStyle": "custom",
-                "navigationBarTextStyle": "white"
-            }
-        },
-        {
-            "path": "pages/my/records",
-            "style": {
-                "navigationBarTitleText": "记录",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/my/feedback",
-            "style": {
-                "navigationBarTitleText": "意见反馈",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/submission/index",
-            "style": {
-                "navigationBarTitleText": "维修报送",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/submission/submissionDetails",
-            "style": {
-                "navigationBarTitleText": "维修报送",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8"
-            }
-        },
-        {
-            "path": "pages/submission/records",
-            "style": {
-                "navigationBarTitleText": "报送记录",
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#efefef",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path": "pages/submission/recordsdetails",
-            "style": {
-                "navigationBarTitleText": "维修详情",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
-        {
-            "path": "pages/submission/evaluate",
-            "style": {
-                "navigationBarTitleText": "评价",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
-        {
-            "path": "pages/submission/sendOrders",
-            "style": {
-                "navigationBarTitleText": "工单",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
-        {
-            "path": "pages/order/tasking",
-            "style": {
-                "navigationStyle": "custom",
-                "navigationBarTextStyle": "white"
-            }
-        },
-        {
-            "path": "pages/order/location",
-            "style": {
-                "navigationBarTitleText": "查看位置",
-                "enablePullDownRefresh": false,
-                "navigationBarTextStyle": "black",
-                "navigationBarBackgroundColor": "#F8F8F8",
-                "app-plus": {
-                    "titleNView": {}
-                }
-            }
-        },
         {
             "path": "pages/login/login",
             "style": {
@@ -144,33 +37,100 @@
                 "navigationStyle": "custom",
                 "navigationBarTextStyle": "white"
             }
-        },
+        }
+    ],
+    "subPackages": [
         {
-            "path": "pages/inspection/quest",
+            "root": "pages/forgot",
-            "style": {
+            "pages": [
-                "navigationStyle": "custom",
+                {
-                "navigationBarTextStyle": "white"
+                    "path": "forgotPassword",
-            }
+                    "style": {
+                        "navigationBarTitleText": "忘记密码",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                }
+            ]
         },
         {
-            "path": "pages/inspection/plan",
+            "root": "pages/inspection",
-            "style": {
+            "pages": [
-                "navigationBarTitleText": "巡检计划",
+                {
-                "enablePullDownRefresh": false,
+                    "path": "quest",
-                "navigationBarTextStyle": "black",
+                    "style": {
-                "navigationBarBackgroundColor": "#F8F8F8",
+                        "navigationStyle": "custom",
-                "app-plus": {
+                        "navigationBarTextStyle": "white"
-                    "titleNView": {}
+                    }
+                },
+                {
+                    "path": "questDetails",
+                    "style": {
+                        "navigationBarTitleText": "巡检任务单",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "plan",
+                    "style": {
+                        "navigationBarTitleText": "巡检计划",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "planDetails",
+                    "style": {
+                        "navigationBarTitleText": "巡检计划详情",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
+                },
+                {
+                    "path": "questOrder",
+                    "style": {
+                        "navigationBarTitleText": "巡检任务单",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
+                    }
                 }
-            }
+            ]
         },
         {
-            "root": "pages",
+            "root": "pages/order",
             "pages": [
                 {
-                    "path": "pages/inspection/questOrder",
+                    "path": "tasking",
                     "style": {
-                        "navigationBarTitleText": "巡检任务单",
+                        "navigationStyle": "custom",
+                        "navigationBarTextStyle": "white"
+                    }
+                },
+                {
+                    "path": "location",
+                    "style": {
+                        "navigationBarTitleText": "查看位置",
                         "enablePullDownRefresh": false,
                         "navigationBarTextStyle": "black",
                         "navigationBarBackgroundColor": "#F8F8F8",
@@ -180,16 +140,71 @@
                     }
                 }
             ]
-        }
+        },
-    ],
-    "subPackages": [
         {
-            "root": "pages",
+            "root": "pages/my",
             "pages": [
                 {
-                    "path": "inspection/planDetails",
+                    "path": "my",
                     "style": {
-                        "navigationBarTitleText": "巡检计划详情",
+                        "navigationStyle": "custom",
+                        "navigationBarTextStyle": "white"
+                    }
+                },
+                {
+                    "path": "records",
+                    "style": {
+                        "navigationBarTitleText": "记录",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                },
+                {
+                    "path": "feedback",
+                    "style": {
+                        "navigationBarTitleText": "意见反馈",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                }
+            ]
+        },
+        {
+            "root": "pages/submission",
+            "pages": [
+                {
+                    "path": "index",
+                    "style": {
+                        "navigationBarTitleText": "维修报送",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                },
+                {
+                    "path": "submissionDetails",
+                    "style": {
+                        "navigationBarTitleText": "维修报送",
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8"
+                    }
+                },
+                {
+                    "path": "records",
+                    "style": {
+                        "navigationBarTitleText": "报送记录",
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#efefef",
+                        "enablePullDownRefresh": true
+                    }
+                },
+                {
+                    "path": "recordsdetails",
+                    "style": {
+                        "navigationBarTitleText": "维修详情",
                         "enablePullDownRefresh": false,
                         "navigationBarTextStyle": "black",
                         "navigationBarBackgroundColor": "#F8F8F8",
@@ -199,9 +214,9 @@
                     }
                 },
                 {
-                    "path": "inspection/questDetails",
+                    "path": "evaluate",
                     "style": {
-                        "navigationBarTitleText": "巡检任务单",
+                        "navigationBarTitleText": "评价",
                         "enablePullDownRefresh": false,
                         "navigationBarTextStyle": "black",
                         "navigationBarBackgroundColor": "#F8F8F8",
@@ -211,10 +226,15 @@
                     }
                 },
                 {
-                    "path": "login/forgotPassword",
+                    "path": "sendOrders",
                     "style": {
-                        "navigationStyle": "custom",
+                        "navigationBarTitleText": "工单",
-                        "navigationBarTextStyle": "white"
+                        "enablePullDownRefresh": false,
+                        "navigationBarTextStyle": "black",
+                        "navigationBarBackgroundColor": "#F8F8F8",
+                        "app-plus": {
+                            "titleNView": {}
+                        }
                     }
                 }
             ]

pages/forgot/forgotPassword.vue

@@ -0,0 +1,147 @@
+<template>
+    <view class="page_css">
+        <view class="container">
+            <betone-header-top :title="title" />
+            <u-form :model="forgotInfo" :rules="rules" ref="forgotForm">
+                <u-form-item prop="mobile" :border-bottom="false" label-position="top" label="手机号" :required="true">
+                    <u-input v-model="forgotInfo.mobile" :border="true" placeholder="请输入" />
+                </u-form-item>
+                <u-form-item prop="verificationCode" :border-bottom="false" label-position="top" label="验证码"
+                    :required="true">
+                    <betone-new-input v-model="forgotInfo.verificationCode" placeholder="请输入手机6位数验证码" :isSms="true"
+                        @ch="sendCode" ref="verificationCode" />
+                </u-form-item>
+                <u-form-item prop="password" :border-bottom="false" label-position="top" label="密码" :required="true">
+                    <u-input v-model="forgotInfo.password" type="password" :border="true" :password-icon="true" />
+                </u-form-item>
+                <u-form-item prop="confirmPassword" :border-bottom="false" label-position="top" label="确认密码"
+                    :required="true">
+                    <u-input v-model="forgotInfo.confirmPassword" type="password" :border="true"
+                        :password-icon="true" />
+                </u-form-item>
+            </u-form>
+            <u-button class="item-bottom" type="primary" @click="formSubmit()">
+                确定
+            </u-button>
+        </view>
+    </view>
+</template>
+<script>
+export default {
+
+    data() {
+        return {
+            title: "忘记密码",
+            forgotInfo: {
+                mobile: '',
+                verificationCode: '',//验证码
+                password: "",//密码
+                confirmPassword: '',//确认密码
+            },
+            rules: {
+                mobile: [
+                    {
+                        type: "string",
+                        required: true,
+                        message: "请输入手机号",
+                        trigger: ["blur", "change"],
+                    },
+                    {
+                        validator: (rule, value, callback) => {
+                            return this.$u.test.mobile(value);
+                        },
+                        message: '请输入正确的手机号',
+                        trigger: ["change", "blur"]
+                    },
+                ],
+                password: [
+                    {
+                        type: "string",
+                        required: true,
+                        message: "请输入密码",
+                        trigger: ["blur", "change"],
+                    },
+                    {
+                        min: 8,
+                        max: 16,
+                        message: '长度在8-16个字符之间'
+                    },
+                ],
+                confirmPassword: [
+                    {
+                        type: "string",
+                        required: true,
+                        message: "请确认密码",
+                        trigger: ["blur"],
+                    },
+                    {
+                        asyncValidator: (rules, value, callback) => {
+                            if (value != this.forgotInfo.password) {
+                                callback(new Error('两次密码校验不一致'))
+                            }
+                            callback()
+                        },
+                        message: '两次密码校验不一致',
+                        trigger: ["blur"]
+                    },
+                ],
+                verificationCode: {
+                    type: "string",
+                    required: true,
+                    message: "请输入验证码",
+                    trigger: ["blur", "change"],
+                },
+            },
+        }
+    },
+    onReady() {
+        this.$refs.forgotForm.setRules(this.rules);
+    },
+    methods: {
+        // 发送验证码
+        sendCode() {
+            if (this.registerInfo.phoneNumber == '') {
+                uni.$u.toast("请先输入手机号");
+                return false;
+            }
+            let query = {
+                phone: this.registerInfo.phoneNumber
+            }
+            this.$u.api.sendVerify(query).then(res => {
+                if (res.code == 200) {
+                    this.$refs.verificationCode.sendSuceess()
+                }
+            })
+
+        },
+        formSubmit() {
+            this.$refs.forgotForm.validate(valid => {
+                if (valid) {
+                    console.log('校验通过')
+                    uni.$u.toast('修改成功，请登录');
+                    setTimeout(() => {
+                        uni.navigateTo({
+                            url: "/pages/login/login",
+                        });
+                    }, 1000)
+                } else {
+                    console.log('校验失败')
+                }
+            })
+
+
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.page_css {
+    .container {
+        padding: 32rpx 64rpx 32rpx 64rpx;
+
+        .item-bottom {
+            margin-top: 64rpx;
+        }
+    }
+}
+</style>

pages/inspection/quest.vue

@@ -305,6 +305,7 @@ export default {
         },
         //跳转工单
         openWorkOrder(item, type) {
+          
             let param = {
                 id: item.id,
                 type: 'view',

pages/inspection/questOrder.vue

@@ -15,10 +15,12 @@
             <view class="info_title">巡检配置</view>
             <u-form labelPosition="left" ref="sendOrderForm" :model="detailForm" :label-width="200" class="repair_form">
                 <u-form-item label="巡检内容:" prop="dispatchTime" :border-bottom="false">
-                    <betone-new-input label="" v-model="detailForm.taskContent" placeholder="" :disabled="true" />
+                    <!-- <betone-new-input label="" v-model="detailForm.taskContent" placeholder=""  /> -->
+                    <u-input v-model="detailForm.taskContent" :disabled="true" :border="true" />
                 </u-form-item>
                 <u-form-item label="任务开始时间:" prop="dispatchTime" :border-bottom="false">
-                    <betone-new-input label="" v-model="detailForm.startTime" placeholder="" :disabled="true" />
+                    <!-- <betone-new-input label="" v-model="detailForm.startTime" placeholder="" :disabled="true" /> -->
+                    <u-input v-model="detailForm.startTime" :disabled="true" :border="true" />
                 </u-form-item>
                 <u-form-item label="预约上门时间:" prop="customerOpinion" :border-bottom="false">
                     <u-input v-if="reservationDisabled" v-model="reservationTime" type="select"

pages/login/forgotPassword.vue

@@ -1,65 +0,0 @@
-<template>
-    <view class="page_css">
-        <view class="container">
-            <betone-header-top :title="title" />
-            <u-form labelPosition="left" :model="forgotInfo" :rules="rules" ref="registerForm">
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="手机号">
-                    <u-input v-model="forgotInfo.mobile" :border="true" placeholder="请输入" />
-                </u-form-item>
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="验证码">
-
-                </u-form-item>
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="密码">
-                    <u-input v-model="forgotInfo.password" type="password" :border="true" :password-icon="true" />
-                </u-form-item>
-                <u-form-item prop="businessName" :border-bottom="false" label-position="top" label="确认密码">
-                    <u-input v-model="forgotInfo.confirmPassword" type="password" :border="true" :password-icon="true" />
-                </u-form-item>
-            </u-form>
-            <!-- <u-button @click="submit">确定</u-button> -->
-        </view>
-    </view>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            title: "忘记密码",
-            forgotInfo: {
-                mobile: '',
-                verificationCode:'',//验证码
-                password:"",//密码
-                confirmPassword:'',//确认密码
-            },
-            rules: {
-                mobile: [
-                    {
-                        required: true,
-                        message: '请输入手机号',
-                        trigger: ['change', 'blur'],
-                    },
-                    {
-                        // 自定义验证函数，见上说明
-                        validator: (rule, value, callback) => {
-                            // 上面有说，返回true表示校验通过，返回false表示不通过
-                            // this.$u.test.mobile()就是返回true或者false的
-                            return this.$u.test.mobile(value);
-                        },
-                        message: '手机号码不正确',
-                        // 触发器可以同时用blur和change
-                        trigger: ['change', 'blur'],
-                    }
-                ]
-            },
-        }
-    }
-}
-</script>
-<style lang="scss" scoped>
-.page_css {
-    .container {
-        padding: 32rpx 64rpx 32rpx 64rpx;
-
-    }
-}
-</style>

pages/login/login.vue

@@ -3,18 +3,20 @@
     <view class="container">
       <view class="title">科研医疗建筑运维平台</view>
       <view class="sp-login-form">
-        <u-input v-model="userInfo.username" :border="true" placeholder="请输入手机号" style="margin-bottom: 32rpx" prefix-icon="search" />
+        <view style="margin-bottom: 32rpx">
-        <u-input v-model="userInfo.pwd" type="password" :border="true" :password-icon="true" placeholder="请输入密码" style="margin-bottom: 32rpx" />
+          <u-input v-model="userInfo.username" :border="true" placeholder="请输入手机号" />
-        <!-- <betone-new-input :value="userInfo.username" placeholder="请输入用户名" icon="account-fill"
+        </view>
-          style="margin-bottom: 32rpx" @changevalue="userInfo.username = $event" />
+        <view style="margin-bottom: 32rpx">
-        <betone-new-input style="margin-bottom: 32rpx" v-model="userInfo.pwd" placeholder="请输入密码" :type="'password'"
+          <u-input v-model="userInfo.pwd" type="password" :border="true" :password-icon="true" placeholder="请输入密码" />
-          icon="lock-fill" @changevalue="userInfo.pwd = $event" /> -->
+        </view>
         <u-checkbox-group>
           <u-checkbox @change="rememberPwdChange" v-model="rememberPwd" key="index" name="记住密码">记住密码</u-checkbox>
         </u-checkbox-group>
-        <u-button class="item-bottom" type="primary" :disabled="disabled" @click="formSubmit()">
+        <view class="item-bottom">
-          登录
+          <u-button type="primary" :disabled="disabled" @click="formSubmit()">
-        </u-button>
+            登录
+          </u-button>
+        </view>
         <view class="footer">
           <span @click="linkRegister()">注册账号</span>
           <span @click="forgotPassword()">忘记密码</span>
@@ -45,7 +47,6 @@ export default {
   },
   computed: {
     disabled() {
-      console.log(11111111111, this.userInfo)
       return !this.userInfo.username || !this.userInfo.pwd;
     },
   },
@@ -85,7 +86,7 @@ export default {
         uni.showToast({ title: "请输入密码", icon: "none" });
         return false;
       }
-     this.BetLoading.show();
+      this.BetLoading.show();
       // // 实例化smCrypto
       // const smCryptoInstance = new smCrypto.SM2Instance();
       // // 设置密钥
@@ -114,7 +115,7 @@ export default {
       this.$u.api
         .login(bjectToQueryString(formdata), formdata)
         .then((res) => {
-         
+
           uni.setStorage({
             key: "userinfo",
             data: res,
@@ -123,10 +124,9 @@ export default {
             key: "token",
             data: res.access_token,
           });
-          console.log(555555555,res.detail.status)
           this.$store.dispatch("changeTabbar", res);
 
-         this.BetLoading.hide();
+          this.BetLoading.hide();
         })
         .catch((err) => {
           if (err.error_code == 2004) {
@@ -135,7 +135,7 @@ export default {
             });
             return false
           }
-         this.BetLoading.hide();
+          this.BetLoading.hide();
         });
     },
 
@@ -161,9 +161,9 @@ export default {
         url: "/pages/register/index",
       });
     },
-    forgotPassword(){
+    forgotPassword() {
       uni.navigateTo({
-        url: "/pages/login/forgotPassword",
+        url: "/pages/forgot/forgotPassword",
       });
     },
   },
@@ -207,6 +207,7 @@ export default {
 
     .item-bottom {
       margin-bottom: 32rpx;
+      margin-top: 32rpx;
     }
 
     .footer {
@@ -225,15 +226,16 @@ export default {
         &:nth-child(1) {
           text-align: left;
           position: relative;
-          // &::before {
+
-          //   content: "";
+          &::before {
-          //   width: 1px;
+            content: "";
-          //   height: 20rpx;
+            width: 1px;
-          //   position: absolute;
+            height: 20rpx;
-          //   top: 10rpx;
+            position: absolute;
-          //   right: 0;
+            top: 10rpx;
-          //   background: rgb(58, 98, 215);
+            right: 0;
-          // }
+            background: rgb(58, 98, 215);
+          }
         }
 
         &:nth-child(2) {

pages/register/index.vue

@@ -2,33 +2,35 @@
   <view class="page_css">
     <view class="container">
       <betone-header-top :title="title" />
-      <u-form labelPosition="left" :model="registerInfo" :rules="rules" ref="registerForm">
+      <u-form label-position="top" :model="registerInfo" :rules="rules" ref="registerForm">
-        <u-form-item prop="businessName" :border-bottom="false" label-width="0">
+        <u-form-item prop="businessName" :border-bottom="false" label="企业名称" :required="true">
-          <betone-new-input label="企业名称" v-model="registerInfo.businessName" placeholder="请输入" :isRequire="true" />
+          <u-input v-model="registerInfo.businessName" :border="true" placeholder="请输入手机号"
+            style="margin-bottom: 32rpx" />
         </u-form-item>
-        <u-form-item prop="area" :border-bottom="false" label-width="0">
+        <u-form-item prop="area" :border-bottom="false" label="实验室地址" :required="true">
           <view @click.stop="addMap()" style="width: 100%;height: 100%;">
-            <betone-new-input label="实验室地址" v-model="registerInfo.area" placeholder="请选择" :isRequire="true"
+            <betone-new-input v-model="registerInfo.area" placeholder="请选择" type="select" />
-              type="select" />
           </view>
         </u-form-item>
-        <u-form-item prop="personName" :border-bottom="false" label-width="0">
+        <u-form-item prop="personName" :border-bottom="false" label="负责人姓名" :required="true">
-          <betone-new-input label="负责人姓名" v-model="registerInfo.personName" placeholder="请输入" :isRequire="true" />
+
+          <u-input v-model="registerInfo.personName" type="text" :border="true" placeholder="请输入"
+            style="margin-bottom: 32rpx" />
         </u-form-item>
-        <u-form-item prop="phoneNumber" :border-bottom="false" label-width="0">
+        <u-form-item prop="phoneNumber" :border-bottom="false" label="手机号" :required="true">
-          <betone-new-input label="手机号" v-model="registerInfo.phoneNumber" placeholder="请输入" :isRequire="true" />
+
+          <u-input v-model="registerInfo.phoneNumber" type="text" :border="true" placeholder="请输入"
+            style="margin-bottom: 32rpx" />
         </u-form-item>
-        <u-form-item prop="verificationCode" :border-bottom="false" label-width="0">
+        <u-form-item prop="verificationCode" :border-bottom="false" >
-          <betone-new-input label="手机验证码" v-model="registerInfo.verificationCode" placeholder="请输入手机6位数验证码"
+          <betone-new-input label="手机验证码" :isRequire="true" v-model="registerInfo.verificationCode" placeholder="请输入手机6位数验证码"
-            :isSms="true" @ch="sendCode" :isRequire="true" ref="verificationCode" />
+            :isSms="true" @ch="sendCode" ref="verificationCode" />
         </u-form-item>
-        <u-form-item prop="password" :border-bottom="false" label-width="0">
+        <u-form-item prop="password" :border-bottom="false" label="设置密码" :required="true">
-          <betone-new-input label="设置密码" v-model="registerInfo.password" placeholder="请输入8-16位数字与字母的组合"
+          <u-input v-model="registerInfo.password" type="password" placeholder="请输入8-16位数字与字母的组合" :border="true" :password-icon="true" />
-            :isRequire="true" type="password" />
         </u-form-item>
-        <u-form-item prop="confirmPassword" :border-bottom="false" label-width="0">
+        <u-form-item prop="confirmPassword" label="确认密码" :border-bottom="false" :required="true">
-          <betone-new-input label="确认密码" v-model="registerInfo.confirmPassword" placeholder="请再次输入密码" :isRequire="true"
+          <u-input v-model="registerInfo.confirmPassword" type="password" :border="true" :password-icon="true" />
-            type="password" />
         </u-form-item>
 
         <u-form-item prop="checked" :border-bottom="false">
@@ -189,7 +191,7 @@ export default {
               uni.$u.toast("请勾选《注册服务协议》及《隐私权政策》");
               return false;
             }
-           this.BetLoading.show();
+            this.BetLoading.show();
             let query_ = {
               "deptName": this.registerInfo.businessName,//企业名称
               "address": this.registerInfo.area,//详细地址
@@ -201,7 +203,7 @@ export default {
               "verifyCode": this.registerInfo.verificationCode,//验证码
             }
             this.$u.api.registerUser(query_).then(res => {
-             this.BetLoading.hide();
+              this.BetLoading.hide();
               if (res.code == 200) {
                 setTimeout(() => {
                   uni.navigateTo({
@@ -212,11 +214,11 @@ export default {
                 uni.$u.toast(res.msg);
               }
             }).finally(err => {
-             this.BetLoading.hide();
+              this.BetLoading.hide();
               uni.$u.toast(err.data.msg);
             })
           } else {
-           this.BetLoading.hide();
+            this.BetLoading.hide();
             console.log('验证失败');
           }
         });
@@ -249,7 +251,7 @@ export default {
         this.selectMap = e
         console.log('选中地点', e)
         uni.$emit('commitCheck', e);
-        this.registerInfo.area =e.province+e.city+e.district+e.address
+        this.registerInfo.area = e.province + e.city + e.district + e.address
       }
       this.mapInfo.showMapSelect = false
     }
@@ -274,5 +276,8 @@ export default {
   /deep/.u-form-item__body__right__message {
     margin-left: 0 !important;
   }
+  /deep/.arrow{
+    top: 15rpx;
+  }
 }
 </style>

pages/submission/components/subForm.vue

@@ -3,31 +3,31 @@
         <view class="container">
             <view v-for="(item, index) in breakdownInfo" :key="index">
                 <betone-header-top :titleMin="'故障信息'" />
-                <u-form labelPosition="left" :rules="rules" :ref="`breakdownForm${index}`" :model="item">
+                <u-form labelPosition="top" :rules="rules" :ref="`breakdownForm${index}`" :model="item">
-                    <u-form-item  prop="businessName" :border-bottom="false">
+                    <u-form-item prop="businessName" :border-bottom="false" label="设备名称">
                         <view @click="itemIndexFn(index)" style="width: 100%">
-                            <betone-new-input :disabled="formDisabled" label="设备名称:" v-model="item.deviceName"
+                            <betone-new-input :disabled="formDisabled" v-model="item.deviceName" placeholder="请输入"
-                                placeholder="请输入" endIcon="scan" @scanSuccess="scanSuccess" :endScanIndex="index" />
+                                endIcon="scan" @scanSuccess="scanSuccess" :endScanIndex="index" />
                         </view>
                     </u-form-item>
-                    <u-form-item  prop="businessName" :border-bottom="false">
+                    <u-form-item prop="businessName" :border-bottom="false" label="故障位置">
-                        <betone-new-input :disabled="formDisabled" label="故障位置:" v-model="item.faultLocation"
+                        <u-input v-model="item.faultLocation" :disabled="formDisabled" type="text" :border="true"
                             placeholder="请输入" />
                     </u-form-item>
-                    <u-form-item  prop="businessName" :border-bottom="false">
+                    <u-form-item prop="businessName" :border-bottom="false" label="故障专业类型">
-                        <betone-new-input :disabled="formDisabled" label="故障专业类型:" v-model="item.faultType"
+                        <u-input v-model="item.faultType" :disabled="formDisabled" type="text" :border="true"
                             placeholder="请输入" />
                     </u-form-item>
-                    <u-form-item  prop="faultDescribe" :border-bottom="false" label-width="0">
+                    <u-form-item prop="faultDescribe" :border-bottom="false" label="故障描述:" :required="true">
-                        <betone-new-input :disabled="formDisabled" label="故障描述:" v-model="item.faultDescribe"
+                        <u-input v-model="item.faultDescribe" :disabled="formDisabled" type="textarea" :border="true"
-                            placeholder="请输入" type="textarea" :height="150" :isRequire="true" />
+                            placeholder="请输入" :height="150" />
                     </u-form-item>
-                    <u-form-item label="故障视频:" prop="businessName" :border-bottom="false" label-position="top">
+                    <u-form-item label="故障视频" prop="businessName" :border-bottom="false" label-position="top">
                         <betone-upload :disabled="formDisabled" :type="'video'" v-model="item.videoAttaches"
                             @changeFile="changeVideo" :formIndex="index">
                         </betone-upload>
                     </u-form-item>
-                    <u-form-item label="故障图片:" prop="businessName" :border-bottom="false" label-width="180"
+                    <u-form-item label="故障图片" prop="businessName" :border-bottom="false" label-width="180"
                         label-position="top">
                         <betone-upload :disabled="formDisabled" :type="'images'" v-model="item.picAttaches"
                             @changeFile="changePic" :formIndex="index">
@@ -196,7 +196,7 @@ export default {
             })
         },
         // 扫码成功
-        scanSuccess(e,index) {
+        scanSuccess(e, index) {
             // 扫码返回  设备id  
             let id_ = e.toString()
             this.$u.api.getDeviceDetail({ id: id_ }).then(res => {

static/images/betone-sp-component/null.svg

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="236px" height="170px" viewBox="0 0 236 170" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 2备份</title>
-    <g id="24.2.23/改颜色" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="缺省页" transform="translate(-70.000000, -327.000000)">
-            <g id="编组-2备份" transform="translate(70.000000, 327.000000)">
-                <g id="编组-2" transform="translate(3.000000, 8.000000)">
-                    <path d="M1.15952713,86.4493832 C9.61090723,124.376489 43.1975673,143.902897 72.2343843,151.2136 C101.271201,158.524304 158.458911,158.524304 201.13796,120.624295 C220.860541,103.110175 237.542004,66.2072931 221.68648,35.8166135 C208.35199,10.2580628 180.6398,-2.3102229 152.227976,6.7623668 C110.820303,19.9848483 95.6846167,44.8277782 78.0908054,39.1187297 C68.9209547,36.1431878 42.0171394,28.4341586 23.2069533,37.5232749 C5.92681707,45.8730683 -3.42545173,65.8734565 1.15952713,86.4493832 Z" id="路径-2" fill="#99DBFF" opacity="0.25"></path>
-                    <path d="M193.496502,24.3892062 C194.03718,23.8486689 194.913678,23.8487829 195.454216,24.3894608 C195.505912,24.441171 195.553431,24.4968959 195.596325,24.5561124 L199.481193,29.9192686 C199.586318,30.0643957 199.553889,30.2672649 199.408762,30.3723895 C199.295221,30.4546343 199.141698,30.4546533 199.028137,30.3724366 L193.663345,26.4884054 C193.04439,26.0402906 192.905896,25.1752592 193.354011,24.5563037 C193.397006,24.4969172 193.444653,24.4410421 193.496502,24.3892062 Z M202.376285,21.6249978 C203.1332,21.7313475 203.660587,22.4311616 203.554237,23.1880763 C203.544043,23.2606332 203.528103,23.332266 203.506567,23.4022992 L201.5602,29.7317705 C201.507528,29.9030561 201.325974,29.9992115 201.154689,29.9465397 C201.020692,29.9053345 200.928311,29.7827319 200.925646,29.6425677 L200.799772,23.0220191 C200.78524,22.2576995 201.393063,21.6263158 202.157383,21.6117841 C202.230585,21.6103923 202.303782,21.6148108 202.376285,21.6249978 Z" id="形状结合" fill="#000000" transform="translate(198.329323, 26.022571) rotate(-270.000000) translate(-198.329323, -26.022571) "></path>
-                    <path d="M56.3925065,131.401807 C28.8834097,118.594203 25.872195,104.351677 47.3588625,88.6742299 C48.9708173,87.4980896 63.3739494,78.591178 78.4475938,74.7193644 C107.63379,67.2226035 136.627527,66.7452129 159.529024,54.7744535 C168.29405,50.1929182 172.374042,44.9628806 171.769001,39.0843409" id="路径-10" stroke="#000000" stroke-width="1.29789" stroke-dasharray="2.163149952888489"></path>
-                    <ellipse id="椭圆形" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF" cx="95.4815995" cy="141.477144" rx="58.9749938" ry="13.5228559"></ellipse>
-                    <ellipse id="椭圆形" fill="#080508" cx="95.4815995" cy="145.263544" rx="55.7286639" ry="9.73645627"></ellipse>
-                    <g id="脸蛋" transform="translate(177.721958, 33.835211) rotate(27.000000) translate(-177.721958, -33.835211) translate(164.195583, 20.312355)">
-                        <ellipse id="椭圆形" fill="#5669EF" cx="13.5263747" cy="13.5228559" rx="13.5263747" ry="13.5228559"></ellipse>
-                        <ellipse id="椭圆形" fill="#000000" cx="10.0636228" cy="10.2773705" rx="1" ry="3.24548542"></ellipse>
-                        <ellipse id="椭圆形备份" fill="#000000" cx="16.5562827" cy="10.2773705" rx="1" ry="3.24548542"></ellipse>
-                        <rect id="矩形" fill="#000000" x="7.57476985" y="19.148364" width="11.9032098" height="1.08182847" rx="0.540914237"></rect>
-                    </g>
-                    <g id="牌牌" transform="translate(79.764379, 0.000000)">
-                        <path d="M35.4666828,59.7994336 L27.904142,7.74674626 C27.7277687,6.53277559 28.2511008,5.32312329 29.2566548,4.62048998 L32.9993332,2.00528418 C33.9786225,1.32100336 35.3272125,1.56015499 36.0114934,2.53944429 C36.2039429,2.81486301 36.3295884,3.13132603 36.3784694,3.46374585 L45.1206263,62.9155968 L45.1206263,62.9155968" id="路径-11" fill="#000000"></path>
-                        <path d="M9.87266955,8.20200594 L60.738908,8.2040505 C64.9200319,8.20482728 68.3094606,11.5942559 68.3102374,15.7753798 L68.3110205,35.2520614 C68.3117973,39.4334231 64.9222702,42.8232227 60.7409085,42.8233908 C60.7407056,42.8233908 60.7405027,42.8233908 60.7402999,42.8227821 L9.87406138,42.8207376 C5.69293747,42.8199608 2.30350883,39.4305322 2.302732,35.2494083 L2.30194895,15.7727266 C2.30117215,11.591365 5.69069922,8.20156537 9.87206087,8.20139726 C9.87226377,8.20139726 9.87246667,8.20139726 9.87266955,8.20200594 Z" id="矩形" stroke="#000000" stroke-width="1.081575" fill="#EFE05D" transform="translate(35.306485, 25.512394) rotate(-9.000000) translate(-35.306485, -25.512394) "></path>
-                    </g>
-                    <g id="手" transform="translate(74.773284, 54.256505)">
-                        <path d="M57.1551612,4.33177743 L65.01875,15.3838148 L68.8696447,20.874971 L67.3520484,30.8470663 L68.8696447,47.7832566 L58.8012372,62.7316841 L42.5159924,70.4748231 L42.515377,99.6357774 L0.586376956,99.8167774 L0.448376956,98.8479837 L1.5378483,92.9905412 L14.8011318,37.524566 L29.4234023,10.0261366 L44.5147347,6.24877763 L57.1551612,4.33177743 Z" id="形状结合" fill="#FFFFFF"></path>
-                        <path d="M20.7083152,81.270582 C28.4473038,81.270582 35.8178508,81.5461875 42.5159483,82.0442847 L42.5159483,99.9697919 C35.8178508,100.467889 28.4473038,100.743495 20.7083152,100.743495 C13.6285924,100.743495 6.85721167,100.512845 0.626918354,100.09221 L0.448376956,98.8479837 L1.5378483,92.9905412 L4.23643999,81.7028911 C9.44235377,81.4218867 14.9741991,81.270582 20.7083152,81.270582 Z" id="形状结合" fill="#FFFFFF"></path>
-                        <path d="M34.5779538,30.0249824 C35.8167535,42.253005 32.796652,50.9094695 25.5176494,55.9943761" id="路径-4" stroke="#000000" stroke-width="1.081575" stroke-linecap="round"></path>
-                        <path d="M45.5289874,5.56101798 C51.7772292,3.48878131 56.5117672,2.37313776 59.7326014,2.21408734 C70.1746991,1.69843832 74.6181356,8.98252732 70.6177666,19.5179019" id="路径-8" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF"></path>
-                        <path d="M52.1086675,16.3695616 C58.1334136,15.4008564 62.2282259,15.1461199 64.3931044,15.6053521 C70.8013444,16.9647218 74.093069,23.3754713 70.2204036,30.8470663" id="路径-7" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF"></path>
-                        <path d="M52.6699918,27.0266266 C68.8428705,24.9752933 74.3359719,30.0503119 69.149296,42.2516822" id="路径-6" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF"></path>
-                        <line x1="42.5159924" y1="71.9772468" x2="42.5159924" y2="99.8849379" id="路径-9" stroke="#000000" stroke-width="1.081575"></line>
-                        <path d="M60.5160145,53.0457867 C48.4867129,55.7965558 43.1529529,53.4558573 44.5147347,46.0236912 C45.7554552,39.2522389 57.6137855,37.2094311 65.0842836,40.0835396 C69.9129158,41.9412488 72.1238475,44.9495304 71.509258,49.2452346 C70.3144469,57.5964261 60.2058522,73.2940761 32.6075468,72.6849" id="路径-5" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF" stroke-linecap="round"></path>
-                        <path d="M60.5160145,53.0457867 C48.4867129,55.7965558 43.1529529,53.4558573 44.5147347,46.0236912 C45.7554552,39.2522389 57.6137855,37.2094311 65.0842836,40.0835396 C69.9129158,41.9412488 72.1238475,44.9495304 71.509258,49.2452346 C70.3144469,57.5964261 60.2058522,73.2940761 32.6075468,72.6849" id="路径-5" stroke="#000000" stroke-width="1.081575" stroke-linecap="round"></path>
-                        <path d="M0.182498262,99.8849379 C-1.15412258,48.0837373 4.8513345,16.8592085 18.1988695,6.21135135 C38.220172,-9.76043433 51.7775486,8.68791656 52.5358789,21.0058533 C52.7895084,25.1256832 53.0449877,33.3642598 49.6528928,37.624922 C47.1196769,40.8067839 43.7615052,41.1943617 40.528505,39.6633128 C34.926824,37.01053 32.5221027,22.752849 32.5221027,16.9392024" id="路径-3" stroke="#000000" stroke-width="1.081575" fill="#FFFFFF" stroke-linecap="round"></path>
-                    </g>
-                    <path d="M66.3463964,76.3316439 C64.1801266,72.4693902 59.1142039,71.137111 51.1486281,72.3348063 C47.4702963,72.5165963 47.4702963,71.3788639 51.1486281,68.9216094 C53.0139702,67.6754955 55.2809412,66.5768201 56.8126072,65.0132448 C59.8114581,61.9519188 61.7938893,58.2294432 58.5582926,52.8477633 C56.4174323,50.1177539 56.1277972,48.9092741 57.6893871,49.222324 C60.031772,49.6918989 64.9395867,53.0550953 66.7877932,52.0167389 C68.0199309,51.3245012 68.2707262,49.1961353 67.5401792,45.631641 C68.4763048,47.0573599 69.3604188,47.7702194 70.1925213,47.7702194 C71.4406751,47.7702194 73.3220554,45.772 74.2038022,44.1299516 C75.085549,42.4879032 75.6343742,38.2618585 75.6343742,41.4337636 C75.6343742,44.6056688 76.0124128,54.8325562 76.8813381,56.5319815 C77.7502633,58.2314068 75.7501795,57.7303962 74.5426891,55.1487351 C73.3351987,52.5670739 74.2768785,49.083856 71.530886,50.6917343 C68.7848935,52.2996127 71.0133217,54.8353609 71.0133217,55.9355262 C71.0133217,57.0356916 68.454824,57.3933896 66.3463964,56.9626856 C64.2379689,56.5319815 63.3414802,56.3275484 63.3414802,60.2536107 C63.3414802,64.179673 61.3961402,67.2942828 58.5582926,68.1079461 C62.350215,70.3232829 64.6264261,72.105943 65.386926,73.4559266 C66.1474258,74.8059101 66.4672493,75.7644826 66.3463964,76.3316439 Z" id="路径-12" fill="#FFFFFF"></path>
-                    <g id="0" transform="translate(114.859424, 25.165098) rotate(-7.000000) translate(-114.859424, -25.165098) translate(107.896722, 14.836900)" fill="#000000" fill-rule="nonzero">
-                        <path d="M6.78244458,0.00122943512 C4.38859155,0.0430142952 2.62509673,1.10402352 1.46509637,3.24041398 C0.438443065,5.04034908 -0.0486465819,7.44343365 0.00382742851,10.4496677 C0.0563014389,13.4559017 0.626960806,15.8405232 1.71580553,17.6035322 C2.94917233,19.6703023 4.74910743,20.6969556 7.14296046,20.6551707 C9.508978,20.6138717 11.2719869,19.525027 12.4603087,17.4159862 C13.486962,15.6160511 13.9740516,13.2129665 13.9215776,10.2067325 C13.8691036,7.20049842 13.2984442,4.81587692 12.2095995,3.05286798 C10.9479113,0.958748249 9.14846211,-0.0400695545 6.78244458,0.00122943512 Z M6.81645551,1.94971446 C8.59792754,1.91861875 9.89488015,2.84267572 10.7077992,4.74972088 C11.287831,6.07610748 11.626089,7.90790593 11.6669021,10.246088 C11.7072293,12.5564345 11.4331063,14.3989221 10.9002039,15.772579 C10.1538491,17.6789974 8.89042156,18.67559 7.10894953,18.7066857 C5.32747751,18.7377814 4.03003902,17.7858889 3.21760582,15.9066793 C2.63708816,14.5524572 2.32666571,12.7201728 2.28633846,10.4098263 C2.24552534,8.07164428 2.49181289,6.22964255 3.02520112,4.88382112 C3.77107007,2.94956723 5.03498349,1.98081017 6.81645551,1.94971446 Z" id="形状"></path>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>