Merge branch 'spp' into 'master'

Spp

See merge request !24

src/views/tabbar/Home.vue

@@ -25,8 +25,14 @@
       <div class="end" @click="endShow">{{endTime}}</div>
     </div>
 
-    <van-pull-refresh v-model="isloading" @refresh="onRefresh" >
-      <van-list v-model="loading" :finished="finished" finished-text="没有更多了~" @load="onmore" v-if="list.length">
+    <van-pull-refresh v-model="isloading" @refresh="onRefresh">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了~"
+        @load="onmore"
+        v-if="list.length"
+      >
         <div class="order-item" v-for="(item, index) in list" :key="item.id">
           <div class="title">{{item.order_status_display }}</div>
           <div class="item flex-h flex-vc">
@@ -75,6 +81,18 @@
             <div class="item-title">联系电话：</div>
             <div class="item-desc">{{item.worker.phone}}</div>
           </div>
+          <div class="material" v-if="item.no_pay_order">
+            <div class="item-title bz-title">待支付耗材</div>
+            <div class="no-pay ma-item flex-h flex-hb" v-for="(child, index) in item.no_pay_order.goods" :key="index">
+              <div class="one one1 text-line-one">{{child.parent_detail.goods_name}}</div>
+              <div class="one one2 flex-h">
+                <div class="_one text-line-one">{{child.good_detail.goods_name}}</div>
+                <div class="_two text-line-one">*{{child.number}}</div>
+              </div>
+              <div class="one one3">￥{{child.price}}</div>
+            </div>
+            <div class="item_line"></div>
+          </div>
           <div class="material" v-if="item.pay_order != ''">
             <div class="item-title">已支付耗材</div>
             <div v-for="(parent, index) in item.pay_order" :key="index">
@@ -153,7 +171,7 @@
         </div>
         <!-- 空数据 -->
       </van-list>
-    <van-empty class="custom-image" description="暂无工单哦~" v-if="!list.length && !more" />
+      <van-empty class="custom-image" description="暂无工单哦~" v-if="!list.length && !more" />
     </van-pull-refresh>
     <div class="blank"></div>
     <!-- 发起转单弹窗 -->