Browse Source

提交

master
chenkainan 10 months ago
parent
commit
3c2901075f
  1. 1
      pages/daoyou/index.vue
  2. 17
      subPackages/daoyou/detail.vue
  3. 2
      subPackages/daoyou/order.vue
  4. 24
      subPackages/line/orders.vue
  5. 7
      subPackages/order/orderDetail.vue
  6. 4
      subPackages/order/trades.vue
  7. 1
      subPackages/user/bindTel.vue
  8. 1
      subPackages/user/changeNickname.vue
  9. 1
      subPackages/user/logout.vue
  10. 1
      subPackages/user/myContactsAdd.vue
  11. 2
      subPackages/user/profile.vue
  12. 2
      subPackages/user/register.vue

1
pages/daoyou/index.vue

@ -377,7 +377,6 @@
height: 273rpx; height: 273rpx;
background: #FFFFFF; background: #FFFFFF;
border-radius: 7rpx; border-radius: 7rpx;
border: 1rpx solid #96684F;
background-image: url('https://static.ticket.sz-trip.com/tourist/daoyou/itemBg.png'); background-image: url('https://static.ticket.sz-trip.com/tourist/daoyou/itemBg.png');
background-size: 100% 100%; background-size: 100% 100%;
padding: 14rpx; padding: 14rpx;

17
subPackages/daoyou/detail.vue

