优化

ghsApp/src/admin/home/workbench.vue

@@ -231,12 +231,12 @@ export default {
 				const { asset,menu } = res.data;
 				this.tabsData = menu
 				if (!this.$util.isEmpty(asset)) {
-					this.totalData[0].value = asset.totalUser || '-';
-					this.totalData[1].value = asset.totalVisit || '-';
-					this.totalData[2].value = asset.finishOrder || '-';
-					this.totalData[3].value = asset.totalIncome || '-';
-					this.totalData[4].value = asset.totalExpend || '-';
-					this.totalData[5].value = asset.totalPurchase || '-';
+					this.totalData[0].value = asset.totalUser ? parseFloat(asset.totalUser) : '-';
+					this.totalData[1].value = asset.totalVisit ? parseFloat(asset.totalVisit) : '-';
+					this.totalData[2].value = asset.finishOrder ? parseFloat(asset.finishOrder) : '-';
+					this.totalData[3].value = asset.totalIncome ? parseFloat(asset.totalIncome) : '-';
+					this.totalData[4].value = asset.totalExpend ? parseFloat(asset.totalExpend) : '-';
+					this.totalData[5].value = asset.totalPurchase ? parseFloat(asset.totalPurchase) : '-';
 				}
 			})
 		},

hdApp/src/admin/clear/info.vue

@@ -85,7 +85,7 @@
 
 				</div>
 			</view>
-			<view class="content-box price-detail" v-if="detailInfo.remark.length > 0">
+			<view class="content-box price-detail" v-if="detailInfo.remark && detailInfo.remark.length > 0">
 				<div class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<div class="tui-title">备注</div>
@@ -102,18 +102,13 @@
 				</div>
 			</view>
 
-			<view class="title">
-				供应商
-			</view>
+			<view class="title"> 供应商 </view>
 			<view class="address-des_bx content-box">
 				<view>
 					<view> {{ detailInfo.ghsName }} {{ detailInfo.ghsMobile }} </view>
 				</view>
 				<view>
-					<i
-						@click="callUp(detailInfo.ghsMobile)"
-						class="iconfont icondianhua1"
-					></i>
+					<i @click="callUp(detailInfo.ghsMobile)" class="iconfont icondianhua1" ></i>
 				</view>
 			</view>
 

hdApp/src/admin/home/workbench.vue

@@ -92,11 +92,6 @@ export default {
         todayData: { income:0.00, order:0, custom:0, expend:0.00 },
         isMini:0
       },
-      orderData: [
-        { name: "待配送", value: 0, url: "/admin/home/order", type: 4, query: { tabIndex: 2 } },
-        { name: "配送中", value: 0, url: "/admin/home/order", type: 4, query: { tabIndex: 3 } },
-        { name: "已完成", url: "/admin/home/order", type: 4, query: { tabIndex: 0 }, value: 0 }
-      ],
       tabsData: [
         {
           name: "商城",
@@ -197,17 +192,13 @@ export default {
           this.data = res.data;
           const { asset, todayData } = res.data;
           if (!this.$util.isEmpty(asset)) {
-            // 订单总览
-            this.orderData[0].value = asset.unSendOrder;
-            this.orderData[1].value = asset.sendingOrder;
-            this.orderData[2].value = todayData.order;
             // 总览数据
-            this.totalData[0].value = asset.totalUser;
-            this.totalData[1].value = asset.totalView;
-            this.totalData[2].value = asset.totalOrder;
-            this.totalData[3].value = asset.totalIncome;
-            this.totalData[4].value = asset.totalExpend;
-            this.totalData[5].value = asset.totalPurchase;
+            this.totalData[0].value = asset.totalUser ? parseFloat(asset.totalUser) : '-';
+            this.totalData[1].value = asset.totalView ? parseFloat(asset.totalView) : '-';
+            this.totalData[2].value = asset.totalOrder ? parseFloat(asset.totalOrder) : '-';
+            this.totalData[3].value = asset.totalIncome ? parseFloat(asset.totalIncome) : '-';
+            this.totalData[4].value = asset.totalExpend ? parseFloat(asset.totalExpend) : '-';
+            this.totalData[5].value = asset.totalPurchase ? parseFloat(asset.totalPurchase) : '-';
           }
         });
     },

hdApp/src/pagesPurchase/order.vue

@@ -3,18 +3,18 @@
     <view class="order_list">
       <block>
         <block v-if="!$util.isEmpty(supplierList)">
-          <view class="list_item" v-for="(item, index) in supplierList" :key="index" @click="enterShop(item)" >
+          <view class="list_item" v-for="(ghsInfo, index) in supplierList" :key="index">
             <view class="store_name">
-              <image :src="item.avatar"></image>
-              <view class="store_title">{{item.name}}</view>
+              <image :src="ghsInfo.avatar"></image>
+              <view class="store_title">{{ghsInfo.name}}</view>
               <view class="accumulative"></view>
             </view>
-            <view class="cg-button">进店</view>
+            <view class="cg-button" @click="enterShop(ghsInfo)">进店</view>
             <view class="store_btn">
-              <view class="btn_entrance" @click.stop="pageTo({ url: '/admin/clear/list',query: {ghsId: item.id}})"> 结账记录 </view>
-              <view class="btn_entrance" @click.stop="settleAccounts(item)" > 欠款订单 </view>
-              <view class="btn_entrance" @click.stop="pageTo({url:'/pagesPurchase/shopping'})" > 采购记录 </view>
-              <view class="btn_entrance" style="text-decoration:none;color:red;font-size:25upx;"> 欠账 ¥{{parseFloat(item.debtAmount)}} </view>
+              <view class="btn_entrance" @click="pageTo({ url: '/admin/clear/list',query: {ghsId: ghsInfo.id}})">结账记录</view>
+              <view class="btn_entrance" @click="settleAccounts(ghsInfo)" > 欠款订单 </view>
+              <view class="btn_entrance" @click="pageTo({url:'/pagesPurchase/shopping'})" > 采购记录 </view>
+              <view class="btn_entrance" style="text-decoration:none;color:red;font-size:25upx;"> 欠账 ¥{{parseFloat(ghsInfo.debtAmount)}} </view>
             </view>
           </view>
         </block>
@@ -74,6 +74,7 @@ export default {
 		},
     enterShop(item) {
       const { id } = item
+      console.log(item)
       this.pageTo({url: '/pagesPurchase/ghsProduct',query:{id:id}})
     },
     init() {
@@ -87,9 +88,10 @@ export default {
     },
     // 结账
     settleAccounts (item) {
-      this.pageTo({
-        url: '/pagesPurchase/gathering?id='+item.id,
-      })
+      console.log('999999')
+      console.log(item)
+      console.log(item.id)
+      this.pageTo({ url: '/pagesPurchase/gathering',query:{id:item.id}})
     },
     // 采购记录详情
     gotoDetails (val) {