From c250848b12db57ff2d7d6a924c429f52984d3594 Mon Sep 17 00:00:00 2001 From: hurui Date: Thu, 8 Aug 2019 22:52:49 +0800 Subject: [PATCH 1/9] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=97=A0=E6=95=B0=E6=8D=AE=E6=97=B6?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E5=9B=BE=E7=89=87]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/integralmall/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/integralmall/index.js b/pages/integralmall/index.js index 124e625..e565800 100644 --- a/pages/integralmall/index.js +++ b/pages/integralmall/index.js @@ -13,7 +13,7 @@ Page({ erweima: imgurl.erweima.url, bannerUrl: imgurl.banner.url, loadingUrl: imgurl.loading.url, - nodata: imgurl.nodata.url, + nodata: imgurl.noCoupon.url, wmhome: imgurl.wmhome.url, barcode: imgurl.barcode.url, list: [], From 77556efb974821612e7ffafd58552fbeb74fc044 Mon Sep 17 00:00:00 2001 From: hurui Date: Thu, 8 Aug 2019 23:42:16 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[=E7=A7=AF=E5=88=86=E5=95=86=E5=9F=8E][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E7=94=A8=E6=88=B7=E5=90=8D=E8=BF=87?= =?UTF-8?q?=E9=95=BF=E6=8C=A4=E4=B8=8B=E5=8E=BB]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/integralmall/index.wxml | 12 +++++++----- pages/integralmall/index.wxss | 11 +++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/pages/integralmall/index.wxml b/pages/integralmall/index.wxml index eef0f33..bb9db83 100644 --- a/pages/integralmall/index.wxml +++ b/pages/integralmall/index.wxml @@ -8,16 +8,18 @@ - - - - {{levelName}} + + + + + {{levelName}} + + 还需{{upgradeScore}}成长值升级 - 还需{{upgradeScore}}成长值升级 diff --git a/pages/integralmall/index.wxss b/pages/integralmall/index.wxss index fd6f9ca..7378149 100644 --- a/pages/integralmall/index.wxss +++ b/pages/integralmall/index.wxss @@ -62,15 +62,19 @@ .myName{ float: left; font-size: 32rpx; - height: 100%; - width:35%; margin-top:36rpx; } +.bot{ + display: flex; + flex-direction: column; +} .view{ + height: 40rpx; display: block; - margin: 60rpx 0 0 20rpx; } progress{ + margin: 14rpx 8rpx 0 20rpx; + float: left; width:230rpx; border-radius:60rpx; overflow:hidden; @@ -81,7 +85,6 @@ progress{ font-family:PingFangSC-Regular; font-weight:400; color:rgba(255,255,255,1); - margin-top: 84rpx; } .btoml{ float: left; From 508e2fcddb16fd08c944f9e334147262f9536cff Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 10 Aug 2019 21:17:03 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[undefined][=E4=BF=AE=E6=94=B9]:=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ConsumeDetail/ConsumeDetail.js | 13 ++++++++++--- pages/cardorder/index/index.js | 6 ++++++ pages/index/searchbar/detail/index.js | 5 ----- pages/order/index/index.js | 3 +++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index fccec60..31ce6af 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -70,6 +70,9 @@ Page({ * 跳转到门店列表的详情页面 */ gotoDetail(e) { + if (e.currentTarget.dataset.id == undefined) { + return + } wx.navigateTo({ url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` }) @@ -128,9 +131,13 @@ Page({ }, onLoad(options) { let that = this; - console.log(options.cardId) - that.cardpayList(options.cardId); - that.cardDetail(options.cardId); + let cardId = options.cardId + console.log(cardId) + if (cardId == undefined) { + cardId = 0; + } + that.cardpayList(cardId); + that.cardDetail(cardId); if (options.from){ this.setData({ showIndexReuturn:true diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index de2e053..33cbecd 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -117,6 +117,9 @@ Page({ }, // 跳转到详情 gotoConsumeDetail: function(e) { + if (e.currentTarget.dataset.id == undefined) { + return; + } wx.navigateTo({ url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, }) @@ -128,6 +131,9 @@ Page({ } else { var mystatus = this.data.mystatus; } + if (e.currentTarget.dataset.quancode == undefined) { + return; + } wx.navigateTo({ url: `/pages/couponorder/detail/index?quancode=${ e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index 2076456..2b0f006 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -181,11 +181,6 @@ Page({ /** * 获取多商铺列表 */ - // shopList: function(e) { - // wx.navigateTo({ - // url: `/pages/index/merchantList/index?id=${e.currentTarget.dataset.id}` - // }) - // }, onShareAppMessage: function(res) { let that = this; let shareObj = { diff --git a/pages/order/index/index.js b/pages/order/index/index.js index 39eb742..37ca9ea 100644 --- a/pages/order/index/index.js +++ b/pages/order/index/index.js @@ -75,6 +75,9 @@ Page({ // }, getList(key, pageNum) { let that = this; + if (key == undefined) { + key = 'all' + } /** * key==0 * 不发送该字段 From 32f7d61dbdbc6f64312aa444026b217269ea8f36 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 10 Aug 2019 21:50:32 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E6=B6=88=E8=B4=B9=E5=8D=A1undifi?= =?UTF-8?q?ned=E7=9A=84=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ConsumeDetail/ConsumeDetail.js | 11 +++++------ pages/cardorder/index/index.js | 20 +++++++++----------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 31ce6af..b503020 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -131,13 +131,12 @@ Page({ }, onLoad(options) { let that = this; - let cardId = options.cardId - console.log(cardId) - if (cardId == undefined) { - cardId = 0; + + if (options.cardId){ + that.cardpayList(cardId); + that.cardDetail(cardId); } - that.cardpayList(cardId); - that.cardDetail(cardId); + if (options.from){ this.setData({ showIndexReuturn:true diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 33cbecd..7bf63a5 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -117,12 +117,11 @@ Page({ }, // 跳转到详情 gotoConsumeDetail: function(e) { - if (e.currentTarget.dataset.id == undefined) { - return; + if (e.currentTarget.dataset.id){ + wx.navigateTo({ + url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, + }) } - wx.navigateTo({ - url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, - }) }, //点击跳转到券详情页面 gotouse: function(e) { @@ -131,13 +130,12 @@ Page({ } else { var mystatus = this.data.mystatus; } - if (e.currentTarget.dataset.quancode == undefined) { - return; + if (e.currentTarget.dataset.quancode) { + wx.navigateTo({ + url: `/pages/couponorder/detail/index?quancode=${ + e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` + }); } - wx.navigateTo({ - url: `/pages/couponorder/detail/index?quancode=${ - e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` - }); }, gotoBuy: function() { wx.navigateTo({ From 8c32f90c9644989dc19eb8d9848825ddf91d78d5 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 10 Aug 2019 21:52:05 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E6=B6=88=E8=B4=B9=E5=8D=A1undifi?= =?UTF-8?q?ned=E7=9A=84=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ConsumeDetail/ConsumeDetail.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index b503020..85bd614 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -133,8 +133,8 @@ Page({ let that = this; if (options.cardId){ - that.cardpayList(cardId); - that.cardDetail(cardId); + that.cardpayList(options.cardId); + that.cardDetail(options.cardId); } if (options.from){ From 8d059dbecb06ec23a18e1ac3fbb18372dad6d9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Mon, 12 Aug 2019 13:45:22 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[=E6=8B=BC=E5=9C=98=E8=A9=B3=E6=83=85?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E4=B9=8B=E5=BE=8C=E9=A0=81?= =?UTF-8?q?=E9=9D=A2=E6=9C=AA=E8=B7=B3=E8=BD=89=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/spellGroup/paySpellGroup/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/spellGroup/paySpellGroup/index.js b/pages/spellGroup/paySpellGroup/index.js index 7957268..8ecbbc2 100644 --- a/pages/spellGroup/paySpellGroup/index.js +++ b/pages/spellGroup/paySpellGroup/index.js @@ -109,7 +109,7 @@ Page({ */ payOrderUpdate: (orderId, payOrderId, status, reason, _this, orderGroupId) => { console.log(orderGroupId,7777) - let that = this; + let that = _this; // 支付成功 Http.post({ url: config.api.payOrderUpdate, From a423ba31d6d5cbc716027f597c026c14d29c4d3a Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 12 Aug 2019 12:41:37 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E5=88=B8][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=9B=A2undifined?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/spellGroup/mySpellGroup/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index fabc580..a28bb6f 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -53,10 +53,6 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function(options) { - this.setData({ - couponChannelId: options.couponChannelId, - couponId: options.couponId - }) if (options && options.couponChannelId) { this.getDetail(options.couponChannelId); } From de7a18c6581d95ab55e6f81c040e125592771305 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Mon, 12 Aug 2019 16:54:52 +0800 Subject: [PATCH 8/9] =?UTF-8?q?[=E9=A6=96=E9=A1=B5][=E4=BF=AE=E6=94=B9]:[?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9=E6=8B=BC=E5=9B=A2=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E9=A1=B5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 23 ++++++++++++----------- pages/index/index.js | 2 +- project.config.json | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/ext.json b/ext.json index cb6c532..6b64b8c 100644 --- a/ext.json +++ b/ext.json @@ -3,28 +3,29 @@ "attr": { "imgProxy": [ { - "newUrl": "https://ctest.malls.iformall.com/img", + "newUrl": "https://ciformall.youlane.cn/img", "orgUrl": "https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn" }, { - "newUrl": "https://ctest.malls.iformall.com/img1", + "newUrl": "https://ciformall.youlane.cn/img1", "orgUrl": "https://s3.cn-northwest-1.amazonaws.com.cn" }, { - "newUrl": "https://ctest.malls.iformall.com/img2", + "newUrl": "https://ciformall.youlane.cn/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://ctest.malls.iformall.com/C/api", + "configUrl": "https://ciformall.youlane.cn/C/api", "etcpAppId": "wx192b7d2e8dcbefd0", + "socketUrl": "wss://mp.youlane.cn/W/ws", "etcpVersion": "release", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", + "etcpCallbackUrl": "https://ciformall.youlane.cn/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "富茂链客", - "weappId": "wx649b3be73c1afe47", - "appVersion": "C.test.5.2.0" + "name": "富茂客官开发", + "weappId": "wxea71200db93d756b", + "appVersion": "C.4.5.106" }, "debug": false, "tabBar": { @@ -60,10 +61,10 @@ "window": { "backgroundTextStyle": "dark", "navigationBarTextStyle": "black", - "navigationBarTitleText": "", - "navigationBarBackgroundColor": "#FFFFFF" + "navigationBarTitleText": "WeChat", + "navigationBarBackgroundColor": "#fff" }, - "extAppid": "wx649b3be73c1afe47", + "extAppid": "wxea71200db93d756b", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/pages/index/index.js b/pages/index/index.js index 012c41c..43f1174 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -173,7 +173,7 @@ Page({ } } // 拼团详情页(只有通过扫码进入才可能进入拼团详情页面,只有这一个入口) - else if (options && options.couponChannelId && app.globalData.type == 'sd' || options && options.couponChannelId && options.spellGroup) { + else if ((options && options.couponChannelId && app.globalData.type == 'sd') || (options && options.couponChannelId && options.spellGroup) ){ wx.redirectTo({ url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${options.couponChannelId}`, }) diff --git a/project.config.json b/project.config.json index b6bb9ba..cb99eff 100644 --- a/project.config.json +++ b/project.config.json @@ -14,7 +14,7 @@ }, "compileType": "miniprogram", "libVersion": "2.5.0", - "appid": "wxfa336cad86ed598d", + "appid": "wxb11603577a84a86d", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "isGameTourist": false, "simulatorType": "wechat", From 0c9e01150ac1b52e7b1323c5c3c22b651efff2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Mon, 12 Aug 2019 18:22:41 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E5=88=B8id=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/getuserinfo/index.js | 4 ++++ pages/spellGroup/mySpellGroup/index.js | 16 ++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index f8eb123..083cec2 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -36,6 +36,10 @@ Page({ frommd: options.frommd }) } + // that.setData({ + // optionData: null + // }) + console.log(wx.getStorageSync('options'),6666) that.setData({ optionData: wx.getStorageSync('options') ? JSON.parse(wx.getStorageSync('options')):null }) diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index a28bb6f..28a2de4 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -53,12 +53,17 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad: function(options) { + this.setData({ + couponChannelId: options.couponChannelId, + couponId: options.couponId ? options.couponId:'' + }) if (options && options.couponChannelId) { this.getDetail(options.couponChannelId); } if (options && options.couponId) { this.getOneSpell(options.couponId) } + console.log(this.data.couponId) this.getUserInfo(); }, /** @@ -603,14 +608,12 @@ Page({ * */ wx.redirectTo({ - url: "/pages/getphoneInfo/index?path=spell&couponChannelId=" + - that.data.couponChannelId + '&couponId=' + that.data.couponId + url: `/pages/getphoneInfo/index?path=spell&couponChannelId=${that.data.couponChannelId}&couponId=${that.data.data.couponId}` }); } else if (err.code == 11006) { // 用户手机已加密 wx.redirectTo({ - url: "/pages/phoneinput/phoneinput?path=spell&couponChannelId=" + - that.data.couponChannelId + '&couponId=' + that.data.couponId + url: `/pages/phoneinput/phoneinput?path=spell&couponChannelId=${that.data.couponChannelId}&couponId=${that.data.data.couponId}` }); } else { wx.showToast({ @@ -735,6 +738,7 @@ Page({ */ onPullDownRefresh: function(e) { let that = this; + console.log(this.data.couponId,222) that.getDetail(that.data.couponChannelId); if (that.data.couponId) { that.getOneSpell(that.data.couponId) @@ -745,7 +749,7 @@ Page({ var that = this; var shareObj = { title: that.data.data.title, - path: `/pages/index/index?couponChannelId=${that.data.couponChannelId}&spellGroup=spellGroup`, + path: `/pages/index/index?couponChannelId=${that.data.couponChannelId}&couponId=${that.data.data.couponId}&spellGroup=spellGroup`, success: function (res) { if (res.errMsg == 'shareAppMessage:ok') { } }, @@ -756,7 +760,7 @@ Page({ // 来自页面内的按钮的转发 if (options.from == 'button') { var eData = options.target.dataset.id; - shareObj.path = `/pages/index/index?couponChannelId=${eData}&spellGroup=spellGroup&frommd=JC`; + shareObj.path = `/pages/index/index?couponChannelId=${eData}&couponId=${that.data.data.couponId}&spellGroup=spellGroup&frommd=JC`; } // 返回shareObj return shareObj;