diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9a1da6e..2f36eb6 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,17 +28,17 @@
-
+
{{item.title}}
-
-
+
+
-
+
@@ -51,13 +51,13 @@
-
+
{{item.title}}
{{item.money / 100}}
-
+
@@ -71,36 +71,30 @@
typeList: [
{
title: '品牌导游',
- id: '57'
- },
- {
- title: '选项2',
- id: '58'
+ id: '2'
}
],
typeIndex: 0,
- 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'
- }
- ],
+ tourList: [],
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({
- url: '/subPackages/webPage/webPage?url=' + item.tdata
- });
+ window.location.href = 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;
diff --git a/static/css/base.css b/static/css/base.css
index 9bdcd64..6ffdcee 100644
--- a/static/css/base.css
+++ b/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 {
diff --git a/subPackages/daoyou/order.vue b/subPackages/daoyou/order.vue
index 2f06ede..d2a0ae6 100644
--- a/subPackages/daoyou/order.vue
+++ b/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
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index 534fb79..3e65686 100644
--- a/subPackages/line/orders.vue
+++ b/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({
- // nonceStr: res.data.nonceStr,
- // package: res.data.package,
- // paySign: res.data.paySign,
- // signType: res.data.signType,
- // timeStamp: res.data.timeStamp,
- // success: () => {
- // this.getSubscribeMessage()
- // },
- // fail() {
- // uni.navigateTo({
- // url: '/subPackages/order/trades'
- // })
- // }
- // })
+ 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'
+ })
+ });
}
})
}
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index dca0efb..2bd95b7 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
daoyous
\ No newline at end of file
+ document.write('')