WIN-2CJ8FMUT9OF\Administrator 8 месяцев назад
Родитель
Сommit
4645b67aaf
3 измененных файлов с 28 добавлено и 13 удалено
  1. 3 0
      api/shop_order.js
  2. 2 1
      index.html
  3. 23 12
      pages/index/index.vue

+ 3 - 0
api/shop_order.js

@@ -2,5 +2,8 @@ import {request} from '../service/ajax.js'
 
 const newsUrl = '/api/shop_order/'
 
+//订单详情
 export const shopOrderInfo = (data) => request(newsUrl + 'order_info', 'post', { ...data },false)
 
+//订单未支付时请求该接口
+export const shopAutomaticCancel = (data) => request(newsUrl + 'automatic_cancel', 'post', { ...data },false)

+ 2 - 1
index.html

@@ -7,7 +7,8 @@
 			content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
 		<meta name="viewport"
 			content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover" />
-
+		<meta name="viewport"
+			content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, text-size-adjust=100%">
 		<title>振合网</title>
 
 		<!--preload-links-->

+ 23 - 12
pages/index/index.vue

@@ -5,22 +5,22 @@
 				¥
 			</view>
 			<view class="sys-color-547BFA sys-size-64 sys-weight-bold">
-				{{orderInfo.pay_money}}
+				{{orderInfo.pay_money || '0.00'}}
 			</view>
 		</view>
 		<view class="align-items-center flex-justify-center cg-box">
-			<uni-icons class="mr-10" type="checkbox-filled" size="25" color="#547BFA"></uni-icons>
+			<uni-icons v-if="orderInfo.status === 1" class="mr-10" type="checkbox-filled" size="25" color="#547BFA"></uni-icons>
+			<uni-icons v-else class="mr-10" type="clear" size="25" color="#FF0000"></uni-icons>
 			<view class="">
-				支付成功
+				{{orderInfo.status === 1?'支付成功':'支付失败'}}
 			</view>
 		</view>
 		<view class="align-items-center flex-justify-space mb-20">
-			
 			<view class="sys-color-AD flex-shrink0 mr-20">
 				商户名称
 			</view>
 			<view class="sys-size-28">
-				{{orderInfo.shop_name}}
+				{{orderInfo.shop_name || '无'}}
 			</view>
 		</view>
 		<view class="align-items-center flex-justify-space mb-20">
@@ -28,10 +28,10 @@
 				订单号
 			</view>
 			<view class="sys-size-28">
-				{{orderInfo.rs_sn}}
+				{{orderInfo.rs_sn || '无'}}
 			</view>
 		</view>
-<!-- 		<view class="align-items-center flex-justify-space mb-64">
+		<!-- 		<view class="align-items-center flex-justify-space mb-64">
 			<view class="sys-color-AD flex-shrink0 mr-20">
 				交易流水号
 			</view>
@@ -49,15 +49,14 @@
 
 <script>
 	import {
-		shopOrderInfo
+		shopOrderInfo,
+		shopAutomaticCancel
 	} from '@/api/shop_order';
 	export default {
 		components: {},
 		data() {
 			return {
-				orderInfo:{
-					
-				}
+				orderInfo: {}
 			}
 		},
 		onLoad(data) {
@@ -67,7 +66,7 @@
 			};
 			var postData = JSON.stringify(mchData);
 			parent.postMessage(postData, "https://payapp.weixin.qq.com");
-			if(data.order_sn) {
+			if (data.order_sn) {
 				this.shopOrderInfo(data.order_sn)
 			}
 		},
@@ -79,6 +78,9 @@
 				}).then((res) => {
 					if (res.code === 1) {
 						this.orderInfo = res.data
+						if (res.data.status === 1) {
+							this.shopAutomaticCancel(res.data.rs_sn)
+						}
 					}
 				})
 			},
@@ -89,6 +91,15 @@
 				}
 				var postData = JSON.stringify(mchData)
 				parent.postMessage(postData, 'https://payapp.weixin.qq.com')
+			},
+			shopAutomaticCancel(order_sn) {
+				shopAutomaticCancel({
+					order_sn: order_sn
+				}).then((res) => {
+					if (res.code === 1) {
+						console.log(res, 'ok');
+					}
+				})
 			}
 		}
 	}