Merge branch 'spp' into 'master'

Spp

See merge request !39

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/assets/styles/tabbar/admin_index.scss

@@ -432,4 +432,10 @@
     width: 100%;
     height: 100%;
     border-radius: 50%;
+}
+// 暂无员工样式
+.none{
+    margin-left: 0.3rem;
+    color: #000000;
+    font-size: 0.28rem;
 }
\ No newline at end of file

src/views/my/order_detail.vue

@@ -208,6 +208,10 @@
       <img src="@assets/images/tabbar/icon_01_sel.png" alt />
     </div>
   </div>
+  <div v-else>
+    <img class="none-img" src="https://img01.yzcdn.cn/vant/empty-image-default.png">
+    <p class="none-p">暂无工单哦！</p>
+  </div>
 </template>
 
 <script>
@@ -240,8 +244,8 @@ export default {
         }
     },
     created () {
-				this.order_id = this.$route.query.id
-				// this.order_id =  143
+				// this.order_id = this.$route.query.id
+				this.order_id =  211
         this.getDetail()
     },
     methods: {
@@ -474,4 +478,11 @@ export default {
   height: 100%;
   border-radius: 50%;
 }
+.none-img{
+  display: block;
+  margin: 0 auto;
+}
+.none-p{
+  text-align: center;
+}
 </style>
\ No newline at end of file

src/views/tabbar/Home.vue

@@ -624,12 +624,12 @@ export default {
         // 备注耗材弹窗
         bz_click (item) {
             this.curItem = item
-            this.hcShow = true
             // 默认为一个空数据
             this.addList = [{
-                goods_name: '',
+              goods_name: '',
                 number: ''
             }]
+            this.hcShow = true
         },
         // 添加耗材
         addMeth () {
@@ -669,9 +669,15 @@ export default {
             this.$http
                 .post(this.$myApi.MATERIAL_REMARK, curParams)
                 .then((data) => {
-                    this.hcShow = false
+                  this.hcShow = false
+                  // setTimeout(()=>{
                     this.$toast('操作成功')
-                    vm.$set(vm.list, index, data)
+                    this.addList = [{
+                        goods_name: '',
+                        number: ''
+                      }]
+                      vm.$set(vm.list, index, data)
+                  // },800)
                 })
                 .catch(() => {
                     this.hcShow = false

src/views/tabbar/admin_home.vue

@@ -58,25 +58,28 @@
               <div class="workers">
                 <div class="gr-item" v-for="(child_item,child_index) in columns" :key="child_index">
                   <div class="bm-item">{{child_item.name}}</div>
-                  <div
-                    class="people-item flex-h flex-vc flex-hb"
-                    v-for="(lchild_item,lchild_index) in child_item.user"
-                    :key="lchild_index"
-                    @click="chooseWorker(lchild_item,lchild_index,index)"
-                  >
-                    <div class="flex-h flex-vc">
-                      <img class="gr-img" src="@assets/images/gr.png" />
-                      <div
-                        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.name}} (休息中)</div>
+                  <div v-if="child_item.user.length">
+                    <div
+                      class="people-item flex-h flex-vc flex-hb"
+                      v-for="(lchild_item,lchild_index) in child_item.user"
+                      :key="lchild_index"
+                      @click="chooseWorker(lchild_item,lchild_index,index)"
+                    >
+                      <div class="flex-h flex-vc">
+                        <img class="gr-img" :src=gr_img />
+                        <div
+                          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.name}} (休息中)</div>
+                      </div>
+                      <img
+                        class="k-img"
+                        :src="item.temporaryId && item.temporaryId.includes(lchild_item.id) ? select_img : unselect_img"
+                      />
                     </div>
-                    <img
-                      class="k-img"
-                      :src="item.temporaryId && item.temporaryId.includes(lchild_item.id) ? select_img : unselect_img"
-                    />
                   </div>
+                  <div v-else class="none">暂无员工</div>
                 </div>
               </div>
               <div class="allBtn btn-box flex-h flex-hc">
@@ -286,6 +289,7 @@ import { trimStrSpace } from '@assets/js/format.js'
 import { ImagePreview, CellGroup } from 'vant';
 import select_img from '@assets/images/select.png'
 import unselect_img from '@assets/images/un_select.png'
+import gr_img from '@assets/images/gr.png'
 export default {
     name: 'home',
     components: {
@@ -295,6 +299,7 @@ export default {
         return {
             select_img,
             unselect_img,
+            gr_img,
             reson: '',//取消原因
             qxShow: false, // 发起转单弹窗
             workerName: '',