From d2a97c734b82a7745a95c71ba27d05b15b297700 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Sun, 8 May 2022 01:55:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E5=9F=BA?=
 =?UTF-8?q?=E7=A1=80=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/BsPay.vue                    |  77 ++++++++++++++++++
 components/UiLineBox.vue                |   0
 components/UiRadio.vue                  |  10 +++
 layouts/default.vue                     |   4 +-
 pages/order/detail/index.vue            |  10 +++
 pages/order/payResult.vue               |  14 ++++
 pages/order/submit/index.vue            | 102 +++++++++++++++++++++++-
 pages/order/submit/module/OrderInfo.vue |   5 +-
 plugins/api/order.js                    |  13 +--
 plugins/api/wx.js                       |  17 ++++
 plugins/axiosTk.js                      |  18 ++++-
 plugins/storeStorage.js                 |   2 +-
 store/index.js                          |   4 +-
 13 files changed, 259 insertions(+), 17 deletions(-)
 create mode 100644 components/BsPay.vue
 create mode 100644 components/UiLineBox.vue
 create mode 100644 components/UiRadio.vue
 create mode 100644 pages/order/detail/index.vue
 create mode 100644 pages/order/payResult.vue
 create mode 100644 plugins/api/wx.js

diff --git a/components/BsPay.vue b/components/BsPay.vue
new file mode 100644
index 0000000..e29a13e
--- /dev/null
+++ b/components/BsPay.vue
@@ -0,0 +1,77 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-05-08 00:39:50
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-08 01:49:59
+ * @Description: file content
+-->
+<template>
+	<el-dialog :visible="visible" title="打开微信扫描付款" @open="getCodeImg" @close="close">
+		<div>
+			<span v-if="startSecondNum">{{timeTips}}</span>
+			<div class="code-img">
+				<img :src="imgUrl" v-if="imgUrl"/>
+				<p v-if="!startSecondNum">已超时，请重新下单</p>
+			</div>
+			<p>如支付后没有自动跳转，请点击 <span>完成付款</span></p>
+		</div>
+	</el-dialog>
+</template>
+<script>
+import {ApiPostPayCdoeImg} from '@/plugins/api/wx'
+export default {
+	props : {
+		visible : {
+			type : Boolean,
+			default : false
+		},
+		orderId : {
+			type : Number | String,
+			default : ''
+		},
+		money : {
+			type : String | Number,
+			default : 0
+		}
+	},
+	data(){
+		return {
+			imgUrl : '',
+			timeTips : '',
+			timerStop : null,
+			startSecondNum : 1800
+		}
+	},
+	methods : {
+		async getCodeImg(){
+			this.timerStop = null;
+			const {error, result} = await ApiPostPayCdoeImg({orderId : this.orderId});
+			if(error){
+				return false;
+			}
+			// 待支付 开始倒计时
+			if(this.timerStop){
+				clearTimeout(this.timerStop);
+			}
+			this.timer();
+			this.imgUrl = result.dataInfo.codeImgData;
+		},
+		/**
+		 * 待付款的倒计时
+		 */
+		timer(){
+			if(this.startSecondNum === 0){
+				return false
+			}
+			this.startSecondNum--;
+			let minute = parseInt(this.startSecondNum / 60);
+			let second = parseInt(this.startSecondNum % 60);
+			this.timeTips = `剩余${minute > 0 ? `${minute}分` : ''} ${second}秒`;
+			this.timerStop = setTimeout(()=>this.timer(),1000)
+		},
+		close(){
+			this.$emit('cancel');
+		}
+	}
+}
+</script>
\ No newline at end of file
diff --git a/components/UiLineBox.vue b/components/UiLineBox.vue
new file mode 100644
index 0000000..e69de29
diff --git a/components/UiRadio.vue b/components/UiRadio.vue
new file mode 100644
index 0000000..d409acf
--- /dev/null
+++ b/components/UiRadio.vue
@@ -0,0 +1,10 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-05-07 22:57:24
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-07 22:57:39
+ * @Description: file content
+-->
+<template>
+	<el-radio/>
+</template>
\ No newline at end of file
diff --git a/layouts/default.vue b/layouts/default.vue
index ba34c1a..4a373e2 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:56:39
  * @LastEditors: ch
- * @LastEditTime: 2022-05-04 21:19:27
+ * @LastEditTime: 2022-05-07 23:02:34
  * @Description: file content
 -->
 <template>
