diff --git a/api/order.js b/api/order.js
index 23ec45b..0d313cd 100644
--- a/api/order.js
+++ b/api/order.js
@@ -121,6 +121,7 @@ export function orderDel(uni) {
  * @param string uni 
  */
 export function getOrderDetail(uni) {
+	console.log(uni,'uniuni');
 	return request.get('order/detail/' + uni);
 }
 
diff --git a/components/payment/index.vue b/components/payment/index.vue
index 40133f5..46c1c67 100644
--- a/components/payment/index.vue
+++ b/components/payment/index.vue
@@ -50,24 +50,25 @@
 		},
 		data() {
 			return {
-				formContent:'',
-				payChannel:'',
+				formContent: '',
+				payChannel: '',
 				//支付方式
-				payMode: [{
-						"name": "微信支付",
-						"icon": "icon-weixin2",
-						value: 'weixin',
-						title: '微信快捷支付',
-						payStatus: 1,
-					},
-					{
-						"name": "余额支付",
-						"icon": "icon-yuezhifu",
-						value: 'yue',
-						title: '可用余额:',
-						payStatus: 1,
-						number: 0
-					},
+				payMode: [
+					// {
+					// 	"name": "微信支付",
+					// 	"icon": "icon-weixin2",
+					// 	value: 'weixin',
+					// 	title: '微信快捷支付',
+					// 	payStatus: 1,
+					// },
+					// {
+					// 	"name": "余额支付",
+					// 	"icon": "icon-yuezhifu",
+					// 	value: 'yue',
+					// 	title: '可用余额:',
+					// 	payStatus: 1,
+					// 	number: 0
+					// },
 					// #ifndef MP
 					{
 						"name": "支付宝支付",
@@ -78,12 +79,19 @@
 					}
 					// #endif
 				],
+				openId: '',
+				checkid: '',
+				isAli: false,
 			};
 		},
-		computed: mapGetters(['systemPlatform','userInfo','productType']),
-		created(){
+		computed: mapGetters(['systemPlatform', 'userInfo', 'productType']),
+		created() {
 			this.payConfig();
 			this.payMode[1].number = this.userInfo.nowMoney;
+		
+		},
+		mounted() {
+				this.importAliPayScript(); // 导入支付宝脚本
 		},
 		methods: {
 			close: function() {
@@ -91,12 +99,105 @@
 					action: 'payClose'
 				});
 			},
-			payConfig(){
-				getPayConfig().then(res=>{
+			payConfig() {
+				getPayConfig().then(res => {
 					this.payMode[1].payStatus = parseInt(res.data.yuePayStatus) === 1 ? 1 : 2;
 					this.payMode[0].payStatus = parseInt(res.data.payWeixinOpen) === 1 ? 1 : 0;
 				})
 			},
+			// 导入 my 对象所需的脚本
+			importAliPayScript() {
+				if (navigator.userAgent.indexOf('AliApp') > -1) {
+					this.isAli = true
+					const scriptElement = document.createElement('script');
+					scriptElement.src = 'https://appx/web-view.min.js';
+					document.head.appendChild(scriptElement);
+					// this.listenMessageFromMiniProgram(); // 监听来自小程序的消息
+
+				}
+			},
+			// 发送消息给小程序
+			sendMessageToMiniProgram() {
+				my.postMessage({
+					name: "测试支付"
+				});
+			},
+			// 监听来自小程序的消息
+			listenMessageFromMiniProgram() {
+				my.onMessage = (e) => {
+					if (e.type == 'authorizeResult') {
+						this.openId = e.data.data.alipaySystemOauthTokenResponse.openId
+					}
+					// console.log(e.data.data.alipaySystemOauthTokenResponse, 'aaaa'); // 在这里处理来自小程序的消息
+				};
+			},
+			aliPay(id) {
+				console.log('支付宝小程序支付');
+				let that = this
+				console.log(that.order_id, 'idididiid');
+
+				my.tradePay({
+					tradeNO: that.order_id,
+					success: (res) => {
+						uni.hideLoading();
+						this.alipayQueryPay()
+						// my.alert({
+						// 	content: JSON.stringify(res),
+						// });
+
+						// setTimeout(res => {
+						// 	that.$emit('onChangeFun', {
+						// 		action: 'pay_complete'
+						// 	});
+						// }, 2000)
+					},
+					fail: (error) => {
+						uni.hideLoading();
+						// that.stopPolling()
+						uni.showModal({
+							content: "支付失败",
+							showCancel: false,
+							success: function(res) {
+								if (res.confirm) {
+									//点击确认的操作
+									that.$emit('onChangeFun', {
+										action: 'pay_fail'
+									});
+								} else if (res.cancel) {
+									// ji
+								}
+							}
+						})
+						// console.error('调用 my.tradePay 失败: ', JSON.stringify(error));
+					},
+				});
+			},
+			alipayQueryPay() {
+			
+				let id = this.checkid
+				alipayQueryPayResult(id).then(res => {
+					if (res.data == true) {
+				
+						uni.navigateTo({
+							url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
+								id +
+								'&payChannel=' +
+								'appAlipay'
+						})
+					} else {
+						setTimeout(() => {
+							this.alipayQueryPay()
+						}, 1000);
+					}
+					if (res.data == null) {
+						setTimeout(() => {
+							this.alipayQueryPay()
+						}, 1000);
+					}
+				}).catch(err => {
+			
+				})
+			},
 			goPay: function(number, paytype) {
 				let that = this;
 				let goPages = '/pages/order_pay_status/index?order_id=' + that.order_id;
@@ -110,18 +211,18 @@
 					title: '支付中'
 				});
 				// #ifdef H5
-				if(paytype == 'alipay'){
+				if (paytype == 'alipay') {
 					that.payChannel = 'alipay';
-				}else if(paytype == 'weixin' && this.$wechat.isWeixin()){
+				} else if (paytype == 'weixin' && this.$wechat.isWeixin()) {
 					that.payChannel = 'public';
-				}else{
+				} else {
 					that.payChannel = 'weixinh5';
 				}
 				// #endif
 				// #ifdef APP-PLUS
-				if(paytype == 'alipay'){
+				if (paytype == 'alipay') {
 					that.payChannel = 'appAliPay';
-				}else if(paytype == 'weixin'){
+				} else if (paytype == 'weixin') {
 					that.payChannel = that.systemPlatform === 'ios' ? 'weixinAppIos' : 'weixinAppAndroid';
 				}
 				// #endif
@@ -131,16 +232,19 @@
 					payChannel: 'routine',
 					// #endif
 					// #ifndef MP
-					payChannel:that.payChannel,
+					payChannel: that.payChannel,
 					// #endif
 					payType: paytype,
-					scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
+					isAli: that.isAli,
+					// scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
 				}).then(res => {
 					let jsConfig = res.data.jsConfig;
 					that.order_id = res.data.orderNo;
+					that.order_id = res.data.tradeNo;
+					that.checkid = res.data.orderNo
 					switch (res.data.payType) {
 						case 'weixin':
-						that.weixinPay(jsConfig);
+							that.weixinPay(jsConfig);
 							break;
 						case 'yue':
 							uni.hideLoading();
@@ -167,55 +271,75 @@
 							});
 							break;
 						case 'alipay':
-							//#ifdef H5
-							if (this.$wechat.isWeixin()) {
-								//微信公众号内支付
-							} else {
-								//h5支付
-								uni.hideLoading();
-								that.formContent = res.data.alipayRequest;
-								uni.setStorage({key: 'orderNo', data:that.order_id});
-								that.$nextTick(() => {
-									document.forms['punchout_form'].submit();
-								})
-							}
-							//#endif
-							// #ifdef APP-PLUS
-							let alipayRequest = res.data.alipayRequest;
-							uni.requestPayment({
-								provider: 'alipay',
-								orderInfo: alipayRequest,
-								success: (e) => {
-									uni.showToast({
-										title: "支付成功"
-									})
-									setTimeout(res => {
-										that.$emit('onChangeFun', {
-											action: 'pay_complete'
-										});
-									}, 2000)
-								},
-								fail: (e) => {
-									uni.showModal({
-										content: "支付失败",
-										showCancel: false,
-										success: function(res) {
-											if (res.confirm) {
-												//点击确认的操作
-												that.$emit('onChangeFun', {
-													action: 'pay_fail'
-												});
-											} else if (res.cancel) {
-												
-											}
-										}
-									})
-								},
-								complete: () => {
+							if (that.isAli == false) {
+								if (this.$wechat.isWeixin()) {
+									//微信公众号内支付
+								} else {
+									//h5支付
+									console.log('进入h5支付宝');
 									uni.hideLoading();
-								},
-							});
-							// #endif
+									that.formContent = res.data.alipayRequest;
+									uni.setStorage({
+										key: 'orderNo',
+										data: that.order_id
+									});
+									that.$nextTick(() => {
+										document.forms['punchout_form'].submit();
+									})
+									this.alipayQueryPay()
+								}
+							} else {
+								this.aliPay(that.order_id)
+							}
+							// //#ifdef H5
+							// if (this.$wechat.isWeixin()) {
+							// 	//微信公众号内支付
+							// } else {
+							// 	//h5支付
+							// 	uni.hideLoading();
+							// 	that.formContent = res.data.alipayRequest;
+							// 	uni.setStorage({key: 'orderNo', data:that.order_id});
+							// 	that.$nextTick(() => {
+							// 		document.forms['punchout_form'].submit();
+							// 	})
+							// }
+							// //#endif
+							// // #ifdef APP-PLUS
+							// let alipayRequest = res.data.alipayRequest;
+							// uni.requestPayment({
+							// 	provider: 'alipay',
+							// 	orderInfo: alipayRequest,
+							// 	success: (e) => {
+							// 		uni.showToast({
+							// 			title: "支付成功"
+							// 		})
+							// 		setTimeout(res => {
+							// 			that.$emit('onChangeFun', {
+							// 				action: 'pay_complete'
+							// 			});
+							// 		}, 2000)
+							// 	},
+							// 	fail: (e) => {
+							// 		uni.showModal({
+							// 			content: "支付失败",
+							// 			showCancel: false,
+							// 			success: function(res) {
+							// 				if (res.confirm) {
+							// 					//点击确认的操作
+							// 					that.$emit('onChangeFun', {
+							// 						action: 'pay_fail'
+							// 					});
+							// 				} else if (res.cancel) {
+
+							// 				}
+							// 			}
+							// 		})
+							// 	},
+							// 	complete: () => {
+							// 		uni.hideLoading();
+							// 	},
+							// });
+							// // #endif
 							break;
 					}
 				}).catch(err => {
@@ -229,57 +353,57 @@
 					});
 				})
 			},
-			weixinPay(jsConfig){
+			weixinPay(jsConfig) {
 				let that = this;
 				// #ifdef MP
-                uni.requestOrderPayment({
-                    timeStamp: jsConfig.timeStamp,
-                    nonceStr: jsConfig.nonceStr,
-                    package: jsConfig.packages,
-                    signType: jsConfig.signType,
-                    paySign: jsConfig.paySign,
-                    ticket: jsConfig.ticket,
-                    success: function(ress) {
-                        uni.hideLoading();
-                        wechatQueryPayResult(that.order_id).then(res => {
-                            uni.hideLoading();
-                            return that.$util.Tips({
-                                title: "支付成功",
-                                icon: 'success'
-                            }, () => {
-                                that.$emit('onChangeFun', {
-                                    action: 'pay_complete'
-                                });
-                            });
-                        }).cache(err => {
-                            uni.hideLoading();
-                            return that.$util.Tips({
-                                title: err
-                            });
-                        })
-                    },
-                    fail: function(e) {
-                        uni.hideLoading();
-                        return that.$util.Tips({
-                            title: '取消支付'
-                        }, () => {
-                            that.$emit('onChangeFun', {
-                                action: 'pay_fail'
-                            });
-                        });
-                    },
-                    complete: function(e) {
-                        uni.hideLoading();
-                        if (e.errMsg == 'requestPayment:cancel') return that.$util
-                            .Tips({
-                                title: '取消支付'
-                            }, () => {
-                                that.$emit('onChangeFun', {
-                                    action: 'pay_fail'
-                                });
-                            });
-                    },
-                })
+				uni.requestOrderPayment({
+					timeStamp: jsConfig.timeStamp,
+					nonceStr: jsConfig.nonceStr,
+					package: jsConfig.packages,
+					signType: jsConfig.signType,
+					paySign: jsConfig.paySign,
+					ticket: jsConfig.ticket,
+					success: function(ress) {
+						uni.hideLoading();
+						wechatQueryPayResult(that.order_id).then(res => {
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: "支付成功",
+								icon: 'success'
+							}, () => {
+								that.$emit('onChangeFun', {
+									action: 'pay_complete'
+								});
+							});
+						}).cache(err => {
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: err
+							});
+						})
+					},
+					fail: function(e) {
+						uni.hideLoading();
+						return that.$util.Tips({
+							title: '取消支付'
+						}, () => {
+							that.$emit('onChangeFun', {
+								action: 'pay_fail'
+							});
+						});
+					},
+					complete: function(e) {
+						uni.hideLoading();
+						if (e.errMsg == 'requestPayment:cancel') return that.$util
+							.Tips({
+								title: '取消支付'
+							}, () => {
+								that.$emit('onChangeFun', {
+									action: 'pay_fail'
+								});
+							});
+					},
+				})
 				// #endif
 				// #ifdef H5
 				let datas = {
@@ -313,7 +437,7 @@
 							});
 						})
 					}
-				
+
 				}).cache(errW => {
 					uni.hideLoading();
 					return that.$util.Tips({
@@ -462,4 +586,4 @@
 		font-size: 0.3rpx;
 		color: #999;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/components/productWindow/index.vue b/components/productWindow/index.vue
index 268913d..c6e8703 100644
--- a/components/productWindow/index.vue
+++ b/components/productWindow/index.vue
@@ -41,7 +41,7 @@
 					</view>
 				</view>
 				<!-- 分期方案 -->
-				<view class="periodization">
+				<view class="periodization" v-if='false'>
 					<text class="fangan">分期方案</text>
 					<view class="returnthedate" v-for="(item,index) in fenqlist" :key="index">
 						<a href="javascript:;" :v-model="indexs" :class="indexs === index ? 'actives' : ''"
diff --git a/config/app.js b/config/app.js
index af7fec1..07bf5d2 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,7 +1,7 @@
 //移动端商城API
 // let domain = 'http://117.50.163.143:20410'
 // let domain = 'http://117.50.215.20:20410'  
-// let domain = 'http://192.168.2.26:20411' 		
+// let domain = 'http://192.168.2.35:20411' 		
 // let domain = 'http://106.75.49.247:20410' 
 let domain = 'https://yruibao.com/prod'		
 module.exports = {
diff --git a/libs/order.js b/libs/order.js
index f6b606e..b5195b7 100644
--- a/libs/order.js
+++ b/libs/order.js
@@ -29,15 +29,24 @@ export function goShopDetail(item, uid) {
 /**
  * 活动商品、普通商品、购物车、再次购买预下单
  */
-export function getPreOrder(preOrderType, orderDetails) {
+export function getPreOrder(preOrderType, orderDetails,type) {
+	console.log(type,'preOrderTypepreOrderType');
 	return new Promise((resolve, reject) => {
 		preOrderApi({
 			"preOrderType": preOrderType,
 			"orderDetails": orderDetails
 		}).then(res => {
-			uni.navigateTo({
-				url: '/pages/users/order_confirm/index?preOrderNo=' + res.data.preOrderNo
-			});
+			if(type==0){
+				uni.navigateTo({
+					url: '/pages/users/order_confirm/index?preOrderNo=' + res.data.preOrderNo
+				});
+			}else if(type==1){
+				console.log('判断2');
+				uni.navigateTo({
+					url: '/pages/users/order_confirms/index?preOrderNo=' + res.data.preOrderNo
+				});
+			}
+			
 		}).catch(err => {
 			return util.Tips({
 				title: err
diff --git a/pages.json b/pages.json
index 0d8f9ac..21cd345 100644
--- a/pages.json
+++ b/pages.json
@@ -541,6 +541,20 @@
 						}
 					}
 				},
+				{
+					"path": "order_confirms/index",
+					"style": {
+						"navigationBarTitleText": "提交订单",
+						// "navigationStyle": "custom",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
+					}
+				},
 				{
 					"path": "order_improves/index",
 					"style": {
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index c3e9b5d..36a7229 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -228,9 +228,12 @@
 					<view class="bnt acea-row skeleton-rect" v-else>
 						<form @submit="joinCart" report-submit="true"><button class="joinCart bnts"
 								form-type="submit"></button></form>
-					<form @submit="goBuy" report-submit="true"><button class="buy bnts"
+					<form @submit="goBuy(1)" report-submit="true"><button class="buy bnts" style="width: 200rpx;margin-right: 20rpx;"
 								form-type="submit">先享后付</button>
 					</form>
+					<form @submit="goBuys(0)" report-submit="true"><button class="buy bnts" style="width: 200rpx;"
+								form-type="submit">立即购买</button>
+					</form>
 					</view>
 				</block>
 				<view class="bnt bntVideo acea-row skeleton-rect"
@@ -540,6 +543,7 @@
 				fenqlist:[],//分期
 				isshim:false,
 				stause:false,
+				types:0,
 			};
 		},
 		computed: mapGetters(['isLogin', 'uid', 'chatUrl', 'productType']),
@@ -1391,6 +1395,7 @@
 								title: '您有正在进行的订单，请还款后再继续'
 							});
 						}else{
+							this.types=0
 							this.goCat(0);
 						}
 						
@@ -1408,6 +1413,10 @@
 					
 				}
 			}),
+			goBuys(){
+				this.types=1
+				this.goCat(0);
+			},
 			/**
 			 * 预下单
 			 */
@@ -1416,7 +1425,7 @@
 					"attrValueId": parseFloat(this.attr.productSelect.unique),
 					"productId": parseFloat(this.id),
 					"productNum": parseFloat(this.attr.productSelect.cart_num)
-				}]);
+				}],this.types);
 				// console.log(JSON.stringify(this.$Order))
 				this.isOpen = false;
 			},
