测试问题修改

api/api.js

@@ -348,8 +348,13 @@ const install = (Vue, vm) => {
         authorizations: true,
         isparams: false
     })
+    // 忘记密码  
+    let resetPwd = (params) => http.post('/blade-system/user/register/reset-pwd', params, {
+        authorizations: true,
+        isparams: false
+    })
     // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
-    vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition};
+    vm.$u.api = { getTenantInfo, login, logout, registerUser, getworkbench, getLoginRecords, getEditRecords, subEditRecords, getChildList, getDeviceList, workOrderSave, getWorkOrderRecords, getBreakdownInfo, workOrderupdate, evaluateSign, getRepairPersons, getGoodsList, getDictionaryList, getUserList, workList, deviceList, upkeepStat, pieStat, getUserInfo, overview, sendOrders, cloneOrder, editData, repairReject, applySave, sendVerify, serviceman, servicemanReceive, servicemanSubmit, supervisorReject, supervisorconfirm, customerConfirm, customerReject, servicemanRepairSubmit, evaluateRepairReject, getDeviceDetail, getTaskPage, getTaskDetail, taskSupervisorconfirm, taskServicemanreceive, updateCoordinate, taskServicemanUpdateTime, getPlanDetail, getRepairPage, updateDetaile, taskServicemanSubmit, taskCustomerConfirm, taskCustomerRefuse, taskSolutionSave, taskSolutionSubmit, repairSolutionSupervisor, repairSolutionRefuse, repairSolutionCustomer, repairCustomerRefuse, repairServicemanSubmit,repairConfirmFinish,repairRefuseFinish ,confirmPayment,getPosition,getRepairDetail,updatePosition,resetPwd};
 }
 
 export default {

common/betone_components/betone-tabbar.vue

@@ -15,6 +15,7 @@
 </template>
 <script>
 import global from "@/utils/global.js";
+import tabBar from "@/utils/tabbar.js"; // 引入刚刚创建的tabBar.js
 export default {
   name: "sp-tabbar",
   props: [],
@@ -41,7 +42,7 @@ export default {
     getPermission() {
       const tabBarList = uni.getStorageSync("tabBarList");
       this.current=global.tabBarCurrent
-      this.list = tabBarList;
+      this.list = tabBarList.length<=0?tabBar.oathTab:tabBarList;
     },
     tabbatChange(index) {
 				global.tabBarCurrent = index

pages/forgot/forgotPassword.vue

@@ -100,12 +100,12 @@ export default {
     methods: {
         // 发送验证码
         sendCode() {
-            if (this.registerInfo.phoneNumber == '') {
+            if (this.forgotInfo.mobile == '') {
                 uni.$u.toast("请先输入手机号");
                 return false;
             }
             let query = {
-                phone: this.registerInfo.phoneNumber
+                phone: this.forgotInfo.mobile
             }
             this.$u.api.sendVerify(query).then(res => {
                 if (res.code == 200) {
@@ -118,12 +118,20 @@ export default {
             this.$refs.forgotForm.validate(valid => {
                 if (valid) {
                     console.log('校验通过')
-                    uni.$u.toast('修改成功，请登录');
+                    let query = {
-                    setTimeout(() => {
+                        phone: this.forgotInfo.mobile,
-                        uni.navigateTo({
+                        password: this.forgotInfo.password,
-                            url: "/pages/login/login",
+                        verifyCode: this.forgotInfo.verificationCode,
-                        });
+                    }
-                    }, 1000)
+                    this.$u.api.resetPwd(query).then(res => {
+                        uni.$u.toast('修改成功，请登录');
+                        setTimeout(() => {
+                            uni.navigateTo({
+                                url: "/pages/login/login",
+                            });
+                        }, 1000)
+                    })
+
                 } else {
                     console.log('校验失败')
                 }

pages/inspection/quest.vue

@@ -392,7 +392,7 @@ export default {
 
             this.$u.api.confirmPayment(query).then(res => {
                 this.paymentShow = false
-                // this.BetLoading.hide();
+                
                 if (res.code == 200) {
                     uni.showToast({ title: "确认成功", icon: "none" });
                     this.getRecordsList()

pages/login/authInfo.vue

@@ -41,6 +41,7 @@
   import swiperSlider from "./components/swiper.vue";
   import alarm from "./components/alarm.vue";
   import eacharts from "./components/eacharts.vue";
+
   export default {
     components: {
       swiperSlider,

pages/login/login.vue

@@ -125,7 +125,7 @@ export default {
           });
           this.$store.dispatch("changeTabbar", res);
 
-          // this.BetLoading.hide();
+          this.$refs.BetLoading.hide();
         })
         .catch((err) => {
           if (err.error_code == 2004) {
@@ -134,7 +134,7 @@ export default {
             });
             return false
           }
-          // this.BetLoading.hide();
+          this.$refs.BetLoading.hide();
         });
     },
 

pages/register/index.vue

@@ -4,7 +4,7 @@
       <betone-header-top :title="title" />
       <u-form label-position="top" :model="registerInfo" :rules="rules" ref="registerForm">
         <u-form-item prop="businessName" :border-bottom="false" label="企业名称" :required="true">
-          <u-input v-model="registerInfo.businessName" :border="true" placeholder="请输入手机号"
+          <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="实验室地址" :required="true">

pages/submission/records.vue

@@ -221,7 +221,7 @@ export default {
   onLoad(options) {
     this.type = options.type?options.type:''
   },
-  mounted() {
+  onShow() {
     this.$nextTick(() => {
      
       if(this.type==''){

static/scss/sp-components/index.scss

@@ -11,6 +11,7 @@
     background: #EFEFEF;
     box-sizing: border-box;
     padding: 16rpx;
+    min-height: 100vh;
     .fixedBtns {
         position: fixed;
         left: 50%;

utils/website.js

@@ -3,9 +3,9 @@
  */
 export default {
     // baseUrl: 'http://124.221.142.15:8088/lab',
-    // baseUrl:'http://192.168.0.111:80',  //李庆坤
+    baseUrl:'http://192.168.0.118:80',  //李庆坤
     // baseUrl:'http://192.168.0.109:80', //李涛
-    baseUrl:'http://192.168.1.12:80', //李涛
+    // baseUrl:'http://192.168.1.12:80', //李涛
     indexTitle: "科研医疗建筑运维平台",
     clientId: "saber", // 客户端id
     clientSecret: "saber_secret", // 客户端密钥