11

pages/index/index.vue

@@ -206,31 +206,48 @@
 		onShow() {
 			this.shopName = uni.getStorageSync('shopName')
 			this.type = uni.getStorageSync('type')
-			this.getSaleInfo()
-			this.getServerData();
-			this.getOrderInfoList();
-			this.getWaitCount()
+			this.getSaleInfo()
 		},
 		onLoad() {
 			
 		},
 		methods: {
-			getWaitCount() {
-				this.tui.request("/app/sale/getWaitCount", "POST", {}, false, false).then((res) => {
-					if (res.code == 200) {
-						this.waitCount = res.result
-					} else {
-						this.tui.toast(res.message)
-					}
-
-				})
-			},
 			getSaleInfo() {
 				this.tui.request("/app/sale/getShopAll", "POST", {
-					shopId: this.shopIndex
+					pageVo: {
+						pageSize: 5,
+						pageNumber: 1
+					},
 				}, false, false).then((res) => {
 					if (res.code == 200) {
-						this.shopInfo = res.result
+						this.shopInfo = {
+							totalAmount:res.result.totalAmount,
+							totalCCount:res.result.totalCCount,
+							totalCount:res.result.totalCount,
+							totalJCount:res.result.totalJCount,
+							totalProfit:res.result.totalProfit
+						}
+						for (var i = 0; i <= res.result.salePage.records.length; i++) {
+							res.result.salePage.records[i].img = '/static/images/dingdan/dd' + i + '.png'
+							this.inventoryList = res.result.salePage.records
+						}
+						this.waitCount = res.result.countMap
+						let dataList = {
+							categories: this.getWeek(),
+							series: [{
+								name: "七天营收统计",
+								linearColor: [
+									[0, "#1890FF"],
+									[0.33, "#00B5FF"],
+									[0.66, "#00D1ED"],
+									[1, "#00E6BB"],
+									[1, "#90F489"]
+								],
+								setShadow: [3, 8, 10, "#00E6BB"],
+								data: res.result.weekSale
+							}]
+						};
+						this.chartData = JSON.parse(JSON.stringify(dataList));
 					} else {
 						this.tui.toast(res.message)
 					}
@@ -271,31 +288,6 @@
 					}
 				}).catch((res) => {})
 			},
-			getServerData() {
-
-				this.tui.request("/app/sale/getShopWeek", "POST", {}, false, false).then((res) => {
-					if (res.code == 200) {
-						let dataList = {
-							categories: this.getWeek(),
-							series: [{
-								name: "七天营收统计",
-								linearColor: [
-									[0, "#1890FF"],
-									[0.33, "#00B5FF"],
-									[0.66, "#00D1ED"],
-									[1, "#00E6BB"],
-									[1, "#90F489"]
-								],
-								setShadow: [3, 8, 10, "#00E6BB"],
-								data: res.result
-							}]
-						};
-						this.chartData = JSON.parse(JSON.stringify(dataList));
-					} else {
-						this.tui.toast(res.message)
-					}
-				})
-			},
 			getWeek() {
 				let days = 7
 				let week = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"];

pages/index/peopleList.vue

@@ -26,7 +26,7 @@
 				</view>
 			</view>
 			<!-- 物流公司啦包公走这一套 -->
-			<view class="" v-else>
+			<view class="" v-if="popleType== 'wlName' || popleType== 'fcName' || popleType== 'dbName'">
 				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList[0]" :key="item">
 					<view class="name-tel">
 						<text style="line-height: 75rpx;">{{item.companyName}}</text>
@@ -63,7 +63,7 @@
 				</view>
 			</view>
 			<!--快递公司 -->
-			<view class="" v-else>
+			<view class="" v-if="popleType== 'kdName' || popleType== 'lbgName'">
 				<view class="list-1" :style="{height:popleType == 'kdName'?'75rpx':'120rpx'}" style="display: flex;position: relative;" @tap="clickList(item)" v-for="item in popleList" :key="item">
 					<view class="name-tel">
 						<text style="line-height: 75rpx;">{{item.companyName}}</text>
@@ -77,9 +77,9 @@
 						</view>
 						<view class="phone-btn" @tap.stop="clickPhone(item.mobile)" v-if="popleType != 'kdName'">拨打电话</view>
 					</view>
-					<view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
+					<!-- <view style="position: absolute;bottom: 0;left: 40rpx;" v-if="popleType == 'fcName' || popleType == 'lbgName' || popleType == 'wlName'">
 						<text style="line-height: 45rpx;color:red;font-size: 24rpx;" v-if="item.rebateAmount">本单返佣{{item.rebateAmount}}元</text>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>