@@ -21,7 +21,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.layout-center {
+.layout-box {
   width: 1200px;
   margin: 0 auto;
 }
diff --git a/pages/order/detail/index.vue b/pages/order/detail/index.vue
new file mode 100644
index 0000000..7cb5044
--- /dev/null
+++ b/pages/order/detail/index.vue
@@ -0,0 +1,10 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-05-08 01:14:03
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-08 01:14:31
+ * @Description: file content
+-->
+<template>
+	<div>订单详情页</div>
+</template>
\ No newline at end of file
diff --git a/pages/order/payResult.vue b/pages/order/payResult.vue
new file mode 100644
index 0000000..588f05c
--- /dev/null
+++ b/pages/order/payResult.vue
@@ -0,0 +1,14 @@
+<!--
+ * @Author: ch
+ * @Date: 2022-05-08 01:11:33
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-08 01:11:40
+ * @Description: file content
+-->
+<template>
+	<div>
+		<p>支付成功</p>
+		<button>返回首页</button>
+		<button>查看订单</button>
+	</div>
+</template>
\ No newline at end of file
diff --git a/pages/order/submit/index.vue b/pages/order/submit/index.vue
index cc35f91..552c77a 100644
--- a/pages/order/submit/index.vue
+++ b/pages/order/submit/index.vue
@@ -2,22 +2,118 @@
  * @Author: ch
  * @Date: 2022-05-04 17:30:58
  * @LastEditors: ch
- * @LastEditTime: 2022-05-04 17:31:12
+ * @LastEditTime: 2022-05-08 01:17:18
  * @Description: file content
 -->
 
 <template>
-	<div>我是订单提交页</div>
+	<div style="padding-top:350px">
+		<h3 class="title">支付方式</h3>
+		<div class="pay-type">
+			<el-radio label="微信支付" />
+			<el-radio label="支付宝支付" />
+		</div>
+		<div v-for="item in orderInfo.products" :key="item.productId">
+			<div>{{item.productName}}</div>
+		</div>
+		<button @click="submit">立即支付</button>
+		<BsPay :visible.sync="payVisible" :orderId="orderId" @cancel="cancelPay"/>
+	</div>
 </template>
 <script>
+import {ApiPostSubmitOrder, ApiGetBeforeOrder, ApiGetBeforeCartOrder} from '@/plugins/api/order';
+import BsPay from '../../../components/BsPay.vue';
 export default {
+	components: { BsPay },
 	data(){
 		return {
+			address : {id:3},
+			orderInfo : {},
+			orderId : '',
+			payVisible : false
+		}
+	},
+	created(){
+		this.getBeforeOrder();
+	},
+	methods : {
+		/**
+		 * 获取预订单信息，将要提交的订单信息
+		 */
+		async getBeforeOrder(){
+			const query = this.$route.query;
+			let res = {};
+			// 购物车结算
+			if(query.mode === 'cart'){
+				res = await ApiGetBeforeCartOrder({
+					cartIds: query.ids,
+					recipientAddressId : this.address.id
+				})
+			}
+			// 立即购买
+			if(query.mode === 'buyNow'){
+				res = await ApiGetBeforeOrder({
+					productSkuId : query.skuId,
+					quantity : query.num,
+					activityId : query.activityId,
+					activityTimeId : query.activityTimeId,
+					// 1正常购买 2活动购买
+					activityType : query.activityType,
+					recipientAddressId : this.address.id
+				});
+			}
+			if(res.error){
+				this.$message.error(res.error.message);
+				return false;
+			}
+			this.orderInfo = res.result;
+
+
+		},
+		/**
+		 * 提交订单
+		 */
+		async submit(){
+			const {query} = this.$route;
 			
+			if(!this.address.id){
+				this.$message.error('请选择收货地址');
+				return false;
+			}
+			const {error, result} = await ApiPostSubmitOrder({
+				orderSource :  4,
+				recipientAddressId : this.address.id,
+				shoppingCartIds : query.ids ? query.ids.split(',') : [],
+				products : this.orderInfo.products.map(i => ({
+					activityId : query.activityId,
+					activityTimeId : query.activityTimeId,
+					productId : i.productId,
+					productSkuId : i.productSkuId,
+					quantity : i.quantity,
+					activityType : query.activityType
+				})),
+				userMessage : this.userMessage
+			});
+			if(error){
+				this.$message.error(error.message);
+				return false;
+			}
+			this.payVisible = true;
+			this.orderId = result.orderId;
+
+		},
+		cancelPay(){
+			this.$router.replace('/order/detail')
 		}
 	}
 }
 </script>
 <style lang="scss" scoped>
-
+.title{
+	margin: 24px 0 13px;
+}
+.pay-type{
+	border: 1px solid #DDDDDD;
+	padding: 30px 70px;
+}
 </style>
\ No newline at end of file
diff --git a/pages/order/submit/module/OrderInfo.vue b/pages/order/submit/module/OrderInfo.vue
index 3ed4bdc..c2ea61e 100644
--- a/pages/order/submit/module/OrderInfo.vue
+++ b/pages/order/submit/module/OrderInfo.vue
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:36:46
  * @LastEditors: ch
- * @LastEditTime: 2022-05-04 17:49:58
+ * @LastEditTime: 2022-05-07 22:42:40
  * @Description: file content
 -->
 
@@ -15,7 +15,8 @@ export default {
 		return {
 			
 		}
-	}
+	},
+	
 }
 </script>
 <style lang="scss" scoped>
