diff --git a/pages/info/showInfo/index.js b/pages/info/showInfo/index.js index f4ae96b..baf18b8 100644 --- a/pages/info/showInfo/index.js +++ b/pages/info/showInfo/index.js @@ -292,13 +292,13 @@ Page({ }) }, showOrder: function () { - // if(this.data.info.sku.length==0){ - // wx.showToast({ - // title: '该演出暂时无法预约', - // icon:'none' - // }) - // return; - // } + if(this.data.info.sku.length<=0){ + wx.showToast({ + title: '暂无绑定演出具体信息', + icon:'none' + }) + return; + } // app.globalData.couponInfo = null; // app.globalData.productShow = this.data.info; // app.globalData.retailId = this.data.retailId; diff --git a/pages/info/showInfo/index.wxml b/pages/info/showInfo/index.wxml index fa6565c..acf357a 100644 --- a/pages/info/showInfo/index.wxml +++ b/pages/info/showInfo/index.wxml @@ -107,7 +107,7 @@ - + 首页 diff --git a/pages/info/showInfo/index.wxss b/pages/info/showInfo/index.wxss index 441ab09..1ad32cd 100644 --- a/pages/info/showInfo/index.wxss +++ b/pages/info/showInfo/index.wxss @@ -754,12 +754,16 @@ margin-right: 29rpx; } .pro-list{ display: flex; - justify-content: space-between; + /* justify-content: space-between; */ align-items: center; flex-wrap: wrap; } .proitem{ width: 213rpx; + margin-right: 15rpx; +} +.proitem:last-of-type{ + margin-right: 0; } .item-hd image{ width: 213rpx; diff --git a/pages/list/theatre/index.js b/pages/list/theatre/index.js index 668cd36..c326a4e 100644 --- a/pages/list/theatre/index.js +++ b/pages/list/theatre/index.js @@ -9,9 +9,9 @@ Page({ */ data: { list:[], - tagList: [], // 父标签278 + tagList: [], // 父标签477 total:1, - type:278, + type:477, sort:["","weight","distance","weight","price"], order:['','desc',"asc","desc","asc"], lat:"", @@ -107,7 +107,7 @@ Page({ // 获取子标签 getTags () { commonApi._post("product/tag_list",{ - pid:"278", + pid:"477", }).then(res=>{ let resData = res.data || [] this.setData({ diff --git a/pages/list/theatre/index.wxml b/pages/list/theatre/index.wxml index ff6ce3e..097052b 100644 --- a/pages/list/theatre/index.wxml +++ b/pages/list/theatre/index.wxml @@ -5,7 +5,7 @@ - 全部 + 全部 {{item.name}} diff --git a/pages/order/show/index.js b/pages/order/show/index.js index eba7e5b..309b28d 100644 --- a/pages/order/show/index.js +++ b/pages/order/show/index.js @@ -255,9 +255,10 @@ Page({ // app.globalData.retailId = this.data.retailId; app.globalData.product = { - product: product, + product: {...product, price: skuSelect.price}, sku: sku - } + } + date.price = skuSelect.price app.globalData.product.date = date app.globalData.product.time = time diff --git a/utils/https.js b/utils/https.js index 58ee3a1..50f43f4 100644 --- a/utils/https.js +++ b/utils/https.js @@ -1,8 +1,8 @@ var app = getApp(); import util from "../utils/util" // import userApi from "../utils/https/user.js"; -const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; -// let baseUrl = "https://api.cloud.sz-trip.com/api/"; +// const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; +let baseUrl = "https://api.cloud.sz-trip.com/api/"; const env = wx.getAccountInfoSync().miniProgram.envVersion if (env == 'develop1') { baseUrl = "https://test.api.cloud.sz-trip.com/api/"