Merge branch 'master' of ssh://47.110.145.204:2222/godwithdh/wx_h5

src/view/tiip/kanban/FinanceDetail.vue

@@ -21,18 +21,20 @@
             display: flex;
             background: #fff;
             border-bottom:1px solid #ddd;
+            font-size: 15px;
         }
         >.content{
             flex-grow:1;
             overflow: auto;
+            -webkit-overflow-scrolling: touch;
             height:1px;
-            font-size:15px;
+            font-size:13.5px;
             >.list{
                 background:#fff;
                 display:flex;
                 >span{
                     &:first-child{
-                        padding: 10px 5px;
+                        padding: 12.4px 5px;
                         min-width: 30px;
                         text-align: right;
                         font-weight: 600;
@@ -78,9 +80,9 @@
         </div>
         <div class="content">
             <div class="list" v-for="(v,k) in list" :key="k">
-                <span>{{k}}</span>
+                <span>{{k+1}}</span>
                 <span>{{v["客户名称"]}}</span>
-                <span>{{v["总金额"]}}</span>
+                <span>{{v["总金额"].toLocaleString()}}</span>
             </div>
             <img src="@/assets/noData.jpg" style="width:100%;" v-if="list.length==0"/>
         </div>

src/view/tiip/kanban/index.vue

@@ -50,6 +50,9 @@
                     border-radius: 50px;
                     margin: 0 5px;
                 }
+                >:not(.line){
+                    font-size:13px;
+                }
             }
             >button{
                 flex-shrink: 0;

src/view/tiip/kanban/operate.vue

@@ -55,11 +55,11 @@
                 </td>
                 <td>
                     <div style="display:flex;flex-wrap:wrap">
-                        <span style="width:100%;">
-                            {{Number(v.M_nQty||0).toLocaleString()}}(M)
+                        <span style="width:100%;" v-if="v.M_nQty>0">
+                            {{Number(v.M_nQty).toLocaleString()}}(M)
                         </span>
-                        <span style="width:100%;">
-                            {{Number(v.YD_nQty||0).toLocaleString()}}(YD)
+                        <span v-if="v.YD_nQty>0">
+                            {{Number(v.YD_nQty).toLocaleString()}}(YD)
                         </span>
                         <span style="width:100%;">
                             {{Number(v.KG_nQty||0).toLocaleString()}}(KG)