shish 3 năm trước cách đây
mục cha
commit
3f2e5bc418

+ 3 - 3
ghsApp/src/admin/stat/kdIncome.vue

@@ -8,12 +8,12 @@
 			<view class="space-view ex-table">
 			<view class="space-view ex-table">
 				<block>
 				<block>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th><view style="width:260upx;">渠道</view></t-th><t-th>笔数</t-th><t-th>金额</t-th><t-th>操作</t-th></t-tr>
+						<t-tr header><t-th><view style="width:180upx;">渠道</view></t-th><t-th>笔数</t-th><t-th>金额</t-th><t-th>操作</t-th></t-tr>
 						<view v-for="(item, index) in profile" :key="index">
 						<view v-for="(item, index) in profile" :key="index">
 							<t-tr>
 							<t-tr>
-								<t-td><view style="width:260upx;color:black;font-size:30upx;">{{item.name}}</view></t-td>
+								<t-td><view style="width:180upx;color:black;font-size:30upx;">{{item.name}}</view></t-td>
 								<t-td><view style="color:black;font-size:30upx;">{{item.num}}</view></t-td>
 								<t-td><view style="color:black;font-size:30upx;">{{item.num}}</view></t-td>
-								<t-td><view style="color:black;font-size:30upx;">{{item.amount?parseFloat(item.amount):0}}</view></t-td>
+								<t-td><view style="color:black;font-size:30upx;">¥{{item.amount?parseFloat(item.amount):0}}</view></t-td>
 								<t-td>
 								<t-td>
 									<view>
 									<view>
 										<button class="admin-button-com middel blue" @click="getDetail(item)">明细</button>
 										<button class="admin-button-com middel blue" @click="getDetail(item)">明细</button>

+ 1 - 2
hdApp/src/admin/goods/list.vue

@@ -6,8 +6,7 @@
 			</view>
 			</view>
 			<view style="padding-left:10upx;">
 			<view style="padding-left:10upx;">
         <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="selectFlowerNumFn()">按支数查</button>
         <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="selectFlowerNumFn()">按支数查</button>
-        <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="addGoods()">新增作品</button>
-				<button class="admin-button-com middle blue" @click="cgPlant()">新增采购</button>
+        <button class="admin-button-com middle blue" style="margin-right:6upx;" @click="addGoods()">新增花束花篮</button>
 			</view>
 			</view>
 		</view>
 		</view>
     <view class="app-middle">
     <view class="app-middle">

+ 11 - 2
hdApp/src/admin/home/workbench.vue

@@ -35,6 +35,12 @@
             {{ $util.numberFormat(data.todayData.visit) || 0 }}
             {{ $util.numberFormat(data.todayData.visit) || 0 }}
           </div>
           </div>
         </div>
         </div>
+        <div class="info-list" @click="goToKindStat">
+          <div class="info-list-name">花束</div>
+          <div class="info-list-value">
+            {{ $util.numberFormat(data.todayData.bouquet) || 0 }}
+          </div>
+        </div>
         <div class="info-list" @click="goToExpend" >
         <div class="info-list" @click="goToExpend" >
           <div class="info-list-name">损耗</div>
           <div class="info-list-name">损耗</div>
           <div class="info-list-value">
           <div class="info-list-value">
@@ -408,10 +414,13 @@ export default {
       this.$util.pageTo({ url: item.page })
       this.$util.pageTo({ url: item.page })
     },
     },
     goToExpend () {
     goToExpend () {
-      uni.navigateTo({ url: '/pagesStore/me/expend' })
+      uni.navigateTo({url:'/pagesStore/me/expend'})
+    },
+    goToKindStat(){
+      this.$util.pageTo({url:'/admin/stat/kind'})
     },
     },
     goToProfit () {
     goToProfit () {
-      this.$util.pageTo({ url: '/admin/stat/profit' })
+      this.$util.pageTo({url:'/admin/stat/profit'})
     },
     },
     goToMallPt (url) {
     goToMallPt (url) {
       let self = this
       let self = this

+ 3 - 3
hdApp/src/admin/stat/kdIncome.vue

@@ -8,12 +8,12 @@
 			<view class="space-view ex-table">
 			<view class="space-view ex-table">
 				<block>
 				<block>
 					<t-table :headerBackgroundColor="'#F0F2F6'">
 					<t-table :headerBackgroundColor="'#F0F2F6'">
-						<t-tr header><t-th><view style="width:260upx;">渠道</view></t-th><t-th>笔数</t-th><t-th>金额</t-th><t-th>操作</t-th></t-tr>
+						<t-tr header><t-th><view style="width:180upx;">渠道</view></t-th><t-th>笔数</t-th><t-th>金额</t-th><t-th>操作</t-th></t-tr>
 						<view v-for="(item, index) in profile" :key="index">
 						<view v-for="(item, index) in profile" :key="index">
 							<t-tr>
 							<t-tr>
-								<t-td><view style="width:260upx;color:black;font-size:30upx;">{{item.name}}</view></t-td>
+								<t-td><view style="width:180upx;color:black;font-size:30upx;">{{item.name}}</view></t-td>
 								<t-td><view style="color:black;font-size:30upx;">{{item.num}}</view></t-td>
 								<t-td><view style="color:black;font-size:30upx;">{{item.num}}</view></t-td>
-								<t-td><view style="color:black;font-size:30upx;">{{item.amount?parseFloat(item.amount):0}}</view></t-td>
+								<t-td><view style="color:black;font-size:30upx;">¥{{item.amount?parseFloat(item.amount):0}}</view></t-td>
 								<t-td>
 								<t-td>
 									<view>
 									<view>
 										<button class="admin-button-com middel blue" @click="getDetail(item)">明细</button>
 										<button class="admin-button-com middel blue" @click="getDetail(item)">明细</button>