Browse Source

【ID1006499】【ID1006498】bug修复

chenrui 4 years ago
parent
commit
a473743c9c
4 changed files with 16 additions and 16 deletions
  1. 2 2
      pages/cleared/chooseNetwork.vue
  2. 10 10
      pages/cleared/details.vue
  3. 2 2
      pages/cleared/index.vue
  4. 2 2
      pages/index/index.vue

+ 2 - 2
pages/cleared/chooseNetwork.vue

@@ -38,11 +38,11 @@
 							</view>
 							<view class="cell-item-info-weight">
 								<view class="cell-item-weight-bar">
-									{{item.totalWeight}}kg
+									{{ (item.totalWeight/1000).toFixed(2) }}kg
 									<u-badge class="badge" type="primary" bgColor="#01c9b2" count="总" :offset="[0,0]"></u-badge>
 								</view>
 								<view class="cell-item-weight-bar">
-									{{item.maxWeight}}kg
+									{{ (item.maxWeight/1000).toFixed(2) }}kg
 									<u-badge class="badge" type="warning" bgColor="#05695d" count="最大" :offset="[0,0]"></u-badge>
 								</view>
 							</view>

+ 10 - 10
pages/cleared/details.vue

@@ -7,55 +7,55 @@
 					<view class="cell-item-c">
 						<view class="cell-item-info">
 							<view class="cell-item-info-network">{{item.stationName || '--'}}</view>
-							<view class="cell-item-info-weight">清运总重量:<text>{{item.totalWeight}}kg</text></view>
+							<view class="cell-item-info-weight">清运总重量:<text>{{ (item.totalWeight/1000).toFixed(2) }}kg</text></view>
 						</view>
 					</view>
 					<u-grid :col="3" :hover-class="none">
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number blue">{{item.clothes}}</text>
-								<text class="cell-item-unit"></text>
+								<text class="cell-item-number blue">{{ (item.clothes/1000).toFixed(2) }}</text>
+								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧衣物</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number green">{{item.paper}}</text>
-								<text class="cell-item-unit"></text>
+								<text class="cell-item-number green">{{ (item.paper/1000).toFixed(2) }}</text>
+								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧纸张</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number red">{{item.plastic}}</text>
+								<text class="cell-item-number red">{{ (item.plastic/1000).toFixed(2) }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧塑料</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{item.metal}}</text>
+								<text class="cell-item-number yellow">{{ (item.metal/1000).toFixed(2) }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧金属</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{item.plaMet}}</text>
+								<text class="cell-item-number yellow">{{ (item.plaMet/1000).toFixed(2) }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧金属/塑料</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{item.glass}}</text>
+								<text class="cell-item-number yellow">{{ (item.glass/1000).toFixed(2) }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">废旧玻璃</view>
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number yellow">{{item.recycling}}</text>
+								<text class="cell-item-number yellow">{{ (item.recycling/1000).toFixed(2) }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">可回收物</view>

+ 2 - 2
pages/cleared/index.vue

@@ -5,7 +5,7 @@
 			<view class="cell-item-con">
 				<view class="cell-item" v-for="(item, index) in listdata" :key="index" @tap="goPage(item)">
 					<view class="cell-item-c">
-						<view class="cell-item-date">{{item.cleanDate}}</view>
+						<view class="cell-item-date">{{ item.cleanDate.substr(0,10) }}</view>
 						<view class="cell-item-orderNum">
 							<u-icon name="arrow-right" :size="28" color="#999"></u-icon>
 						</view>
@@ -27,7 +27,7 @@
 						</u-grid-item>
 						<u-grid-item>
 							<view class="cell-item-main">
-								<text class="cell-item-number red">{{item.totalWeight}}</text>
+								<text class="cell-item-number red">{{ (item.totalWeight/1000).toFixed(2) }}</text>
 								<text class="cell-item-unit">kg</text>
 							</view>
 							<view class="cell-item-exp">清运总重量</view>

+ 2 - 2
pages/index/index.vue

@@ -13,11 +13,11 @@
 							</view>
 							<view class="cell-item-info-weight">
 								<view class="cell-item-weight-bar">
-									{{item.totalWeight}}kg
+									{{ (item.totalWeight/1000).toFixed(2) }}kg
 									<u-badge class="badge" type="primary" bgColor="#01c9b2" count="总" :offset="[0,0]"></u-badge>
 								</view>
 								<view class="cell-item-weight-bar">
-									{{item.maxWeight}}kg
+									{{ (item.maxWeight/1000).toFixed(2) }}kg
 									<u-badge class="badge" type="warning" bgColor="#05695d" count="最大" :offset="[0,0]"></u-badge>
 								</view>
 							</view>