shish пре 1 година
родитељ
комит
2204b91c47
2 измењених фајлова са 26 додато и 11 уклоњено
  1. 22 10
      ghsApp/src/admin/home/workbench.vue
  2. 4 1
      ghsApp/src/api/console/index.js

+ 22 - 10
ghsApp/src/admin/home/workbench.vue

@@ -48,17 +48,17 @@
 
 		<div class="user-wrap">
 			<div class="user-top" style="position: relative;">
-				<div class="app-size-28" @click="showSend()">今概况</div>
+				<div class="app-size-28" @click="showSend()">今概况</div>
 				<image :src="`${constant.imgUrl}/icon/notice_icon.png`" class="mind-item"></image>
 				<view class="red-mind" v-if="notifyNum>0">{{ notifyNum>9?9:notifyNum }}</view>
 				<view class="mind-mask" @click="toNotify()"> </view>
 			</div>
-<block v-if="lookMoney == 1">
-			<div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
-				<div>收入</div>
-				<div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
-			</div>
-</block>
+			<block v-if="lookMoney == 1">
+				<div class="income-amount" @click="pageTo({url:'/admin/stat/kdIncome'})">
+					<div>收入</div>
+					<div class="price">{{ $util.numberFormat(data.todayData.income) }}</div>
+				</div>
+			</block>
 			<div class="user-bottom">
 				<navigator class="info-list" url="/admin/custom/visit">
 					<div class="info-list-name">访客</div>
@@ -78,8 +78,13 @@
 						{{ $util.numberFormat(data.todayData.wastage) || 0 }}
 					</div>
 				</navigator>
+				<navigator url="/admin/stat/wastage" class="info-list">
+					<div class="info-list-name">昨日</div>
+					<div class="info-list-value">
+						{{ $util.numberFormat(yesterdayIncome) }}
+					</div>
+				</navigator>
 			</div>
-
 		</div>
 
 		<!-- 消息 -->
@@ -185,7 +190,7 @@ import { closeBook } from "@/api/book";
 import productMins from "@/mixins/product";
 import { allProduct } from '@/api/product'
 import {currentShop} from "@/api/shop";
-import { getStat,getStrokeCount } from '@/api/console'
+import { getStat,getStrokeCount,getYesterdayIncome } from '@/api/console'
 import autoUpdateMixins from "@/mixins/autoUpdate";
 import { getWeixinId } from "@/api/invite/index";
 import { getErrorPrice } from "@/api/item"
@@ -246,7 +251,8 @@ export default {
 			keyShow:true,
 			sendOrderList:[],
 			showSendPage:0,
-			renewType:0
+			renewType:0,
+			yesterdayIncome:0
 		};
 	},
 	onShareAppMessage(res) {
@@ -559,6 +565,12 @@ export default {
 				}
 			})
 
+			getYesterdayIncome({searchTime:'yesterday'}).then(res=>{
+				if(res.code == 1){
+					this.yesterdayIncome = res.data.income?parseFloat(res.data.income):0
+				}
+			})
+
 		},
 		setIndex(){
 			// #ifdef MP-WEIXIN

+ 4 - 1
ghsApp/src/api/console/index.js

@@ -4,7 +4,10 @@ export const getStat = async data => {
 	return https.get('/console/stat', data)
 }
 
-
 export const getStrokeCount = async data => {
 	return https.get('/console/stroke-count', data)
+}
+
+export const getYesterdayIncome = async data => {
+	return https.get('/console/get-yesterday-income', data)
 }