diff --git a/pages.json b/pages.json
index 507c667..d0bc9a3 100644
--- a/pages.json
+++ b/pages.json
@@ -114,7 +114,7 @@
{
"path": "eventCalendar/eventCalendar",
"style": {
- "navigationBarTitleText": "岁时雅集"
+ "navigationBarTitleText": "近期活动"
// "navigationStyle": "custom"
}
},
@@ -328,13 +328,13 @@
{
"path": "leyou/index",
"style": {
- "navigationBarTitleText": "乐游同里"
+ "navigationBarTitleText": "景点展览"
}
},
{
"path": "leyou/detail",
"style": {
- "navigationBarTitleText": "乐游同里详情",
+ "navigationBarTitleText": "景点展览详情",
"navigationStyle": "custom"
}
},
@@ -363,6 +363,12 @@
"style": {
"navigationBarTitleText": "用户评价"
}
+ },
+ {
+ "path": "user/logout",
+ "style": {
+ "navigationBarTitleText": "注销账号"
+ }
}
]
}],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 28991a1..7e3a664 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -58,11 +58,11 @@
景点展览
- 更多
+ 更多
-
+
{{item.title}}
@@ -138,27 +138,27 @@
navList: [
{
img: 'syyj',
- text: '岁月雅集',
+ text: '近期活动',
path: '/subPackages/eventCalendar/eventCalendar'
},
{
img: 'sxly',
- text: '膳香留韵',
+ text: '美食推荐',
path: '/subPackages/food/foodList'
},
{
img: 'xjsg',
- text: '栖居水阁',
+ text: '酒店民宿',
path: '/subPackages/hotelHomestay/hotelHomestay'
},
{
img: 'fyty',
- text: '风雅体验',
+ text: '特色体验',
path: '/subPackages/line/lineList'
},
{
img: 'ssfw',
- text: '水市风物',
+ text: '水乡特产',
path: '/subPackages/techan/techanList'
},
{
@@ -169,11 +169,11 @@
{
img: 'shtl',
text: '数绘同里',
- // path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/')
+ path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://xnlv.tongli.net/TongliPanoTours/#/pc/pano')
},
{
img: 'lfys',
- text: '里坊轶事',
+ text: '找车位',
// path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/')
}
],
@@ -271,7 +271,7 @@
this.goOtherDetail(item)
if(!item.link_type) {
uni.navigateTo({
- url:'/subPackages/ticketBooking/detail?id='+item.id
+ url:'/subPackages/leyou/detail?id='+item.id
})
}
},
@@ -305,10 +305,10 @@
// 景点推荐
getScenicByTag() {
this.Post({
- tag_id: 48,
+ scenic_type_id: 12,
offset: 0,
limit: 5
- },'/api/scenic/getScenicByTagId').then(res => {
+ },'/api/scenic/getScenicByType').then(res => {
this.scenicList = res.data
})
},
diff --git a/subPackages/food/foodOrder.vue b/subPackages/food/foodOrder.vue
index e525a05..bd57ae2 100644
--- a/subPackages/food/foodOrder.vue
+++ b/subPackages/food/foodOrder.vue
@@ -153,10 +153,13 @@
paySign: res.data.paySign,
signType: res.data.signType,
timeStamp: res.data.timeStamp,
- complete() {
+ success: () => {
+ this.getSubscribeMessage()
+ },
+ fail() {
uni.navigateTo({
url: '/subPackages/order/trades'
- });
+ })
}
});
}
diff --git a/subPackages/hotelHomestay/order.vue b/subPackages/hotelHomestay/order.vue
index 4818a4b..9e9cab1 100644
--- a/subPackages/hotelHomestay/order.vue
+++ b/subPackages/hotelHomestay/order.vue
@@ -350,7 +350,10 @@
paySign: res.data.paySign,
signType: res.data.signType,
timeStamp: res.data.timeStamp,
- complete() {
+ success: () => {
+ this.getSubscribeMessage()
+ },
+ fail() {
uni.navigateTo({
url: '/subPackages/order/trades'
})
diff --git a/subPackages/leyou/index.vue b/subPackages/leyou/index.vue
index ba58940..0f07298 100644
--- a/subPackages/leyou/index.vue
+++ b/subPackages/leyou/index.vue
@@ -21,6 +21,10 @@
+
+
+
+
@@ -37,7 +41,6 @@
},
methods: {
getList() {
- https://tlgz.sz-trip.com?scenic_type_id=11&offset=0&limit=10&lon=120&lat=30&token=96035795-fe93-4db8-8cf3-aeabbdb4e8c4
this.Post({
scenic_type_id: 12,
offset: 0,
@@ -150,4 +153,24 @@
}
}
}
+
+ .current-box {
+ position: absolute;
+ bottom: 70rpx;
+ left: 0;
+ display: flex;
+ width: 750rpx;
+ justify-content: center;
+
+ .current-item {
+ width: 13rpx;
+ height: 13rpx;
+ background: rgba(36, 139, 170, .3);
+ border-radius: 7rpx;
+ margin-right: 6rpx;
+ }
+ .current-items {
+ background: #248BAA;
+ }
+ }
\ No newline at end of file
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index 3f48024..f6cdbb9 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -266,7 +266,10 @@
paySign: res.data.paySign,
signType: res.data.signType,
timeStamp: res.data.timeStamp,
- complete() {
+ success: () => {
+ this.getSubscribeMessage()
+ },
+ fail() {
uni.navigateTo({
url: '/subPackages/order/trades'
})
diff --git a/subPackages/order/commentList.vue b/subPackages/order/commentList.vue
index 4d825ef..075585d 100644
--- a/subPackages/order/commentList.vue
+++ b/subPackages/order/commentList.vue
@@ -12,8 +12,8 @@
-
- |
+
{{item.goods_name}}
@@ -24,10 +24,10 @@
- 收起
+ 收起
- 展开
+ 展开
@@ -258,8 +258,7 @@
font-family: PingFang SC;
font-weight: 400;
color: #000000;
- // line-height: 50rpx;
-
+ line-height: 50rpx;
}
.img-list {
@@ -331,9 +330,9 @@
}
.open, .close {
- font-size: 24rpx;
font-weight: bold;
- color: #08C59B;
+ font-size: 29rpx;
+ color: #E52910;
display: flex;
align-items: center;
margin-top: 10rpx;
diff --git a/subPackages/order/detail.vue b/subPackages/order/detail.vue
index 3691c61..65389d3 100644
--- a/subPackages/order/detail.vue
+++ b/subPackages/order/detail.vue
@@ -29,7 +29,7 @@
- 核销码:{{item.child_id}}
+ 核销码:{{item.third_order_id ? item.third_order_id : item.child_id}}
@@ -141,7 +141,7 @@
商家名称
-
+
{{item.goods_title}}
@@ -150,6 +150,7 @@
x{{item.num}}
+ 去评价
@@ -383,7 +384,8 @@
关闭订单
-
+
立即评价
@@ -467,14 +469,14 @@
},
methods: {
// 去评价
- goComment() {
- let order_id = ''
- for(let item of this.info.order_child) {
- if (item.status == 'WAIT_COMMENT') {
- order_id = item.order_id
- break;
- }
- }
+ goComment(index) {
+ let order_id = this.info.order_child[index].order_id
+ // for(let item of this.info.order_child) {
+ // if (item.status == 'WAIT_COMMENT') {
+ // order_id = item.order_id
+ // break;
+ // }
+ // }
uni.navigateTo({
url: '/subPackages/order/writeComment?order_id=' + order_id
})
@@ -523,7 +525,11 @@
.includes(this.info.status)) {
this.isQrcode = true
for (let i = 0; i < this.info.order_child.length; i++) {
- this.getCodeImg(this.info.order_child[i].child_id, i);
+ if(this.info.order_child[i].third_order_id) {
+ this.getCodeImg(this.info.order_child[i].third_order_id, i);
+ }else {
+ this.getCodeImg(this.info.order_child[i].child_id, i);
+ }
// 未核销数量
if (this.info.order_child[i].status == 'SUCCESS') this.remainNum += 1
@@ -685,10 +691,21 @@
signType: res.data.signType,
timeStamp: res.data.timeStamp,
success: () => {
- that.getDetail();
- uni.$emit("updateDataByConnect", {
- msgType: 'updateOrderTrades',
- data: {}
+ const templateIds = [
+ // 退款成功通知
+ 'hRZoiEES2BWtKb6Xgsnn8khLQH9un5j_11qu0bwlhfE',
+ // 出票结果通知
+ 'YyTCUIYBnrj9CyKks8cOjNX_Rk8a4yVdswMP-zXVbhc'
+ ]
+ uni.requestSubscribeMessage({
+ tmplIds: templateIds,
+ complete (res) {
+ that.getDetail();
+ uni.$emit("updateDataByConnect", {
+ msgType: 'updateOrderTrades',
+ data: {}
+ })
+ }
})
}
});
@@ -1018,6 +1035,7 @@
margin-top: 24rpx;
padding-bottom: 33rpx;
border-bottom: 1rpx solid #D8D8D8;
+ position: relative;
.product-img {
width: 140rpx;
@@ -1055,6 +1073,20 @@
}
}
}
+
+ .evaluate-btn {
+ width: 147rpx;
+ height: 53rpx;
+ border-radius: 27rpx;
+ border: 1rpx solid #999999;
+ font-weight: 500;
+ font-size: 27rpx;
+ color: #000000;
+ margin-left: auto;
+ position: absolute;
+ right: 0;
+ bottom: 26rpx;
+ }
}
}
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
index 22ce130..81f31e4 100644
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@@ -167,10 +167,21 @@
paySign: res.data.paySign,
signType: res.data.signType,
timeStamp: res.data.timeStamp,
- complete() {
- that.list = [];
- that.finished = false;
- that.getList()
+ success: () => {
+ const templateIds = [
+ // 退款成功通知
+ 'hRZoiEES2BWtKb6Xgsnn8khLQH9un5j_11qu0bwlhfE',
+ // 出票结果通知
+ 'YyTCUIYBnrj9CyKks8cOjNX_Rk8a4yVdswMP-zXVbhc'
+ ]
+ uni.requestSubscribeMessage({
+ tmplIds: templateIds,
+ complete (res) {
+ that.list = [];
+ that.finished = false;
+ that.getList()
+ }
+ })
}
});
}
diff --git a/subPackages/order/writeComment.vue b/subPackages/order/writeComment.vue
index a05509b..62c71c3 100644
--- a/subPackages/order/writeComment.vue
+++ b/subPackages/order/writeComment.vue
@@ -176,7 +176,7 @@
});
return
} else{
- this.list = this.list.map(item => 'https://yjdtadmin.sz-trip.com' + item);
+ this.list = this.list.map(item => NEWAPIURL + item);
}
console.log('-----------',this.list);
this.Post({
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index a544ca9..4a49d57 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -576,10 +576,13 @@ export default {
paySign: res.data.paySign,
signType: res.data.signType,
timeStamp: res.data.timeStamp,
- complete() {
+ success: () => {
+ this.getSubscribeMessage()
+ },
+ fail() {
uni.navigateTo({
url: '/subPackages/order/trades'
- });
+ })
}
});
}
diff --git a/subPackages/user/getCoupon.vue b/subPackages/user/getCoupon.vue
index 8664c5f..4f17b6e 100644
--- a/subPackages/user/getCoupon.vue
+++ b/subPackages/user/getCoupon.vue
@@ -38,7 +38,7 @@
}
},
onReady() {
- this.getHeadImg('line').then(res => {this.headImg = res})
+ this.getHeadImg('coupon').then(res => {this.headImg = res})
},
onShow() {
this.getList()
diff --git a/subPackages/user/logout.vue b/subPackages/user/logout.vue
new file mode 100644
index 0000000..d7d70a0
--- /dev/null
+++ b/subPackages/user/logout.vue
@@ -0,0 +1,154 @@
+
+
+
+ 用户注销协议
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/user/profile.vue b/subPackages/user/profile.vue
index e449e10..ecc29c8 100644
--- a/subPackages/user/profile.vue
+++ b/subPackages/user/profile.vue
@@ -26,6 +26,10 @@
{{birthday}}
+
+ 注销账号
+ 注销后账号无法恢复，请谨慎操作
+
保存
@@ -307,6 +311,13 @@
font-weight: 500;
font-size: 31rpx;
flex-shrink: 0;
+ color: #000;
+ }
+
+ .userinfo-item i {
+ font-weight: 500;
+ font-size: 24rpx;
+ color: #999999;
}
.userinfo-item {