diff --git a/pages/users/alipay_return/alipay_return.vue b/pages/users/alipay_return/alipay_return.vue
index 1638a42..28ce489 100644
--- a/pages/users/alipay_return/alipay_return.vue
+++ b/pages/users/alipay_return/alipay_return.vue
@@ -1,1711 +1,251 @@
 <template>
 	<view :data-theme="theme">
-		<!-- #ifndef APP-PLUS-->
-		<view v-if="productType==='video'" class='cart_nav'>
-			<nav-bar :navTitle='navTitle' @getNavH='getNavH'></nav-bar>
+		<view class='payment-status'>
+			<!--失败时： 用icon-iconfontguanbi fail替换icon-duihao2 bg-color-->
+			<view class='iconfont icons icon-duihao2 bg_color'
+				v-if="order_pay_info.paid === 1"></view>
+			<view v-if="order_pay_info.paid === 2" class='iconfont icons icon-iconfontguanbi'></view>
+			<!-- 失败时：订单支付失败 -->
+			<view class='status'>{{payResult}}</view>
+			<view class='wrapper'>
+				<view class='item acea-row row-between-wrapper'>
+					<view>订单编号</view>
+					<view class='itemCom'>{{orderId}}</view>
+				</view>
+				<view class='item acea-row row-between-wrapper'>
+					<view>下单时间</view>
+					<view class='itemCom'>{{order_pay_info.createTime?order_pay_info.createTime:'-'}}</view>
+				</view>
+				<view class='item acea-row row-between-wrapper'>
+					<view>支付方式</view>
+					<view class='itemCom'>支付宝支付</view>
+				</view>
+				<view class='item acea-row row-between-wrapper'>
+					<view>支付金额</view>
+					<view class='itemCom'>{{order_pay_info.payPrice}}</view>
+				</view>
+				<!--失败时加上这个  -->
+				<view class='item acea-row row-between-wrapper'
+					v-if="order_pay_info.paid === 2">
+					<view>失败原因</view>
+					<view class='itemCom'>{{msg}}</view>
+				</view>
+			</view>
+			<!--失败时： 重新购买 -->
+			<view @tap="goOrderDetails">
+				<button formType="submit" class='returnBnt bg_color' hover-class='none'>查看订单</button>
+			</view>
+			<button @click="goIndex" class='returnBnt cart-color' formType="submit" hover-class='none'>返回首页</button>
 		</view>
-
-		<!-- #endif -->
-		<view class='order-submission' :style="'margin-top:'+(marTop)+'rpx;'">
-			<view class="allAddress" :style="store_self_mention ? '':'padding-top:0;'">
-				<view class="nav acea-row">
-					<view class="item font_color" :class="shippingType == 0 ? 'on' : 'on2'" @tap="addressType(0)"
-						v-if='store_self_mention'></view>
-					<view class="item font_color" :class="shippingType == 1 ? 'on' : 'on2'" @tap="addressType(1)"
-						v-if='store_self_mention'></view>
-				</view>
-				<view class='address acea-row row-between-wrapper' @tap='onAddress' v-if='shippingType == 0'
-					:style="store_self_mention ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
-					<view class='addressCon' v-if="addressInfo.realName">
-						<view class='name'>{{addressInfo.realName}}
-							<text class='phone'>{{addressInfo.phone}}</text>
-						</view>
-						<view class="acea-row">
-							<text class='default font_color' v-if="addressInfo.isDefault">[默认]</text>
-							<text
-								class="line2">{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}}</text>
-						</view>
-					</view>
-					<view class='addressCon' v-else>
-						<view class='setaddress'>设置收货地址</view>
-					</view>
-					<view class='iconfont icon-jiantou'></view>
-
-				</view>
-
-				<view class='address acea-row row-between-wrapper' v-else @tap="showStoreList">
-					<block v-if="storeList.length>0">
-						<view class='addressCon'>
-							<view class='name'>{{system_store.name}}
-								<text class='phone'>{{system_store.phone}}</text>
-							</view>
-							<view class="line1"> {{system_store.address}}{{", " + system_store.detailedAddress}}
-							</view>
-						</view>
-						<view class='iconfont icon-jiantou'></view>
-					</block>
-					<block v-else>
-						<view>暂无门店信息</view>
-					</block>
-				</view>
-				<view class='line'>
-					<image src='/static/images/line.jpg'></image>
-				</view>
-			</view>
-
-
-
-			<view class="pad30">
-				<!-- 完善身份信息 -->
-				<view class="identity" @click="btnimprovess">
-					<view class="lt">
-						<image src="https://img.51miz.com/Element/00/77/81/22/fcdde517_E778122_151271f0.png" mode="">
-						</image>
-					</view>
-					<view class="cen">
-						<text>完善身份信息 &nbsp;&nbsp;{{sfxx}}</text>
-						<text>填写资料 加速审核</text>
-					</view>
-					<view class="rt">
-						<uni-view data-v-064d693c="" style="font-size: 19px;" class="iconfont icon-jiantou"></uni-view>
-					</view>
-				</view>
-				<!-- 邮箱 -->
-				<!-- <view class="emils">
-					<text>邮箱</text> <input type="text" v-model="emitext" placeholder="请输入您的个人邮箱(必填)" />
-				</view> -->
-
-
-				<orderGoods :cartInfo="cartInfo" :orderProNum="orderProNum"></orderGoods>
-				<view class='wrapper borRadius14'>
-					<view class='item acea-row row-between-wrapper' @tap='couponTap'
-						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
-						<view>优惠券</view>
-						<view class='discount'>{{couponTitle}}
-							<text class='iconfont icon-jiantou'></text>
-						</view>
-					</view>
-
-					<view class='item acea-row row-between-wrapper'
-						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
-						<view>积分抵扣</view>
-						<view class='discount acea-row row-middle'>
-							<view> {{useIntegral ? "剩余积分":"当前积分"}}
-								<text
-									class='num font_color'>{{useIntegral ? orderInfoVo.surplusIntegral : orderInfoVo.userIntegral || 0}}</text>
-							</view>
-							<checkbox-group @change="ChangeIntegral">
-								<checkbox :checked='useIntegral ? true : false'
-									:disabled="orderInfoVo.userIntegral==0 && !useIntegral" @click="btnjf" />
-							</checkbox-group>
-						</view>
-					</view>
-					<!-- <view class='item acea-row row-between-wrapper'
-						v-if="priceGroup.vipPrice > 0 && userInfo.vip && !pinkId && !BargainId && !combinationId && !seckillId">
-						<view>会员优惠</view>
-						<view class='discount'>-￥{{priceGroup.vipPrice}}</view>
-					</view> -->
-					<view class='item acea-row row-between-wrapper' v-if='shippingType==0'>
-						<view>快递费用</view>
-						<view class='discount' v-if='parseFloat(orderInfoVo.freightFee) > 0'>
-							+￥{{orderInfoVo.freightFee}}
-						</view>
-						<view class='discount' v-else>免运费</view>
-					</view>
-					<view v-else>
-						<view class="item acea-row row-between-wrapper">
-							<view>联系人</view>
-							<view class="discount textR">
-								<input type="text" placeholder="请填写您的联系姓名" placeholder-style="color:#ccc;"
-									placeholder-class="placeholder" @blur='realName' maxlength="20"></input>
-							</view>
-						</view>
-						<view class="item acea-row row-between-wrapper">
-							<view>联系电话</view>
-							<view class="discount textR">
-								<input type="number" placeholder="请填写您的联系电话" placeholder-style="color:#ccc;"
-									placeholder-class="placeholder" @blur='phone' maxlength="11"></input>
-							</view>
-						</view>
-					</view>
-
-					<view class='item acea-row row-between-wrapper'>
-						<view>商品总价：</view>
-						<view class='money'>￥{{orderInfoVo.proTotalFee || 0}}</view>
-					</view>
-					<view class='item' v-if="textareaStatus">
-						<view class="flex justify-between">
-							<view>备注信息</view>
-							<view>
-								<text style="color:#666;">{{markNum ? markNum : 150}}</text>/<text>150</text>
-							</view>
-						</view>
-						<textarea v-if="coupon.coupon===false" placeholder-class='placeholder' @input='bindHideKeyboard'
-							value="" name="mark" placeholder='请添加备注（150字以内）'></textarea>
-					</view>
-				</view>
-				<view class='wrapper borRadius14' v-if="orderInfoVo.payFee != 0">
-					<view class='item'>
-						<a @click="btnment">
-							<view class="planjh">
-								<text>分期计划</text>
-								<view class="datejt"><text class="detewz">{{installmentobj.name}}</text><uni-view
-										data-v-064d693c="" class="iconfont icon-jiantou"></uni-view></view>
-							</view>
-						</a>
-						<view class="planjh">
-							<text>首付金额</text>
-							<view class="datejt"><text class="detewzs">￥{{downPaymentAmount}}</text></view>
-						</view>
-						<view class="planjh">
-							<text>还款周期(间隔)</text>
-							<view class="datejt"><text class="detewzs">{{fenqiobj.cycle}}天</text></view>
-						</view>
-						<view class="planjh">
-							<text>还款期数</text>
-							<view class="datejt"><text class="detewzs">{{fenqiobj.downPaymentNumber}}</text></view>
-						</view>
-						<view class="planjh">
-							<text>每期还款</text>
-							<view class="datejt"><text class="detewzs">￥{{fenqiobj.repaymentAmount}}</text></view>
-						</view>
-						<view class="planjh">
-							<text>合计付款</text>
-							<view class="datejt"><text class="detewzs">￥{{totalAmount}}</text></view>
-						</view>
-						<!-- 支付方式 -->
-						<!-- <view>支付方式</view>
-						<view class='list'>
-							<view class='payItem acea-row row-middle' :class='active==index ?"on":""'
-								@tap='payItem(index)' v-for="(item,index) in cartArr" :key='index'
-								v-if="item.payStatus==1">
-								<view class='name acea-row row-center-wrapper'>
-									<view class='iconfont animated'
-										:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'>
-									</view>
-									{{item.name}}
-								</view>
-								<view class='tip'>{{item.title}}</view>
-							</view>
-						</view> -->
-					</view>
-				</view>
-				<view class='moneyList borRadius14'>
-					<!-- 增值服务 -->
-					<view class='addedservice'>
-						<view>增值服务：</view>
-						<view class='money'>￥0.00</view>
-					</view>
-					<view class='addedservices'>
-						<view>暂无：</view>
-						<view class='money'>￥0.00</view>
-					</view>
-
-					<view class='item acea-row row-between-wrapper' v-if="orderInfoVo.couponFee > 0">
-						<view>优惠券抵扣：</view>
-						<view class='money'>-￥{{orderInfoVo.couponFee}}</view>
-					</view>
-					<view class='item acea-row row-between-wrapper' v-if="orderInfoVo.deductionPrice > 0">
-						<view>积分抵扣：</view>
-						<view class='money'>-￥{{orderInfoVo.deductionPrice}}</view>
-					</view>
-					<view class='item acea-row row-between-wrapper' v-if="orderInfoVo.freightFee > 0">
-						<view>运费：</view>
-						<view class='money'>+￥{{orderInfoVo.freightFee}}</view>
-					</view>
-				</view>
-				<view style='height:200rpx;'></view>
-			</view>
-
-			<view class='footer acea-row row-between-wrapper'>
-				<view class="readbox">
-					<checkbox :v-model="checkeds" @click="btncheaced" />
-					<view class="readtx">
-						我已阅读并同意<text>《隐私协议》</text>、<text>《租赁服务协议》</text>、<text>《用户协议》</text>、<text>《意外保障协议》</text>
-					</view>
-				</view>
-				<view>合计:
-					<text class='price_color'>￥{{orderInfoVo.payFee || 0}}</text>
-				</view>
-				<view class='settlement' style='z-index:100' @tap="SubOrder">立刻申请</view>
-			</view>
-
-		</view>
-		<view class="alipaysubmit" v-html="formContent"></view>
-		<couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" :openType='openType'
-			@ChangCoupons="ChangCoupons" :orderShow="orderShow"></couponListWindow>
 	</view>
 </template>
+
 <script>
-	import{
-		getidentity
-	}from '@/api/myapi.js'
-	import {
-		getinstallment,
-	} from '@/api/api.js'
-	import {
-		getCouponsOrderPrice,
-		orderCreate,
-		postOrderComputed,
-		orderPay,
-		wechatQueryPayResult,
-		loadPreOrderApi
-	} from '@/api/order.js';
-	import {
-		getAddressDetail,
-		getAddressDefault
-	} from '@/api/user.js';
-	import {
-		openPaySubscribe,
-		openOrderSubscribe
-	} from '@/utils/SubscribeMessage.js';
-	import {
-		storeListApi
-	} from '@/api/store.js';
-	import {
-		CACHE_LONGITUDE,
-		CACHE_LATITUDE
-	} from '@/config/cache.js';
-	import couponListWindow from '@/components/couponListWindow';
-	import orderGoods from '@/components/orderGoods';
-	import navBar from '@/components/navBar';
-	import {
-		toLogin
-	} from '@/libs/login.js';
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		Debounce
-	} from '@/utils/validate.js'
-	import {
-		login
-	} from '../../../api/public';
+	import {getOrderDetail,alipayQueryPayResult} from '@/api/order.js';
 	let app = getApp();