@ -1,6 +1,6 @@
<template> <template>
<view class="bg"> <view class="bg">
<view class="kefu-box"> <view class="kefu-box" @click="gotoPath('/subPackages/onlineService/index')">
<image src="https://static.ticket.sz-trip.com/tourist/daoyou/kefu.png" class="kefu-img"></image> <image src="https://static.ticket.sz-trip.com/tourist/daoyou/kefu.png" class="kefu-img"></image>
客服 客服
</view> </view>
@ -317,7 +317,15 @@
}, },
// //
preNextDate(e) { preNextDate(e) {
let currentDate = new Date()
if (e) { 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; this.month += 1;
if (this.month > 12) { if (this.month > 12) {
@ -330,6 +338,9 @@
this.getEveryDay(this.year + '-' + this.month); this.getEveryDay(this.year + '-' + this.month);
} }
} else { } else {
currentDate.setMonth(currentDate.getMonth() - 1);
let minMonth = Number(this.getNowTime(currentDate).slice(5, 7))
if(this.month - 1 == minMonth) return;
// //
this.month -= 1; this.month -= 1;
if (this.month == 0) { if (this.month == 0) {
@ -475,7 +486,7 @@
} }
.calendar { .calendar {
height: 668rpx; height: auto;
background: #FFFFFF; background: #FFFFFF;
border-radius: 13rpx; border-radius: 13rpx;
margin-top: 28rpx; margin-top: 28rpx;
@ -589,7 +600,7 @@
.sku-box { .sku-box {
border-radius: 13rpx; border-radius: 13rpx;
background-color: #fff; background-color: #fff;
margin-top: 100rpx; margin-top: 30rpx;
.sku-item { .sku-item {
height: 132rpx; height: 132rpx;

2
subPackages/daoyou/order.vue

@ -58,7 +58,7 @@
</view> </view>
<view class="flex-between"> <view class="flex-between">
联系电话 联系电话
<input type="number" maxlength="11" v-model="phone" placeholder="请填写联系手机号"/> <input type="number" maxlength="11" v-model="phone" placeholder="请填写联系手机号" style="color: #000;"/>
<image src="https://static.ticket.sz-trip.com/tourist/daoyou/phoneClear.png" v-if="phone.length > 0" @click="phone = ''"></image> <image src="https://static.ticket.sz-trip.com/tourist/daoyou/phoneClear.png" v-if="phone.length > 0" @click="phone = ''"></image>
</view> </view>
</view> </view>

24
subPackages/line/orders.vue

@ -145,7 +145,6 @@
coupon: '', coupon: '',
reserve_name: '', reserve_name: '',
reserve_phone: '', reserve_phone: '',
reserve_mobile: '',
remark: '', remark: '',
peopleList: [], peopleList: [],
linkmanList: [], linkmanList: [],
@ -258,7 +257,6 @@
data: JSON.stringify(data), data: JSON.stringify(data),
method: 'POST', method: 'POST',
},'/api/order/place').then(res => { },'/api/order/place').then(res => {
console.log(res)
if(res.code == 1) { if(res.code == 1) {
let order_id = res.data.order_id let order_id = res.data.order_id
this.$store.commit("changeLineInfo", null); this.$store.commit("changeLineInfo", null);
@ -315,18 +313,29 @@
limit: 100 limit: 100
},'/api/user/contactList').then(res => { },'/api/user/contactList').then(res => {
this.peopleList = res.data this.peopleList = res.data
this.reserve_mobile = this.peopleList[0].tel
// //
if(this.linkmanList.length > 0){ if(this.linkmanList.length > 0){
//
for (let i = 0; i < this.linkmanList.length; i++) { for (let i = 0; i < this.linkmanList.length; i++) {
for (let j = 0; j < this.peopleList.length; j++) { for (let j = 0; j < this.peopleList.length; j++) {
if(this.peopleList[j].id == this.linkmanList[i].id){ if(this.peopleList[j].id == this.linkmanList[i].id){
this.linkmanList[i] = this.peopleList[j] this.linkmanList[i] = this.peopleList[j]
this.peopleList[j].is_seld = true 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() this.$forceUpdate()
} }
}) })
@ -337,7 +346,6 @@
if (res && res.code == 1) { if (res && res.code == 1) {
this.getPeople(); this.getPeople();
this.changeContactAddPopup('close') this.changeContactAddPopup('close')
console.log('this.linkmanList3',this.linkmanList)
} }
}, },
// //
@ -348,8 +356,7 @@
} }
this.skuIndex = skuIndex this.skuIndex = skuIndex
this.peopleList.forEach(item => {
this.peopleList.map(item => {
if(item.is_seld && item.is_sku != this.sku[this.skuIndex].id) { if(item.is_seld && item.is_sku != this.sku[this.skuIndex].id) {
item.is_disable = true item.is_disable = true
}else { }else {
@ -393,7 +400,7 @@
return; return;
} }
this.linkmans[this.skuIndex] = [] this.linkmans[this.skuIndex] = []
this.peopleList.map(items => { this.peopleList.forEach(items => {
if(items.id == item.id) { if(items.id == item.id) {
items.is_seld = !items.is_seld items.is_seld = !items.is_seld
} }
@ -683,6 +690,7 @@
.popup-list { .popup-list {
height: 666rpx; height: 666rpx;
padding-bottom: 100rpx;
overflow: scroll; overflow: scroll;
.popup-item { .popup-item {

7
subPackages/order/orderDetail.vue

@ -45,7 +45,7 @@
</view> </view>
<!-- 提示语 --> <!-- 提示语 -->
<view class="swiper-prompt">左右滑动核销其他二维码</view> <view class="swiper-prompt">请到现场后给工作人员出示二维码核销</view>
</view> </view>
<view :style="{margin: isQrcode ? '0' : '-66rpx auto 0'}" v-if="info.order_child"> <view :style="{margin: isQrcode ? '0' : '-66rpx auto 0'}" v-if="info.order_child">
@ -269,6 +269,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '是否申请退款?', content: '是否申请退款?',
confirmColor: '#000000',
success: successRes => { success: successRes => {
if (successRes.confirm) { if (successRes.confirm) {
that.Post({ that.Post({
@ -298,6 +299,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认关闭订单?', content: '确认关闭订单?',
confirmColor: '#000000',
success: successRes => { success: successRes => {
if (successRes.confirm) { if (successRes.confirm) {
that.Post({ that.Post({
@ -471,7 +473,7 @@
.swiper-prompt { .swiper-prompt {
font-weight: 500; font-weight: 500;
font-size: 29rpx; font-size: 29rpx;
color: #EE3E3B; color: #888888;
text-align: center; text-align: center;
margin-bottom: 45rpx; margin-bottom: 45rpx;
} }
@ -549,6 +551,7 @@
font-weight: 500; font-weight: 500;
font-size: 27rpx; font-size: 27rpx;
color: #000000; color: #000000;
white-space: nowrap;
span { span {
display: inline-block; display: inline-block;

4
subPackages/order/trades.vue

@ -50,7 +50,7 @@
<view class="item-btns"> <view class="item-btns">
<view @click.stop="() => refund(item.order_id, key)" v-if="item.status == 'PAYMENT_SUCCESSFULLY'">申请退款</view> <view @click.stop="() => refund(item.order_id, key)" v-if="item.status == 'PAYMENT_SUCCESSFULLY'">申请退款</view>
<view @click.stop="() => closeOrder(item.order_id, item)" v-if="item.status == 'WAIT_PAYMENT'">关闭订单</view> <view @click.stop="() => closeOrder(item.order_id, item)" v-if="item.status == 'WAIT_PAYMENT'">关闭订单</view>
<view @click.stop="gotoDetailByTypeId(item.order_id[0].goods_id, item.order_id[0].type_id)" v-if="item.status == 'CLOSED'">再次购买</view> <view @click.stop="gotoDetailByTypeId(item.order_child[0].goods_id, item.order_child[0].type_id)" v-if="item.status == 'CLOSED'">再次购买</view>
<view class="pay-btn" @click.stop="setOrderId(item.order_id)" v-if="item.status == 'WAIT_PAYMENT'">立即支付</view> <view class="pay-btn" @click.stop="setOrderId(item.order_id)" v-if="item.status == 'WAIT_PAYMENT'">立即支付</view>
</view> </view>
</navigator> </navigator>
@ -113,6 +113,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '是否申请退款?', content: '是否申请退款?',
confirmColor: '#000000',
success: successRes => { success: successRes => {
if (successRes.confirm) { if (successRes.confirm) {
that.Post( that.Post(
@ -139,6 +140,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '是否关闭订单?', content: '是否关闭订单?',
confirmColor: '#000000',
success: successRes => { success: successRes => {
if (successRes.confirm) { if (successRes.confirm) {
that.Post( that.Post(

1
subPackages/user/bindTel.vue

@ -52,6 +52,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '保存成功!', content: '保存成功!',
confirmColor: '#000000',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.goBack() this.goBack()

1
subPackages/user/changeNickname.vue

@ -32,6 +32,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '保存成功!', content: '保存成功!',
confirmColor: '#000000',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.goBack() this.goBack()

1
subPackages/user/logout.vue

@ -50,6 +50,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认注销账号?', content: '确认注销账号?',
confirmColor: '#000000',
success: successRes => { success: successRes => {
if (successRes.confirm) { if (successRes.confirm) {
this.Post({ this.Post({

1
subPackages/user/myContactsAdd.vue

@ -123,6 +123,7 @@
title: '提示', title: '提示',
content: '成功', content: '成功',
showCancel: false, showCancel: false,
confirmColor: '#000000',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
uni.navigateBack({}) uni.navigateBack({})

2
subPackages/user/profile.vue

@ -222,6 +222,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认修改您的信息?', content: '确认修改您的信息?',
confirmColor: '#000000',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.Post({ this.Post({
@ -238,6 +239,7 @@
title: '提示', title: '提示',
content: res.msg || '修改成功', content: res.msg || '修改成功',
showCancel: false, showCancel: false,
confirmColor: '#000000',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.getList() this.getList()

2
subPackages/user/register.vue

@ -413,6 +413,7 @@
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
content: '确认修改您的信息?', content: '确认修改您的信息?',
confirmColor: '#000000',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.Post(param, api).then(res => { this.Post(param, api).then(res => {
@ -422,6 +423,7 @@
title: '提示', title: '提示',
content: res.msg, content: res.msg,
showCancel: false, showCancel: false,
confirmColor: '#000000',
success: res => { success: res => {
if (res.confirm) { if (res.confirm) {
this.getUserInfo() this.getUserInfo()

Loading…
Cancel
Save