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

pages/index/index.vue

@@ -28,17 +28,17 @@
 		</view>
 		
 		<view class="type-box">
-			<view v-for="(item,index) in typeList" :key="index" :class="['type-item', {'type-active': index == typeIndex}]" @click="typeIndex = index">
+			<view v-for="(item,index) in typeList" :key="index" :class="['type-item', {'type-active': index == typeIndex}]" @click="typeIndex = index;getTouristList()">
 				{{item.title}}
 			</view>
 		</view>
 		
 		<view class="tour-box">
-			<view v-for="(item,index) in tourList" :key="index" class="tour-item">
+			<navigator :url="'/subPackages/daoyou/detail?id=' + item.id" v-for="(item,index) in tourList" :key="index" class="tour-item">
-				<image :src="showImg(item.img)" mode="aspectFill" class="tour-img"></image>
+				<image :src="showImg(item.image)" mode="aspectFill" class="tour-img"></image>
 				<!-- <image src="https://static.ticket.sz-trip.com/tourist/index/play.png" class="playImg"></image> -->
 				<!-- <view class="time">{{item.time}}</view> -->
-			</view>
+			</navigator>
 		</view>
 		
 		<!-- 精选线路 -->
@@ -51,13 +51,13 @@
 		</view>
 		
 		<view class="line-box">
-			<view v-for="(item,index) in lineList" :key="index" class="line-item">
+			<navigator :url="'/subPackages/line/detail?id=' + item.id" v-for="(item,index) in lineList" :key="index" class="line-item">
 				<image :src="showImg(item.image)" mode="aspectFill" class="line-img"></image>
 				<view class="line-content">
 					<view class="line-title text-overflowRows">{{item.title}}</view>
 					<view class="line-price">{{item.money / 100}}</view>
 				</view>
-			</view>
+			</navigator>
 		</view>
 	</view>
 </template>
@@ -71,36 +71,30 @@
 				typeList: [
 					{
 						title: '品牌导游',
-						id: '57'
+						id: '2'
-					},
-					{
-						title: '选项2',
-						id: '58'
 					}
 				],
 				typeIndex: 0,
