11

package2/shop/merchantCenter.vue

@@ -105,7 +105,7 @@
 				</view>
 				<view class="data22">
 					<view class="data222">
-						{{shopData.orderRevenueAndCount.amount}}
+						{{shopData.orderRevenueAndCount.amount == undefined?0:shopData.orderRevenueAndCount.amount}}
 					</view>
 					<view class="data333">
 						营业额

package2/shop/orderDetail.vue

@@ -180,6 +180,16 @@
 					if (res.code == 200) {
 						that.data = res.result
 						
+						//商家预计收入的计算
+						let price = that.data.goodsAmount+that.data.packageFee
+						if(that.data.orderType == 1){
+							that.data.chouyong = price * uni.getStorageSync('shopTakeaway').commissionRateOne
+							that.data.yujishouru = price - that.data.chouyong
+						}else{
+							that.data.chouyong = price * uni.getStorageSync('shopTakeaway').commissionRateMore
+							that.data.yujishouru = price - that.data.chouyong
+						}
+						
 						that.data.goodsNum = 0
 						for(let m=0;m<that.data.goodsList.length;m++){
 							that.data.goodsNum += that.data.goodsList[m].quantity