瀏覽代碼

空标签隐藏

xiaohaizhao 2 年之前
父節點
當前提交
9534dc5c1a

+ 2 - 2
Eservice/addTrainers/components/index.wxml

@@ -16,8 +16,8 @@
         <view style="flex:1" slot="content">
           <view class="flex-align-center flex-between card__header">
             <view>
-              <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.enterprisename}}</t-tag>
-              <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
+              <t-tag class="mr-5"  wx:if="{{item.enterprisename}}" variant="light" shape="round" theme="primary" size="small">{{item.enterprisename}}</t-tag>
+              <t-tag class="mr-5"  wx:if="{{item.type}}" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
             </view>
           </view>
           <view class="card__body">

+ 2 - 2
Eservice/agent/orderList/index.wxml

@@ -10,8 +10,8 @@
     <view style="flex:1" slot="content">
       <view class="flex-align-center flex-between card__header">
         <view>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.tradefield}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.type}}" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.tradefield}}" variant="light" shape="round" theme="primary" size="small">{{item.tradefield}}</t-tag>
         </view>
         <view>
           {{item.status}}

+ 3 - 3
Eservice/agent/serviceBillDetail/index.wxml

@@ -7,9 +7,9 @@
                 <text class="billno">{{orderMainData.billno}}</text>
             </view>
             <view class="mt-5">
-                <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.servicetype}}</t-tag>
-                <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class1}}</t-tag>
-                <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class2}}</t-tag>
+                <t-tag class="mr-5" wx:if="{{orderMainData.servicetype}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.servicetype}}</t-tag>
+                <t-tag class="mr-5" wx:if="{{orderMainData.class1}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class1}}</t-tag>
+                <t-tag class="mr-5" wx:if="{{orderMainData.class2}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class2}}</t-tag>
             </view>
         </view>
     </view>

+ 3 - 3
Eservice/agent/serviceBillList/index.wxml

@@ -12,9 +12,9 @@
             <view style="flex:1" slot="content">
                 <view class="flex-align-center flex-between card__header">
                     <view>
-                        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.servicetype}}</t-tag>
-                        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.class1}}</t-tag>
-                        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.class2}}</t-tag>
+                        <t-tag class="mr-5" wx:if="{{item.servicetype}}" variant="light" shape="round" theme="primary" size="small">{{item.servicetype}}</t-tag>
+                        <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{item.class1}}</t-tag>
+                        <t-tag class="mr-5" wx:if="{{item.class2}}" variant="light" shape="round" theme="primary" size="small">{{item.class2}}</t-tag>
                     </view>
                     <text>{{item.status}}</text>
                 </view>

+ 1 - 1
Eservice/saler/agentList/index.wxml

@@ -7,7 +7,7 @@
       <view style="flex:1" slot="content">
         <view wx:if="{{item.type}}" class="flex-align-center flex-between card__header">
           <view>
-            <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
+            <t-tag class="mr-5" wx:if="{{item.type}}" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
           </view>
         </view>
         <view class="card__body">

+ 2 - 2
Eservice/saler/orderList/index.wxml

@@ -10,8 +10,8 @@
     <view style="flex:1" slot="content">
       <view class="flex-align-center flex-between card__header">
         <view>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.tradefield}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.type}}" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.tradefield}}" variant="light" shape="round" theme="primary" size="small">{{item.tradefield}}</t-tag>
         </view>
         <view>
           {{item.status}}

+ 3 - 3
Eservice/saler/serviceBillDetail/index.wxml

@@ -7,9 +7,9 @@
         <text class="billno">{{orderMainData.billno}}</text>
       </view>
       <view class="mt-5">
-        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.servicetype}}</t-tag>
-        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class1}}</t-tag>
-        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class2}}</t-tag>
+        <t-tag class="mr-5" wx:if="{{orderMainData.servicetype}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.servicetype}}</t-tag>
+        <t-tag class="mr-5" wx:if="{{orderMainData.class1}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class1}}</t-tag>
+        <t-tag class="mr-5" wx:if="{{orderMainData.class2}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class2}}</t-tag>
       </view>
     </view>
   </view>

+ 3 - 3
Eservice/saler/serviceBillList/index.wxml

@@ -19,9 +19,9 @@
     <view style="flex:1"  slot="content">
       <view class="flex-align-center flex-between card__header">
         <view>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.servicetype}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.class1}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.class2}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.servicetype}}" variant="light" shape="round" theme="primary" size="small">{{item.servicetype}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{item.class1}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.class2}}" variant="light" shape="round" theme="primary" size="small">{{item.class2}}</t-tag>
         </view>
         <text>{{item.status}}</text>
       </view>

+ 4 - 2
Eservice/workOrder/index.js

@@ -41,11 +41,13 @@ Page({
         }
       }
     })
-    if (res.data.length === 0) return false;
     this.setData({
-      list: this.data.list.concat(res.data),
       statistics: res.data[0].rows_total[0]
     })
+    if (!res.data[0].billno) return false;
+    this.setData({
+      list: this.data.list.concat(res.data)
+    })
     console.log(this.data.statistics)
   },
   onTabsChange(e) {

+ 2 - 2
Eservice/workerLeader/agentList/index.wxml

@@ -13,8 +13,8 @@
     <view style="flex:1" slot="content">
       <view class="flex-align-center flex-between card__header">
         <view>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.enterprisename}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.enterprisename}}" variant="light" shape="round" theme="primary" size="small">{{item.enterprisename}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.type}}" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
         </view>
       </view>
       <view class="card__body">

+ 2 - 2
Eservice/workerLeader/orderList/index.wxml

@@ -10,8 +10,8 @@
     <view style="flex:1" slot="content">
       <view class="flex-align-center flex-between card__header">
         <view>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.tradefield}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.type}}" variant="light" shape="round" theme="primary" size="small">{{item.type}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.tradefield}}" variant="light" shape="round" theme="primary" size="small">{{item.tradefield}}</t-tag>
         </view>
         <view>
           {{item.status}}

+ 3 - 3
Eservice/workerLeader/serviceBillDetail/index.wxml

@@ -7,9 +7,9 @@
         <text class="billno">{{orderMainData.billno}}</text>
       </view>
       <view class="mt-5">
-        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.servicetype}}</t-tag>
-        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class1}}</t-tag>
-        <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class2}}</t-tag>
+        <t-tag class="mr-5" wx:if="{{orderMainData.servicetype}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.servicetype}}</t-tag>
+        <t-tag class="mr-5" wx:if="{{orderMainData.class1}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class1}}</t-tag>
+        <t-tag class="mr-5" wx:if="{{orderMainData.class2}}" variant="light" shape="round" theme="primary" size="small">{{orderMainData.class2}}</t-tag>
       </view>
     </view>
   </view>

+ 3 - 3
Eservice/workerLeader/serviceBillList/index.wxml

@@ -19,9 +19,9 @@
     <view style="flex:1"  slot="content">
       <view class="flex-align-center flex-between card__header">
         <view>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.servicetype}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.class1}}</t-tag>
-          <t-tag class="mr-5" variant="light" shape="round" theme="primary" size="small">{{item.class2}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.servicetype}}" variant="light" shape="round" theme="primary" size="small">{{item.servicetype}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{item.class1}}</t-tag>
+          <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{item.class1}}</t-tag>
         </view>
         <text>{{item.status}}</text>
       </view>