Merge branch 'spp' into 'master'

Spp

See merge request !16

src/assets/styles/tabbar/index.scss

@@ -136,6 +136,7 @@
 }
 .one3 {
     width: 20%;
+    text-align: right;
 }
 ._one{
     width: 50%

src/views/tabbar/Home.vue

@@ -104,7 +104,7 @@
             >
               <div class="one one1 text-line-one">免费</div>
               <div class="one one2 flex-h">
-                <div class="_one text-line-one">{{child.goods_name}}</div>
+                <div class="_one text-line-one" @click="showAll(item,$event)">{{child.goods_name}}</div>
                 <div class="_two text-line-one">*{{child.number}}</div>
               </div>
               <!-- <div class="one one2 text-line-one">{{child.goods_name}}*{{child.number}}</div> -->
@@ -252,7 +252,7 @@
 <script>
 import myTabbar from '@components/common/tabbar.vue'
 import { trimStrSpace } from '@assets/js/format.js'
-import { ImagePreview } from 'vant';
+import { ImagePreview, Toast } from 'vant';
 export default {
     name: 'home',
     components: {
@@ -318,6 +318,11 @@ export default {
         this.getUserInfo()
     },
     methods: {
+      showAll(item,e){
+        this.$toast(e.target.innerHTML,{
+          duration: 0
+        })
+      },
       callPhone(item){
         console.log('电话',item)
         let phoneNumber = item.telephone

src/views/tabbar/admin_home.vue

@@ -35,7 +35,7 @@
       <div class="end" @click="endShow">{{endTime}}</div>
     </div>
 
-    <van-pull-refresh v-model="isloading" @refresh="onRefresh">
+    <van-pull-refresh v-model="isloading" @refresh="onRefresh" v-if="list.length">
       <van-list v-model="loading" :finished="finished" finished-text="没有更多了~" @load="onmore">
         <div class="order-item" v-for="(item, index) in list" :key="index">
           <div class="title">{{item.order_status_display }}</div>
@@ -77,6 +77,18 @@
               <img :src="child.url" alt />
             </div>
           </div>
+          <div class="item flex-h flex-start" v-if="item.orderlog_transfer">
+            <div class="item-title">转单备注:</div>
+            <div
+              class="item-desc"
+            >{{item.orderlog_transfer.remark}}</div>
+          </div>
+          <div class="item flex-h flex-start" v-if="item.orderlog_cancel">
+            <div class="item-title">退回备注:</div>
+            <div
+              class="item-desc"
+            >{{item.orderlog_cancel.remark}}</div>
+          </div>
           <div v-if="item.worker">
             <div class="line"></div>
             <div class="item flex-h flex-vc">
@@ -118,16 +130,16 @@
             </div>
           </div>
         </div>
-        <!-- 空数据 -->
-        <van-empty class="custom-image" description="暂无工单哦~" v-if="!list.length && !more" />
       </van-list>
     </van-pull-refresh>
+    <!-- 空数据 -->
+    <van-empty class="custom-image" description="暂无工单哦~" v-if="!list.length && !more" />
     <div class="blank"></div>
     <!-- 取消工单原因弹窗 -->
     <van-popup v-model="qxShow" close-icon="close">
       <div class="cancel_cont">
-        <div class="pop_title">备注转单原因</div>
-        <textarea placeholder="请输入转单理由" v-model="reason"></textarea>
+        <div class="pop_title">备注取消原因</div>
+        <textarea placeholder="请输入转单理由" v-model="reason" maxlength="100"></textarea>
         <div class="btnItem flex-h">
           <div class="cancel" @click="cancel">取消</div>
           <div class="sure" @click="qx_submit">提交</div>
@@ -287,6 +299,7 @@ export default {
                 .then((data) => {
                       console.log('指派工人',data);
                     this.$toast('操作成功')
+                    this.reason = ''
                   this.changeList(data,index)
                 })
                 .catch(() => {})
@@ -303,6 +316,7 @@ export default {
             console.log('aaa',item);
             this.curItem = item
             this.qxShow = true;
+            this.reason = ''
         },
         workers(){
             this.showWorker = true