-	export default {
-		components: {
-			navBar,
-			couponListWindow,
-			orderGoods,
-		},
-		onReady() {
-			this.$nextTick(function() {
-				// #ifdef MP
-				const menuButton = uni.getMenuButtonBoundingClientRect();
-				const query = uni.createSelectorQuery().in(this);
-				query
-					.select('#home')
-					.boundingClientRect(data => {
-						this.homeTop = menuButton.top * 2 + menuButton.height - data.height;
-					})
-					.exec();
-				// #endif
-			});
-		},
+	export default{
 		data() {
 			return {
-				marTop: 0,
-				navTitle: '提交订单',
-				homeTop: 20,
-				orderShow: 'orderShow', //下单页面使用优惠券组件不展示tab切换页
-				textareaStatus: true,
-				//支付方式
-				cartArr: [{
-						"name": "微信支付",
-						"icon": "icon-weixin2",
-						value: 'weixin',
-						title: '微信快捷支付',
-						payStatus: 1,
-					},
-					{
-						"name": "余额支付",
-						"icon": "icon-yuezhifu",
-						value: 'yue',
-						title: '可用余额:',
-						payStatus: 1,
-					},
-					// #ifndef MP
-					{
-						"name": "支付宝支付",
-						"icon": "icon-zhifubao",
-						value: 'alipay',
-						title: '支付宝快捷支付',
-						payStatus: 1,
-					}
-					// #endif
-				],
-				payType: 'weixin', //支付方式
-				openType: 1, //优惠券打开方式 1=使用
-				active: 0, //支付方式切换
-				coupon: {
-					coupon: false,
-					list: [],
-					statusTile: '立即使用'
-				}, //优惠券组件
-				addressInfo: {}, //地址信息
-				addressId: 0, //地址id
-				couponId: 0, //优惠券id
-				cartId: '', //购物车id
-				userInfo: {}, //用户信息
-				mark: '', //备注信息
-				couponTitle: '请选择', //优惠券
-				coupon_price: 0, //优惠券抵扣金额
-				useIntegral: false, //是否使用积分
-				integral_price: 0, //积分抵扣金额
-				integral: 0,
-				ChangePrice: 0, //使用积分抵扣变动后的金额
-				formIds: [], //收集formid
+				orderId: '',
+				payPrice:'',
+				order_pay_info: {
+					paid: 0,
+					_status: {}
+				},
+				isAuto: false, //没有授权的不会自动授权
+				isShowAuth: false, //是否隐藏授权
 				status: 0,
-				is_address: false,
-				toPay: false, //修复进入支付时页面隐藏从新刷新页面
-				shippingType: 0,
-				system_store: {},
-				storePostage: 0,
-				contacts: '',
-				contactsTel: '',
-				mydata: {},
-				storeList: [],
-				store_self_mention: false,
-				cartInfo: [],
-				priceGroup: {},
-				animated: false,
-				totalPrice: 0,
-				integralRatio: "0",
-				orderKey: "",
-				// usableCoupon: {},
-				offlinePostage: "",
-				payChannel: '',
-				news: true,
-				again: false,
-				addAgain: false,
-				bargain: false, //是否是砍价
-				combination: false, //是否是拼团
-				secKill: false, //是否是秒杀
-				orderInfoVo: {},
-				addressList: [], //地址列表数据
-				orderProNum: 0,
-				preOrderNo: '', //预下单订单号
-				shopobj: {},
-				theme: app.globalData.theme,
-				formContent: '',
-				addressChangeId: 0,
-				emitext: '', //邮箱文本
-				installmentid: '', //分期id
-				fenqiname: '',
-				installmentarr: [],
-				checkeds: false,
-				timeString: '',
-				shopmey: 0,
-				orderNo: '',
-				sfxx: '未完成',
-				fenqiobj: {}, //分期还款信息
-				installmentobj: {},
-				downPaymentAmount: 0,
-				totalAmount: 0,
-                identification:{}, //获取是否存有身份信息	
-			    zongmey:'',
-				
-
+				msg: '',
+				payResult: '订单查询中...',
+				payTime:'',
+				theme:app.globalData.theme,
 			};
 		},
-		computed: {
-			...mapGetters(['isLogin', 'systemPlatform', 'productType']),
-			markNum() {
-				let markNum = 0;
-				if (this.mark) {
-					markNum = 150 - this.mark.length
-					return markNum
-				}
-			},
-		},
-		watch: {
-			isLogin: {
-				handler: function(newV, oldV) {
-					if (newV) {
-						this.getloadPreOrder();
-					}
-				},
-				deep: true
-			}
-		},
-		onLoad(options) {
+		onLoad(e){
 			// #ifdef H5
-			this.payChannel = this.$wechat.isWeixin() ? 'public' : 'weixinh5';
-			// #endif 
-			// #ifdef MP
-			this.payChannel = 'routine';
-			// #endif
-			// #ifdef APP-PLUS
-			this.payChannel = this.systemPlatform === 'ios' ? 'weixinAppIos' : 'weixinAppAndroid';
-			// #endif
-			// if (!options.cartId) return this.$util.Tips({
-			// 	title: '请选择要购买的商品'
-			// }, {
-			// 	tab: 3,
-			// 	url: 1
-			// });
-			this.preOrderNo = options.preOrderNo || 0;
-			this.addressChangeId = options.addressId || 0;
-			this.is_address = options.is_address ? true : false;
-			if (this.isLogin) {
-				this.getloadPreOrder();
-			} else {
-				toLogin();
-			}
-
-			// this.installmentid = JSON.parse(localStorage.getItem('installments')).id
-			// this.fenqiname = JSON.parse(localStorage.getItem('installments')).name
-			this.installmentobj = JSON.parse(this.$Cache.get('installments'))
-			
-		},
-		/**
-		 * 生命周期函数--监听页面显示
-		 */
-		onShow: function() {
-			// console.log(this.$Cache.get('improvescode'))
-			this.getidentityq()
-			let _this = this
-			// wx.getLaunchOptionsSync 
-			this.textareaStatus = true;
-
-			uni.$on("handClick", res => {
-				if (res) {
-					_this.system_store = res.address
-				}
-				// 清除监听
-				uni.$off('handClick');
-			})
-
-
-
-		},
-		methods: {
-			// 页面加载请求分期计划
-			getinstallmentpost: function() {
-				let data = {
-					payFee: this.zongmey,
-					// uid: this.$store.getters.uid,
-					comboId: this.installmentobj.id
-				}
-				getinstallment(data).then(res => {
-					this.fenqiobj = res.data
-					this.downPaymentAmount = res.data.downPaymentAmount
-					this.totalAmount = res.data.totalAmount
-					this.installmentarr = res.data.userInstallmentBills
-					this.downPaymentAmount = parseFloat(this.downPaymentAmount).toFixed(2)
-					this.totalAmount = parseFloat(this.totalAmount).toFixed(2)
-				})
-			},
-			// 点击积分重新请求
-			btnjf(){
-				// this.zongmey = this.orderInfoVo.payFee
-				this.getinstallmentpost()
-			},
-			
-			
-			// 跳转到分期计划
-			btnment() {
-				uni.navigateTo({
-					url: '/pages/users/installment/index?list=' + JSON.stringify(this.installmentarr) + '&cart=' +
-						JSON.stringify(this.cartInfo) + '&fenqiobj=' + JSON.stringify(this.fenqiobj)
-				})
-			},
-			// 点击跳转到完善信息页面
-			btnimprovess() {
-				uni.navigateTo({
-					url: '/pages/users/order_improves/index?identification=' + JSON.stringify(this.identification),
-				})
-			},
-
-			getNavH(marTop) {
-				this.marTop = marTop;
-			},
-			// 订单详情
-			getloadPreOrder: function() {
-				loadPreOrderApi(this.preOrderNo).then(res => {
-					let orderInfoVo = res.data.orderInfoVo;
-					this.zongmey = orderInfoVo.payFee
-					// console.log(this.zongmey,11)
-					this.getinstallmentpost()
+			// var url = window.location.search;
+			// if(url){
+			// 	var theRequest = new Object();
+			// 	if (url.indexOf("?") != -1) {
+			// 	    var str = url.substr(1);
+			// 	    var strs = str.split("&");
+			// 	    for (var i = 0; i < strs.length; i++) {
+			// 			theRequest[strs[i].split('=')[0]] = decodeURI(strs[i].split('=')[1]);
+			// 	    }
+			// 	}
+			// 	// this.orderId = theRequest.out_trade_no; //返回的订单号
 				
-					
-					this.orderInfoVo = orderInfoVo;
-					this.shopmey = this.orderInfoVo.proTotalFee //商品金额
-					if (orderInfoVo.addressId && this.addressChangeId === 0) {
-						this.addressId = orderInfoVo.addressId;
-					} else {
-						this.addressId = this.addressChangeId;
-						if (orderInfoVo.addressId != this.addressChangeId) this.computedPrice();
-					}
-					this.cartInfo = orderInfoVo.orderDetailList;
-					this.orderProNum = orderInfoVo.orderProNum;
-					this.cartArr[1].title = '可用余额:' + orderInfoVo.userBalance;
-					this.cartArr[1].payStatus = parseInt(res.data.yuePayStatus) === 1 ? 1 : 2;
-					this.cartArr[0].payStatus = parseInt(res.data.payWeixinOpen) === 1 ? 1 : 0;
-					this.getaddressInfo();
-					// #ifdef H5
-					if (this.$wechat.isWeixin()) this.cartArr.pop();
-					// #endif
-					this.store_self_mention = res.data.storeSelfMention == '1' && this
-						.productType ===
-						'normal' ? true : false;
-				}).catch(err => {
-					// uni.navigateTo({
-					// 	url: '/pages/users/pay_success/index'
-					// });
-				})
-			},
-			/**
-			 * 获取门店列表数据
-			 */
-			getList: function() {
-				let longitude = uni.getStorageSync("user_longitude") ? uni.getStorageSync("user_longitude") : ''; //经度
-				let latitude = uni.getStorageSync("user_latitude") ? uni.getStorageSync("user_latitude") : ''; //纬度
-				let data = {
-					latitude: latitude, //纬度
-					longitude: longitude, //经度
-					page: 1,
-					limit: 10
-				}
-				storeListApi(data).then(res => {
-					let list = res.data.list || [];
-					this.$set(this, 'storeList', list);
-					this.$set(this, 'system_store', list[0]);
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					});
-				})
-			},
-			/*
-			 * 跳转门店列表
-			 */
-			showStoreList: function() {
-				if (this.storeList.length > 0) {
-					uni.navigateTo({
-						url: '/pages/users/goods_details_store/index'
-					})
-				}
-			},
-			// 计算订单价格
-			computedPrice: function() {
-				let shippingType = this.shippingType;
-				postOrderComputed({
-					addressId: this.addressId,
-					useIntegral: this.useIntegral ? true : false,
-					couponId: this.couponId,
-					shippingType: parseInt(shippingType) + 1,
-					preOrderNo: this.preOrderNo
-				}).then(res => {
-					let data = res.data;
-					this.orderInfoVo.couponFee = data.couponFee;
-					//赋值操作，userIntegral 当前积分，surplusIntegral 剩余积分
-					this.orderInfoVo.userIntegral = data.surplusIntegral;
-					this.orderInfoVo.deductionPrice = data.deductionPrice;
-					this.orderInfoVo.freightFee = data.freightFee;
-					this.orderInfoVo.payFee = data.payFee;
-					this.orderInfoVo.proTotalFee = data.proTotalFee;
-					this.orderInfoVo.useIntegral = data.useIntegral;
-					this.orderInfoVo.usedIntegral = data.usedIntegral;
-					this.orderInfoVo.surplusIntegral = data.surplusIntegral;
-					// console.log(this.orderInfoVo.payFee,11)
-					this.zongmey = this.orderInfoVo.payFee
-					this.getinstallmentpost()
-					
-				}).catch(err => {
-					return this.$util.Tips({
-						title: err
-					});
-				});
-			},
-			//选择地址还是门店自提
-			addressType: function(e) {
-				let index = e;
-				this.shippingType = parseInt(index);
-				this.computedPrice();
-				//调起获取定位信息
-				if (index == 1) {
-					this.getList();
-					this.$util.$L.getLocation();
-				}
-			},
-			bindPickerChange: function(e) {
-				let value = e.detail.value;
-				this.shippingType = value;
-				this.computedPrice();
-			},
-			ChangCouponsClone: function() {
-				this.$set(this.coupon, 'coupon', false);
-			},
-			/**
-			 * 处理点击优惠券后的事件
-			 * 
-			 */
-			ChangCoupons: function(e) {
-				// this.usableCoupon = e
-				// this.coupon.coupon = false
-				let index = e,
-					list = this.coupon.list,
-					couponTitle = '请选择',
-					couponId = 0;
-				for (let i = 0, len = list.length; i < len; i++) {
-					if (i != index) {
-						list[i].use_title = '';
-						list[i].isUse = 0;
-					}
-				}
-				if (list[index].isUse) {
-					//不使用优惠券
-					list[index].use_title = '';
-					list[index].isUse = 0;
-				} else {
-					//使用优惠券
-					list[index].use_title = '不使用';
-					list[index].isUse = 1;
-					couponTitle = list[index].name;
-					couponId = list[index].id;
-				}
-				this.couponTitle = couponTitle;
-				this.couponId = couponId;
-				this.$set(this.coupon, 'coupon', false);
-				this.$set(this.coupon, 'list', list);
-				this.computedPrice();
-			},
-			/**
-			 * 使用积分抵扣
-			 */
-			ChangeIntegral: function() {
-				this.useIntegral = !this.useIntegral;
-				this.computedPrice();
-			},
-			bindHideKeyboard: function(e) {
-				this.mark = e.detail.value;
-			},
-			/**
-			 * 获取当前金额可用优惠券
-			 * 
-			 */
-			getCouponList: function() {
-				getCouponsOrderPrice(this.preOrderNo).then(res => {
-					this.$set(this.coupon, 'list', res.data);
-					this.openType = 1;
-				});
-			},
-			/*
-			 * 获取默认收货地址或者获取某条地址信息
-			 */
-			getaddressInfo: function() {
-				if (this.addressId) {
-					getAddressDetail(this.addressId).then(res => {
-						if (res.data) {
-							res.data.isDefault = res.data.isDefault;
-							this.addressInfo = res.data || {};
-						}
-					})
-				}
-			},
-			payItem: function(e) {
-				let that = this;
-				let active = e;
-				that.active = active;
-				that.animated = true;
-				that.payType = that.cartArr[active].value;
-				// #ifdef H5
-				if (that.payType == 'alipay' && this.$wechat.isWeixin() == true) {
-					that.payChannel = 'public';
-				} else if (that.payType == 'alipay' && this.$wechat.isWeixin() == false) {
-					that.payChannel = 'weixinh5';
-				}
-				// #endif
-				// #ifdef APP-PLUS
-				if (that.payType == 'alipay') {
-					that.payChannel = 'appAliPay';
-				}
-				// #endif
-				//that.computedPrice();
-				setTimeout(function() {
-					that.car();
-				}, 500);
-			},
-			// 点击优惠卷
-			btnyhq(){
-				this.zongmey = this.orderInfoVo.payFee
-				console.log(111)
-				this.getinstallmentpost()
-			},
-			couponTap: function() {
-				this.coupon.coupon = true;
-				if (!this.coupon.list.length) this.getCouponList();
-			},
-			car: function() {
-				let that = this;
-				that.animated = false;
-			},
-			onAddress: function() {
-
-				uni.redirectTo({
-					url: '/pages/users/user_address_list/index?preOrderNo=' + this.preOrderNo
-				});
-			},
-			realName: function(e) {
-				this.contacts = e.detail.value;
-			},
-			phone: function(e) {
-				this.contactsTel = e.detail.value;
-			},
-			payment: function(data) {
-				let that = this;
-				// #ifdef MP
-				uni.checkBeforeAddOrder({
-					success(res) {
-						console.log("下单前置检查 成功：", JSON.stringify(res));
-						const traceId = res.data.traceId;
-						data.traceId = traceId;
-						that.onCreate(data);
-					},
-					fail(res) {
-						console.log("下单前置检查 失败：", JSON.stringify(res));
-					}
-				});
-				// #endif
-				// #ifndef MP
-				that.onCreate(data);
-				// #endif
-			},
-			onCreate(data) {
-				let that = this;
-				orderCreate(data).then(res => {
-					this.$Cache.set('ordernobh', res.data.orderNo)
-					that.getOrderPay(res.data.orderNo, '支付成功');
-				}).catch(err => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: err
-					}, );
-				});
-			},
-			// getOrderPay: function(orderNo, message) {
+			// 	this.getOrderPayInfo();
+			// }else{
+				 
+			// 	console.log('11111');
 			// 	let that = this;
