收款码流水

ghsApp/src/admin/billing/affirm.vue

@@ -329,7 +329,7 @@ export default {
       discountValue:0,
       autoLoad: false,
       staffList:[],
-			payWayList:[{name:"线下微信",id:0},{name:"线下支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
+			payWayList:[{name:"线下微信（收款码）",id:0},{name:"线下支付宝（收款码）",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
 			payWayindex:0,
       form: {
         shopId: "",

ghsApp/src/admin/home/apply.vue

@@ -107,7 +107,8 @@ export default {
 
                         {name: "员工",img: `${this.$constant.hostUrl}/image/ghs/home/yggl.png`,url: "/admin/staff/list"},
                         {name: "员工业绩",img: `${this.$constant.hostUrl}/image/ghs/home/icon_ygyj.png`,url: "/admin/staff/achieve"},
-                        {name: "门店",img: `${this.$constant.hostUrl}/image/ghs/home/shop.png`,url: "/admin/shop/list"}
+                        {name: "门店",img: `${this.$constant.hostUrl}/image/ghs/home/shop.png`,url: "/admin/shop/list"},
+                        {name: "收款码", img: `${this.$constant.hostUrl}/image/ghs/home/shop.png`, url: "/admin/cg/code"}
                     ]
                 },
                 {

ghsApp/src/admin/order/scanPay.vue

@@ -8,20 +8,12 @@
 			<block v-if="!$util.isEmpty(list.data)">
 				<view class="allot-item" v-for="(item, index) in list.data" :key="index" @click="gotoDetails(item)" >
 					<view class="info">
-						<view class="info-order"><text style="font-weight:normal;font-size:28upx;">来自：</text>
-							{{ item.outShopName }}
-						</view>
 						<view class="info-name">单号：{{ item.orderSn }}</view>
-						<view class="info-name">价格：¥{{ item.price?parseFloat(item.price):0 }}</view>
-						<view class="info-name">数量：
-							<text v-if="Number(item.bigNum)>0" style="color:#3385ff;font-weight:bold;">{{ item.bigNum}}扎</text>
-							<text v-if="Number(item.smallNum)>0" style="color:#3385ff;font-weight:bold;">{{ item.smallNum}}支</text>
-						</view>
-            			<view class="info-name">时间：{{ item.updateTime.substr(5,11) }}</view>
-						<view class="info-name">编号：{{ item.id }}</view>
+						<view class="info-name">价格：¥{{ item.actPrice?parseFloat(item.actPrice):0 }}</view>
+            			<view class="info-name">时间：{{ item.addTime.substr(5,11) }}</view>
 					</view>
 					<view class="primary" >
-						<view :class="['status-name']">{{ item.statusName }}</view>
+						<view class="status-name">{{ item.status==1?'待付款':item.status==2?'已付款':'已取消' }}</view>
 					</view>
 				</view>
 			</block>
@@ -36,51 +28,49 @@
 import Tabs from "@/components/plugin/tabs";
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import { list } from "@/mixins";
-import { getStockInListApi } from "@/api/storehouse/stock";
-import { PUT_STATUS } from "@/utils/declare";
+import { getScanPayList } from "@/api/order";
 export default {
-	name: "allotPut",
+	name: "scanPay",
 	components: { Tabs, AppWrapperEmpty },
 	mixins: [list],
 	data() {
 		return {
-			PUT_STATUS,
 			tabIndex: 0,
 			tabs: [
 				{
 					name: "全部",
-					key: ""
+					key: 0
 				},
 				{
-					name: "配送中",
-					key: PUT_STATUS.CONFIRM
+					name: "待付款",
+					key: 1
 				},
 				{
-					name: "已入库",
-					key: PUT_STATUS.DONE
+					name: "已付款",
+					key: 2
 				},
 				{
 					name: "已取消",
-					key: PUT_STATUS.CANCEL
+					key: 3
 				}
 			]
 		};
 	},
 	onPullDownRefresh() {
-		this.resetList();
+		this.resetList()
 		this.getMyScanList().then(res => {
-			uni.stopPullDownRefresh();
-		});
+			uni.stopPullDownRefresh()
+		})
 	},
 	onLoad() {
 	},
 	onReachBottom() {
 		if (!this.list.finished) {
-		this.getMyScanList().then((res) => {
-			uni.stopPullDownRefresh();
-		});
+			this.getMyScanList().then((res) => {
+				uni.stopPullDownRefresh()
+			})
 		} else {
-		uni.stopPullDownRefresh();
+			uni.stopPullDownRefresh()
 		}
 	},
 	methods: {
@@ -88,11 +78,9 @@ export default {
 			this.getMyScanList();
 		},
 		getMyScanList() {
-			return getStockInListApi({status:this.tabs[this.tabIndex].key,page: this.list.page})
-				.then(res => {
-					this.completes(res);
-				})
-				.catch(err => {});
+			return getScanPayList({status:this.tabs[this.tabIndex].key,page: this.list.page}).then(res => {
+				this.completes(res)
+			})
 		},
 		changeTabEvent(info) {
 			const { index } = info;
@@ -100,34 +88,12 @@ export default {
 				return false;
 			} else {
 				this.tabIndex = index;
-				this.resetList();
-				this.getMyScanList();
+				this.resetList()
+				this.getMyScanList()
 			}
 		},
-		getItemStatusName(status) {
-			let name = "";
-			switch (status) {
-				case PUT_STATUS.CONFIRM:
-					name = "配送中";
-					break;
-				case PUT_STATUS.DONE:
-					name = "已入库";
-					break;
-				case PUT_STATUS.CANCEL:
-					name = "已取消";
-					break;
-
-				default:
-					break;
-			}
-			return name;
-		},
-		addEvent() {
-			uni.navigateTo({url:'/pagesStorehouse/allot/addExDetails'})
-		},
-		gotoDetails(item) {
-			uni.navigateTo({url: `/pagesStorehouse/allot/putDetails?orderSn=${item.orderSn}`})
-		}
+		addEvent(){},
+		gotoDetails(item){}
 	}
 };
 </script>

ghsApp/src/api/order/index.js

@@ -277,3 +277,4 @@ export const scanPay = data => https.get("/order/scan-pay", data);
 //扫码付款结果查询
 export const scanPayCheck = data => https.get("/order/scan-pay-check", data);
 
+export const getScanPayList = data => https.get("/scan-pay/list", data);

ghsApp/src/pages.json

@@ -480,7 +480,7 @@
 			"root": "admin/order",
 			"pages": [
 				{"path": "itemOrder","style": {"navigationBarTitleText": "订单列表"}},
-				{"path": "scanPay","style": {"navigationBarTitleText": "二维码收款"}},
+				{"path": "scanPay","style": {"navigationBarTitleText": "收款码流水"}},
 				{"path": "bookSet","style": {"navigationBarTitleText": "预订开关"}},
 				{"path": "statBook","style": {"navigationBarTitleText": "预订汇总","enablePullDownRefresh": true}},
 				{"path": "statKhBook","style": {"navigationBarTitleText": "详情"}},
@@ -490,7 +490,8 @@
 		{
 			"root": "admin/cg",
 			"pages": [
-				{"path": "set","style": {"navigationBarTitleText": "采购设置"}}
+				{"path": "set","style": {"navigationBarTitleText": "采购设置"}},
+				{"path": "code","style": {"navigationBarTitleText": "收款码"}}
 			]
 		},
 		{

hdApp/src/admin/home/workbench.vue

@@ -231,11 +231,11 @@
               </view>
               <view class="icon-text">利润表</view>
             </view>
-            <view class="icon-item" @click="goPage({url: '/admin/picText/picTextList'})">
+            <view class="icon-item" @click="goPage({url: '/admin/order/scanPay'})">
               <view class="icon-wrapper">
                 <image class="icon-image" :src="`${constant.hostUrl}/image/ghs/home/kcyjs2.png`" mode="aspectFit"></image>
               </view>
-              <view class="icon-text">图文</view>
+              <view class="icon-text">收款码流水</view>
             </view>
           </view>
         </view>

hdApp/src/admin/order/scanPay.vue

@@ -0,0 +1,166 @@
+<template>
+<view class="app-content">
+	<view class="allot-ex-page">
+		<view class="tabs">
+			<Tabs :tabs="tabs" :currentTab="tabIndex" @change="changeTabEvent" @add="addEvent" ></Tabs>
+		</view>
+		<scroll-view scroll-y class="allot-list">
+			<block v-if="!$util.isEmpty(list.data)">
+				<view class="allot-item" v-for="(item, index) in list.data" :key="index" @click="gotoDetails(item)" >
+					<view class="info">
+						<view class="info-name">单号：{{ item.orderSn }}</view>
+						<view class="info-name">价格：¥{{ item.actPrice?parseFloat(item.actPrice):0 }}</view>
+            			<view class="info-name">时间：{{ item.addTime.substr(5,11) }}</view>
+					</view>
+					<view class="primary" >
+						<view class="status-name">{{ item.status==1?'待付款':item.status==2?'已付款':'已取消' }}</view>
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<AppWrapperEmpty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+			</block>
+		</scroll-view>
+	</view>
+</view>
+</template>
+<script>
+import Tabs from "@/components/plugin/tabs";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import { list } from "@/mixins";
+import { getScanPayList } from "@/api/order";
+export default {
+	name: "scanPay",
+	components: { Tabs, AppWrapperEmpty },
+	mixins: [list],
+	data() {
+		return {
+			tabIndex: 0,
+			tabs: [
+				{
+					name: "全部",
+					key: 0
+				},
+				{
+					name: "待付款",
+					key: 1
+				},
+				{
+					name: "已付款",
+					key: 2
+				},
+				{
+					name: "已取消",
+					key: 3
+				}
+			]
+		};
+	},
+	onPullDownRefresh() {
+		this.resetList()
+		this.getMyScanList().then(res => {
+			uni.stopPullDownRefresh()
+		})
+	},
+	onLoad() {
+	},
+	onReachBottom() {
+		if (!this.list.finished) {
+			this.getMyScanList().then((res) => {
+				uni.stopPullDownRefresh()
+			})
+		} else {
+			uni.stopPullDownRefresh()
+		}
+	},
+	methods: {
+		async init() {
+			this.getMyScanList();
+		},
+		getMyScanList() {
+			return getScanPayList({status:this.tabs[this.tabIndex].key,page: this.list.page}).then(res => {
+				this.completes(res)
+			})
+		},
+		changeTabEvent(info) {
+			const { index } = info;
+			if (this.tabIndex == index) {
+				return false;
+			} else {
+				this.tabIndex = index;
+				this.resetList()
+				this.getMyScanList()
+			}
+		},
+		addEvent(){},
+		gotoDetails(item){}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.allot-ex-page {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	background-color: #f9fbfc;
+	.allot-list {
+		margin-top: 20upx;
+		flex: 1;
+		padding-bottom: 30upx;
+		.allot-item {
+			margin-bottom: 1upx;
+			padding: 30upx;
+			display: flex;
+			align-items: center;
+
+			box-shadow: 0upx 1upx 0upx 0upx #eeeeee;
+			background-color: #fff;
+			.info {
+				flex: 1;
+				margin-right: 20upx;
+				.info-order {
+					font-size: 32upx;
+					font-weight: 600;
+					color: #333333;
+				}
+				.info-name {
+					margin: 20upx 0 20upx;
+					font-size: 28upx;
+					font-weight: 400;
+					color: #666666;
+				}
+				.info-time {
+					margin-right: 30upx;
+					font-size: 28upx;
+					font-weight: 400;
+					color: #666666;
+				}
+			}
+			.status {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				flex-shrink: 0;
+				width: 100upx;
+				color: #cccccc;
+				.status-name {
+					margin-top: 10upx;
+					font-size: 24upx;
+				}
+				.iconfont {
+					font-size: 46upx;
+				}
+				&.primary {
+					color: #3385ff;
+				}
+				&.gray {
+					color: #cccccc;
+				}
+				&.warn {
+					color: #ffaf1d;
+				}
+			}
+		}
+	}
+}
+</style>

hdApp/src/api/order/index.js

@@ -210,3 +210,5 @@ export const thirdSend = data => https.get("/order/third-send", data);
 export const selfSend = data => https.get("/order/self-send", data);
 
 export const reachOrder = data => https.get("/order/reach", data);
+
+export const getScanPayList = data => https.get("/scan-pay/list", data);

hdApp/src/pages.json

@@ -411,7 +411,8 @@
 				{ "path": "workOrder", "style": { "navigationBarTitleText": "开单" } },
 				{ "path": "modify", "style": { "navigationBarTitleText": "修改" } },
 				{ "path": "clearRemind","style": {"navigationBarTitleText": "如何查看还有多少待结订单"}},
-				{ "path": "itemOrder","style": {"navigationBarTitleText": "订单列表"}}
+				{ "path": "itemOrder","style": {"navigationBarTitleText": "订单列表"}},
+				{ "path": "scanPay","style": {"navigationBarTitleText": "收款码流水"}}
 			]
 		},
 		{