-				tourList: [
+				tourList: [],
-					{
-						img: 'https://static.ticket.sz-trip.com/uploads/20241126/50d406ead15c861f76b8df7dab401802.png',
-						time: '0:30'
-					},
-					{
-						img: 'https://static.ticket.sz-trip.com/uploads/20241126/50d406ead15c861f76b8df7dab401802.png',
-						time: '0:30'
-					},
-					{
-						img: 'https://static.ticket.sz-trip.com/uploads/20241126/50d406ead15c861f76b8df7dab401802.png',
-						time: '0:30'
-					}
-				],
 				lineList: []
 			}
 		},
 		onReady() {
 			this.getTopBanner()
 			this.getLineList()
+			this.getTouristList()
 		},
 		methods: {
+			// 获取导游列表
+			getTouristList() {
+				this.Post({
+					type_id: this.typeList[this.typeIndex].id,
+					offset: 0,
+					limit: 5
+				},'/api/goods/getGoodsByDateType').then(res => {
+					this.tourList = res.data
+				})
+			},
 			// 获取线路列表
 			getLineList() {
 				this.Post({
@@ -132,9 +126,10 @@
 						});
 						break;
 					case 3:
-						uni.navigateTo({
+						window.location.href = item.tdata
-							url: '/subPackages/webPage/webPage?url=' + item.tdata
+						// uni.navigateTo({
-						});
+						// 	url: '/subPackages/webPage/webPage?url=' + item.tdata
+						// });
 						break;
 					case 4:
 						uni.navigateToMiniProgram({
@@ -279,6 +274,7 @@
 			width: 266.73rpx;
 			height: 333.4rpx;
 			padding: 6rpx;
+			box-sizing: border-box;
 			
 			.tour-img {
 				width: 253rpx;
@@ -325,6 +321,7 @@
 			border: 1rpx solid #96684F;
 			margin-right: 13rpx;
 			padding: 22rpx;
+			box-sizing: border-box;
 			
 			.line-img {
 				width: 423rpx;

static/css/base.css

@@ -48,10 +48,13 @@ view {
 /*单行隐藏*/
 .text-overflow {
 	overflow-x: hidden;
-	overflow-y: hidden;
+	overflow-y: inherit;
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.text-overflow::-webkit-scrollbar {
+	display: none;
+}
 
 /* 两行隐藏 */
 .text-overflowRows {

subPackages/daoyou/order.vue

@@ -222,7 +222,36 @@
 						method: 'POST',
 						data: JSON.stringify(data)
 					}, '/api/order/place').then(res => {
+						let order_id = res.data.order_id
+						this.$store.commit("changeTouristInfo", null);
+						this.$store.commit("choseCoupon", "");
 						
+						this.Post({
+							order_id: order_id,
+							type: "miniprogram",
+							platform: 'miniprogram'
+						}, '/api/pay/unify').then(res => {
+							if (res.data) {
+								let data = res.data
+								WeixinJSBridge.invoke('getBrandWCPayRequest', {
+									"appId": data.appId,     //公众号ID，由商户传入     
+									"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     
+									"nonceStr": data.timeStamp,      //随机串     
+									"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'
+									})
+								});
+							}
+						})
 					})
 				}else {
 					this.isBottom = false

subPackages/line/orders.vue

@@ -266,25 +266,28 @@
 							
 							this.Post({
 								order_id: order_id,
-								type: "wx",
+								type: "miniprogram",
 								platform: 'miniprogram'
 							}, '/api/pay/unify').then(res => {
 								if (res.data) {
-									// uni.requestPayment({
+									let data = res.data
-									// 	nonceStr: res.data.nonceStr,
+									WeixinJSBridge.invoke('getBrandWCPayRequest', {
-									// 	package: res.data.package,
+										"appId": data.appId,     //公众号ID，由商户传入     
-									// 	paySign: res.data.paySign,
+										"timeStamp": data.timeStamp,     //时间戳，自1970年以来的秒数     
-									// 	signType: res.data.signType,
+										"nonceStr": data.timeStamp,      //随机串     
-									// 	timeStamp: res.data.timeStamp,
+										"package": data.package,
-									// 	success: () => {
+										"signType": data.signType,     //微信签名方式：     
-									// 		this.getSubscribeMessage()
+										"paySign": data.paySign //微信签名 
-									// 	},
+									},
-									// 	fail() {
+									function(res) {
-									// 		uni.navigateTo({
+										// if (res.err_msg == "get_brand_wcpay_request:ok") {
-									// 			url: '/subPackages/order/trades'
+										// 	// 使用以上方式判断前端返回,微信团队郑重提示：
-									// 		})
+										// 	//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
 										// }
-									// })
+										uni.navigateTo({
+											url: '/subPackages/order/trades'
+										})
+									});
 								}
 							})
 						}

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.fd846d3a.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.741e8866.js></script></body></html>

unpackage/dist/build/web/static/css/base.css

@@ -52,6 +52,9 @@ view {
 	text-overflow: ellipsis;
 	white-space: nowrap;
 }
+.text-overflow::-webkit-scrollbar {
+	display: none;
+}
 
 /* 两行隐藏 */
 .text-overflowRows {

unpackage/dist/build/web/static/js/request.js

@@ -10,7 +10,7 @@ Vue.prototype.NEWAPIURL = NEWAPIURL
 Vue.prototype.Post = (params, apiurl) => {
     if (uni.getStorageSync('userInfo') && JSON.parse(uni.getStorageSync('userInfo')).token) params.token = JSON.parse(uni.getStorageSync('userInfo')).token
 	else if (store.state.user.userInfo.token) params.token = store.state.user.userInfo.token
-	params.token = '84bf42c7-e4b9-48b7-976e-2dddcc596d39'
+	// params.token = '84bf42c7-e4b9-48b7-976e-2dddcc596d39'
 	return new Promise((resolve, reject) => {
 		uni.showLoading({
 			title: '加载中'