-			// 	let goPages = '/pages/order_pay_status/index?order_id=' + orderNo;
-			// 	orderPay({
-			// 		orderNo: orderNo,
-			// 		payChannel: that.payChannel,
-			// 		payType: that.payType,
-			// 		scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
-			// 	}).then(res => {
-			// 		let jsConfig = res.data.jsConfig;
-			// 		switch (res.data.payType) {
-			// 			case 'weixin':
-			// 				that.weixinPay(jsConfig, orderNo, goPages);
-			// 				break;
-			// 			case 'yue':
-			// 				uni.hideLoading();
-			// 				return that.$util.Tips({
-			// 					title: message
-			// 				}, {
-			// 					tab: 5,
-			// 					url: goPages + '&status=1'
-			// 				});
-			// 				break;
-			// 			case 'weixinh5':
-			// 				uni.hideLoading();
-			// 				setTimeout(() => {
-			// 					location.href = jsConfig.mwebUrl + '&redirect_url=' +
-			// 						window.location
-			// 						.protocol + '//' + window.location.host + goPages +
-			// 						'&status=1';
-			// 				}, 100)
-			// 				break;
-			// 			case 'alipay':
-			// 				//#ifdef H5
-			// 				if (this.$wechat.isWeixin()) {
-			// 					uni.redirectTo({
-			// 						url: `/pages/users/alipay_invoke/index?id=${orderNo}&type=order`
-			// 					});
-			// 				} else {
-			// 					//h5支付
-			// 					uni.hideLoading();
-			// 					that.formContent = res.data.alipayRequest;
-			// 					uni.setStorage({
-			// 						key: 'orderNo',
-			// 						data: orderNo
-			// 					});
-			// 					that.$nextTick(() => {
-			// 						document.forms['punchout_form'].submit();
-			// 					})
-			// 				}
-			// 				//#endif
-			// 				// #ifdef APP-PLUS
-			// 				let alipayRequest = res.data.alipayRequest;
-			// 				uni.requestPayment({
-			// 					provider: 'alipay',
-			// 					orderInfo: alipayRequest,
-			// 					success: (e) => {
-			// 						uni.showToast({
-			// 							title: "支付成功"
-			// 						})
-			// 						setTimeout(res => {
-			// 							uni.navigateTo({
-			// 								url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
-			// 									orderNo +
-			// 									'&payChannel=' +
-			// 									'appAlipay'
-			// 							})
-			// 						}, 1000)
-			// 					},
-			// 					fail: (e) => {
-			// 						console.log(e, '失败');
-			// 						uni.showModal({
-			// 							content: "支付失败",
-			// 							showCancel: false,
-			// 							success: function(res) {
-			// 								if (res.confirm) {
-			// 									//点击确认的操作
-			// 									uni.navigateTo({
-			// 										url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
-			// 											orderNo +
-			// 											'&payChannel=' +
-			// 											'appAlipay'
-			// 									})
-			// 								}
-			// 							}
-			// 						})
-			// 					},
-			// 					complete: () => {
-			// 						uni.hideLoading();
-			// 					},
-			// 				});
-			// 				// #endif
-			// 				break;
-			// 		}
-			// 	}).catch(err => {
-			// 		uni.hideLoading();
-			// 		return that.$util.Tips({
-			// 			title: err
-			// 		});
+			// 	that.orderId = e.out_trade_no
+			// 	uni.getStorage({
+			// 	    key: 'orderNo',
+			// 	    success: function (res) {
+						
+			// 	        // that.orderId = res.data; //如果是支付宝中途放弃支付跳转到这个页面，就从缓存读取订单号查询订单详情和支付结果
+			// 			// that.orderId='order92934171248038859056274'
+			// 			setTimeout(()=>{
+			// 				that.getOrderPayInfo();
+			// 					// that.alipayQueryPay()
+			// 			},200)
+			// 	    }
 			// 	});
-			// },
-			weixinPay(jsConfig, orderNo, goPages) {
-				let that = this;
-				// #ifdef MP
-				if (that.productType === 'video') {
-					uni.requestOrderPayment({
-						timeStamp: jsConfig.timeStamp,
-						nonceStr: jsConfig.nonceStr,
-						package: jsConfig.packages,
-						signType: jsConfig.signType,
-						paySign: jsConfig.paySign,
-						ticket: jsConfig.ticket,
-						success: function(ress) {
-							uni.hideLoading();
-							openOrderSubscribe().then(() => {
-								if (that.orderInfoVo.bargainId || that.orderInfoVo
-									.combinationId || that
-									.pinkId || that.orderInfoVo.seckillId) {
-									return that.$util.Tips({
-										title: '支付成功',
-										icon: 'success'
-									}, {
-										tab: 4,
-										url: goPages
-									});
-								}
-								return that.$util.Tips({
-									title: '支付成功',
-									icon: 'success'
-								}, {
-									tab: 5,
-									url: goPages
-								}, );
-							})
-						},
-						fail: function(e) {
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: '取消支付'
-							}, {
-								tab: 5,
-								url: goPages + '&status=2'
-							});
-						},
-						complete: function(e) {
-							uni.hideLoading();
-							//关闭当前页面跳转至订单状态
-							if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
-								title: '取消支付'
-							}, {
-								tab: 5,
-								url: goPages + '&status=2'
-							});
-						},
-					})
-				} else {
-					uni.requestPayment({
-						timeStamp: jsConfig.timeStamp,
-						nonceStr: jsConfig.nonceStr,
-						package: jsConfig.packages,
-						signType: jsConfig.signType,
-						paySign: jsConfig.paySign,
-						//ticket: jsConfig.ticket,
-						success: function(ress) {
-							uni.hideLoading();
-							openOrderSubscribe().then(() => {
-								if (that.orderInfoVo.bargainId || that.orderInfoVo
-									.combinationId || that
-									.pinkId || that.orderInfoVo.seckillId) {
-									return that.$util.Tips({
-										title: '支付成功',
-										icon: 'success'
-									}, {
-										tab: 4,
-										url: goPages
-									});
-								}
-								return that.$util.Tips({
-									title: '支付成功',
-									icon: 'success'
-								}, {
-									tab: 5,
-									url: goPages
-								}, );
-							})
-						},
-						fail: function(e) {
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: '取消支付'
-							}, {
-								tab: 5,
-								url: goPages + '&status=2'
-							});
-						},
-						complete: function(e) {
-							uni.hideLoading();
-							//关闭当前页面跳转至订单状态
-							if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
-								title: '取消支付'
-							}, {
-								tab: 5,
-								url: goPages + '&status=2'
-							});
-						},
-					})
-				}
-
-				// #endif
-				// #ifdef H5
-				let data = {
-					timestamp: jsConfig.timeStamp,
-					nonceStr: jsConfig.nonceStr,
-					package: jsConfig.packages,
-					signType: jsConfig.signType,
-					paySign: jsConfig.paySign
-				};
-				that.$wechat.pay(data).then(res => {
-					if (res.errMsg == 'chooseWXPay:cancel') {
-						uni.hideLoading();
-						return that.$util.Tips({
-							title: '取消支付'
-						}, {
-							tab: 5,
-							url: goPages + '&status=2'
-						});
-					} else {
-						wechatQueryPayResult(orderNo).then(res => {
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: '支付成功',
-								icon: 'success'
-							}, {
-								tab: 5,
-								url: goPages
-							});
-						}).cache(err => {
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: err
-							});
-						})
-					}
-				}).cache(res => {
-					uni.hideLoading();
-					return that.$util.Tips({
-						title: '取消支付'
-					}, {
-						tab: 5,
-						url: goPages + '&status=2'
-					});
-				});
-				// #endif
-				// #ifdef APP-PLUS
-				uni.requestPayment({
-					provider: 'wxpay',
-					orderInfo: {
-						"appid": jsConfig.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
-						"noncestr": jsConfig.nonceStr, // 随机字符串
-						"package": "Sign=WXPay", // 固定值
-						"partnerid": jsConfig.partnerid, // 微信支付商户号
-						"prepayid": jsConfig.packages, // 统一下单订单号
-						"timestamp": Number(jsConfig.timeStamp), // 时间戳（单位：秒）
-						"sign": this.systemPlatform === 'ios' ? 'MD5' : jsConfig
-							.paySign // 签名，这里用的 MD5 签名
-					}, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
-					success: function(res) {
-						wechatQueryPayResult(orderNo).then(res => {
-							uni.hideLoading();
-							let url = '/pages/order_pay_status/index?order_id=' + orderNo +
-								'&msg=支付成功';
-							uni.showToast({
-								title: "支付成功"
-							})
-							setTimeout(res => {
-								uni.redirectTo({
-									url: url
-								})
-							}, 2000)
-						}).cache(err => {
-							uni.hideLoading();
-							return that.$util.Tips({
-								title: err
-							});
-						})
-					},
-					fail: function(err) {
-						uni.hideLoading();
-						let url = '/pages/order_pay_status/index?order_id=' + orderNo +
-							'&msg=支付失败';
-						uni.showModal({
-							content: "支付失败",
-							showCancel: false,
-							success: function(res) {
-								if (res.confirm) {
-									uni.redirectTo({
-										url: url
-									})
-								}
-							}
-						})
-					},
-					complete: (err) => {
-						uni.hideLoading();
-					}
-				});
-				// #endif
-			},
-
-			// 点击选中
-			btncheaced() {
-				if (this.checkeds) {
-					this.checkeds = false
-				} else {
-					this.checkeds = true
-				}
-			},
+			// }
+			// #endif
 			
