From 4fe41eec79849c2dc9276c626c98a53865fcc402 Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 29 Jul 2021 18:52:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80=E8=AE=A2=E5=8D=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3(=E5=BE=85?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=81=94=E8=B0=83)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api.js       |  7 ++++++-
 pages/user/user.vue | 43 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/common/api.js b/common/api.js
index 2486592..256be39 100644
--- a/common/api.js
+++ b/common/api.js
@@ -33,8 +33,13 @@ export const API_BUYAGREE = '/api/agent_info/buy_protocol'; //购买协议
 
 export const API_CONFIRMDETAILS = '/api/order/price'; //确认购买商品详情
 
-export const API_CREATEORDER = '/api/order/create'; //创建订单
+export const API_CREATEORDER = '/api/order/create'; //创建订单并支付
 
+export const API_ORDERPAY = '/api/order/pay'; //订单页面支付
+
+
+
+export const API_CONFIRM_CODE = '/api/verification/verify'; //核销订单
 
 export const API_MESSAGELIST = '/api/message/list'; //消息列表
 export const API_MESSAGEDETAILS = '/api/message/show'; //消息详情
diff --git a/pages/user/user.vue b/pages/user/user.vue
index fa2eb04..750395d 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -67,6 +67,22 @@
 				<button class="feedback-btn" open-type="contact"></button>
 			</view>
 		</view>
+		<!-- 商家工具 -->
+		<view class="shop-list" v-if="userInfo.verifier == 1">
+			<view class="lf-row-between">
+				<view class="lf-font-36 lf-font-bold">商家工具</view>
+			</view>
+			<view class="lf-row-between list-item" hover-class="lf-opacity" @click="chargeOff">
+				<view class="lf-row-center">
+					<image class="icon-img" src="../../static/center/order.png"></image>
+					<text class="lf-text-vertical lf-m-l-20 lf-font-28 lf-color-black">卡券核销</text>
+				</view>
+				<view>
+					<text class="lf-iconfont lf-icon-xiangyou lf-text-vertical"></text>
+				</view>
+			</view>
+		</view>
+		
 		<view class="lf-p-t-35" style="background-color: #F6F6F6;">
 			<!-- <view class="lf-p-t-40 lf-p-b-20 text-center details-title">
 				
@@ -129,6 +145,24 @@
 			}
 		},
 		methods: {
+			// 卡券核销
+			chargeOff(){
+				uni.scanCode({
+					complete: result => {
+						console.log("resuly", result)
+						if(result.errMsg == 'scanCode:ok'){
+							let content = result.result; // 核销码
+							this.$http(this.API.API_CONFIRM_CODE, {id: content}).then(res => {
+								this.$msg('核销成功!');
+								let order_id = res.data.id;
+								time = setTimeout(() => {
+									this.$url('/pages/shopOrder/order-details?order_id='+ order_id);
+								}, 1000);
+							});
+						}
+					}
+				})
+			},
 			// 检查当前用户登录状态
 			verifyUserInfo(){
 				let userInfo = uni.getStorageSync('userinfo') || {};
@@ -247,4 +281,13 @@
 		left: 0;
 		z-index: -1;
 	}
+	.shop-list{
+		margin-top: 20rpx;
+		width: 750rpx;
+		height: auto;
+		background-color: #FFFFFF;
+		padding: 0 32rpx;
+		padding-bottom: 0;
+		box-sizing: border-box;
+	}
 </style>