diff --git a/pages/daoyou/index.vue b/pages/daoyou/index.vue
index 5c847f4..9560248 100644
--- a/pages/daoyou/index.vue
+++ b/pages/daoyou/index.vue
@@ -377,7 +377,6 @@
height: 273rpx;
background: #FFFFFF;
border-radius: 7rpx;
- border: 1rpx solid #96684F;
background-image: url('https://static.ticket.sz-trip.com/tourist/daoyou/itemBg.png');
background-size: 100% 100%;
padding: 14rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 8e98173..8aa7296 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -73,10 +73,10 @@
title: '品牌导游',
id: '57'
},
- {
- title: '选项2',
- id: '58'
- }
+ // {
+ // title: '选项2',
+ // id: '58'
+ // }
],
typeIndex: 0,
tourList: [],
diff --git a/subPackages/daoyou/detail.vue b/subPackages/daoyou/detail.vue
index 1d3cb4a..be8863c 100644
--- a/subPackages/daoyou/detail.vue
+++ b/subPackages/daoyou/detail.vue
@@ -1,6 +1,6 @@
-
+
客服
@@ -112,6 +112,7 @@
+ 暂无场次
@@ -136,7 +137,8 @@
skus: [],
type: '',
- id: ''
+ id: '',
+ skuHeight: 0
}
},
onLoad(option) {
@@ -216,6 +218,17 @@
this.selectDay = item
this.selectIndex = index - 1
}
+
+ this.getSkuHeight()
+ },
+ getSkuHeight() {
+ const query = uni.createSelectorQuery().in(this);
+ query
+ .select(".sku-box")
+ .boundingClientRect(res => {
+ this.skuHeight = res.height
+ })
+ .exec();
},
// 根据日期判断库存
getStoreByDate() {
@@ -225,6 +238,10 @@
end_date: this.everyDay[this.everyDay.length - 1].date
},'/api/goods/get_product_sku_price_by_date').then(res => {
this.skus = res.data
+
+ this.$nextTick(() => {
+ this.getSkuHeight()
+ })
})
},
// 播放视频
@@ -317,7 +334,15 @@
},
// 切换上一月、下一月
preNextDate(e) {
+ let currentDate = new Date()
if (e) {
+ // 只能往后点三个月
+ let monthsToAdd = 3; // 三个月
+ let maxMonth = 0
+ currentDate.setMonth(currentDate.getMonth() + monthsToAdd);
+ maxMonth = Number(this.getNowTime(currentDate).slice(5, 7))
+
+ // if(this.month + 1 == maxMonth) return;
// 下一月
this.month += 1;
if (this.month > 12) {
@@ -330,6 +355,9 @@
this.getEveryDay(this.year + '-' + this.month);
}
} else {
+ currentDate.setMonth(currentDate.getMonth() - 1);
+ let minMonth = Number(this.getNowTime(currentDate).slice(5, 7))
+ if(this.month - 1 == minMonth) return;
// 上一月
this.month -= 1;
if (this.month == 0) {
@@ -475,7 +503,7 @@
}
.calendar {
- height: 668rpx;
+ height: auto;
background: #FFFFFF;
border-radius: 13rpx;
margin-top: 28rpx;
@@ -589,7 +617,7 @@
.sku-box {
border-radius: 13rpx;
background-color: #fff;
- margin-top: 100rpx;
+ margin-top: 30rpx;
.sku-item {
height: 132rpx;
@@ -637,4 +665,16 @@
border-top: 1rpx solid #D8D8D8;
}
}
+
+ .empty-text {
+ width: 697rpx;
+ line-height: 133rpx;
+ background: #FFFFFF;
+ border-radius: 13rpx 13rpx 0rpx 0rpx;
+ text-align: center;
+ margin-top: 30rpx;
+ font-weight: 500;
+ font-size: 28rpx;
+ color: #999999;
+ }
\ No newline at end of file
diff --git a/subPackages/daoyou/order.vue b/subPackages/daoyou/order.vue
index 302d706..169d271 100644
--- a/subPackages/daoyou/order.vue
+++ b/subPackages/daoyou/order.vue
@@ -58,7 +58,7 @@
联系电话
-
+
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index a7963d9..7cfd548 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -145,7 +145,6 @@
coupon: '',
reserve_name: '',
reserve_phone: '',
- reserve_mobile: '',
remark: '',
peopleList: [],
linkmanList: [],
@@ -258,7 +257,6 @@
data: JSON.stringify(data),
method: 'POST',
},'/api/order/place').then(res => {
- console.log(res)
if(res.code == 1) {
let order_id = res.data.order_id
this.$store.commit("changeLineInfo", null);
@@ -315,18 +313,29 @@
limit: 100
},'/api/user/contactList').then(res => {
this.peopleList = res.data
- this.reserve_mobile = this.peopleList[0].tel
// 如果是添加或者修改完出行人后需要默认选中已选择的出行人
if(this.linkmanList.length > 0){
+ // 之前选中的出行人在请求列表后默认选中
for (let i = 0; i < this.linkmanList.length; i++) {
for (let j = 0; j < this.peopleList.length; j++) {
if(this.peopleList[j].id == this.linkmanList[i].id){
this.linkmanList[i] = this.peopleList[j]
this.peopleList[j].is_seld = true
- this.linkmanList[i].is_seld = true
}
}
}
+
+ // 之前选中的出行人在请求列表后追加规格id
+ for (let i = 0; i < this.linkmans.length; i++) {
+ this.linkmans[i].forEach(item => {
+ for (let j = 0; j < this.peopleList.length; j++) {
+ if(this.peopleList[j].id == item.id){
+ this.peopleList[j].is_sku = item.is_sku
+ }
+ }
+ })
+ }
+ this.showLinkman(this.skuIndex)
this.$forceUpdate()
}
})
@@ -337,7 +346,6 @@
if (res && res.code == 1) {
this.getPeople();
this.changeContactAddPopup('close')
- console.log('this.linkmanList3',this.linkmanList)
}
},
// 选择出行人弹框
@@ -348,8 +356,7 @@
}
this.skuIndex = skuIndex
-
- this.peopleList.map(item => {
+ this.peopleList.forEach(item => {
if(item.is_seld && item.is_sku != this.sku[this.skuIndex].id) {
item.is_disable = true
}else {
@@ -393,7 +400,7 @@
return;
}
this.linkmans[this.skuIndex] = []
- this.peopleList.map(items => {
+ this.peopleList.forEach(items => {
if(items.id == item.id) {
items.is_seld = !items.is_seld
}
@@ -683,6 +690,7 @@
.popup-list {
height: 666rpx;
+ padding-bottom: 100rpx;
overflow: scroll;
.popup-item {
diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue
index 3cf8b41..82e2363 100644
--- a/subPackages/order/orderDetail.vue
+++ b/subPackages/order/orderDetail.vue
@@ -45,7 +45,7 @@
- 左右滑动核销其他二维码
+ 请到现场后给工作人员出示二维码核销
@@ -269,6 +269,7 @@
uni.showModal({
title: '提示',
content: '是否申请退款？',
+ confirmColor: '#000000',
success: successRes => {
if (successRes.confirm) {
that.Post({
@@ -298,6 +299,7 @@
uni.showModal({
title: '提示',
content: '确认关闭订单？',
+ confirmColor: '#000000',
success: successRes => {
if (successRes.confirm) {
that.Post({
@@ -471,7 +473,7 @@
.swiper-prompt {
font-weight: 500;
font-size: 29rpx;
- color: #EE3E3B;
+ color: #888888;
text-align: center;
margin-bottom: 45rpx;
}
@@ -549,6 +551,7 @@
font-weight: 500;
font-size: 27rpx;
color: #000000;
+ white-space: nowrap;
span {
display: inline-block;
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
index 285c3bf..77ed0a6 100644
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@@ -50,7 +50,7 @@
申请退款
关闭订单
- 再次购买
+ 再次购买
立即支付
@@ -113,6 +113,7 @@
uni.showModal({
title: '提示',
content: '是否申请退款？',
+ confirmColor: '#000000',
success: successRes => {
if (successRes.confirm) {
that.Post(
@@ -139,6 +140,7 @@
uni.showModal({
title: '提示',
content: '是否关闭订单？',
+ confirmColor: '#000000',
success: successRes => {
if (successRes.confirm) {
that.Post(
diff --git a/subPackages/user/bindTel.vue b/subPackages/user/bindTel.vue
index bd9d1e9..c585bbf 100644
--- a/subPackages/user/bindTel.vue
+++ b/subPackages/user/bindTel.vue
@@ -52,6 +52,7 @@
uni.showModal({
title: '提示',
content: '保存成功！',
+ confirmColor: '#000000',
success: res => {
if (res.confirm) {
this.goBack()
diff --git a/subPackages/user/changeNickname.vue b/subPackages/user/changeNickname.vue
index 180f052..4c353cd 100644
--- a/subPackages/user/changeNickname.vue
+++ b/subPackages/user/changeNickname.vue
@@ -32,6 +32,7 @@
uni.showModal({
title: '提示',
content: '保存成功！',
+ confirmColor: '#000000',
success: res => {
if (res.confirm) {
this.goBack()
diff --git a/subPackages/user/logout.vue b/subPackages/user/logout.vue
index dc513cc..2eed90a 100644
--- a/subPackages/user/logout.vue
+++ b/subPackages/user/logout.vue
@@ -50,6 +50,7 @@
uni.showModal({
title: '提示',
content: '确认注销账号？',
+ confirmColor: '#000000',
success: successRes => {
if (successRes.confirm) {
this.Post({
diff --git a/subPackages/user/myContactsAdd.vue b/subPackages/user/myContactsAdd.vue
index 3294e2c..93ad08e 100644
--- a/subPackages/user/myContactsAdd.vue
+++ b/subPackages/user/myContactsAdd.vue
@@ -123,6 +123,7 @@
title: '提示',
content: '成功',
showCancel: false,
+ confirmColor: '#000000',
success: res => {
if (res.confirm) {
uni.navigateBack({})
diff --git a/subPackages/user/profile.vue b/subPackages/user/profile.vue
index 2e1d3b8..27f611d 100644
--- a/subPackages/user/profile.vue
+++ b/subPackages/user/profile.vue
@@ -222,6 +222,7 @@
uni.showModal({
title: '提示',
content: '确认修改您的信息？',
+ confirmColor: '#000000',
success: res => {
if (res.confirm) {
this.Post({
@@ -238,6 +239,7 @@
title: '提示',
content: res.msg || '修改成功',
showCancel: false,
+ confirmColor: '#000000',
success: res => {
if (res.confirm) {
this.getList()
diff --git a/subPackages/user/register.vue b/subPackages/user/register.vue
index 613f304..852ea91 100644
--- a/subPackages/user/register.vue
+++ b/subPackages/user/register.vue
@@ -413,6 +413,7 @@
uni.showModal({
title: '提示',
content: '确认修改您的信息？',
+ confirmColor: '#000000',
success: res => {
if (res.confirm) {
this.Post(param, api).then(res => {
@@ -422,6 +423,7 @@
title: '提示',
content: res.msg,
showCancel: false,
+ confirmColor: '#000000',
success: res => {
if (res.confirm) {
this.getUserInfo()
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 0f0f6fa..ed939b8 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('')