From c9d7a3aea1e58f58dfa3d195ff4d3bc1c322d48c Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Sat, 10 Oct 2020 18:20:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E5=BA=97=E9=93=BA?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=B5=B7=E6=8A=A5=E9=97=AE=E9=A2=98=E3=80=81?= =?UTF-8?q?=E6=88=91=E7=9A=84=E6=8B=BC=E5=9B=A2=E5=A2=9E=E5=8A=A0=E6=8B=BC?= =?UTF-8?q?=E5=9B=A2=E7=8A=B6=E6=80=8198=2099=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ext.json | 39 ++++++---------- index/index.js | 64 ++++++++++++++++++++++++--- pages/canvas/index.js | 1 - pages/index/searchbar/detail/index.js | 2 +- pages/spellGroup/spellGroup.wxml | 2 + project.config.json | 2 +- utils/spell.js | 16 +++++++ 7 files changed, 91 insertions(+), 35 deletions(-) diff --git a/ext.json b/ext.json index 83e3089..d947234 100644 --- a/ext.json +++ b/ext.json @@ -1,44 +1,30 @@ { "ext": { "attr": { - "car": { - "tjd": { - "payPath": "", - "tjdAppId": "wx6945d1bda68d7993" - }, - "etcp": { - "payPath": "pages/pay/order-pay-open/main", - "etcpAppId": "wxc07f9d67923d676d", - "etcpCallbackUrl": "https://admin.malls.iformall.com/api/carCallback/etcpPaidCallback" - }, - "bolink": { - "payPath": "pages/park/park", - "bolinkAppId": "wxbd08b4baa10fcc1d" - }, - "version": "release" - }, "imgProxy": [ { - "newUrl": "https://c.malls.iformall.com/img", + "newUrl": "https://ctest.malls.iformall.com/img", "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img1", + "newUrl": "https://ctest.malls.iformall.com/img1", "orgUrl": "https://formall.oss-accelerate.aliyuncs.com" }, { - "newUrl": "https://c.malls.iformall.com/img2", + "newUrl": "https://ctest.malls.iformall.com/img2", "orgUrl": "https://wx.qlogo.cn" } ], - "configUrl": "https://c.malls.iformall.com/C/api", - "ifStoreApp": "0", + "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": "wx6a2524a8286d687f", - "appVersion": "C.5.1.1" + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", + "appVersion": "C.test.5.2.0" }, "debug": false, "tabBar": { @@ -68,7 +54,8 @@ "selectedIconPath": "assets/images/user-a.png" } ], - "custom": true + "color": "#abb1be", + "selectedColor": "#b2743d" }, "window": { "backgroundTextStyle": "dark", @@ -82,7 +69,7 @@ "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx6a2524a8286d687f", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/index.js b/index/index.js index 45e0e31..18ccd5b 100644 --- a/index/index.js +++ b/index/index.js @@ -411,7 +411,7 @@ Page({ getWeapNote: function(couponChannelId, couponId, orderId) { var that = this; - app.tokenCallback = token => { + if (app.globalData.token){ // 登录 console.log(app.globalData.token) that.getmemberId(app.globalData.token); @@ -430,11 +430,11 @@ Page({ app.businessListCallback(app.globalData.token); } Http.get({ - url: config.api.getWeapNote, - data: { - appId: config.weapp.AppId, - } - }) + url: config.api.getWeapNote, + data: { + appId: config.weapp.AppId, + } + }) .then(res => { console.log(33333333333) console.log(app.globalData.token) @@ -459,7 +459,59 @@ Page({ showCancel: false }); }); + + }else{ + app.tokenCallback = token => { + // 登录 + console.log(app.globalData.token) + that.getmemberId(app.globalData.token); + that.getBannerlist(); + that.topicShow(); + that.getxsList(); + that.getMallInfo(app.globalData.token); + + if (app.couponChannelListCallback) { + app.couponChannelListCallback(app.globalData.token); + } + if (app.couponListCallback) { + app.couponListCallback(app.globalData.token); + } + if (app.businessListCallback) { + app.businessListCallback(app.globalData.token); + } + Http.get({ + url: config.api.getWeapNote, + data: { + appId: config.weapp.AppId, + } + }) + .then(res => { + console.log(33333333333) + console.log(app.globalData.token) + console.log(res) + console.log(33333333333) + // that.getGameOne(app.globalData.token) + that.getStaticGame(app.globalData.token) + that.getGg(app.globalData.token) + let weapNote = JSON.parse(res.data.weapNote); + that.setData({ + desc: weapNote.firstpage.desc, + title: weapNote.firstpage.title + }) + }) + .catch(err => { + // that.getGameOne(app.globalData.token) + that.getStaticGame(app.globalData.token) + that.getGg(app.globalData.token) + wx.showModal({ + title: "提示", + content: err.errMsg, + showCancel: false + }); + }); + } } + }, getStaticGame(token) { diff --git a/pages/canvas/index.js b/pages/canvas/index.js index 0a3c810..1fd55b2 100644 --- a/pages/canvas/index.js +++ b/pages/canvas/index.js @@ -129,7 +129,6 @@ Page({ if (options && options.couponChannelId) { src1 = that.data.data.coverImg + `?imageView/2/w/${topImageWidth}/h/${topImageHeight}`; src2 = util.getProxyImgUrl(src1); - } else if (options && options.merchantId) { //商户详情海报 src1 = that.data.data.merchantImgUrl + `?imageView/2/w/${topImageWidth}/h/${topImageHeight}`; diff --git a/pages/index/searchbar/detail/index.js b/pages/index/searchbar/detail/index.js index 54e918e..866e3ad 100644 --- a/pages/index/searchbar/detail/index.js +++ b/pages/index/searchbar/detail/index.js @@ -110,7 +110,7 @@ Page({ } }).then(res => { wx.navigateTo({ - url: `/pages/canvas/index?couponChannelId=${that.data.id}` + url: `/pages/canvas/index?merchantId=${that.data.id}` }) }).catch(err => { console.log(err) diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml index 5f30535..ba9a263 100644 --- a/pages/spellGroup/spellGroup.wxml +++ b/pages/spellGroup/spellGroup.wxml @@ -85,6 +85,8 @@ {{item.statusText}} {{item.statusText}} + {{item.statusText}} + {{item.statusText}} diff --git a/project.config.json b/project.config.json index 37c20e3..850364e 100644 --- a/project.config.json +++ b/project.config.json @@ -32,7 +32,7 @@ }, "compileType": "miniprogram", "libVersion": "2.5.0", - "appid": "wx453ae0d37f3550d0", + "appid": "wxfa336cad86ed598d", "projectname": "oldC", "isGameTourist": false, "simulatorType": "wechat", diff --git a/utils/spell.js b/utils/spell.js index 1d5a0bd..aa8c663 100644 --- a/utils/spell.js +++ b/utils/spell.js @@ -26,6 +26,14 @@ const spellStatus=[ { name: '拼团取消', value: 16 + }, + { + name: '失败请稍后', + value: 98 + }, + { + name: '失败请稍后', + value: 99 } ] const spellStatus02 = [ @@ -56,6 +64,14 @@ const spellStatus02 = [ { name: '拼团取消', value: 16 + }, + { + name: '失败请稍后', + value: 98 + }, + { + name: '失败请稍后', + value: 99 } ] module.exports={