From e9397b5c75d901a670328910d584f59a169bc308 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Wed, 2 Jan 2019 14:21:52 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=97=A8?= =?UTF-8?q?=E5=BA=97=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=88=90?= =?UTF-8?q?=E9=95=BF=E5=80=BC=E7=AD=89=E7=BA=A7=E8=A7=84=E5=88=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.js | 6 ++-- pages/coupon/detail/index.wxml | 1 + pages/coupon/detail/index.wxss | 6 +++- pages/grade/grade.js | 1 + pages/grade/grade.wxml | 4 +-- pages/order/detail/index.js | 4 +-- pages/order/detail/index.wxml | 8 ++--- pages/order/detail/index.wxss | 57 ++++++++++++++++++++++++++-------- project.config.json | 2 +- 9 files changed, 63 insertions(+), 26 deletions(-) diff --git a/config/config.js b/config/config.js index 98502ba..006b46a 100755 --- a/config/config.js +++ b/config/config.js @@ -1,9 +1,9 @@ var extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}; var appId = extConfig.appId; var config = { - // url: "https://ciformall.youlane.cn/C/api", + url: "https://ciformall.youlane.cn/C/api", // url:"https://c.malls.iformall.com/C/api", - url:'https://ctest.malls.iformall.com/C/api', + // url:'https://ctest.malls.iformall.com/C/api', // url:'http://10.100.33.68:7000/C/api', // url: 'http://10.100.30.172:7000/C/api', api: { @@ -199,7 +199,7 @@ var config = { }, weapp: { - AppId: "wx649b3be73c1afe47" + AppId: "wxea71200db93d756b" }, ErrorCode: { diff --git a/pages/coupon/detail/index.wxml b/pages/coupon/detail/index.wxml index 3db97cc..5b752e0 100644 --- a/pages/coupon/detail/index.wxml +++ b/pages/coupon/detail/index.wxml @@ -59,6 +59,7 @@ + 适用门店: @@ -79,7 +79,7 @@ - - + + \ No newline at end of file diff --git a/pages/order/detail/index.wxss b/pages/order/detail/index.wxss index 316ef0b..b1487be 100644 --- a/pages/order/detail/index.wxss +++ b/pages/order/detail/index.wxss @@ -1,15 +1,19 @@ @import "../../../app.wxss"; + page { - height: auto!important; + height: auto !important; } + .order { width: 100%; } -.success{ + +.success { vertical-align: middle; width: 40rpx; margin-right: 10rpx; } + .tips { width: 92%; height: 88rpx; @@ -18,9 +22,11 @@ page { padding: 0 4%; line-height: 88rpx; } -.merchantName{ + +.merchantName { color: #999; } + .tips text:nth-child(2) { font-size: 32rpx; padding-left: 16rpx; @@ -143,6 +149,7 @@ page { .classif > view text:nth-child(2) { color: #b8b8b8; font-size: 30rpx; + margin-left:80rpx; } .classif > view:nth-child(1) { @@ -358,13 +365,15 @@ radio { .jine { color: #f96563 !important; font-size: 36rpx !important; - font-weight: 400!important; + font-weight: 400 !important; } + .jine1 { color: #b8b8b8 !important; font-size: 30rpx !important; - font-weight: 400!important; + font-weight: 400 !important; } + .buy-view { background: #fff; position: fixed; @@ -385,28 +394,29 @@ radio { line-height: 94rpx; border-radius: 61rpx; } -.active{ - opacity: .6; -} +.active { + opacity: 0.6; +} -.game-entry{ +.game-entry { width: 690rpx; height: 140rpx; margin: 20rpx auto 0; } -.gameimg{ + +.gameimg { display: block; width: 100%; height: 140rpx; } - -.merchantVoList{ +.merchantVoList { width: 100%; position: relative; } -.merchantVoList image{ + +.merchantVoList .tel { width: 40rpx; position: absolute; top: 0; @@ -414,4 +424,25 @@ radio { margin: auto; right: 14rpx; z-index: 10; +} + +.btns { + background: #00c0ff; + height: 94rpx; + width: 670rpx; + margin: 0 auto 30rpx; + color: #fff; + font-size: 36rpx; + line-height: 94rpx; + border-radius: 61rpx; +} +.merchantImgUrl{ + width: 60rpx; + position: absolute; + top: 0; + bottom: 0; + margin: auto; + left: 0; + border-radius: 10rpx; + z-index: 10; } \ No newline at end of file diff --git a/project.config.json b/project.config.json index 2970aaf..4e30ca0 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.0.9", - "appid": "wx649b3be73c1afe47", + "appid": "wxea71200db93d756b", "projectname": "C", "isGameTourist": false, "condition": {