From 7478c0c32df6173132bab271d0a9a3f9a53155a7 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Thu, 25 Apr 2019 21:48:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=97=A8=E5=BA=97][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=96=B0=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 3 ++- ext.json | 2 +- pages/coupon/detail/index.wxml | 2 +- pages/getuserinfo/index.js | 2 +- pages/index/detail/index.wxml | 4 ++-- pages/index/detail/index.wxss | 4 ++-- pages/index/searchbar/index.wxml | 2 +- pages/index/searchbar/index.wxss | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/app.json b/app.json index b8302dc..a03b24f 100644 --- a/app.json +++ b/app.json @@ -112,5 +112,6 @@ "request": 30000, "downloadFile": 10000 }, - "debug": false + "debug": false, + "sitemapLocation": "sitemap.json" } \ No newline at end of file diff --git a/ext.json b/ext.json index afcaf1b..fb955ed 100644 --- a/ext.json +++ b/ext.json @@ -4,7 +4,7 @@ "ext": { "weappId": "wxea71200db93d756b", "name": "富茂客官开发", - "appVersion": "C.5.1.106", + "appVersion": "C.5.1.107", "attr": { "configUrl": "https://ciformall.youlane.cn/C/api", "socketUrl": "wss://mp.youlane.cn/W/ws", diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index ea48554..b229eb1 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -78,7 +78,7 @@ {{item.merchantName}} - {{itemName.shopNumber}}{{itemName.buildingName}}{{itemName.floorName}}, + {{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}, diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index 64431f6..b237e40 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -124,7 +124,7 @@ Page({ url: `/pages/bannerdetail/index?id=${that.data.optionData.id}`, }) } - } else if (that.data.orderId&&app.globalData.type=='bg') { + } else if (that.data.orderId||that.data.orderId&&app.globalData.type=='bg') { // 参与砍价 wx.navigateTo({ url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}` diff --git a/pages/index/detail/index.wxml b/pages/index/detail/index.wxml index 927c8ca..c9d87d9 100644 --- a/pages/index/detail/index.wxml +++ b/pages/index/detail/index.wxml @@ -26,7 +26,7 @@ 商户位置 - {{item.buildingName}} {{item.floorName}} {{item.shopNumber}} + {{item.buildingName}}{{item.floorName}}--{{item.shopNumber}} @@ -36,7 +36,7 @@ 联系商户 - + {{data.merchantLinkPhone}} diff --git a/pages/index/detail/index.wxss b/pages/index/detail/index.wxss index a65fc58..41fa1e2 100644 --- a/pages/index/detail/index.wxss +++ b/pages/index/detail/index.wxss @@ -90,7 +90,7 @@ .merchant-shop view, .merchant-phone view { display: flex; - flex: 4; + flex: 3; color: #333; } @@ -133,7 +133,7 @@ } .merchants text{ display: block; - text-align: right; + text-align: left; height: 50rpx; line-height: 50rpx; } diff --git a/pages/index/searchbar/index.wxml b/pages/index/searchbar/index.wxml index 19afa84..06205cc 100644 --- a/pages/index/searchbar/index.wxml +++ b/pages/index/searchbar/index.wxml @@ -26,7 +26,7 @@ {{item.merchantName}} - {{itemName.shopNumber}}{{itemName.buildingName}}{{itemName.floorName}}, + {{itemName.buildingName}}{{itemName.floorName}}--{{itemName.shopNumber}}, diff --git a/pages/index/searchbar/index.wxss b/pages/index/searchbar/index.wxss index 6a860d1..d574910 100644 --- a/pages/index/searchbar/index.wxss +++ b/pages/index/searchbar/index.wxss @@ -131,7 +131,7 @@ color: #b8b8b8; padding-top: 3rpx; height: 36rpx; - line-height: 36rpx; + line-height: 56rpx; overflow: hidden; }