xiaohaizhao 11 месяцев назад
Родитель
Сommit
fe9df09f52

+ 1 - 1
salesPanel/AnalysisOfTheProportionOfProductCategoriesInOrders/index.wxml

@@ -22,7 +22,7 @@
 		</view>
 	</view>
 	<view style="margin-left: 30rpx;margin-bottom:20rpx;">
-		{{language[itemclassfullname||'全部']||itemclassfullname||'全部'}}({{total}})
+		{{language[itemclassfullname||'全部']||itemclassfullname||'全部'}}({{list[0].isEmpty?0:total}})
 	</view>
 	<My_empty wx:if='{{list[0].isEmpty}}' />
 	<block wx:else>

+ 1 - 1
salesPanel/FinancialCollectionAnalysis/index.wxml

@@ -8,7 +8,7 @@
 		<ec-canvas id="mychart" canvas-id="chart" ec="{{ ec }}"></ec-canvas>
 	</view>
 	<view style="margin-left:30rpx;margin-bottom:20rpx;">
-		{{language[content.unwriteoffamounttype]||content.unwriteoffamounttype}}({{total}})
+		{{language[content.unwriteoffamounttype]||content.unwriteoffamounttype}}({{list[0].isEmpty?0:total}})
 	</view>
 	<My_empty wx:if='{{!list.length}}' />
 	<block wx:else>

+ 1 - 1
salesPanel/analysisOfOrderTypeDistribution/index.wxml

@@ -12,7 +12,7 @@
 		</view>
 	</view>
 	<view style="margin-left: 30rpx;margin-bottom:20rpx;">
-		{{language[content.where.type||'全部']||content.where.type||'全部'}}({{total}})
+		{{language[content.where.type||'全部']||content.where.type||'全部'}}({{list[0].isEmpty?0:total}})
 	</view>
 	<My_empty wx:if='{{list[0].isEmpty}}' />
 	<block wx:else>

+ 2 - 1
salesPanel/shipmentAnalysis/index.js

@@ -90,6 +90,7 @@ Component({
                 this.setData({
                     list: res.pageNumber == 1 ? res.data : this.data.list.concat(res.data),
                     "content.pageNumber": res.pageNumber + 1,
+                    "content.pageTotal": res.pageTotal,
                     "content.pageSize": res.pageSize,
                     total: res.total
                 })
@@ -124,7 +125,7 @@ Component({
                     if (type != that.data.content.dateType) {
                         that.setData({
                             "content.dateType": type,
-                            "pages.pageNumber": 1
+                            "content.pageNumber": 1
                         })
                     }
                     that.getList()

+ 1 - 1
salesPanel/shipmentAnalysis/index.wxml

@@ -8,7 +8,7 @@
 		<ec-canvas id="mychart" canvas-id="chart" ec="{{ ec }}"></ec-canvas>
 	</view>
 	<view class="dateType" style="margin-left: 30rpx;margin-bottom: 20rpx;">
-		{{language[content.dateType||'全部']||content.dateType||'全部'}}({{total}})
+		{{language[content.dateType||'全部']||content.dateType||'全部'}}({{list[0].isEmpty?0:total}})
 	</view>
 	<My_empty wx:if='{{list[0].isEmpty}}' />
 	<block wx:else>