收入统计

ghsApp/src/admin/home/apply.vue

@@ -50,7 +50,7 @@ export default {
                     title:'统计',
                     list:[
                         {name: "利润表",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/profit"},
-                        {name: "各渠道收入",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/kdIncome"},
+                        {name: "收入统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/kdIncome"},
                         {name: "花材销量",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/productSale"},
                         {name: "客户下单榜",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/customSale"},
                         {name: "采购统计",img: `${this.$constant.imgUrl}/ghs/home/jyzk.png`,url: "/admin/stat/cgStat"},

ghsApp/src/admin/stat/kdIncome.vue

@@ -8,10 +8,6 @@
 		</view>
 		<view class="top-bar">
 			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
-			<view style="position:absolute;top:-20upx;right:30upx;">
-				<button class="admin-button-com middle" :class="params.contain == 0 ? 'blue' : 'default'" @click="changeContain(0)">不含结账</button>
-				<button class="admin-button-com middle" :class="params.contain == 1 ? 'blue' : 'default'" @click="changeContain(1)" style="margin-left:30upx;">含结账</button>
-			</view>
 		</view>
 		<view  class="main-view">
 			<view class="space-view ex-table">
@@ -30,6 +26,15 @@
 								</t-td>
 							</t-tr>
 						</view>
+
+						<t-tr>
+							<t-td align="center">
+								<view style="font-weight:bold;color:black;font-size:34upx;">
+									合计 ¥{{totalIncome}}
+								</view>
+							</t-td>
+						</t-tr>
+
 					</t-table>
 				</block>
 			</view>
@@ -109,7 +114,7 @@ export default {
 				contain:0
 			},
 			profile:[],
-			income:0,
+			totalIncome:0,
 			showDetailPop:false,
 			detailItem:[]
 		};
@@ -165,7 +170,7 @@ export default {
 			getStatKdProfile(this.params).then(res => {
 				uni.hideLoading()
 				that.profile = res.data.list
-				that.income = res.data.income
+				that.totalIncome = res.data.totalIncome
 			})
 		}
 	}

ghsApp/src/admin/stat/profit.vue

@@ -21,21 +21,23 @@
 						</t-tr>
 
 						<t-tr v-for="(item, inIndex) in profit.income" :key="inIndex">
-							<t-td><view>{{item.name}}</view></t-td>
-							<t-td><view>{{item.amount}}</view></t-td>
+							<t-td><view style="color:black;font-size:30upx;">{{item.name}}</view></t-td>
+							<t-td><view style="color:black;font-size:30upx;">{{item.amount}}</view></t-td>
 							<t-td><view>-</view></t-td>
 						</t-tr>
 						<!--同个节点v-for key重复会报错，所以再包一层-->
 						<view>
 							<t-tr v-for="(item, exIndex) in profit.expend" :key="exIndex">
-								<t-td><view>{{item.name}}</view></t-td>
-								<t-td v-if="item.amount==0"><view>0</view></t-td>
-								<t-td v-else><view>-{{item.amount}}</view></t-td>
+								<t-td><view style="color:black;font-size:30upx;">{{item.name}}</view></t-td>
+								<t-td v-if="item.amount==0"><view style="color:black;font-size:30upx;">0</view></t-td>
+								<t-td v-else><view style="color:black;font-size:30upx;">-{{item.amount}}</view></t-td>
 								<t-td><view>-</view></t-td>
 							</t-tr>
-							</view>
+						</view>
 						<t-tr>
-							<t-td align="center"><view style="font-weight:bold;color:black;">合计 ¥{{profit.balance||0}}</view></t-td>
+							<t-td align="center">
+								<view style="font-weight:bold;color:black;font-size:34upx;">合计 ¥{{profit.balance||0}}</view>
+							</t-td>
 						</t-tr>
 
 					</t-table>

ghsApp/src/pages.json

@@ -229,7 +229,7 @@
 			"pages": [
 				{"path": "profit","style": {"navigationBarTitleText": "利润表"}},
 				{"path": "productSale","style": {"navigationBarTitleText": "花材销量"}},
-				{"path": "kdIncome","style": {"navigationBarTitleText": "各渠道收入"}},
+				{"path": "kdIncome","style": {"navigationBarTitleText": "收入统计"}},
 				{"path": "customSale","style": {"navigationBarTitleText": "客户下单排行"}},
 				{"path": "incomeStat","style": {"navigationBarTitleText": "应收款"}},
 				{"path": "cgStat","style": {"navigationBarTitleText": "采购统计"}},