diff --git a/plugins/api/order.js b/plugins/api/order.js
index 95ae5cb..d40289a 100644
--- a/plugins/api/order.js
+++ b/plugins/api/order.js
@@ -4,10 +4,11 @@
  * @Author: ch
  * @Date: 2022-05-04 18:17:25
  * @LastEditors: ch
- * @LastEditTime: 2022-05-07 10:29:48
+ * @LastEditTime: 2022-05-07 23:27:49
  * @Description: file content
  */
 import {axiosTk} from "../axiosTk";
+import {ToAsyncAwait} from "@/plugins/utils";
 import ENV from '../config/env';
 
 const BASE_URL = `${ENV.base_url}/mall/trade`;
@@ -19,20 +20,20 @@ const APPID = 'wx0643970a8e86d028';
  * @param {*} params 
  */
 export const ApiGetOrderList = (params) => 
-	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/page`, params));
+	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/page`, {params}));
 /**
  * 获取立即购买预订单
  * @param {*} data 
  */
-export const ApiGetBeforeOrder = (data) =>
-	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/buyAdvanceOrder`, data));
+export const ApiGetBeforeOrder = (params) =>
+	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/buyAdvanceOrder`, {params}));
 
 /**
  * 获取购物车预订单
  * @param {*} data 
  */
-export const ApiGetBeforeCartOrder = (data) =>
-	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/cartAdvanceOrder`, data));
+export const ApiGetBeforeCartOrder = (params) =>
+	ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/cartAdvanceOrder`, {params}));
 
 /**
  * 订单详情
diff --git a/plugins/api/wx.js b/plugins/api/wx.js
new file mode 100644
index 0000000..c8c691c
--- /dev/null
+++ b/plugins/api/wx.js
@@ -0,0 +1,17 @@
+/*
+ * @Author: ch
+ * @Date: 2022-05-08 00:44:22
+ * @LastEditors: ch
+ * @LastEditTime: 2022-05-08 00:47:55
+ * @Description: file content
+ */
+
+
+import {axiosTk} from "../axiosTk";
+import {ToAsyncAwait} from "@/plugins/utils";
+import ENV from '../config/env';
+
+const BASE_URL = `${ENV.base_url}/mall/trade`;
+
+export const ApiPostPayCdoeImg = (data) => 
+	ToAsyncAwait(axiosTk.post(`${BASE_URL}/pay/wxPay/nativeImage`, data));
\ No newline at end of file
diff --git a/plugins/axiosTk.js b/plugins/axiosTk.js
index 96b6ff1..ffb6c11 100644
--- a/plugins/axiosTk.js
+++ b/plugins/axiosTk.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-04 17:11:07
  * @LastEditors: ch
- * @LastEditTime: 2022-05-04 21:50:14
+ * @LastEditTime: 2022-05-07 23:59:45
  * @Description: file content
  */
 let axiosTk = null;
@@ -15,6 +15,22 @@ export default function ({$axios, store}, inject) {
 		config.headers.Authorization = store.state.token;
 		return config;
 	});
+	$axiosTk.onResponse(response => {
+		const result = response.data;
+		if(response.status === 200){
+			if(result.code === 'SUCCESS'){
+				return result.data;
+			}
+			if(result.code === 'TOKEN_FAIL'){
+				alert('这里要弹登录')
+				store.commit('SET_TOKEN', '');
+				return result;
+			}
+			return Promise.reject(result);
+		}
+		return Promise.reject({message:'请求出错'});
+		
+	  });
 	inject('$axiosTk', $axiosTk);
 	axiosTk = $axiosTk;
 	
diff --git a/plugins/storeStorage.js b/plugins/storeStorage.js
index 74b8697..de3fab4 100644
--- a/plugins/storeStorage.js
+++ b/plugins/storeStorage.js
@@ -4,7 +4,7 @@
  * @Author: ch
  * @Date: 2022-05-04 21:15:17
  * @LastEditors: ch
- * @LastEditTime: 2022-05-07 11:05:11
+ * @LastEditTime: 2022-05-07 22:33:57
  * @Description: 服务端没有localStorage对象，在Sotre中不能直接取值，在plugins中统一为state做一次初始取值处理
  */
 import { TOKEN } from "./config/sotrageKey";
diff --git a/store/index.js b/store/index.js
index c7c6892..d8dd686 100644
--- a/store/index.js
+++ b/store/index.js
@@ -2,11 +2,11 @@
  * @Author: ch
  * @Date: 2022-05-04 20:35:20
  * @LastEditors: ch
- * @LastEditTime: 2022-05-04 21:39:42
+ * @LastEditTime: 2022-05-07 22:33:28
  * @Description: file content
  */
 
-import { TOKEN } from "../plugins/config/localKey";
+import { TOKEN } from "@/plugins/config/sotrageKey";
 
 
 export const state = () => ({