Merge branch '03/03Lebao' into dev

src/utils/validate.js

@@ -31,6 +31,8 @@ export function vaildStudentUrl() {
   let returnUrl = ''
   if (/dev/.test(url)) { // dev 环境
     returnUrl = 'http://mstudev.dayaedu.com'
+  } else if (/test/.test(url)) { // dev 环境
+    returnUrl = 'http://mstutest.dayaedu.com'
   } else if (/online/.test(url)) { //线上
     returnUrl = 'https://mstuonline.dayaedu.com'
   } else { // 默认dev环境
@@ -45,6 +47,8 @@ export function vaildTeacherUrl() {
   let returnUrl = ''
   if (/dev/.test(url)) { // dev 环境
     returnUrl = 'http://mteadev.dayaedu.com'
+  } else if (/test/.test(url)) { // dev 环境
+    returnUrl = 'http://mteatest.dayaedu.com'
   } else if (/online/.test(url)) { //线上
     returnUrl = 'https://mteaonline.dayaedu.com'
   } else { // 默认dev环境

src/views/repairManager/repairList.vue

@@ -20,7 +20,7 @@
             placeholder="维修单号/姓名"
           ></el-input>
         </el-form-item>
-        <!-- <el-form-item>
+        <el-form-item>
           <el-input
             type="number"
             v-model.trim="searchForm.studentInstrumentId"
@@ -37,7 +37,7 @@
             <el-option label="是" value="1"></el-option>
             <el-option label="否" value="0"></el-option>
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
 
         <el-form-item>
           <el-select

src/views/resetTeaming/modals/subject-preview.vue

@@ -435,12 +435,12 @@ export default {
                         })
 
                         // 乐保服务初始化
-                        // this.instrumentResult.forEach(item => {
-                        //     if(item.checked && item.kitType == "GROUP") {
-                        //         this.leBaoStatus = true
-                        //         this.buyMaintenance = true
-                        //     }
-                        // })
+                        this.instrumentResult.forEach(item => {
+                            if(item.checked && item.kitType == "GROUP") {
+                                this.leBaoStatus = true
+                                this.buyMaintenance = true
+                            }
+                        })
                     }
                 }
                 // 初始化计算金额
@@ -510,13 +510,13 @@ export default {
                 item.checked = false
             })
             item.checked = true
-            // if(item.kitType == "GROUP") {
-            //     this.leBaoStatus = true
-            //     this.buyMaintenance = true
-            // } else {
-            //     this.leBaoStatus = false
-            //     this.buyMaintenance = false
-            // }
+            if(item.kitType == "GROUP") {
+                this.leBaoStatus = true
+                this.buyMaintenance = true
+            } else {
+                this.leBaoStatus = false
+                this.buyMaintenance = false
+            }
             // 重新计算金额
             this.calcPrice()
         },

src/views/studentManager/components/studentLebao.vue

@@ -144,6 +144,7 @@ export default {
      try{
        const res = await getInstrument({...this.searchForm,rows:this.pageInfo.limit,page:this.pageInfo.page})
         this.tableList = res.data.rows
+        this.pageInfo.total = res.data.total
      }catch(e){
        console.log(e)
      }