From 47df1fd94a214375666faee1baa7fb3e8e026ac7 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 8 Jul 2019 23:29:02 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E5=92=8C=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D][=E4=BF=AE=E5=A4=8D];[bug=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 43 +++++++++++------------- pages/acSignIn/index.js | 13 +++++-- pages/radetail/index.wxml | 2 +- pages/radetail/index.wxss | 6 ++-- pages/spellGroup/mySpellGroup/index.wxml | 2 +- project.config.json | 2 +- 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/ext.json b/ext.json index 78e6e54..cb6c532 100644 --- a/ext.json +++ b/ext.json @@ -1,35 +1,30 @@ { "ext": { "attr": { - "configUrl": "https://ciformall.youlane.cn/C/api", - "etcpAppId": "wx192b7d2e8dcbefd0", - "socketUrl": "wss://mp.youlane.cn/W/ws", - "etcpVersion": "release", - "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback", - "ifHaveWebSocket": "0", - "ifHaveCarModular": "1", "imgProxy": [ { - "orgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn", - "newUrl": "https://ciformall.youlane.cn/img" - }, - { - "orgUrl": "https://s3.cn-northwest-1.amazonaws.com.cn", - "newUrl": "https://ciformall.youlane.cn/img1" + "newUrl": "https://ctest.malls.iformall.com/img", + "orgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn" }, { - "orgUrl": "https://wx.qlogo.cn", - "newUrl": "https://ciformall.youlane.cn/img2" + "newUrl": "https://ctest.malls.iformall.com/img1", + "orgUrl": "https://s3.cn-northwest-1.amazonaws.com.cn" }, { - "orgUrl": "http://thirdwx.qlogo.cn", - "newUrl": "https://ciformall.youlane.cn/img3" + "newUrl": "https://ctest.malls.iformall.com/img2", + "orgUrl": "https://wx.qlogo.cn" } - ] + ], + "configUrl": "https://ctest.malls.iformall.com/C/api", + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", + "ifHaveWebSocket": "0", + "ifHaveCarModular": "1" }, - "name": "富茂客官开发", - "weappId": "wxea71200db93d756b", - "appVersion": "C.4.5.106" + "name": "富茂链客", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { @@ -65,10 +60,10 @@ "window": { "backgroundTextStyle": "dark", "navigationBarTextStyle": "black", - "navigationBarTitleText": "WeChat", - "navigationBarBackgroundColor": "#fff" + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#FFFFFF" }, - "extAppid": "wxea71200db93d756b", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/acSignIn/index.js b/pages/acSignIn/index.js index 447328b..349f7b2 100644 --- a/pages/acSignIn/index.js +++ b/pages/acSignIn/index.js @@ -43,9 +43,16 @@ Page({ //跳转到报名详情页 goSignUp(e) { let activityId = e.currentTarget.dataset.id; - wx.navigateTo({ - url: `/pages/radetail/index?id=${activityId}`, - }) + if (activityId){ + wx.navigateTo({ + url: `/pages/radetail/index?id=${activityId}`, + }) + }else{ + wx.showToast({ + title: '此活动报名已结束', + }) + } + }, goback: function () { wx.switchTab({ diff --git a/pages/radetail/index.wxml b/pages/radetail/index.wxml index 4d57907..acf23ee 100644 --- a/pages/radetail/index.wxml +++ b/pages/radetail/index.wxml @@ -6,7 +6,7 @@ {{data.title}} diff --git a/pages/radetail/index.wxss b/pages/radetail/index.wxss index 555919f..8f7cb06 100644 --- a/pages/radetail/index.wxss +++ b/pages/radetail/index.wxss @@ -18,7 +18,7 @@ .banner image { width: 750rpx; - height: 280rpx; + /* height: 280rpx; */ } .act { @@ -565,13 +565,13 @@ button::after{ border: none; } .banner { position: relative; width: 750rpx; - height: 280rpx; + /* height: 280rpx; */ overflow: hidden; } .banner image { width: 750rpx; - height: 280rpx; + /* height: 280rpx; */ } .act { diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml index c23afc0..8faf55a 100644 --- a/pages/spellGroup/mySpellGroup/index.wxml +++ b/pages/spellGroup/mySpellGroup/index.wxml @@ -65,7 +65,7 @@ - + diff --git a/project.config.json b/project.config.json index cb99eff..b6bb9ba 100644 --- a/project.config.json +++ b/project.config.json @@ -14,7 +14,7 @@ }, "compileType": "miniprogram", "libVersion": "2.5.0", - "appid": "wxb11603577a84a86d", + "appid": "wxfa336cad86ed598d", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "isGameTourist": false, "simulatorType": "wechat",