打包费

ghsApp/src/admin/stat/kdIncome.vue

@@ -32,11 +32,21 @@
 						<t-tr>
 							<t-td align="center">
 								<view style="color:black;font-size:25upx;">
-									斗南商家注意：这里的收入合计，暂未剔除运费和包装费
+									以上合计的总收入，已包含了以下收入
 								</view>
 							</t-td>
 						</t-tr>
 
+						<view v-for="(it, idx) in costList" :key="idx">
+							<t-tr>
+								<t-td><view style="width:180upx;color:black;font-size:30upx;">{{it.name}}</view></t-td>
+								<t-td><view style="color:black;font-size:30upx;">数量：{{it.num}}</view></t-td>
+								<t-td><view style="color:black;font-size:30upx;">¥{{it.price?parseFloat(it.price):0}}</view></t-td>
+								<t-td> <view> </view> </t-td>
+							</t-tr>
+						</view>
+
+
 					</t-table>
 				</block>
 			</view>
@@ -118,6 +128,7 @@ export default {
 				contain:0
 			},
 			profile:[],
+			costList:[],
 			totalIncome:0,
 			showDetailPop:false,
 			detailItem:[]
@@ -168,7 +179,8 @@ export default {
 			uni.showLoading()
 			getStatKdProfile(this.params).then(res => {
 				uni.hideLoading()
-				that.profile = res.data.list
+				that.profile = res.data.list||[]
+				that.costList = res.data.costIncome||[]
 				that.totalIncome = res.data.totalIncome
 			})
 		}

ghsApp/src/admin/stat/profit.vue

@@ -41,6 +41,15 @@
 								</t-td>
 							</t-tr>
 						</block>
+						<block>
+							<t-tr>
+								<t-td align="center">
+									<view style="font-weight:bold;font-size:30upx;" @click.stop="goIncomeStat()">
+										收入部分，如需要剔除打包费、运费和纸箱费等，请查看<text style="color:#3385FF;">收入统计模块</text>
+									</view>
+								</t-td>
+							</t-tr>
+						</block>
 					</t-table>
 				</block>
 			</view>
@@ -108,6 +117,9 @@ export default {
 			this.params = {...this.params,...val}
 			this.init();			
 		},
+		goIncomeStat(){
+			this.$util.pageTo({url: "/admin/stat/kdIncome"})
+		},
 		async init() {
 			this._list();
 		},

ghsApp/src/pagesClient/member/detail.vue

@@ -298,7 +298,7 @@ export default {
     }
   },
   onShow(){
-    this.getUserDetail()
+
   },
   methods: {
 		inviteToPay(){
@@ -526,6 +526,11 @@ export default {
         this.form.black = this.userInfo.black
         this.form.showStock = this.userInfo.showStock
         this.discount = parseFloat(res.data.discount)
+        console.log('111111111')
+        console.log(res.data)
+        if(res.data.remainDebtAmount && Number(res.data.remainDebtAmount)>0){
+          this.title = '待结金额 ¥'+res.data.remainDebtAmount
+        }
       })
     }
   }