-			// 查询是否进行过身份保存
-			getidentityq:function(){
-				let data = {
-					uid: this.$store.getters.uid
-				}
-				getidentity(data).then(res=>{
-					if (res.message == '操作成功' && res.data != '') {
-						this.sfxx = '已完成'
-						this.identification = res.data
+			// #ifdef APP-PLUS
+			console.log(e);
+			
+		
+			// #endif
+			this.orderId = e.out_trade_no;
+			this.getOrderPayInfo();
+		},
+		methods:{
+			getOrderPayInfo: function() { 
+				let that = this;
+				uni.showLoading({
+					title: '正在加载中'
+				});
+				console.log(that.orderId,'that.orderIdthat.orderId');
+				getOrderDetail(that.orderId).then(res => {
+					that.$set(that, 'order_pay_info', res.data);
+					if(res.data.paid === false){
+						that.alipayQueryPay();
+					}else{
+						that.payResult = '支付成功';
 					}
+					uni.hideLoading();
+				}).catch(err => {
+					uni.hideLoading();
+				});
+			},
+			alipayQueryPay() {
+				alipayQueryPayResult(this.orderId).then(res => {
+					this.payResult = '支付成功';
+					uni.setNavigationBarTitle({
+						title: '支付成功'
+					});
+					this.order_pay_info.paid = 1;
+					uni.hideLoading();
+				}).catch(err => {
+					this.order_pay_info.paid = 2;
+					this.payResult = err;
+					this.msg = err;
+					uni.hideLoading();
+					return this.$util.Tips({
+						title: err
+					});
 				})
 			},
-			
-			// 立即申请
-			SubOrder(e) {
-				let that = this,
-					data = {};
-				var aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
-				if (this.checkeds == false) {
-					return this.$util.Tips({
-						title: '请勾选并同意政策'
-					});
-				} else if (this.sfxx == '未完成') {
-					return this.$util.Tips({
-						title: '请填写身份信息'
-					});
-				} else if(!that.addressId && !that.shippingType){
-					return that.$util.Tips({
-					 		title: '请选择收货地址'
-						});
-				}else{
-					data = {
-						realName: that.contacts,
-						phone: that.contactsTel,
-						addressId: that.addressId,
-						couponId: that.couponId,
-						payType: 'fenqi',
-						useIntegral: that.useIntegral,
-						preOrderNo: that.preOrderNo,
-						mark: that.mark,
-						storeId: that.system_store.id || 0,
-						shippingType: that.$util.$h.Add(that.shippingType, 1),
-						payChannel: that.payChannel,
-						uid: this.$store.getters.uid,
-						systemInstallmentsComboId: this.installmentobj.id,
-						type: 2,
-					};
-					if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
-						return that.$util.Tips({
-							title: '余额不足！'
-						});
-					uni.showLoading({
-						title: '订单支付中'
-					});
-					// #ifdef MP
-					openPaySubscribe().then(() => {
-						that.payment(data);
-					});
-					// #endif
-					// #ifndef MP
-					that.payment(data);
-					// #endif
-                    
-					// 获取当前时间
-					let now = new Date();
-					let year = now.getFullYear(); // 获取年份  
-					let month = now.getMonth() + 1; // 获取月份（注意，月份从0开始计数，所以需要加1）  
-					let day = now.getDate(); // 获取日期  
-					let shi = now.toLocaleTimeString(); // 获取本地时间字符串
-					this.timeString = year + '-' + month + '-' + day + ' ' + shi
-					this.shopobj.shopmey = this.orderInfoVo.payFee
-					this.shopobj.date = this.timeString
-					this.shopobj.orderNo = this.preOrderNo
-					console.log(this.shopobj)
-					uni.navigateTo({
-						url: '/pages/users/pay_success/index?shopobj=' + JSON.stringify(this.shopobj)
-					})
-				}
-
-
-				// uni.navigateTo({
-				// 	url: '/pages/users/purchase_succeed/index'
-				// })
-				// 	let that = this,
-				// 		data = {};
-				// 	if (!that.payType) return that.$util.Tips({
-				// 		title: '请选择支付方式'
-				// 	});
-				// 	if (!that.addressId && !that.shippingType) return that.$util.Tips({
-				// 		title: '请选择收货地址'
-				// 	});
-				// 	if (that.shippingType == 1) {
-				// 		if (that.contacts == "" || that.contactsTel == "") {
-				// 			return that.$util.Tips({
-				// 				title: '请填写联系人或联系人电话'
-				// 			});
-				// 		}
-				// 		if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(that.contactsTel)) {
-				// 			return that.$util.Tips({
-				// 				title: '请填写正确的手机号'
-				// 			});
-				// 		}
-				// 		if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(that.contacts)) {
-				// 			return that.$util.Tips({
-				// 				title: '请填写您的真实姓名'
-				// 			});
-				// 		}
-				// 		if (that.storeList.length == 0) return that.$util.Tips({
-				// 			title: '暂无门店,请选择其他方式'
-				// 		});
-				// 	}
-				// 	data = {
-				// 		realName: that.contacts,
-				// 		phone: that.contactsTel,
-				// 		addressId: that.addressId,
-				// 		couponId: that.couponId,
-				// 		payType: that.payType,
-				// 		useIntegral: that.useIntegral,
-				// 		preOrderNo: that.preOrderNo,
-				// 		mark: that.mark,
-				// 		storeId: that.system_store.id || 0,
-				// 		shippingType: that.$util.$h.Add(that.shippingType, 1),
-				// 		payChannel: that.payChannel
-
-				// 	};
-				// 	if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
-				// 		return that.$util.Tips({
-				// 			title: '余额不足！'
-				// 		});
-				// 	uni.showLoading({
-				// 		title: '订单支付中'
-				// 	});
-				// 	// #ifdef MP
-				// 	openPaySubscribe().then(() => {
-				// 		that.payment(data);
-				// 	});
-				// 	// #endif
-				// 	// #ifndef MP
-				// 	that.payment(data);
-				// 	// #endif
-				// }
+			goOrderDetails(){
+				uni.navigateTo({
+					url: '/pages/order_details/index?order_id=' + this.orderId
+				})
+			},
+			goIndex(){
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
 			}
 		}
 	}
 </script>
-
-<style lang="scss" scoped>
-	.font_color {
+<style lang="scss">
+	.icon-iconfontguanbi {
+		background-color: #999 !important;
+		text-shadow: none !important;
+	}
+	.bg_color{
+		@include main_bg_color(theme);
+	}
+	.cart_color{
 		@include main_color(theme);
-	}
-
-	.price_color {
-		@include price_color(theme);
-	}
-
-	.line2 {
-		width: 504rpx;
-	}
-
-	.textR {
-		text-align: right;
-	}
-
-	.order-submission .line {
-		width: 100%;
-		height: 3rpx;
-	}
-
-	.order-submission .line image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.order-submission .address {
-		padding: 28rpx;
-		background-color: #fff;
-		box-sizing: border-box;
-	}
-
-	.order-submission .address .addressCon {
-		width: 596rpx;
-		font-size: 26rpx;
-		color: #666;
-	}
-
-	.order-submission .address .addressCon .name {
-		font-size: 30rpx;
-		color: #282828;
-		font-weight: bold;
-		margin-bottom: 10rpx;
-	}
-
-	.order-submission .address .addressCon .name .phone {
-		margin-left: 50rpx;
-	}
-
-	.order-submission .address .addressCon .default {
-		margin-right: 12rpx;
-	}
-
-	.order-submission .address .addressCon .setaddress {
-		color: #333;
-		font-size: 28rpx;
-	}
-
-	.order-submission .address .iconfont {
-		font-size: 35rpx;
-		color: #707070;
-	}
-
-	.order-submission .allAddress {
-		width: 100%;
-		@include index-gradient(theme);
-		padding: 110rpx 30rpx 0 30rpx;
-	}
-
-	.order-submission .allAddress .nav {
-		width: 690rpx;
-		margin: 0 auto;
-	}
-
-	.order-submission .allAddress .nav .item {
-		width: 334rpx;
-	}
-
-	.order-submission .allAddress .nav .item.on {
-		position: relative;
-		width: 230rpx;
-	}
-
-	.order-submission .allAddress .nav .item.on::before {
-		position: absolute;
-		bottom: 0;
-		content: "快递配送";
-		font-size: 28rpx;
-		display: block;
-		height: 0;
-		width: 336rpx;
-		border-width: 0 20rpx 80rpx 0;
-		border-style: none solid solid;
-		border-color: transparent transparent #fff;
-		z-index: 2;
-		border-radius: 14rpx 36rpx 0 0;
-		text-align: center;
-		line-height: 80rpx;
-	}
-
-	.order-submission .allAddress .nav .item:nth-of-type(2).on::before {
-		content: "到店自提";
-		border-width: 0 0 80rpx 20rpx;
-		border-radius: 36rpx 14rpx 0 0;
-	}
-
-	.order-submission .allAddress .nav .item.on2 {
-		position: relative;
-	}
-
-	.order-submission .allAddress .nav .item.on2::before {
-		position: absolute;
-		bottom: 0;
-		content: "到店自提";
-		font-size: 28rpx;
-		display: block;
-		height: 0;
-		width: 401rpx;
-		border-width: 0 0 60rpx 60rpx;
-		border-style: none solid solid;
-		border-color: transparent transparent rgba(255, 255, 255, 0.6);
-		border-radius: 36rpx 14rpx 0 0;
-		text-align: center;
-		line-height: 60rpx;
-	}
-
-	.order-submission .allAddress .nav .item:nth-of-type(1).on2::before {
-		content: "快递配送";
-		border-width: 0 60rpx 60rpx 0;
-		border-radius: 14rpx 36rpx 0 0;
-	}
-
-	.order-submission .allAddress .address {
-		width: 690rpx;
-		max-height: 180rpx;
-		margin: -2rpx auto 0 auto;
-	}
-
-	.order-submission .allAddress .line {
-		width: 100%;
-		margin: 0 auto;
-	}
-
-	.order-submission .wrapper .item .discount .placeholder {
-		color: #ccc;
-	}
-
-	.order-submission .wrapper {
-		background-color: #fff;
-		margin-top: 15rpx;
-	}
-
-	.order-submission .wrapper .item {
-		padding: 27rpx 24rpx;
-		font-size: 30rpx;
-		color: #333333;
-		border-bottom: 1px solid #F5F5F5;
-	}
-
-	.order-submission .wrapper .item .discount {
-		font-size: 30rpx;
-		color: #333;
-	}
-
-	.order-submission .wrapper .item .discount .iconfont {
-		color: #515151;
-		font-size: 30rpx;
-		margin-left: 15rpx;
-	}
-
-	.order-submission .wrapper .item .discount .num {
-		font-size: 32rpx;
-		margin-right: 20rpx;
-	}
-
-	.order-submission .wrapper .item .shipping {
-		font-size: 30rpx;
-		color: #999;
-		position: relative;
-		padding-right: 58rpx;
-	}
-
-	.order-submission .wrapper .item .shipping .iconfont {
-		font-size: 35rpx;
-		color: #707070;
-		position: absolute;
-		right: 0;
-		top: 50%;
-		transform: translateY(-50%);
-		margin-left: 30rpx;
-	}
-
-	.order-submission .wrapper .item textarea {
-		background-color: #f9f9f9;
-		width: auto !important;
-		height: 140rpx;
-		border-radius: 14rpx;
-		margin-top: 30rpx;
-		padding: 15rpx;
-		box-sizing: border-box;
-		font-weight: 400;
-	}
-
-	.order-submission .wrapper .item .placeholder {
-		color: #ccc;
-	}
-
-	.order-submission .wrapper .item .list {
-		margin-top: 35rpx;
-	}
-
-	.order-submission .wrapper .item .list .payItem {
-		border: 1px solid #eee;
-		border-radius: 14rpx;
-		height: 86rpx;
-		width: 100%;
-		box-sizing: border-box;
-		margin-top: 20rpx;
-		font-size: 28rpx;
-		color: #282828;
-	}
-
-	.order-submission .wrapper .item .list .payItem.on {
-		// border-color: #fc5445;
 		@include coupons_border_color(theme);
-		color: $theme-color;
 	}
-
-	.order-submission .wrapper .item .list .payItem .name {
-		width: 50%;
-		text-align: center;
-		border-right: 1px solid #eee;
-	}
-
-	.order-submission .wrapper .item .list .payItem .name .iconfont {
-		width: 44rpx;
-		height: 44rpx;
-		border-radius: 50%;
-		text-align: center;
-		line-height: 44rpx;
-		background-color: #fe960f;
-		color: #fff;
-		font-size: 30rpx;
-		margin-right: 15rpx;
-	}
-
-	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
-		background-color: #41b035;
-	}
-
-	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-zhifubao {
-		background-color: #00AAEA;
-	}
-
-	.order-submission .wrapper .item .list .payItem .tip {
-		width: 49%;
-		text-align: center;
-		font-size: 26rpx;
-		color: #aaa;
-	}
-
-	.order-submission .moneyList {
-		margin-top: 15rpx;
+	.payment-status {
 		background-color: #fff;
-		padding: 30rpx;
-		margin-bottom: calc(constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		margin-bottom: calc(env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+		margin: 195rpx 30rpx 0 30rpx;
+		border-radius: 10rpx;
+		padding: 1rpx 0 28rpx 0;
 	}
 
-	.order-submission .moneyList .item {
+	.payment-status .icons {
+		font-size: 70rpx;
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 50%;
+		color: #fff;
+		text-align: center;
+		line-height: 140rpx;
+		text-shadow: 0px 4px 0px #df1e14;
+		border: 6rpx solid #f5f5f5;
+		margin: -76rpx auto 0 auto;
+		background-color: #999;
+	}
+
+	.payment-status .iconfont {
+		font-size: 70rpx;
+		width: 140rpx;
+		height: 140rpx;
+		border-radius: 50%;
+		color: #fff;
+		text-align: center;
+		line-height: 140rpx;
+		text-shadow: 0px 4px 0px #df1e14;
+		border: 6rpx solid #f5f5f5;
+		margin: -76rpx auto 0 auto;
+		background-color: #999;
+	}
+
+	.payment-status .iconfont.fail {
+		text-shadow: 0px 4px 0px #7a7a7a;
+	}
+
+	.payment-status .status {
+		font-size: 32rpx;
+		font-weight: bold;
+		text-align: center;
+		margin: 25rpx 0 37rpx 0;
+	}
+
+	.payment-status .wrapper {
+		border: 1rpx solid #eee;
+		margin: 0 30rpx 47rpx 30rpx;
+		padding: 35rpx 0;
+		border-left: 0;
+		border-right: 0;
+	}
+
+	.payment-status .wrapper .item {
 		font-size: 28rpx;
 		color: #282828;
 	}
 
-	.order-submission .moneyList .item~.item {
+	.payment-status .wrapper .item~.item {
 		margin-top: 20rpx;
 	}
 
-	.order-submission .moneyList .item .money {
-		color: #666666;
+	.payment-status .wrapper .item .itemCom {
+		color: #666;
 	}
 
-	.order-submission .footer {
-		width: 100%;
-		height: 100rpx;
-		background-color: #fff;
-		padding: 0 30rpx;
-		font-size: 28rpx;
-		color: #333;
-		box-sizing: border-box;
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
-		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
-	}
-
-	.order-submission .footer .settlement {
-		font-size: 30rpx;
-		color: #fff;
-		width: 240rpx;
-		height: 70rpx;
-		@include main_bg_color(theme);
+	.payment-status .returnBnt {
+		width: 630rpx;
+		height: 86rpx;
 		border-radius: 50rpx;
+		color: #fff;
+		font-size: 30rpx;
 		text-align: center;
-		line-height: 70rpx;
+		line-height: 86rpx;
+		margin: 0 auto 20rpx auto;
+		
 	}
-
-	.footer .transparent {
-		opacity: 0
-	}
-
-	/deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked {
-		@include main_bg_color(theme);
-		border: none !important;
-		color: #fff !important
-	}
-
-	/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-		@include main_bg_color(theme);
-		border: none !important;
-		color: #fff !important;
-		margin-right: 0 !important;
-	}
-
-
-	// 新样式
-	.emils {
-		width: 100%;
-		height: 82rpx;
-		line-height: 82rpx;
-		display: flex;
-		padding: 0 13px;
-		font-size: 14px;
-		color: #333333;
-		border-bottom: 1px solid #F5F5F5;
-		background-color: #fff;
-	}
-
-	.emils input {
-		font-size: 12px;
-		width: 80%;
-		height: 82rpx;
-		height: 82rpx;
-		padding-left: 30rpx;
-		box-sizing: b;
-	}
-
-	// 完善身份信息
-	.identity {
-		width: 100%;
-		display: flex;
-		padding: 0 26rpx;
-		border-bottom: 1px solid #F5F5F5;
-		height: 120rpx;
-		// line-height: 120rpx;
-		background-color: #fff;
-	}
-
-	.identity .lt {
-		padding-top: 35rpx;
-		box-sizing: border-box;
-	}
-
-	.identity .lt image {
-		width: 40rpx;
-		height: 36rpx;
-	}
-
-	.identity .cen {
-		width: 88%;
-		padding-left: 50rpx;
-		box-sizing: border-box;
-		padding-top: 20rpx;
-	}
-
-	.identity .cen text {
-		display: block;
-	}
-
-	.identity .cen text:last-of-type {
-		font-size: 12px;
-		color: #666;
-	}
-
-	.identity .rt {
-		padding-top: 35rpx;
-		box-sizing: border-box;
-	}
-
-	.planjh text {
-		display: block;
-	}
-
-	.planjh {
-		display: flex;
-		justify-content: space-between;
-		height: 80rpx;
-		line-height: 80rpx;
-	}
-
-	.detewz {
-		color: rgb(255, 87, 51);
-		display: inline-block;
-	}
-
-	.detewzs {
-		color: #000;
-	}
-
-	.datejt {
-		display: flex;
-	}
-
-	// 增值服务
-	.addedservice {
-		display: flex;
-		justify-content: space-between;
-		height: 80rpx;
-		line-height: 80rpx;
-		font-weight: 700;
-		border-bottom: 1px solid #ccc;
-	}
-
-	.addedservices {
-		display: flex;
-		justify-content: space-between;
-		height: 80rpx;
-		line-height: 80rpx;
-		color: #666;
-	}
-
-	.order-submission .footer {
-		height: 180rpx !important;
-	}
-
-	.readbox {
-		display: flex;
-		padding-top: 20rpx;
-		box-sizing: border-box;
-	}
-
-	.readtx {
-		font-size: 26rpx;
-	}
-
-	.readtx text {
-		color: rgb(255, 146, 26);
-	}
-
-	.order-submission .footer .settlement {
-		border-radius: 10rpx;
-	}
-
-	.price_color {
-		font-size: 40rpx;
-		font-weight: 700;
+	.cart-color {
+		@include main_color(theme);
+		@include coupons_border_color(theme);
 	}
 </style>
\ No newline at end of file
diff --git a/pages/users/alipay_returns/alipay_return.vue b/pages/users/alipay_returns/alipay_return.vue
index 8616393..8bc2a2b 100644
--- a/pages/users/alipay_returns/alipay_return.vue
+++ b/pages/users/alipay_returns/alipay_return.vue
@@ -68,6 +68,7 @@
 			// this.orderId='installment236'
 			this.order_pay_info.payPrice=e.total_amount
 			this.time=e.timestamp
+			// this.orderId='order92934171248038859056274'
 			this.alipayQueryPay();
 			// // #ifdef H5
 			// var url = window.location.search;
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index a103662..923751a 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -316,13 +316,13 @@
 						title: '微信快捷支付',
 						payStatus: 1,
 					},
-					{
-						"name": "余额支付",
-						"icon": "icon-yuezhifu",
-						value: 'yue',
-						title: '可用余额:',
-						payStatus: 1,
-					},
+					// {
+					// 	"name": "余额支付",
+					// 	"icon": "icon-yuezhifu",
+					// 	value: 'yue',
+					// 	title: '可用余额:',
+					// 	payStatus: 1,
+					// },
 					// #ifndef MP
 					{
 						"name": "支付宝支付",
@@ -443,6 +443,7 @@
 			// });
 			this.preOrderNo = options.preOrderNo || 0;
 			this.addressChangeId = options.addressId || 0;
+			this.addressId= options.addressId
 			this.is_address = options.is_address ? true : false;
 			if (this.isLogin) {
 				this.getloadPreOrder();
@@ -697,6 +698,7 @@
 			 * 获取默认收货地址或者获取某条地址信息
 			 */
 			getaddressInfo: function() {
+				console.log(this.addressId,'this.addressIdthis.addressIdthis.addressId');
 				if (this.addressId) {
 					getAddressDetail(this.addressId).then(res => {
 						if (res.data) {
@@ -746,7 +748,7 @@
 			onAddress: function() {
 
 				uni.redirectTo({
-					url: '/pages/users/user_address_list/index?preOrderNo=' + this.preOrderNo
+					url: '/pages/users/user_address_list/index?preOrderNo=' + this.preOrderNo+'&type='+0
 				});
 			},
 			realName: function(e) {
diff --git a/pages/users/order_confirms/index.vue b/pages/users/order_confirms/index.vue
new file mode 100644
index 0000000..f2c270d
--- /dev/null
+++ b/pages/users/order_confirms/index.vue
@@ -0,0 +1,1456 @@
+<template>
+	<view :data-theme="theme">
+		<!-- #ifndef APP-PLUS-->
+		<view v-if="productType==='video'" class='cart_nav'>
+			<nav-bar :navTitle='navTitle' @getNavH='getNavH'></nav-bar>
+		</view>
+
+		<!-- #endif -->
+		<view class='order-submission' :style="'margin-top:'+(marTop)+'rpx;'">
+			<view class="allAddress" :style="store_self_mention ? '':'padding-top:0;'">
+				<view class="nav acea-row">
+					<view class="item font_color" :class="shippingType == 0 ? 'on' : 'on2'" @tap="addressType(0)"
+						v-if='store_self_mention'></view>
+					<view class="item font_color" :class="shippingType == 1 ? 'on' : 'on2'" @tap="addressType(1)"
+						v-if='store_self_mention'></view>
+				</view>
+				<view class='address acea-row row-between-wrapper' @tap='onAddress' v-if='shippingType == 0'
+					:style="store_self_mention ? '':'border-top-left-radius: 14rpx;border-top-right-radius: 14rpx;'">
+					<view class='addressCon' v-if="addressInfo.realName">
+						<view class='name'>{{addressInfo.realName}}
+							<text class='phone'>{{addressInfo.phone}}</text>
+						</view>
+						<view class="acea-row">
+							<text class='default font_color' v-if="addressInfo.isDefault">[默认]</text>
+							<text
+								class="line2">{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}}</text>
+						</view>
+					</view>
+					<view class='addressCon' v-else>
+						<view class='setaddress'>设置收货地址</view>
+					</view>
+					<view class='iconfont icon-jiantou'></view>
+				</view>
+				<view class='address acea-row row-between-wrapper' v-else @tap="showStoreList">
+					<block v-if="storeList.length>0">
+						<view class='addressCon'>
+							<view class='name'>{{system_store.name}}
+								<text class='phone'>{{system_store.phone}}</text>
+							</view>
+							<view class="line1"> {{system_store.address}}{{", " + system_store.detailedAddress}}
+							</view>
+						</view>
+						<view class='iconfont icon-jiantou'></view>
+					</block>
+					<block v-else>
+						<view>暂无门店信息</view>
+					</block>
+				</view>
+				<view class='line'>
+					<image src='/static/images/line.jpg'></image>
+				</view>
+			</view>
+			<view class="pad30">
+				<orderGoods :cartInfo="cartInfo" :orderProNum="orderProNum"></orderGoods>
+				<view class='wrapper borRadius14'>
+					<view class='item acea-row row-between-wrapper' @tap='couponTap'
+						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
+						<view>优惠券</view>
+						<view class='discount'>{{couponTitle}}
+							<text class='iconfont icon-jiantou'></text>
+						</view>
+					</view>
+
+					<view class='item acea-row row-between-wrapper'
+						v-if="!orderInfoVo.bargainId && !orderInfoVo.combinationId && !orderInfoVo.seckillId && productType==='normal'">
+						<view>积分抵扣</view>
+						<view class='discount acea-row row-middle'>
+							<view> {{useIntegral ? "剩余积分":"当前积分"}}
+								<text
+									class='num font_color'>{{useIntegral ? orderInfoVo.surplusIntegral : orderInfoVo.userIntegral || 0}}</text>
+							</view>
+							<checkbox-group @change="ChangeIntegral">
+								<checkbox :checked='useIntegral ? true : false'
+									:disabled="orderInfoVo.userIntegral==0 && !useIntegral" />
+							</checkbox-group>
+						</view>
+					</view>
+					<!-- <view class='item acea-row row-between-wrapper'
+						v-if="priceGroup.vipPrice > 0 && userInfo.vip && !pinkId && !BargainId && !combinationId && !seckillId">
+						<view>会员优惠</view>
+						<view class='discount'>-￥{{priceGroup.vipPrice}}</view>
+					</view> -->
+					<view class='item acea-row row-between-wrapper' v-if='shippingType==0'>
+						<view>快递费用</view>
+						<view class='discount' v-if='parseFloat(orderInfoVo.freightFee) > 0'>
+							+￥{{orderInfoVo.freightFee}}
+						</view>
+						<view class='discount' v-else>免运费</view>
+					</view>
+					<view v-else>
+						<view class="item acea-row row-between-wrapper">
+							<view>联系人</view>
+							<view class="discount textR">
+								<input type="text" placeholder="请填写您的联系姓名" placeholder-style="color:#ccc;"
+									placeholder-class="placeholder" @blur='realName' maxlength="20"></input>
+							</view>
+						</view>
+						<view class="item acea-row row-between-wrapper">
+							<view>联系电话</view>
+							<view class="discount textR">
+								<input type="number" placeholder="请填写您的联系电话" placeholder-style="color:#ccc;"
+									placeholder-class="placeholder" @blur='phone' maxlength="11"></input>
+							</view>
+						</view>
+					</view>
+					<!-- <view class='item acea-row row-between-wrapper' wx:else>
+					  <view>自提门店</view>
+					  <view class='discount'>{{system_store.name}}</view>
+					</view> -->
+					<view class='item' v-if="textareaStatus">
+						<view class="flex justify-between">
+							<view>备注信息</view>
+							<view>
+								<text style="color:#666;">{{markNum ? markNum : 150}}</text>/<text>150</text>
+							</view>
+						</view>
+						<textarea v-if="coupon.coupon===false" placeholder-class='placeholder' @input='bindHideKeyboard'
+							value="" name="mark" placeholder='请添加备注（150字以内）'></textarea>
+					</view>
+				</view>
+				<view class='wrapper borRadius14'>
+					<view class='item'>
+						<view>支付方式</view>
+						<view class='list'>
+							<view class='payItem acea-row row-middle' :class='active==index ?"on":""'
+								@tap='payItem(index)' v-for="(item,index) in cartArr" :key='index'
+								v-if="item.payStatus==1">
+								<view class='name acea-row row-center-wrapper'>
+									<view class='iconfont animated'
+										:class='(item.icon) + " " + (animated==true&&active==index ?"bounceIn":"")'>
+									</view>
+									{{item.name}}
+								</view>
+								<view class='tip'>{{item.title}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class='moneyList borRadius14'>
+					<view class='item acea-row row-between-wrapper'>
+						<view>商品总价：</view>
+						<view class='money'>￥{{orderInfoVo.proTotalFee || 0}}</view>
+					</view>
+					<view class='item acea-row row-between-wrapper' v-if="orderInfoVo.couponFee > 0">
+						<view>优惠券抵扣：</view>
+						<view class='money'>-￥{{orderInfoVo.couponFee}}</view>
+					</view>
+					<view class='item acea-row row-between-wrapper' v-if="orderInfoVo.deductionPrice > 0">
+						<view>积分抵扣：</view>
+						<view class='money'>-￥{{orderInfoVo.deductionPrice}}</view>
+					</view>
+					<view class='item acea-row row-between-wrapper' v-if="orderInfoVo.freightFee > 0">
+						<view>运费：</view>
+						<view class='money'>+￥{{orderInfoVo.freightFee}}</view>
+					</view>
+				</view>
+				<view style='height:120rpx;'></view>
+			</view>
+			<view class='footer acea-row row-between-wrapper'>
+				<view>合计:
+					<text class='price_color'>￥{{orderInfoVo.payFee || 0}}</text>
+				</view>
+				<view class='settlement' style='z-index:100' @tap="SubOrder">立即结算</view>
+			</view>
+		</view>
+		<view class="alipaysubmit" v-html="formContent"></view>
+		<couponListWindow :coupon='coupon' @ChangCouponsClone="ChangCouponsClone" :openType='openType'
+			@ChangCoupons="ChangCoupons" :orderShow="orderShow"></couponListWindow>
+	</view>
+</template>
+<script>
+	import {
+		getCouponsOrderPrice,
+		orderCreate,
+		postOrderComputed,
+		orderPay,
+		// orderPays,
+		wechatQueryPayResult,
+		loadPreOrderApi,
+		alipayQueryPayResult
+	} from '@/api/order.js';
+	import {
+		getAddressDetail,
+		getAddressDefault
+	} from '@/api/user.js';
+	import {
+		openPaySubscribe,
+		openOrderSubscribe
+	} from '@/utils/SubscribeMessage.js';
+	import {
+		storeListApi
+	} from '@/api/store.js';
+	import {
+		CACHE_LONGITUDE,
+		CACHE_LATITUDE
+	} from '@/config/cache.js';
+	import couponListWindow from '@/components/couponListWindow';
+	import orderGoods from '@/components/orderGoods';
+	import navBar from '@/components/navBar';
+	import {
+		toLogin
+	} from '@/libs/login.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		Debounce
+	} from '@/utils/validate.js'
+	let app = getApp();
+	export default {
+		components: {
+			navBar,
+			couponListWindow,
+			orderGoods,
+		},
+		onReady() {
+			this.$nextTick(function() {
+				// #ifdef MP
+				const menuButton = uni.getMenuButtonBoundingClientRect();
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select('#home')
+					.boundingClientRect(data => {
+						this.homeTop = menuButton.top * 2 + menuButton.height - data.height;
+					})
+					.exec();
+				// #endif
+			});
+		},
+		data() {
+			return {
+				marTop: 0,
+				navTitle: '提交订单',
+				homeTop: 20,
+				orderShow: 'orderShow', //下单页面使用优惠券组件不展示tab切换页
+				textareaStatus: true,
+				//支付方式
+				cartArr: [
+					// {
+					// 	"name": "微信支付",
+					// 	"icon": "icon-weixin2",
+					// 	value: 'weixin',
+					// 	title: '微信快捷支付',
+					// 	payStatus: 1,
+					// },
+					// {
+					// 	"name": "余额支付",
+					// 	"icon": "icon-yuezhifu",
+					// 	value: 'yue',
+					// 	title: '可用余额:',
+					// 	payStatus: 1,
+					// },
+					// #ifndef MP
+					{
+						"name": "支付宝支付",
+						"icon": "icon-zhifubao",
+						value: 'alipay',
+						title: '支付宝快捷支付',
+						payStatus: 1,
+					}
+					// #endif
+				],
+				payType: 'alipay', //支付方式
+				openType: 1, //优惠券打开方式 1=使用
+				active: 0, //支付方式切换
+				coupon: {
+					coupon: false,
+					list: [],
+					statusTile: '立即使用'
+				}, //优惠券组件
+				addressInfo: {}, //地址信息
+				addressId: 0, //地址id
+				couponId: 0, //优惠券id
+				cartId: '', //购物车id
+				userInfo: {}, //用户信息
+				mark: '', //备注信息
+				couponTitle: '请选择', //优惠券
+				coupon_price: 0, //优惠券抵扣金额
+				useIntegral: false, //是否使用积分
+				integral_price: 0, //积分抵扣金额
+				integral: 0,
+				ChangePrice: 0, //使用积分抵扣变动后的金额
+				formIds: [], //收集formid
+				status: 0,
+				is_address: false,
+				toPay: false, //修复进入支付时页面隐藏从新刷新页面
+				shippingType: 0,
+				system_store: {},
+				storePostage: 0,
+				contacts: '',
+				contactsTel: '',
+				mydata: {},
+				storeList: [],
+				store_self_mention: false,
+				cartInfo: [],
+				priceGroup: {},
+				animated: false,
+				totalPrice: 0,
+				integralRatio: "0",
+				orderKey: "",
+				// usableCoupon: {},
+				offlinePostage: "",
+				payChannel: '',
+				news: true,
+				again: false,
+				addAgain: false,
+				bargain: false, //是否是砍价
+				combination: false, //是否是拼团
+				secKill: false, //是否是秒杀
+				orderInfoVo: {},
+				addressList: [], //地址列表数据
+				orderProNum: 0,
+				preOrderNo: '', //预下单订单号
+				theme: app.globalData.theme,
+				formContent: '',
+				addressChangeId: 0,
+				openId: '',
+				checkid: '',
+				isAli:false,
+			};
+		},
+		computed: {
+			...mapGetters(['isLogin', 'systemPlatform', 'productType']),
+			markNum() {
+				let markNum = 0;
+				if (this.mark) {
+					markNum = 150 - this.mark.length
+					return markNum
+				}
+			}
+		},
+		watch: {
+			isLogin: {
+				handler: function(newV, oldV) {
+					if (newV) {
+						this.getloadPreOrder();
+					}
+				},
+				deep: true
+			}
+		},
+		onLoad(options) {
+			console.log(options,'options');
+			// #ifdef H5
+			this.payChannel = this.$wechat.isWeixin() ? 'public' : 'weixinh5';
+			// #endif
+			// #ifdef MP
+			this.payChannel = 'routine';
+			// #endif
+			// #ifdef APP-PLUS
+			this.payChannel = this.systemPlatform === 'ios' ? 'weixinAppIos' : 'weixinAppAndroid';
+			// #endif
+			// if (!options.cartId) return this.$util.Tips({
+			// 	title: '请选择要购买的商品'
+			// }, {
+			// 	tab: 3,
+			// 	url: 1
+			// });
+			this.preOrderNo = options.preOrderNo || 0;
+			this.addressChangeId = options.addressId || 0;
+			this.addressId=options.addressId || 0
+			this.is_address = options.is_address ? true : false;
+			if (this.isLogin) {
+				this.getloadPreOrder();
+			} else {
+				toLogin();
+			}
+			this.importAliPayScript(); // 导入支付宝脚本
+			
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow: function() {
+			let _this = this
+			// wx.getLaunchOptionsSync 
+			this.textareaStatus = true;
+
+			uni.$on("handClick", res => {
+				if (res) {
+					_this.system_store = res.address
+				}
+				// 清除监听
+				uni.$off('handClick');
+			})
+			this.getloadPreOrder();
+		},
+		methods: {
+			getNavH(marTop) {
+				this.marTop = marTop;
+			},
+			// 订单详情
+			getloadPreOrder: function() {
+				loadPreOrderApi(this.preOrderNo).then(res => {
+					let orderInfoVo = res.data.orderInfoVo;
+					this.orderInfoVo = orderInfoVo;
+					if (orderInfoVo.addressId && this.addressChangeId === 0) {
+						this.addressId = orderInfoVo.addressId;
+					} else {
+						this.addressId = this.addressChangeId;
+						if (orderInfoVo.addressId != this.addressChangeId) this.computedPrice();
+					}
+					this.cartInfo = orderInfoVo.orderDetailList;
+					this.orderProNum = orderInfoVo.orderProNum;
+						this.getaddressInfo();
+					// this.cartArr[1].title = '可用余额:' + orderInfoVo.userBalance;
+					this.cartArr[1].payStatus = parseInt(res.data.yuePayStatus) === 1 ? 1 : 2;
+					this.cartArr[0].payStatus = parseInt(res.data.payWeixinOpen) === 1 ? 1 : 0;
+				
+					// #ifdef H5
+					if (this.$wechat.isWeixin()) this.cartArr.pop();
+					// #endif
+					this.store_self_mention = res.data.storeSelfMention == '1' && this
+						.productType ===
+						'normal' ? true : false;
+				}).catch(err => {
+					// uni.navigateTo({
+					// 	url: '/pages/users/order_list/index'
+					// });
+				})
+			},
+			/**
+			 * 获取门店列表数据
+			 */
+			getList: function() {
+				let longitude = uni.getStorageSync("user_longitude")?uni.getStorageSync("user_longitude"):''; //经度
+				let latitude = uni.getStorageSync("user_latitude")?uni.getStorageSync("user_latitude"):''; //纬度
+				let data = {
+					latitude: latitude, //纬度
+					longitude: longitude, //经度
+					page: 1,
+					limit: 10
+				}
+				storeListApi(data).then(res => {
+					let list = res.data.list || [];
+					this.$set(this, 'storeList', list);
+					this.$set(this, 'system_store', list[0]);
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				})
+			},
+			/*
+			 * 跳转门店列表
+			 */
+			showStoreList: function() {
+				if (this.storeList.length > 0) {
+					uni.navigateTo({
+						url: '/pages/users/goods_details_store/index'
+					})
+				}
+			},
+			// 计算订单价格
+			computedPrice: function() {
+				let shippingType = this.shippingType;
+				postOrderComputed({
+					addressId: this.addressId,
+					useIntegral: this.useIntegral ? true : false,
+					couponId: this.couponId,
+					shippingType: parseInt(shippingType) + 1,
+					preOrderNo: this.preOrderNo
+				}).then(res => {
+					let data = res.data;
+					this.orderInfoVo.couponFee = data.couponFee;
+					//赋值操作，userIntegral 当前积分，surplusIntegral 剩余积分
+					this.orderInfoVo.userIntegral = data.surplusIntegral;
+					this.orderInfoVo.deductionPrice = data.deductionPrice;
+					this.orderInfoVo.freightFee = data.freightFee;
+					this.orderInfoVo.payFee = data.payFee;
+					this.orderInfoVo.proTotalFee = data.proTotalFee;
+					this.orderInfoVo.useIntegral = data.useIntegral;
+					this.orderInfoVo.usedIntegral = data.usedIntegral;
+					this.orderInfoVo.surplusIntegral = data.surplusIntegral;
+					//this.orderInfoVo.userIntegral = data.userIntegral;
+				}).catch(err => {
+					return this.$util.Tips({
+						title: err
+					});
+				});
+			},
+			//选择地址还是门店自提
+			addressType: function(e) {
+				let index = e;
+				this.shippingType = parseInt(index);
+				this.computedPrice();
+				//调起获取定位信息
+				if (index == 1){
+					this.getList();
+					this.$util.$L.getLocation();
+				} 
+			},
+			bindPickerChange: function(e) {
+				let value = e.detail.value;
+				this.shippingType = value;
+				this.computedPrice();
+			},
+			ChangCouponsClone: function() {
+				this.$set(this.coupon, 'coupon', false);
+			},
+			/**
+			 * 处理点击优惠券后的事件
+			 * 
+			 */
+			ChangCoupons: function(e) {
+				// this.usableCoupon = e
+				// this.coupon.coupon = false
+				let index = e,
+					list = this.coupon.list,
+					couponTitle = '请选择',
+					couponId = 0;
+				for (let i = 0, len = list.length; i < len; i++) {
+					if (i != index) {
+						list[i].use_title = '';
+						list[i].isUse = 0;
+					}
+				}
+				if (list[index].isUse) {
+					//不使用优惠券
+					list[index].use_title = '';
+					list[index].isUse = 0;
+				} else {
+					//使用优惠券
+					list[index].use_title = '不使用';
+					list[index].isUse = 1;
+					couponTitle = list[index].name;
+					couponId = list[index].id;
+				}
+				this.couponTitle = couponTitle;
+				this.couponId = couponId;
+				this.$set(this.coupon, 'coupon', false);
+				this.$set(this.coupon, 'list', list);
+				this.computedPrice();
+			},
+			/**
+			 * 使用积分抵扣
+			 */
+			ChangeIntegral: function() {
+				this.useIntegral = !this.useIntegral;
+				this.computedPrice();
+			},
+			bindHideKeyboard: function(e) {
+				this.mark = e.detail.value;
+			},
+			/**
+			 * 获取当前金额可用优惠券
+			 * 
+			 */
+			getCouponList: function() {
+				getCouponsOrderPrice(this.preOrderNo).then(res => {
+					this.$set(this.coupon, 'list', res.data);
+					this.openType = 1;
+				});
+			},
+			/*
+			 * 获取默认收货地址或者获取某条地址信息
+			 */
+			
+			getaddressInfo: function() {
+					console.log(this.addressId,'this.addressIdthis.addressId');
+				if (this.addressId) {
+				
+					getAddressDetail(this.addressId).then(res => {
+						if (res.data) {
+							res.data.isDefault = res.data.isDefault;
+							this.addressInfo = res.data || {};
+						}
+					})
+				}
+			},
+			payItem: function(e) {
+				let that = this;
+				let active = e;
+				that.active = active;
+				that.animated = true;
+				that.payType = 'alipay'
+				// #ifdef H5
+				if (that.payType == 'alipay' && this.$wechat.isWeixin() == true) {
+					that.payChannel = 'public';
+				} else if (that.payType == 'alipay' && this.$wechat.isWeixin() == false) {
+					that.payChannel = 'weixinh5';
+				}
+				// #endif
+				// #ifdef APP-PLUS
+				if (that.payType == 'alipay') {
+					that.payChannel = 'appAliPay';
+				}
+				// #endif
+				//that.computedPrice();
+				setTimeout(function() {
+					that.car();
+				}, 500);
+			},
+			couponTap: function() {
+				this.coupon.coupon = true;
+				if (!this.coupon.list.length) this.getCouponList();
+			},
+			car: function() {
+				let that = this;
+				that.animated = false;
+			},
+			onAddress: function() {
+				
+				uni.redirectTo({
+					url: '/pages/users/user_address_list/index?preOrderNo=' + this.preOrderNo+'&type='+1
+				});
+			},
+			realName: function(e) {
+				this.contacts = e.detail.value;
+			},
+			phone: function(e) {
+				this.contactsTel = e.detail.value;
+			},
+			payment: function(data) {
+				let that = this;
+				// #ifdef MP
+				uni.checkBeforeAddOrder({
+					success(res) {
+						console.log("下单前置检查 成功：",JSON.stringify(res));
+						const traceId = res.data.traceId;
+						data.traceId = traceId;
+						that.onCreate(data);
+					},
+					fail(res) {
+						console.log("下单前置检查 失败：", JSON.stringify(res));
+					}
+				});
+				// #endif
+				// #ifndef MP
+				that.onCreate(data);
+				// #endif
+			},
+			onCreate(data) {
+				orderCreate(data).then(res => {
+					this.getOrderPay(res.data.orderNo, '支付成功');
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
+					}, '/pages/users/order_list/index');
+				});
+			},
+			// 导入 my 对象所需的脚本
+				importAliPayScript() {
+					if (navigator.userAgent.indexOf('AliApp') > -1) {
+						this.isAli=true
+						const scriptElement = document.createElement('script');
+						scriptElement.src = 'https://appx/web-view.min.js';
+						document.head.appendChild(scriptElement);
+						// this.listenMessageFromMiniProgram(); // 监听来自小程序的消息
+						
+					}
+				},
+			// 发送消息给小程序
+			sendMessageToMiniProgram() {
+				my.postMessage({
+					name: "测试支付"
+				});
+			},
+			// 监听来自小程序的消息
+			listenMessageFromMiniProgram() {
+				my.onMessage = (e) => {
+					if (e.type == 'authorizeResult') {
+						this.openId = e.data.data.alipaySystemOauthTokenResponse.openId
+					}
+					// console.log(e.data.data.alipaySystemOauthTokenResponse, 'aaaa'); // 在这里处理来自小程序的消息
+				};
+			},
+			aliPay(id) {
+				console.log('支付宝小程序支付');
+				let that = this
+				console.log(that.order_id, 'idididiid');
+			
+				my.tradePay({
+					tradeNO: that.order_id,
+					success: (res) => {
+						uni.hideLoading();
+						this.alipayQueryPay()
+						// my.alert({
+						// 	content: JSON.stringify(res),
+						// });
+			
+						// setTimeout(res => {
+						// 	that.$emit('onChangeFun', {
+						// 		action: 'pay_complete'
+						// 	});
+						// }, 2000)
+					},
+					fail: (error) => {
+						uni.hideLoading();
+						// that.stopPolling()
+						uni.showModal({
+							content: "支付失败",
+							showCancel: false,
+							success: function(res) {
+								if (res.confirm) {
+									//点击确认的操作
+									that.$emit('onChangeFun', {
+										action: 'pay_fail'
+									});
+								} else if (res.cancel) {
+			ji
+								}
+							}
+						})
+						// console.error('调用 my.tradePay 失败: ', JSON.stringify(error));
+					},
+				});
+			},
+			getOrderPay: function(orderNo, message) {
+				let that = this;
+				let goPages = '/pages/order_pay_status/index?order_id=' + orderNo;
+				console.log(that.isAli,'that.isAlithat.isAli');
+				orderPay({
+					orderNo: orderNo,
+					payChannel: that.payChannel,
+					payType: that.payType,
+					isAli:that.isAli,
+					// scene: that.productType === 'normal' ? 0 : 1177 //下单时小程序的场景值
+				}).then(res => {
+					let jsConfig = res.data.jsConfig;
+					that.order_id = res.data.tradeNo;
+					that.checkid = res.data.orderNo
+					switch (res.data.payType) {
+						case 'weixin':
+							that.weixinPay(jsConfig, orderNo, goPages);
+							break;
+						case 'yue':
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: message
+							}, {
+								tab: 5,
+								url: goPages + '&status=1'
+							});
+							break;
+						case 'weixinh5':
+							uni.hideLoading();
+							setTimeout(() => {
+								location.href = jsConfig.mwebUrl + '&redirect_url=' +
+									window.location
+									.protocol + '//' + window.location.host + goPages +
+									'&status=1';
+							}, 100)
+							break;
+						case 'alipay':
+						if (that.isAli == false) {
+							if (this.$wechat.isWeixin()) {
+								//微信公众号内支付
+							} else {
+								//h5支付
+								console.log('进入h5支付宝');
+								uni.hideLoading();
+								that.formContent = res.data.alipayRequest;
+								uni.setStorage({
+									key: 'orderNo',
+									data: that.order_id
+								});
+								that.$nextTick(() => {
+									document.forms['punchout_form'].submit();
+								})
+								this.alipayQueryPay()
+							}
+						} else {
+							this.aliPay(that.order_id)
+						}
+							// //#ifdef H5
+							// if (this.$wechat.isWeixin()) {
+							// 	uni.redirectTo({
+							// 		url: `/pages/users/alipay_invoke/index?id=${orderNo}&type=order`
+							// 	});
+							// } else {
+							// 	//h5支付
+							// 	uni.hideLoading();
+							// 	that.formContent = res.data.alipayRequest;
+							// 	uni.setStorage({
+							// 		key: 'orderNo',
+							// 		data: orderNo
+							// 	});
+							// 	that.$nextTick(() => {
+							// 		document.forms['punchout_form'].submit();
+							// 	})
+							// }
+							// //#endif
+							// // #ifdef APP-PLUS
+							// let alipayRequest = res.data.alipayRequest;
+							// uni.requestPayment({
+							// 	provider: 'alipay',
+							// 	orderInfo: alipayRequest,
+							// 	success: (e) => {
+							// 		uni.showToast({
+							// 			title: "支付成功"
+							// 		})
+							// 		
+							// 		}, 1000)
+							// 	},
+							// 	fail: (e) => {
+							// 		console.log(e, '失败');
+							// 		uni.showModal({
+							// 			content: "支付失败",
+							// 			showCancel: false,
+							// 			success: function(res) {
+							// 				if (res.confirm) {
+							// 					//点击确认的操作
+							// 					uni.navigateTo({
+							// 						url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
+							// 							orderNo +
+							// 							'&payChannel=' +
+							// 							'appAlipay'
+							// 					})
+							// 				}
+							// 			}
+							// 		})
+							// 	},
+							// 	complete: () => {
+							// 		uni.hideLoading();
+							// 	},
+							// });
+							// // #endif
+							// break;
+					}
+				}).catch(err => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: err
+					});
+				});
+			},
+			alipayQueryPay() {
+			
+				let id = this.checkid
+				alipayQueryPayResult(id).then(res => {
+					if (res.data == true) {
+	
+						uni.navigateTo({
+							url: '/pages/users/alipay_return/alipay_return?out_trade_no=' +
+								id +
+								'&payChannel=' +
+								'appAlipay'
+						})
+					} else {
+						setTimeout(() => {
+							this.alipayQueryPay()
+						}, 1000);
+					}
+					if (res.data == null) {
+						setTimeout(() => {
+							this.alipayQueryPay()
+						}, 1000);
+					}
+				}).catch(err => {
+			
+				})
+			},
+			weixinPay(jsConfig, orderNo, goPages) {
+				let that = this;
+				// #ifdef MP
+				if(that.productType === 'video'){
+					uni.requestOrderPayment({
+						timeStamp: jsConfig.timeStamp,
+						nonceStr: jsConfig.nonceStr,
+						package: jsConfig.packages,
+						signType: jsConfig.signType,
+						paySign: jsConfig.paySign,
+						ticket: jsConfig.ticket,
+						success: function(ress) {
+							uni.hideLoading();
+							openOrderSubscribe().then(() => {
+								if (that.orderInfoVo.bargainId || that.orderInfoVo
+									.combinationId || that
+									.pinkId || that.orderInfoVo.seckillId) {
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 4,
+										url: goPages
+									});
+								}
+								return that.$util.Tips({
+									title: '支付成功',
+									icon: 'success'
+								}, {
+									tab: 5,
+									url: goPages
+								}, );
+							})
+						},
+						fail: function(e) {
+							console.log(e)
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: '取消支付'
+							}, {
+								tab: 5,
+								url: goPages + '&status=2'
+							});
+						},
+						complete: function(e) {
+							uni.hideLoading();
+							//关闭当前页面跳转至订单状态
+							if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
+								title: '取消支付'
+							}, {
+								tab: 5,
+								url: goPages + '&status=2'
+							});
+						},
+					})
+				}else{
+					uni.requestPayment({
+						timeStamp: jsConfig.timeStamp,
+						nonceStr: jsConfig.nonceStr,
+						package: jsConfig.packages,
+						signType: jsConfig.signType,
+						paySign: jsConfig.paySign,
+						//ticket: jsConfig.ticket,
+						success: function(ress) {
+							uni.hideLoading();
+							openOrderSubscribe().then(() => {
+								if (that.orderInfoVo.bargainId || that.orderInfoVo
+									.combinationId || that
+									.pinkId || that.orderInfoVo.seckillId) {
+									return that.$util.Tips({
+										title: '支付成功',
+										icon: 'success'
+									}, {
+										tab: 4,
+										url: goPages
+									});
+								}
+								return that.$util.Tips({
+									title: '支付成功',
+									icon: 'success'
+								}, {
+									tab: 5,
+									url: goPages
+								}, );
+							})
+						},
+						fail: function(e) {
+							console.log(e)
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: '取消支付'
+							}, {
+								tab: 5,
+								url: goPages + '&status=2'
+							});
+						},
+						complete: function(e) {
+							uni.hideLoading();
+							//关闭当前页面跳转至订单状态
+							if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({
+								title: '取消支付'
+							}, {
+								tab: 5,
+								url: goPages + '&status=2'
+							});
+						},
+					})
+				}
+                
+				// #endif
+				// #ifdef H5
+				let data = {
+					timestamp: jsConfig.timeStamp,
+					nonceStr: jsConfig.nonceStr,
+					package: jsConfig.packages,
+					signType: jsConfig.signType,
+					paySign: jsConfig.paySign
+				};
+				that.$wechat.pay(data).then(res => {
+					if (res.errMsg == 'chooseWXPay:cancel') {
+						uni.hideLoading();
+						return that.$util.Tips({
+							title: '取消支付'
+						}, {
+							tab: 5,
+							url: goPages + '&status=2'
+						});
+					} else {
+						wechatQueryPayResult(orderNo).then(res => {
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: '支付成功',
+								icon: 'success'
+							}, {
+								tab: 5,
+								url: goPages
+							});
+						}).cache(err => {
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: err
+							});
+						})
+					}
+				}).cache(res => {
+					uni.hideLoading();
+					return that.$util.Tips({
+						title: '取消支付'
+					}, {
+						tab: 5,
+						url: goPages + '&status=2'
+					});
+				});
+				// #endif
+				// #ifdef APP-PLUS
+				uni.requestPayment({
+					provider: 'wxpay',
+					orderInfo: {
+						"appid": jsConfig.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
+						"noncestr": jsConfig.nonceStr, // 随机字符串
+						"package": "Sign=WXPay", // 固定值
+						"partnerid": jsConfig.partnerid, // 微信支付商户号
+						"prepayid": jsConfig.packages, // 统一下单订单号
+						"timestamp": Number(jsConfig.timeStamp), // 时间戳（单位：秒）
+						"sign": this.systemPlatform === 'ios' ? 'MD5' : jsConfig
+							.paySign // 签名，这里用的 MD5 签名
+					}, //微信、支付宝订单数据 【注意微信的订单信息，键值应该全部是小写，不能采用驼峰命名】
+					success: function(res) {
+						wechatQueryPayResult(orderNo).then(res => {
+							uni.hideLoading();
+							let url = '/pages/order_pay_status/index?order_id=' + orderNo +
+								'&msg=支付成功';
+							uni.showToast({
+								title: "支付成功"
+							})
+							setTimeout(res => {
+								uni.redirectTo({
+									url: url
+								})
+							}, 2000)
+						}).cache(err => {
+							uni.hideLoading();
+							return that.$util.Tips({
+								title: err
+							});
+						})
+					},
+					fail: function(err) {
+						uni.hideLoading();
+						let url = '/pages/order_pay_status/index?order_id=' + orderNo +
+							'&msg=支付失败';
+						uni.showModal({
+							content: "支付失败",
+							showCancel: false,
+							success: function(res) {
+								if (res.confirm) {
+									uni.redirectTo({
+										url: url
+									})
+								}
+							}
+						})
+					},
+					complete: (err) => {
+						uni.hideLoading();
+					}
+				});
+				// #endif
+			},
+			SubOrder(e) {
+				let that = this,
+					data = {};
+
+				if (!that.payType) return that.$util.Tips({
+					title: '请选择支付方式'
+				});
+				if (!that.addressId && !that.shippingType) return that.$util.Tips({
+					title: '请选择收货地址'
+				});
+				if (that.shippingType == 1) {
+					if (that.contacts == "" || that.contactsTel == "") {
+						return that.$util.Tips({
+							title: '请填写联系人或联系人电话'
+						});
+					}
+					if (!/^1(3|4|5|7|8|9|6)\d{9}$/.test(that.contactsTel)) {
+						return that.$util.Tips({
+							title: '请填写正确的手机号'
+						});
+					}
+					if (!/^[\u4e00-\u9fa5\w]{2,16}$/.test(that.contacts)) {
+						return that.$util.Tips({
+							title: '请填写您的真实姓名'
+						});
+					}
+					if (that.storeList.length == 0) return that.$util.Tips({
+						title: '暂无门店,请选择其他方式'
+					});
+				}
+				data = {
+					realName: that.contacts,
+					phone: that.contactsTel,
+					addressId: that.addressId,
+					couponId: that.couponId,
+					payType: that.payType,
+					useIntegral: that.useIntegral,
+					preOrderNo: that.preOrderNo,
+					mark: that.mark,
+					storeId: that.system_store.id || 0,
+					shippingType: that.$util.$h.Add(that.shippingType, 1),
+					payChannel: that.payChannel,
+					uid: this.$store.getters.uid,
+					type: 0,
+
+				};
+				if (data.payType == 'yue' && parseFloat(that.userInfo.nowMoney) < parseFloat(that.totalPrice))
+					return that.$util.Tips({
+						title: '余额不足！'
+					});
+				uni.showLoading({
+					title: '订单支付中'
+				});
+				// #ifdef MP
+				openPaySubscribe().then(() => {
+					that.payment(data);
+				});
+				// #endif
+				// #ifndef MP
+				that.payment(data);
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.font_color {
+		@include main_color(theme);
+	}
+
+	.price_color {
+		@include price_color(theme);
+	}
+
+	.line2 {
+		width: 504rpx;
+	}
+
+	.textR {
+		text-align: right;
+	}
+
+	.order-submission .line {
+		width: 100%;
+		height: 3rpx;
+	}
+
+	.order-submission .line image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.order-submission .address {
+		padding: 28rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+	}
+
+	.order-submission .address .addressCon {
+		width: 596rpx;
+		font-size: 26rpx;
+		color: #666;
+	}
+
+	.order-submission .address .addressCon .name {
+		font-size: 30rpx;
+		color: #282828;
+		font-weight: bold;
+		margin-bottom: 10rpx;
+	}
+
+	.order-submission .address .addressCon .name .phone {
+		margin-left: 50rpx;
+	}
+
+	.order-submission .address .addressCon .default {
+		margin-right: 12rpx;
+	}
+
+	.order-submission .address .addressCon .setaddress {
+		color: #333;
+		font-size: 28rpx;
+	}
+
+	.order-submission .address .iconfont {
+		font-size: 35rpx;
+		color: #707070;
+	}
+
+	.order-submission .allAddress {
+		width: 100%;
+		@include index-gradient(theme);
+		padding: 110rpx 30rpx 0 30rpx;
+	}
+
+	.order-submission .allAddress .nav {
+		width: 690rpx;
+		margin: 0 auto;
+	}
+
+	.order-submission .allAddress .nav .item {
+		width: 334rpx;
+	}
+
+	.order-submission .allAddress .nav .item.on {
+		position: relative;
+		width: 230rpx;
+	}
+
+	.order-submission .allAddress .nav .item.on::before {
+		position: absolute;
+		bottom: 0;
+		content: "快递配送";
+		font-size: 28rpx;
+		display: block;
+		height: 0;
+		width: 336rpx;
+		border-width: 0 20rpx 80rpx 0;
+		border-style: none solid solid;
+		border-color: transparent transparent #fff;
+		z-index: 2;
+		border-radius: 14rpx 36rpx 0 0;
+		text-align: center;
+		line-height: 80rpx;
+	}
+
+	.order-submission .allAddress .nav .item:nth-of-type(2).on::before {
+		content: "到店自提";
+		border-width: 0 0 80rpx 20rpx;
+		border-radius: 36rpx 14rpx 0 0;
+	}
+
+	.order-submission .allAddress .nav .item.on2 {
+		position: relative;
+	}
+
+	.order-submission .allAddress .nav .item.on2::before {
+		position: absolute;
+		bottom: 0;
+		content: "到店自提";
+		font-size: 28rpx;
+		display: block;
+		height: 0;
+		width: 401rpx;
+		border-width: 0 0 60rpx 60rpx;
+		border-style: none solid solid;
+		border-color: transparent transparent rgba(255, 255, 255, 0.6);
+		border-radius: 36rpx 14rpx 0 0;
+		text-align: center;
+		line-height: 60rpx;
+	}
+
+	.order-submission .allAddress .nav .item:nth-of-type(1).on2::before {
+		content: "快递配送";
+		border-width: 0 60rpx 60rpx 0;
+		border-radius: 14rpx 36rpx 0 0;
+	}
+
+	.order-submission .allAddress .address {
+		width: 690rpx;
+		max-height: 180rpx;
+		margin: -2rpx auto 0 auto;
+	}
+
+	.order-submission .allAddress .line {
+		width: 100%;
+		margin: 0 auto;
+	}
+
+	.order-submission .wrapper .item .discount .placeholder {
+		color: #ccc;
+	}
+
+	.order-submission .wrapper {
+		background-color: #fff;
+		margin-top: 15rpx;
+	}
+
+	.order-submission .wrapper .item {
+		padding: 27rpx 24rpx;
+		font-size: 30rpx;
+		color: #333333;
+		border-bottom: 1px solid #F5F5F5;
+	}
+
+	.order-submission .wrapper .item .discount {
+		font-size: 30rpx;
+		color: #333;
+	}
+
+	.order-submission .wrapper .item .discount .iconfont {
+		color: #515151;
+		font-size: 30rpx;
+		margin-left: 15rpx;
+	}
+
+	.order-submission .wrapper .item .discount .num {
+		font-size: 32rpx;
+		margin-right: 20rpx;
+	}
+
+	.order-submission .wrapper .item .shipping {
+		font-size: 30rpx;
+		color: #999;
+		position: relative;
+		padding-right: 58rpx;
+	}
+
+	.order-submission .wrapper .item .shipping .iconfont {
+		font-size: 35rpx;
+		color: #707070;
+		position: absolute;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%);
+		margin-left: 30rpx;
+	}
+
+	.order-submission .wrapper .item textarea {
+		background-color: #f9f9f9;
+		width: auto !important;
+		height: 140rpx;
+		border-radius: 14rpx;
+		margin-top: 30rpx;
+		padding: 15rpx;
+		box-sizing: border-box;
+		font-weight: 400;
+	}
+
+	.order-submission .wrapper .item .placeholder {
+		color: #ccc;
+	}
+
+	.order-submission .wrapper .item .list {
+		margin-top: 35rpx;
+	}
+
+	.order-submission .wrapper .item .list .payItem {
+		border: 1px solid #eee;
+		border-radius: 14rpx;
+		height: 86rpx;
+		width: 100%;
+		box-sizing: border-box;
+		margin-top: 20rpx;
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.order-submission .wrapper .item .list .payItem.on {
+		// border-color: #fc5445;
+		@include coupons_border_color(theme);
+		color: $theme-color;
+	}
+
+	.order-submission .wrapper .item .list .payItem .name {
+		width: 50%;
+		text-align: center;
+		border-right: 1px solid #eee;
+	}
+
+	.order-submission .wrapper .item .list .payItem .name .iconfont {
+		width: 44rpx;
+		height: 44rpx;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 44rpx;
+		background-color: #fe960f;
+		color: #fff;
+		font-size: 30rpx;
+		margin-right: 15rpx;
+	}
+
+	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 {
+		background-color: #41b035;
+	}
+
+	.order-submission .wrapper .item .list .payItem .name .iconfont.icon-zhifubao {
+		background-color: #00AAEA;
+	}
+
+	.order-submission .wrapper .item .list .payItem .tip {
+		width: 49%;
+		text-align: center;
+		font-size: 26rpx;
+		color: #aaa;
+	}
+
+	.order-submission .moneyList {
+		margin-top: 15rpx;
+		background-color: #fff;
+		padding: 30rpx;
+		margin-bottom: calc(constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		margin-bottom: calc(env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	}
+
+	.order-submission .moneyList .item {
+		font-size: 28rpx;
+		color: #282828;
+	}
+
+	.order-submission .moneyList .item~.item {
+		margin-top: 20rpx;
+	}
+
+	.order-submission .moneyList .item .money {
+		color: #666666;
+	}
+
+	.order-submission .footer {
+		width: 100%;
+		height: 100rpx;
+		background-color: #fff;
+		padding: 0 30rpx;
+		font-size: 28rpx;
+		color: #333;
+		box-sizing: border-box;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		height: calc(100rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
+		height: calc(100rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
+	}
+
+	.order-submission .footer .settlement {
+		font-size: 30rpx;
+		color: #fff;
+		width: 240rpx;
+		height: 70rpx;
+		@include main_bg_color(theme);
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 70rpx;
+	}
+
+	.footer .transparent {
+		opacity: 0
+	}
+
+	/deep/ checkbox .uni-checkbox-input.uni-checkbox-input-checked {
+		@include main_bg_color(theme);
+		border: none !important;
+		color: #fff !important
+	}
+
+	/deep/ checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+		@include main_bg_color(theme);
+		border: none !important;
+		color: #fff !important;
+		margin-right: 0 !important;
+	}
+</style>
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 0691d4f..4aefed5 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -17,14 +17,19 @@
 				</view>
 			</view>
 			<view class='nav acea-row row-around'>
-				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
+				<view class='item' :class='orderStatus==10 ? "on": ""' @click="statusClick(10)">
 					<view>全部</view>
 					<view class='num'>{{orderData.orderCount || 0}}</view>
 				</view>
+				<view class='item' :class='orderStatus==0 ? "on": ""' @click="statusClick(0)">
+					<view>未支付</view>
+					<view class='num'>{{orderData.unPaidCount || 0}}</view>
+				</view>
 				<view class='item' :class='orderStatus==6 ? "on": ""' @click="statusClick(6)">
 					<view>待审核</view>
 					<view class='num'>{{orderData.notAuditCount || 0}}</view>
 				</view>
+				
 				<view class='item' :class='orderStatus==7 ? "on": ""' @click="statusClick(7)">
 					<view>待签约</view>
 					<view class='num '>{{orderData.unsignedCount || 0}}</view>
@@ -76,8 +81,8 @@
 					</view>
 					<view class='bottom acea-row row-right row-middle'>
 						<view class="bohui" v-if="item.status == -4">驳回原因:&nbsp;{{item.auditRejectReason}}</view>
-						<!-- <view class='bnt bg_color'  @click='goPay(item.payPrice,item.orderId)'>立即付款</view> -->
-						<!-- <view class='bnt cancelBnt' v-if="item.status == 6 || item.status== 7" @click='cancelOrder(index,item.id)'>取消订单</view> -->
+						<view class='bnt bg_color'  v-if="item.orderStatus=='未支付'" @click='goPay(item.payPrice,item.orderId)'>立即付款</view>
+						<view class='bnt cancelBnt' v-if="item.status == 6 || item.status== 7" @click='cancelOrder(index,item.id)'>取消订单</view>
 						<view class='bnt bg_color' v-if="item.status==7" @click='lijiqy(item.orderId,item.id)'>立即签约
 						<!-- <view class='bnt bg_color' v-if="item.status==7" @click='lijiali()'>立即签约 -->
 						</view>
@@ -151,7 +156,7 @@
 				loadTitle: '加载更多', //提示语
 				orderList: [], //订单数组
 				orderData: {}, //订单详细统计
-				orderStatus: 0, //订单状态
+				orderStatus: 10, //订单状态
 				page: 1,
 				limit: 20,
 				payMode: [{
diff --git a/pages/users/user_address/index.vue b/pages/users/user_address/index.vue
index d8e721f..116dcc5 100644
--- a/pages/users/user_address/index.vue
+++ b/pages/users/user_address/index.vue
@@ -433,7 +433,8 @@
 				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
 					title: '请输入正确的手机号码'
 				});
-				if (that.region == '省-市-区') return that.$util.Tips({
+				// console.log(that.region.toString(),'that.regionthat.region');
+				if (that.region.toString() == '省,市,区') return that.$util.Tips({
 					title: '请选择所在地区'
 				});
 				if (!value.detail) return that.$util.Tips({
diff --git a/pages/users/user_address_list/index.vue b/pages/users/user_address_list/index.vue
index d65c290..7d99cf5 100644
--- a/pages/users/user_address_list/index.vue
+++ b/pages/users/user_address_list/index.vue
@@ -99,7 +99,8 @@
 				secKill: false, //是否是秒杀
 				theme: app.globalData.theme,
 				locationContent: '授权位置信息，提供完整服务',
-				locationStatus: false
+				locationStatus: false,
+				type:0,
 			};
 		},
 		computed: mapGetters(['isLogin']),
@@ -114,6 +115,8 @@
 			}
 		},
 		onLoad(options) {
+		console.log(options,'optionsoptions');
+		this.type=options.type
 			if (this.isLogin) {
 				this.preOrderNo = options.preOrderNo || 0;
 				this.getAddressList(true);
@@ -378,10 +381,18 @@
 			},
 			goOrder: function(item) {
 				if (this.preOrderNo) {
-					uni.redirectTo({
-						url: '/pages/users/order_confirm/index?is_address=1&preOrderNo=' + this.preOrderNo +
-							'&addressId=' + item.id
-					})
+					if(this.type==0){
+						uni.redirectTo({
+							url: '/pages/users/order_confirm/index?is_address=1&preOrderNo=' + this.preOrderNo +
+								'&addressId=' + item.id
+						})
+					}else {
+						uni.redirectTo({
+							url: '/pages/users/order_confirms/index?is_address=1&preOrderNo=' + this.preOrderNo +
+								'&addressId=' + item.id
+						})
+					}
+					
 				}
 			},
 		},