收支明细

ghsApp/src/admin/order/statKhBook.vue

@@ -9,7 +9,6 @@
 
 	<view class="top-bar">
 		<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
-		<ShopSelect class="bar" top="0" @selectShopFn="selectShopFn" />
 	</view>
 
 		<scroll-view scroll-y scroll-with-animation class="main-view">

ghsApp/src/pagesOrder/detail.vue

@@ -529,7 +529,7 @@ export default {
 				this.detailInfo.product.forEach(ele=>{
 						this.totalItemPrice += Number(ele.xhPrice)
 				})
-				this.totalItemPrice.toFixed(2)
+				this.totalItemPrice = this.totalItemPrice.toFixed(2)
 				this.totalItemPrice = parseFloat(this.totalItemPrice)
 
 				const { product } = this.detailInfo;

ghsApp/src/pagesStore/me/expend.vue

@@ -3,16 +3,16 @@
 		<div class="list-by_box" v-if="!$util.isEmpty(list.data)">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
-					<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
-						{{ item.name }}
-					</t-th>
+					<t-th>时间</t-th>
+					<t-th ><view style="width:210upx;">事项</view></t-th>
+					<t-th>金额</t-th>
+					<t-th>累计支出</t-th>
 				</t-tr>
 				<t-tr v-for="(item, index) in list.data" :key="index">
-					<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
-						<view>
-							{{ item[column.dataIndex] || "" }}
-						</view>
-					</t-td>
+					<t-td> <view>{{item.addTime.substr(5,11)}}</view> </t-td>
+					<t-td> <view style="width:210upx;">{{item.event}}</view> </t-td>
+					<t-td> <view>{{parseFloat(item.amount)}}</view> </t-td>
+					<t-td> <view>{{parseFloat(item.totalExpend)}}</view> </t-td>
 				</t-tr>
 			</t-table>
 		</div>
@@ -33,12 +33,6 @@ export default {
 	mixins: [list],
 	data() {
 		return {
-			columns: [
-				{name: "事项",dataIndex: "event",color: "info",align: "center"},
-				{name: "金额",dataIndex: "amount",color: "info",align: "center"},
-				{name: "累计支出",dataIndex: "totalExpend",color: "info",align: "center"},
-				{name: "时间",dataIndex: "addTime",color: "info",align: "center"}
-			],
 			tabIndex: 0
 		};
 	},

ghsApp/src/pagesStore/me/income.vue

@@ -3,16 +3,16 @@
 		<div class="list-by_box" v-if="!$util.isEmpty(list.data)">
 			<t-table :headerBackgroundColor="'#F0F2F6'">
 				<t-tr header>
-					<t-th v-for="(item, index) in columns" :key="index" :align="item.align">
-						{{ item.name }}
-					</t-th>
+					<t-th>时间</t-th>
+					<t-th><view style="width:210upx;">事项</view></t-th>
+					<t-th>金额</t-th>
+					<t-th>累计收入</t-th>
 				</t-tr>
 				<t-tr v-for="(item, index) in list.data" :key="index">
-					<t-td v-for="(column, colIndex) in columns" :key="colIndex" :align="column.align" :color="column.color" >
-						<view>
-							{{ item[column.dataIndex] || "" }}
-						</view>
-					</t-td>
+					<t-td><view>{{item.addTime.substr(5,11)}}</view></t-td>
+					<t-td><view style="width:210upx;">{{item.event}}</view></t-td>
+					<t-td><view>{{parseFloat(item.amount)}}</view></t-td>
+					<t-td><view>{{parseFloat(item.totalIncome)}}</view></t-td>
 				</t-tr>
 			</t-table>
 		</div>
@@ -33,12 +33,6 @@ export default {
 	mixins: [list],
 	data() {
 		return {
-			columns: [
-				{name: "事项",dataIndex: "event",color: "info",align: "center"},
-				{name: "金额",dataIndex: "amount",color: "info",align: "center"},
-				{name: "累计收入",dataIndex: "totalIncome",color: "info",align: "center"},
-				{name: "时间",dataIndex: "addTime",color: "info",align: "center"}
-			]
 		};
 	},
 	methods: {
@@ -72,4 +66,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-</style>
+</style>

hdApp/src/admin/home/me.vue

@@ -51,8 +51,12 @@
               <div class="tui-title">提现记录</div>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/pagesStore/me/incomeExpenses' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">收支明细</div>
+            <tui-list-cell @click="pageTo({ url: '/pagesStore/me/income' })" class="line-cell" :hover="false" :arrow="true" >
+              <div class="tui-title">收入明细</div>
+            </tui-list-cell>
+
+            <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expend' })" class="line-cell" :hover="false" :arrow="true" >
+              <div class="tui-title">支出明细</div>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/coupon/couponList' })" class="line-cell" :hover="false" :arrow="true" >

hdApp/src/pages.json

@@ -112,6 +112,8 @@
 				{ "path": "me/shopYeChange", "style": { "navigationBarTitleText": "余额明细" } },
 				{ "path": "me/withdraw", "style": { "navigationBarTitleText": "提现记录" } },
 				{ "path": "me/incomeExpenses", "style": { "navigationBarTitleText": "收支记录" } },
+				{"path": "me/income","style": {"navigationBarTitleText": "收入记录"}},
+				{"path": "me/expend","style": {"navigationBarTitleText": "支出记录"}},
 				{ "path": "me/recharge", "style": { "navigationBarTitleText": "充值" } },
 				{ "path": "me/rechargeList", "style": { "navigationBarTitleText": "充值记录" } },
 				{ "path": "me/cashSet", "style": { "navigationBarTitleText": "提现帐号" } },

hdApp/src/pagesPurchase/bookExplain.vue

@@ -11,6 +11,7 @@
         <view>下单时按下单当天销售价付款，到货后按到货当天进货价结算，多退少补</view>
         <view>门店仅收取服务费，每公斤服务费{{parseFloat(kiloFee)}}元，不足{{parseFloat(miniKilo)}}公斤按{{parseFloat(miniKilo)}}公斤计算</view>
         <view>当天15点前下单，第二天送达，15点后下单的，第三天送达</view>
+        <view>预订下单成功后暂不支持取消</view>
       </view>
       <view style="text-align:center;">
         <button style="margin:10upx auto;padding-left:50upx;padding-right:50upx;" class="admin-button-com blue middle" @click="goBack()">返回</button>

hdApp/src/pagesPurchase/order.vue

@@ -72,7 +72,7 @@ export default {
 		},
     enterShop(item) {
       const { id } = item
-      this.pageTo({url: '/pagesPurchase/ghsProduct',query:{id:id}})
+      this.pageTo({url: '/pagesPurchase/ghsProduct',query:{id:id},type:2})
     },
     bookItem(item){
       //没有设置每公斤运费则不能进入预订页面
@@ -81,7 +81,7 @@ export default {
         return false
       }
       const { id } = item
-      this.pageTo({url: '/pagesPurchase/bookProduct',query:{id:id}})
+      this.pageTo({url: '/pagesPurchase/bookProduct',query:{id:id},type:2})
     },
     getBookItemExplain(item){
       if(item.kiloFee && Number(item.kiloFee)<=0){

hdApp/src/pagesStore/me/expend.vue

@@ -0,0 +1,67 @@
+<template>
+	<view class="app-content">
+		<div class="list-by_box" v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th>时间</t-th>
+					<t-th ><view style="width:210upx;">事项</view></t-th>
+					<t-th>金额</t-th>
+					<t-th>累计支出</t-th>
+				</t-tr>
+				<t-tr v-for="(item, index) in list.data" :key="index">
+					<t-td> <view>{{item.addTime.substr(5,11)}}</view> </t-td>
+					<t-td> <view style="width:210upx;">{{item.event}}</view> </t-td>
+					<t-td> <view>{{parseFloat(item.amount)}}</view> </t-td>
+					<t-td> <view>{{parseFloat(item.totalExpend)}}</view> </t-td>
+				</t-tr>
+			</t-table>
+		</div>
+		<block v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+	</view>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { list } from "@/mixins";
+import { capitaList } from '@/api/store'
+export default {
+	name: "expend",
+	components: {
+		AppWrapperEmpty
+	},
+	mixins: [list],
+	data() {
+		return {
+			tabIndex: 0
+		};
+	},
+	methods: {
+		init() {
+			this.getList();
+		},
+		getList(){
+			return capitaList({ page: this.list.page, io: 0 }).then(res=>{
+				 this.completes(res);
+			})
+		}
+	},
+	onPullDownRefresh() {
+		this.resetList();
+		this.getList().then(res => {
+		uni.stopPullDownRefresh();
+		});
+	},
+	onReachBottom() {
+    if (!this.list.finished) {
+      this.getList().then(res => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

hdApp/src/pagesStore/me/income.vue

@@ -0,0 +1,69 @@
+<template>
+	<view class="app-content">
+		<div class="list-by_box" v-if="!$util.isEmpty(list.data)">
+			<t-table :headerBackgroundColor="'#F0F2F6'">
+				<t-tr header>
+					<t-th>时间</t-th>
+					<t-th><view style="width:210upx;">事项</view></t-th>
+					<t-th>金额</t-th>
+					<t-th>累计收入</t-th>
+				</t-tr>
+				<t-tr v-for="(item, index) in list.data" :key="index">
+					<t-td><view>{{item.addTime.substr(5,11)}}</view></t-td>
+					<t-td><view style="width:210upx;">{{item.event}}</view></t-td>
+					<t-td><view>{{parseFloat(item.amount)}}</view></t-td>
+					<t-td><view>{{parseFloat(item.totalIncome)}}</view></t-td>
+				</t-tr>
+			</t-table>
+		</div>
+		<block v-else>
+			<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+		</block>
+	</view>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { list } from "@/mixins";
+import { capitaList } from '@/api/store'
+export default {
+	name: "income",
+	components: {
+		AppWrapperEmpty
+	},
+	mixins: [list],
+	data() {
+		return {
+		};
+	},
+	methods: {
+		init() {
+			this.getList();
+		},
+		getList(){
+			return capitaList({
+				page: this.list.page,
+				io: 1
+			}).then(res=>{
+				 this.completes(res);
+			})
+		}
+	},
+	onPullDownRefresh() {
+		this.resetList();
+		this.getList().then(res => {
+		uni.stopPullDownRefresh();
+		});
+	},
+	onReachBottom() {
+    if (!this.list.finished) {
+      this.getList().then(res => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>