diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 5bf0986..193659b 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -179,16 +179,16 @@ 数字博物馆 - 云上文博会 - - --> + diff --git a/pages/order/hotel/index.wxss b/pages/order/hotel/index.wxss index 765c9a1..7be5117 100644 --- a/pages/order/hotel/index.wxss +++ b/pages/order/hotel/index.wxss @@ -164,7 +164,7 @@ page { z-index: 98; } .price-all { - line-height: 100rpx; + /* line-height: 100rpx; */ flex: 1; } .price-all text { diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index 6ba8417..a17e7c5 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -191,13 +191,13 @@ Page({ order: function () { let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product; let linkmanIds = []; - if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) { - wx.showToast({ - title: '请选择' + productNum + "个出行人", - icon: "none" - }) - return; - } + // if (linkmanList.length < productNum && app.globalData.product.isGroup != 1) { + // wx.showToast({ + // title: '请选择' + productNum + "个出行人", + // icon: "none" + // }) + // return; + // } if (!date) { wx.showToast({ title: '请选择使用日期', diff --git a/pages/search/list/index.wxml b/pages/search/list/index.wxml index dbcbb41..5c718ec 100644 --- a/pages/search/list/index.wxml +++ b/pages/search/list/index.wxml @@ -28,7 +28,7 @@ - + @@ -40,7 +40,7 @@ 距您直线距离{{item.ext.distance}}km - {{item.ext.price/100}} + {{item.ext.price/100}} diff --git a/pages/user/address/add/index.wxml b/pages/user/address/add/index.wxml index 48a27e6..ad93f4e 100644 --- a/pages/user/address/add/index.wxml +++ b/pages/user/address/add/index.wxml @@ -16,7 +16,11 @@ {{multiArray[0][multiIndex[0]]}}{{multiArray[1][multiIndex[1]]}}{{multiArray[2][multiIndex[2]]}} + + + > + 详细地址 diff --git a/utils/util.js b/utils/util.js index 3fb54d1..cf8390c 100644 --- a/utils/util.js +++ b/utils/util.js @@ -200,9 +200,20 @@ const gotoDetail = (item,isPagePoint) =>{ pagePointData.id = item.id pagePoint(pagePointData,1) } - wx.navigateTo({ - url: '/pages/info/postProductInfo/index?id='+item.id - }) + try { + if (item.iShop) { + wx.navigateTo({ + url: '/pages/info/postProductInfo/index?id='+item.id+'&iShop='+item.iShop+'&supplierId='+item.supplierId + }) + }else{ + wx.navigateTo({ + url: '/pages/info/postProductInfo/index?id='+item.id + }) + } + } catch (error) { + + } + break; case "line": // 产品 线路