Merge branch 'spp' into 'master'

Spp

See merge request !37

src/api/apiList.js

@@ -10,8 +10,8 @@ const baseUrl = '/api'
 // todo: url
 // const httpUrl = 'https://repairtest.zeruiedu.com' // 测试接口
 const httpUrl = 'https://repair.zeruiedu.com' // 正式接口
-const h5Url = 'http://localhost:8080' // 测试h5线上地址
-// const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
+// const h5Url = 'http://localhost:8080' // 测试h5线上地址
+const h5Url = 'http://repair.h5.zeruiedu.com' // 测试h5线上地址
 window.localStorage.setItem('httpUrl', httpUrl)
 window.localStorage.setItem('h5Url', h5Url)
 // const httpUrl = 'https://fenghexm.xueyoubangedu.com' // 正式接口

src/views/my/admin_detail.vue

@@ -142,7 +142,7 @@
                       class="gr-name"
                       v-if="lchild_item.repired_count !== 0 || lchild_item.repiring_count !== 0"
                     >{{lchild_item.name}} (已派工: {{lchild_item.repired_count}};维修中: {{lchild_item.repiring_count}})</div>
-                    <div class="gr-name" v-else>{{lchild_item.username}} (休息中)</div>
+                    <div class="gr-name" v-else>{{lchild_item.name}} (休息中)</div>
                   </div>
                   <img
                     class="k-img"
@@ -218,7 +218,7 @@ export default {
 		goBack(){
             this.$router.push({
                 path: '/'
-            })
+            }).catch(()=>{})
         },
 		getDetail () {
 			this.isloading = true

src/views/tabbar/admin_home.vue

@@ -70,7 +70,7 @@
                         class="gr-name"
                         v-if="lchild_item.repired_count !== 0 || lchild_item.repiring_count !== 0"
                       >{{lchild_item.name}} (已派工: {{lchild_item.repired_count}};维修中: {{lchild_item.repiring_count}})</div>
-                      <div class="gr-name" v-else>{{lchild_item.username}} (休息中)</div>
+                      <div class="gr-name" v-else>{{lchild_item.name}} (休息中)</div>
                     </div>
                     <img
                       class="k-img"