diff --git a/app.js b/app.js index 73e4dbc..8619030 100644 --- a/app.js +++ b/app.js @@ -21,7 +21,7 @@ App({ unique_key: "wechatxcx" }).then(res => { let data = JSON.parse(res.data); - data.isTest = data.isTest82? true : false; + data.isTest = data.isTest84? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 73f6710..ec59efe 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -179,7 +179,12 @@ 数字博物馆 - + + 云上文博会 + --> + 云上文博会 @@ -259,17 +264,17 @@ + src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/douinsuzhou.png" mode="aspectFill"> + src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/suzhoumeishi.png" mode="aspectFill"> + src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/yuyindaohang.png" mode="aspectFill"> - + src="https://static.ticket.sz-trip.com/jundaosuzhou/images/jdsz/youjigonlue.png" mode="aspectFill"> + diff --git a/pages/index/index.wxss b/pages/index/index.wxss index 649f537..5858b74 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -281,7 +281,7 @@ margin: 60rpx 0; } .pic-list image { - width: 122rpx; + width: 155.33rpx; height: 200rpx; display: block; } diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js index 412a43e..65f25de 100644 --- a/pages/info/groupOrderInfo/index.js +++ b/pages/info/groupOrderInfo/index.js @@ -127,6 +127,11 @@ Page({ }) } }, + goOrder(){ + wx.navigateTo({ + url: '/pages/user/order/museumOrderInfo/index?id='+ this.data.id, + }) + }, /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/pages/info/groupOrderInfo/index.wxml b/pages/info/groupOrderInfo/index.wxml index abab27b..d76bc7e 100644 --- a/pages/info/groupOrderInfo/index.wxml +++ b/pages/info/groupOrderInfo/index.wxml @@ -58,4 +58,13 @@ 截屏分享给团员 + + + + 查看 + + + 订单 + + \ No newline at end of file diff --git a/pages/info/groupOrderInfo/index.wxss b/pages/info/groupOrderInfo/index.wxss index e8cb5af..13d8fb0 100644 --- a/pages/info/groupOrderInfo/index.wxss +++ b/pages/info/groupOrderInfo/index.wxss @@ -169,4 +169,25 @@ page { position: absolute; right: 20rpx; top: 20rpx; +} +.order-btn{ + width: 110rpx; +height: 110rpx; +background: #FFFFFF; +box-shadow: 0rpx 0rpx 11rpx 0rpx rgba(17,17,17,0.2); +border-radius: 55rpx; +display: flex; +flex-direction: column; +align-items: center; +justify-content: center; +position: fixed; +bottom: 120rpx; +right: 20rpx; +box-sizing: border-box; +font-size: 28rpx; +font-family: PingFang SC; +font-weight: bold; +color: #0B898E; + + } \ No newline at end of file diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js index e08b365..2abd7b0 100644 --- a/pages/info/sceneProductInfo/index.js +++ b/pages/info/sceneProductInfo/index.js @@ -24,7 +24,7 @@ Page({ showAllowance: false, allowance_data: null, //购物车数量 - producNum: 1, + productNum: 1, skuIndex: 0, aniSkuIndex: -1, cartCount: 0, @@ -316,8 +316,10 @@ Page({ } let index = e.currentTarget.dataset.index; this.setData({ - skuIndex: index + skuIndex: index, + productNum:1 }) + }, order: function (e) { commonApi.user_post("/product/checkStock", { @@ -354,6 +356,7 @@ Page({ product = { product: this.data.info.product[this.data.skuList[this.data.skuIndex].proIndex] } + product.productNum = this.data.productNum app.globalData.product = { ...sku, ...product @@ -365,7 +368,7 @@ Page({ } else { commonApi.user_post("cart/add_sku", { sku_id: this.data.skuList[this.data.skuIndex].id, - num: this.data.producNum + num: this.data.productNum }).then(res => { if (res.code == 1) { commonApi.user_post('cart/get_list', {}).then(res => { @@ -702,10 +705,6 @@ Page({ }).exec() } }) - - - - }, hideSku: function () { this.setData({ @@ -715,15 +714,22 @@ Page({ }, //加减数量 minus: function () { - if (this.data.producNum == 1) return; + if (this.data.productNum == 1) return; this.setData({ - producNum: this.data.producNum - 1 + productNum: this.data.productNum - 1 }) }, add: function () { + if (this.data.productNum == this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num){ + wx.showToast({ + title: '本产品单笔限购'+this.data.skuList[this.data.skuIndex].sku_model.traveller_limit_num, + icon:'none' + }); + }else{ this.setData({ - producNum: this.data.producNum + 1 + productNum: this.data.productNum + 1 }) + } }, //立即预定 showOrder: function () { diff --git a/pages/info/sceneProductInfo/index.wxml b/pages/info/sceneProductInfo/index.wxml index 04562e2..11a7cae 100644 --- a/pages/info/sceneProductInfo/index.wxml +++ b/pages/info/sceneProductInfo/index.wxml @@ -130,7 +130,7 @@ 数量 - {{producNum}} + {{productNum}} diff --git a/pages/list/movieticket/index.js b/pages/list/movieticket/index.js index 1f147c2..021a01c 100644 --- a/pages/list/movieticket/index.js +++ b/pages/list/movieticket/index.js @@ -21,7 +21,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function (options) { - commonApi._post("act/get_suzhou_areas").then(res=>{ + commonApi._post("act/get_suzhou_areas_syt").then(res=>{ res.data.unshift({ area_id:"", area_title:"苏州" diff --git a/pages/list/movieticket/list/ticket/index.js b/pages/list/movieticket/list/ticket/index.js index 8dacd88..7fdd246 100644 --- a/pages/list/movieticket/list/ticket/index.js +++ b/pages/list/movieticket/list/ticket/index.js @@ -36,7 +36,7 @@ Page({ id: options.id, title: options.title }) - commonApi._post("act/get_suzhou_areas").then(res => { + commonApi._post("act/get_suzhou_areas_syt").then(res => { res.data.unshift({ area_id: "", area_title: "苏州" diff --git a/pages/order/road/index.wxml b/pages/order/road/index.wxml index 11185fd..9d857f5 100644 --- a/pages/order/road/index.wxml +++ b/pages/order/road/index.wxml @@ -24,7 +24,7 @@ {{(index+1)>=10?(index+1):("0"+(index+1))}} - ￥{{prices[month[monthIndex]+'-'+(index+1)].product_price/100}} + ￥{{prices[month[monthIndex]+'-'+(index+1)].m_price/100}} 售罄 diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index ebf2e9c..009d5cf 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -46,7 +46,8 @@ Page({ date:null, ticket_type:app.globalData.product.sku.ticket_type || 1, isCar:options.isCar - }) + }) + console.log(app.globalData); if (!app.globalData.product) { util.back(); return; diff --git a/pages/user/order/list.js b/pages/user/order/list.js index de965af..584fcc5 100644 --- a/pages/user/order/list.js +++ b/pages/user/order/list.js @@ -95,10 +95,14 @@ Page({ let orderNum = 0; item.order_product_list.map(order=>{ orderNum = orderNum + order.product_num; + /// // 景点线路场馆酒店四类产品的订单 如果是已支付未出票的显示出票中 if(order.state=='PAID' && (order.product_model=='venue' || order.product_model=='ticket' || order.product_model=='hotel' || order.product_model=='line')){ item.orderStateText="出票中" } + if(order.state=='WAIT_USE' && (order.product_model=='venue' || order.product_model=='ticket' || order.product_model=='hotel' || order.product_model=='line')){ + item.orderStateText="已出票" + } }) if(item.order_product_list.length==1 && item.order_product_list[0].scene_id && item.state!='UNPAID' && item.state!='CLOSED' && item.state.indexOf("REFUND")==-1 && this.data.lon && this.data.lat){ let ajax = commonApi.user_post("order/tripplan",{