From b5044ddb5465ec564fb63962c11a3cf044af26f8 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 22 Apr 2019 12:00:01 +0800 Subject: [PATCH 01/14] =?UTF-8?q?[=E6=B9=96=E5=8D=97=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=89=88][=E4=BF=AE=E6=94=B9]:[=E6=B9=96=E5=8D=97=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88=E4=BF=AE=E6=94=B9aiipid]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 40 ++++++++++++++++------------------------ project.config.json | 2 +- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/ext.json b/ext.json index be47808..1844b5b 100644 --- a/ext.json +++ b/ext.json @@ -1,18 +1,16 @@ { "extEnable": true, - "extAppid": "wxea71200db93d756b", + "extAppid": "wx649b3be73c1afe47", "ext": { - "weappId": "wxea71200db93d756b", - "name": "富茂客官开发", - "appVersion": "C.4.2.108", + "weappId": "wx649b3be73c1afe47", + "name": "金泸商务", + "appVersion": "C.4.1.8", "attr": { - "configUrl": "https://ciformall.youlane.cn/C/api", - "socketUrl": "wss://mp.youlane.cn/W/ws", - "ifHaveWebSocket": "0", + "configUrl": "https://ctest.malls.iformall.com/C/api", "ifHaveCarModular": "1", "etcpVersion": "release", "etcpAppId": "wx192b7d2e8dcbefd0", - "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback" + "etcpCallbackReturnUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" } }, "permission": { @@ -22,40 +20,34 @@ }, "directCommit": false, "tabBar": { - "color": "#abb1be", - "selectedColor": "#b2743d", + "color": "#9F9F9F", + "selectedColor": "#00C0FF", "list": [ { "pagePath": "pages/main/index", - "iconPath": "assets/images/home.png", - "selectedIconPath": "assets/images/home-a.png", + "iconPath": "assets/images/home-n.png", + "selectedIconPath": "assets/images/home-y.png", "text": "首页" }, - { - "pagePath": "pages/index/searchbar/index", - "iconPath": "assets/images/mendian.png", - "selectedIconPath": "assets/images/mendian-a.png", - "text": "门店" - }, { "pagePath": "pages/passCar/passCar", - "iconPath": "assets/images/park.png", - "selectedIconPath": "assets/images/park-a.png", + "iconPath": "assets/images/pass1.png", + "selectedIconPath": "assets/images/pass0.png", "text": "停车" }, { "pagePath": "pages/user/index", - "iconPath": "assets/images/user.png", - "selectedIconPath": "assets/images/user-a.png", + "iconPath": "assets/images/user-n.png", + "selectedIconPath": "assets/images/user-y.png", "text": "我的" } ] }, "window": { "backgroundTextStyle": "dark", - "navigationBarBackgroundColor": "#fff", + "navigationBarBackgroundColor": "#02C0FF", "navigationBarTitleText": "WeChat", - "navigationBarTextStyle": "black" + "navigationBarTextStyle": "white" }, "networkTimeout": { "request": 30000, diff --git a/project.config.json b/project.config.json index 913c7d5..646f2c6 100644 --- a/project.config.json +++ b/project.config.json @@ -13,7 +13,7 @@ }, "compileType": "miniprogram", "libVersion": "2.2.0", - "appid": "wxb11603577a84a86d", + "appid": "wxfa336cad86ed598d", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "isGameTourist": false, "simulatorType": "wechat", From 7ffd073b72baccc7d7ea850f938ffe37e6fc8273 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 22 Apr 2019 12:47:50 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=B9=96=E5=8D=97=E7=89=88=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/ext.json b/ext.json index 1844b5b..0e3cb62 100644 --- a/ext.json +++ b/ext.json @@ -20,34 +20,40 @@ }, "directCommit": false, "tabBar": { - "color": "#9F9F9F", - "selectedColor": "#00C0FF", + "color": "#abb1be", + "selectedColor": "#b2743d", "list": [ { "pagePath": "pages/main/index", - "iconPath": "assets/images/home-n.png", - "selectedIconPath": "assets/images/home-y.png", + "iconPath": "assets/images/home.png", + "selectedIconPath": "assets/images/home-a.png", "text": "首页" }, + { + "pagePath": "pages/index/searchbar/index", + "iconPath": "assets/images/mendian.png", + "selectedIconPath": "assets/images/mendian-a.png", + "text": "门店" + }, { "pagePath": "pages/passCar/passCar", - "iconPath": "assets/images/pass1.png", - "selectedIconPath": "assets/images/pass0.png", + "iconPath": "assets/images/park.png", + "selectedIconPath": "assets/images/park-a.png", "text": "停车" }, { "pagePath": "pages/user/index", - "iconPath": "assets/images/user-n.png", - "selectedIconPath": "assets/images/user-y.png", + "iconPath": "assets/images/user.png", + "selectedIconPath": "assets/images/user-a.png", "text": "我的" } ] }, "window": { "backgroundTextStyle": "dark", - "navigationBarBackgroundColor": "#02C0FF", - "navigationBarTitleText": "WeChat", - "navigationBarTextStyle": "white" + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "", + "navigationBarTextStyle": "black" }, "networkTimeout": { "request": 30000, From 9e5f59ceaa30514e7c63a1f71f6f8ab7bf6162f9 Mon Sep 17 00:00:00 2001 From: hurui199683hurui Date: Mon, 22 Apr 2019 14:28:41 +0800 Subject: [PATCH 03/14] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=88=B8=E8=AF=A6?= =?UTF-8?q?=E6=83=85][=E4=BF=AE=E6=94=B9][=E7=A7=AF=E5=88=86=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../integralmall/payIntegcoupondetail/index.wxml | 12 ++---------- .../integralmall/payIntegcoupondetail/index.wxss | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/pages/integralmall/payIntegcoupondetail/index.wxml b/pages/integralmall/payIntegcoupondetail/index.wxml index 60a5341..90751af 100644 --- a/pages/integralmall/payIntegcoupondetail/index.wxml +++ b/pages/integralmall/payIntegcoupondetail/index.wxml @@ -37,15 +37,7 @@ - - - - - - - - - 您的拼团未成功,退款将在24小时内返回到您的支付账号 - 返回首页 + + diff --git a/pages/integralmall/payIntegcoupondetail/index.wxss b/pages/integralmall/payIntegcoupondetail/index.wxss index 3a875f7..3fe5114 100644 --- a/pages/integralmall/payIntegcoupondetail/index.wxss +++ b/pages/integralmall/payIntegcoupondetail/index.wxss @@ -318,7 +318,6 @@ page { width:650rpx; height:85rpx; background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); - box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32); border-radius:43rpx; font-size:36rpx; font-family:PingFang-SC-Medium; @@ -327,7 +326,20 @@ page { line-height: 85rpx; margin-top: 100rpx; } - + .user-enough{ + border: 0; + width:650rpx; + height:85rpx; + background:linear-gradient(90deg,rgba(248,85,45,1) 0%,rgba(241,60,66,1) 0%,rgba(248,86,46,1) 100%); + border-radius:43rpx; + font-size:36rpx; + font-family:PingFang-SC-Medium; + font-weight:500; + color:rgba(254,254,254,1); + line-height: 85rpx; + margin-top: 100rpx; + box-shadow:0px 8rpx 8rpx 1rpx rgba(242,61,65,0.32); + } .user-motto::after { border: none; } From 3f0e29b148f4ea23b0f7d67bdb39132f1ad0e0bc Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 22 Apr 2019 15:08:14 +0800 Subject: [PATCH 04/14] =?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?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/searchbar/index.wxml | 14 +++++++----- pages/index/searchbar/index.wxss | 38 +++++++++++++++++++------------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/pages/index/searchbar/index.wxml b/pages/index/searchbar/index.wxml index 999f6c7..af959b0 100644 --- a/pages/index/searchbar/index.wxml +++ b/pages/index/searchbar/index.wxml @@ -18,12 +18,14 @@