小丽优化

ghsApp/src/admin/home/workbench.vue

@@ -25,8 +25,6 @@
 
 	<view class="app-main app-content">
 
-	<template v-if="lookMoney == 1">
-
 		<div class="user-wrap">
 			<div class="user-top" style="position: relative;">
 				<div class="app-size-28" @click="start()">今日概况</div>
@@ -34,10 +32,12 @@
 				<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>
 			<div class="user-bottom">
 				<navigator class="info-list" url="/admin/custom/visit">
 					<div class="info-list-name">访客</div>
@@ -58,7 +58,9 @@
 					</div>
 				</navigator>
 			</div>
+
 		</div>
+<template v-if="lookMoney == 1">
 		<div class="module-com order-wrap" @click="pageTo({url:'/admin/stat/kdIncome'})">
 			<div class="total-blo">
 				<div class="total-list2"> 

ghsApp/src/pagesPurchase/components/pageSuccess.vue

@@ -14,7 +14,7 @@
 						<view class="flex title" v-if="info.status == 3"> 入库前请确认售价: </view>
 						<view class="flex title" v-else> 确认售价: </view>
 						<view class="flex title">
-							<text style="font-size:28upx;font-weight:normal;color:green;">花材名称 / 进货价 / 成本价（进货价+运费） </text>
+							<text style="font-size:22upx;font-weight:normal;color:green;">花材名称 / 进货价 / 成本价（进货价+运费）/ 入库数 </text>
 						</view>
 
 						<view v-for="(res,i) in flowersList" :key="i">
@@ -23,8 +23,10 @@
 									<view style="margin-bottom:6upx;">
 										<text class="name" @click="pageTo({url:'/admin/item/detail?id='+ res.productId})">
 											{{res.name?res.name.substr(0,11):''}}
-											<text style="color:red;margin-left:40upx;font-weight:normal;">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
-											<text style="color:red;margin-left:40upx;font-weight:normal;">¥{{res.cost?parseFloat(res.cost):0}}</text>
+											<text style="color:red;margin-left:25upx;font-weight:normal;">¥{{res.bigPrice?parseFloat(res.bigPrice):0}}</text>
+											<text style="color:red;margin-left:25upx;font-weight:normal;">¥{{res.cost?parseFloat(res.cost):0}}</text>
+											<text style="color:#CCCCCC;margin-left:25upx;font-weight:normal;">¥{{res.beforeModifyPrice?parseFloat(res.beforeModifyPrice):0}}</text>
+											<text style="color:#CCCCCC;margin-left:25upx;font-weight:normal;">{{res.itemNum?parseFloat(res.itemNum):0}}{{res.bigUnit}}</text>
 											<text style="float:right;color:green;">...</text>
 										</text>
 									</view>