From 2a002eac6b2813d1cf04810da15b75729a2a9f1f Mon Sep 17 00:00:00 2001 From: GL <954534408@qq.com> Date: Thu, 25 Mar 2021 18:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- custom-tab-bar/index.js | 4 +++- ext.json | 16 ++++++++++------ index/index.js | 18 +++++++++--------- index/user.js | 6 +++--- pages/cardorder/index/index.js | 6 +++--- pages/coupon/detail/index.js | 10 +++++----- pages/couponorder/index/index.js | 6 +++--- pages/spellGroup/mySpellGroup/index.wxml | 2 +- project.config.json | 2 +- 10 files changed, 39 insertions(+), 33 deletions(-) diff --git a/app.js b/app.js index 92ba920..03b6c38 100644 --- a/app.js +++ b/app.js @@ -6,7 +6,7 @@ App({ newArr:[],//存放分享二维进入消息信息 }, onLaunch: function(options) { - wx.hideTabBar() + // wx.hideTabBar() var that = this; if (that.globalData.previewFlag) {//解决微信图片预览重复进入app.js onshow that.globalData.previewFlag = false diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 07f4c45..50a7679 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -36,7 +36,9 @@ Component({ ] }, created(){ - this.getType() + if(app.globalData.token){ + this.getType() + } }, // lifetimes: { // attached: function () { diff --git a/ext.json b/ext.json index 30429db..5a139c3 100644 --- a/ext.json +++ b/ext.json @@ -1,6 +1,13 @@ { "ext": { "attr": { + "car": { + "etcp": { + "etcpAppId": "wx192b7d2e8dcbefd0", + "etcpVersion": "release", + "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" + } + }, "imgProxy": [ { "newUrl": "https://ctest.malls.iformall.com/img", @@ -16,14 +23,11 @@ } ], "configUrl": "https://ctest.malls.iformall.com/C/api", - "etcpAppId": "wx9f3a77763caa7c89", - "etcpVersion": "release", - "etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", "ifHaveWebSocket": "0", "ifHaveCarModular": "1" }, - "name": "富茂望京测试版", - "weappId": "wx9f3a77763caa7c89", + "name": "金泸商务", + "weappId": "wx649b3be73c1afe47", "appVersion": "C.test.5.2.0" }, "debug": false, @@ -69,7 +73,7 @@ "provider": "wx2b03c6e691cd7370" } }, - "extAppid": "wx9f3a77763caa7c89", + "extAppid": "wx649b3be73c1afe47", "extEnable": true, "permission": { "scope.userLocation": { diff --git a/index/index.js b/index/index.js index 93052ff..672d7a4 100644 --- a/index/index.js +++ b/index/index.js @@ -382,15 +382,15 @@ Page({ let num = wx.getStorageSync('couponNum'); let num1 = wx.getStorageSync('couponNum2'); - if (num == 'couponNum' || num1 == 'couponNum2') { - wx.showTabBarRedDot({ - index: 3 - }) - } else { - wx.hideTabBarRedDot({ - index: 3 - }) - } + // if (num == 'couponNum' || num1 == 'couponNum2') { + // wx.showTabBarRedDot({ + // index: 3 + // }) + // } else { + // wx.hideTabBarRedDot({ + // index: 3 + // }) + // } if (app.globalData.score) { that.setData({ diff --git a/index/user.js b/index/user.js index b8e6cfa..fbac954 100644 --- a/index/user.js +++ b/index/user.js @@ -244,9 +244,9 @@ Page({ */ let num = wx.getStorageSync('couponNum'); let num1 = wx.getStorageSync('couponNum2'); - wx.hideTabBarRedDot({ - index: 3 - }); + // wx.hideTabBarRedDot({ + // index: 3 + // }); if (num == 'couponNum1') { wx.setStorage({ key: 'couponNum', diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index ef12c97..0db3963 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -51,9 +51,9 @@ Page({ key: 'couponNum2', data: "couponNum3", }) - wx.hideTabBarRedDot({ - index: 3 - }) + // wx.hideTabBarRedDot({ + // index: 3 + // }) }, userule: function() { wx.navigateTo({ diff --git a/pages/coupon/detail/index.js b/pages/coupon/detail/index.js index 203de5b..05e3148 100644 --- a/pages/coupon/detail/index.js +++ b/pages/coupon/detail/index.js @@ -107,7 +107,7 @@ Page({ status: 0, merchantIds: id, pageNum: that.data.page, - pageSize: 4, + pageSize: 5, } Http.post({ url: config.api.listByMerchant, @@ -117,16 +117,16 @@ Page({ return } let dataLsit = [] - dataLsit = that.data.couponList - dataLsit.push(...res.data.page.list) + // dataLsit = that.data.couponList + dataLsit=res.data.page.list dataLsit.map((item,index)=>{ if (item.id == that.data.couponChannelId){ dataLsit.splice(index,1) } }) if (that.data.page>1){ - let tmpeLsit = dataLsit - tmpeLsit.push(...res.data.page.list) + let tmpeLsit = that.data.couponList + tmpeLsit.push(...dataLsit) that.setData({ couponList: tmpeLsit, }) diff --git a/pages/couponorder/index/index.js b/pages/couponorder/index/index.js index 76960d9..b1cb859 100644 --- a/pages/couponorder/index/index.js +++ b/pages/couponorder/index/index.js @@ -48,9 +48,9 @@ Page({ key: 'couponNum', data: "couponNum1", }) - wx.hideTabBarRedDot({ - index:2 - }) + // wx.hideTabBarRedDot({ + // index:2 + // }) }, goback: function () { wx.switchTab({ diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml index bfc9b2e..1d72d53 100644 --- a/pages/spellGroup/mySpellGroup/index.wxml +++ b/pages/spellGroup/mySpellGroup/index.wxml @@ -110,7 +110,7 @@ - + diff --git a/project.config.json b/project.config.json index 5ef8ae6..b3b75cc 100644 --- a/project.config.json +++ b/project.config.json @@ -31,7 +31,7 @@ "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", - "libVersion": "2.9.5", + "libVersion": "2.16.0", "appid": "wxfa336cad86ed598d", "projectname": "oldC", "isGameTourist": false,