he2802 3 år sedan
förälder
incheckning
f5df51faa2
3 ändrade filer med 40 tillägg och 2 borttagningar
  1. 7 0
      common/httpList/order.js
  2. 1 1
      common/request.js
  3. 32 1
      pages2/order/index.vue

+ 7 - 0
common/httpList/order.js

@@ -33,4 +33,11 @@ export default {
 			data: data
 		})
 	},
+	resumeSmallOrder(data) {
+		return myRequest({
+			url: '/order/resumeSmallOrder',
+			method: 'post',
+			data: data
+		})
+	}
 }

+ 1 - 1
common/request.js

@@ -4,7 +4,7 @@ import store from '@/store/index.js'
 import api from './api.js'
 var num = 1
 
-export const BASE_URL = 'http://192.168.1.222:5055' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
+export const BASE_URL = 'http://42.192.164.187:19005' //接口api  http://42.192.164.187:19005 http://192.168.1.222:5055
 
 
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/' //图片上传api  'https://file.xyyxt.net/

+ 32 - 1
pages2/order/index.vue

@@ -30,7 +30,7 @@
 							<text style="color:#ff2d55;font-size: 30rpx;font-weight: bold;">¥{{ item.payPrice }}</text>
 						</view>
 						<view style="display: flex;align-items: center;">
-							<view class="btn2" v-if="item.orderStatus === 0">继续支付</view>
+							<view class="btn2" v-if="item.orderStatus === 0" @click="resumeOrder(item)">继续支付</view>
 							<view class="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2">重新购买</view>
 							<view class="btn2" v-if="item.orderStatus === 1 || item.orderStatus === 2">退款</view>
 							<view class="btn1" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="delOrder(item)">删除订单</view>
@@ -93,6 +93,37 @@ export default {
 		this.getFY();
 	},
 	methods: {
+		resumeOrder(item){
+			let data = {orderSn:item.orderSn}
+			this.$api.resumeSmallOrder(data).then(res => {
+				if(res.data.code==200){
+					let data = res.data.data
+					uni.requestPayment({
+					    provider: data.provider,
+					    nonceStr: data.nonceStr,
+					    package: data.package,
+					    signType: data.signType,
+					    paySign: data.sign,
+						timeStamp: String(data.timeStamp),
+					    success: function (res) {
+							uni.redirectTo({
+							    url: '/pages2/order/confirm_success?sn='+data.orderSn
+							});
+					        console.log('success:' + JSON.stringify(res));
+					    },
+					    fail: function (err) {
+					        console.log('fail:' + JSON.stringify(err));
+					    }
+					});
+				}else{
+					uni.showModal({
+						title: "提示",
+						content: res.data.msg,
+						showCancel: false
+					})
+				}
+			});
+		},
 		openPopup() {},
 		//删除订单
 		delOrder(item) {