Merge branch 'master' of http://47.114.134.244:3000/chenkainan/tourist

pages/daoyou/index.vue

@@ -7,7 +7,7 @@
 			</view>
 			
 			<view class="type-box flex-between">
-				<view :class="['type-item', {'type-active': item.isSelect}]" v-for="(item,index) in typeList" :key="index" @click="selectConditions(item,index)" v-if="index != 2 && index != 3">
+				<view :class="['type-item', {'type-active': item.isSelect}]" v-for="(item,index) in typeList" :key="index" @click="selectConditions(item,index)" v-if="index != 3">
 					{{item.title}}
 					<view class="type-num flex-center" v-if="item.num > 0">{{item.num}}</view>
 					<image src="https://static.ticket.sz-trip.com/tourist/daoyou/bottomIcon.png" class="type-icon" v-if="index > 1"></image>
@@ -49,11 +49,11 @@
 		</view>
 		
 		<!-- 性别弹框 -->
-		<!-- <uni-popup type="bottom" ref="sexPopup" @change="changeTabBar">
+		<uni-popup type="bottom" ref="sexPopup" @change="changeTabBar">
 			<view class="sex-box">
-				<view v-for="(item,index) in typeList[2].list" :key="index" class="flex-center" @click="changeSex(item)">{{item.title}}</view>
+				<view v-for="(item,index) in typeList[2].list" :key="index" class="flex-center" @click="changeSex(item,index)">{{item.title}}</view>
 			</view>
-		</uni-popup> -->
+		</uni-popup>
 		
 		<!-- 擅长景区弹框 -->
 		<!-- <uni-popup type="bottom" ref="scenicPopup" @change="changeTabBar" @maskClick="scenicConfirm(0)">
@@ -114,19 +114,20 @@
 						title: '性别',
 						isSelect: false,
 						list: [
-							// {
-							// 	title: '全部',
-							// 	id: ''
-							// },
-							// {
-							// 	title: '男',
-							// 	id: '1'
-							// },
-							// {
-							// 	title: '女',
-							// 	id: '2'
-							// }
-						]
+							{
+								title: '全部',
+								id: ''
+							},
+							{
+								title: '男',
+								id: '1'
+							},
+							{
+								title: '女',
+								id: '2'
+							}
+						],
+						sexIndex: 0
 					},
 					{
 						title: '擅长景区',
@@ -190,7 +191,8 @@
 					end_date: this.typeList[4].num > 0 ? this.selectDate.endDay : (this.typeList[1].isSelect ? new Date().Format('yyyy-MM-dd') : ''),
 					sort: this.typeList[0].isSelect ? 'sort' : '',
 					order: this.typeList[0].isSelect ? 'desc' : '',
-					title: this.keywords
+					title: this.keywords,
+					sex: this.typeList[2].title == '男' ? 1 : (this.typeList[2].title == '女' ? 2 : '')
 				},'/api/goods/getGoodsByDateType').then(res => {
 					this.list = [...this.list, ...res.data]
 					if (res.data.length < 10) {
@@ -268,6 +270,8 @@
 					this.typeList[2].title = item.title
 					this.typeList[2].isSelect = true
 				}
+				
+				this.onReload()
 				this.$refs.sexPopup.close()
 			},
 			// 擅长景区选择

subPackages/daoyou/order.vue

@@ -236,6 +236,12 @@
 						}, '/api/pay/unify').then(res => {
 							if (res.data) {
 								let data = res.data
+								if(data.status == 'success') {
+									uni.navigateTo({
+										url: '/subPackages/order/trades'
+									})
+									return;
+								}
 								WeixinJSBridge.invoke('getBrandWCPayRequest', {
 									"appId": data.appId,     //公众号ID，由商户传入     
 									"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     

subPackages/line/orders.vue

@@ -269,6 +269,12 @@
 							}, '/api/pay/unify').then(res => {
 								if (res.data) {
 									let data = res.data
+									if(data.status == 'success') {
+										uni.navigateTo({
+											url: '/subPackages/order/trades'
+										})
+										return;
+									}
 									WeixinJSBridge.invoke('getBrandWCPayRequest', {
 										"appId": data.appId,     //公众号ID，由商户传入     
 										"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     

subPackages/order/orderDetail.vue

@@ -330,21 +330,34 @@
 					type: "miniprogram",
 					platform: 'miniprogram'
 				}, '/api/pay/unify').then(res => {
-					if (res.code == 1) {
-						uni.requestPayment({
-							nonceStr: res.data.nonceStr,
-							package: res.data.package,
-							paySign: res.data.paySign,
-							signType: res.data.signType,
-							timeStamp: res.data.timeStamp,
-							success: () => {
-								that.getDetail();
-								uni.$emit("updateDataByConnect", {
-									msgType: 'updateOrderTrades',
-									data: {}
+					if (res.data) {
+						let data = res.data
+						if(data.status == 'success') {
+							uni.navigateTo({
+								url: '/subPackages/order/trades'
+							})
+							return;
+						}
+						WeixinJSBridge.invoke('getBrandWCPayRequest', {
+							"appId": data.appId,     //公众号ID，由商户传入     
+							"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     
+							"nonceStr": data.nonceStr,      //随机串     
+							"package": data.package,
+							"signType": data.signType,     //微信签名方式：     
+							"paySign": data.paySign //微信签名 
+						},
+						function(res) {
+							// if (res.err_msg == "get_brand_wcpay_request:ok") {
+							// 	// 使用以上方式判断前端返回,微信团队郑重提示：
+							// 	//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+							// }
+							uni.navigateTo({
+								url: '/subPackages/order/trades'
 							})
-							}
 						});
+						// uni.navigateTo({
+						// 	url: '/subPackages/order/payResult?text=' + encodeURIComponent(JSON.stringify(res.data))
+						// })
 					}
 				});
 			},

subPackages/order/trades.vue

@@ -171,6 +171,12 @@
 					console.log(res)
 					if (res.data) {
 						let data = res.data
+						if(data.status == 'success') {
+							uni.navigateTo({
+								url: '/subPackages/order/trades'
+							})
+							return;
+						}
 						WeixinJSBridge.invoke('getBrandWCPayRequest', {
 							"appId": data.appId,     //公众号ID，由商户传入     
 							"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     

unpackage/dist/build/web/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>daoyous</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.62659eda.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.54f9da58.js></script></body></html>