diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6f556e2..8d728c9 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -105,7 +105,7 @@
{{item.goods.image_tag}}
- {{item.goods.low_money / 100}}
+ {{item.goods.money / 100}}
{{item.goods.title}}
@@ -176,7 +176,8 @@
{
img: 'https://static.ticket.sz-trip.com/yandu/images/index/xltj.png',
text: '线路推荐',
- path: '/subPackages/line/lineList'
+ // path: '/subPackages/line/lineList'
+ path: '/subPackages/webPage/webPage?url='+ encodeURIComponent('https://yandumap.sz-trip.com/lineList'),
},
{
img: 'https://static.ticket.sz-trip.com/yandu/images/index/zhdt.png',
diff --git a/pages/mall/mall.vue b/pages/mall/mall.vue
index 3810737..65d32d4 100644
--- a/pages/mall/mall.vue
+++ b/pages/mall/mall.vue
@@ -1,7 +1,7 @@
-
- ![]()
+
+ ![]()
diff --git a/subPackages/food/foodList.vue b/subPackages/food/foodList.vue
index be9822b..2e65dff 100644
--- a/subPackages/food/foodList.vue
+++ b/subPackages/food/foodList.vue
@@ -16,7 +16,8 @@
距您约{{ item.distance/1000 }}km
- {{item.low_money/100}}
+
+ {{item.money/100}}
diff --git a/subPackages/ticketBooking/detail.vue b/subPackages/ticketBooking/detail.vue
index 1ca70a7..30d7ca0 100644
--- a/subPackages/ticketBooking/detail.vue
+++ b/subPackages/ticketBooking/detail.vue
@@ -22,7 +22,7 @@
-
+
营业时间
{{info.open_description}}
@@ -300,8 +300,11 @@
specifications_id: this.skuInfo.id,
date: date,
}, '/api/goods/getTimeStock').then(res => {
- if (res.data.length > 0) {
+ if (Array.isArray(res.data)) {
this.timesArr = res.data || []
+ this.seldTimeIndex = -1
+ }
+ if (res.data.length > 0) {
this.seldTimeIndex = this.timesArr.findIndex(item => item.stock_number > 0)
}
})
@@ -333,6 +336,7 @@
addBuyCard() {
let that = this;
// 如果是分时，未选择分时
+ console.log(this.skuInfo)
if(that.skuInfo.is_time_stock && that.seldTimeIndex < 0) {
uni.showToast({title:'请选择分时',icon:'none'})
return;
diff --git a/subPackages/ticketBooking/order.vue b/subPackages/ticketBooking/order.vue
index bc033ed..264ba7e 100644
--- a/subPackages/ticketBooking/order.vue
+++ b/subPackages/ticketBooking/order.vue
@@ -5,7 +5,7 @@
{{ pInfo.title }}
{{showDate.date}} {{ShowDateDay(new Date(showDate.date).getDay())}}
- {{ showDate.startTime }}-{{ showDate.endTime }} 入园
+ {{ showDate.startTime }}-{{ showDate.endTime }} 入园
修改 >
@@ -403,8 +403,8 @@
let res = await this.Post({
specifications_id: skuId,
date: this.showDate.date,
- start_time:this.showDate.startTime,
- end_time:this.showDate.endTime
+ start_time:this.showDate.startTime||'',
+ end_time:this.showDate.endTime||''
}, '/api/goods/getSpecificationsPriceCalendarAndTime')
if (res.code == 1) {
return {code:1,...res.data}
@@ -581,21 +581,21 @@
})
// 如果只有一张票给默认值
- if (!this.setDefault && this.addressList.length>0) {
+ if (!this.setDefault ) {
// 找符合条件的
let currentData = this.pInfo.specifications[0]
let person0 = currentData.selPeople[0]
let person = currentData.selPerson
let currentPerson = {}
- if (this.addressList.some(v=>v.is_default=='1')) {
- currentPerson = this.addressList.find(v=>v.is_default=='1')
- } else {
- currentPerson = this.addressList[0]
- }
-
if (!currentData.is_card) {
person.tel = JSON.parse(uni.getStorageSync('userInfo')).mobile
- } else {
+ } else if(this.addressList.length>0) {
+
+ if (this.addressList.some(v=>v.is_default=='1')) {
+ currentPerson = this.addressList.find(v=>v.is_default=='1')
+ } else {
+ currentPerson = this.addressList[0]
+ }
person.id = currentPerson.id
person.id_number = currentPerson.id_number
person.name = currentPerson.name
@@ -847,10 +847,17 @@
specifications_id: this.sInfo.id,
date: date,
}, '/api/goods/getTimeStock').then(res => {
- if (res.data.length > 0) {
+ if (Array.isArray(res.data)) {
this.timesArr = res.data || []
+ this.seldTimeIndex = -1
+ }
+ if (res.data.length > 0) {
this.seldTimeIndex = this.timesArr.findIndex(item => item.stock_number > 0)
}
+ // if (res.data.length > 0) {
+ // this.timesArr = res.data || []
+ // this.seldTimeIndex = this.timesArr.findIndex(item => item.stock_number > 0)
+ // }
})
},
// 选择日期
@@ -923,8 +930,8 @@
/*---------------------------价格日历-----------------------------------*/
order() {
let use_date = this.allSeldDate[this.seldDateIndex].date
- let start_time =this.timesArr[this.seldTimeIndex].start_time
- let end_time = this.timesArr[this.seldTimeIndex].end_time
+ let start_time =(this.timesArr[this.seldTimeIndex]||{}).start_time
+ let end_time = (this.timesArr[this.seldTimeIndex]||{}).end_time
let goods = []
@@ -944,8 +951,8 @@
num: sku.buyNum,
// contact_id: sku.selPeople.filter(v=>v.id).map(v=>v.id),
date: use_date,
- start_time: start_time,
- end_time: end_time,
+ start_time: start_time||'',
+ end_time: end_time||'',
reserve_mobile: sku.selPerson.tel,
}
goods.push(param)