@@ -6,7 +6,7 @@ App({ | |||||
newArr:[],//存放分享二维进入消息信息 | newArr:[],//存放分享二维进入消息信息 | ||||
}, | }, | ||||
onLaunch: function(options) { | onLaunch: function(options) { | ||||
wx.hideTabBar() | |||||
// wx.hideTabBar() | |||||
var that = this; | var that = this; | ||||
if (that.globalData.previewFlag) {//解决微信图片预览重复进入app.js onshow | if (that.globalData.previewFlag) {//解决微信图片预览重复进入app.js onshow | ||||
that.globalData.previewFlag = false | that.globalData.previewFlag = false | ||||
@@ -36,7 +36,9 @@ Component({ | |||||
] | ] | ||||
}, | }, | ||||
created(){ | created(){ | ||||
this.getType() | |||||
if(app.globalData.token){ | |||||
this.getType() | |||||
} | |||||
}, | }, | ||||
// lifetimes: { | // lifetimes: { | ||||
// attached: function () { | // attached: function () { | ||||
@@ -1,6 +1,13 @@ | |||||
{ | { | ||||
"ext": { | "ext": { | ||||
"attr": { | "attr": { | ||||
"car": { | |||||
"etcp": { | |||||
"etcpAppId": "wx192b7d2e8dcbefd0", | |||||
"etcpVersion": "release", | |||||
"etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback" | |||||
} | |||||
}, | |||||
"imgProxy": [ | "imgProxy": [ | ||||
{ | { | ||||
"newUrl": "https://ctest.malls.iformall.com/img", | "newUrl": "https://ctest.malls.iformall.com/img", | ||||
@@ -16,14 +23,11 @@ | |||||
} | } | ||||
], | ], | ||||
"configUrl": "https://ctest.malls.iformall.com/C/api", | "configUrl": "https://ctest.malls.iformall.com/C/api", | ||||
"etcpAppId": "wx9f3a77763caa7c89", | |||||
"etcpVersion": "release", | |||||
"etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback", | |||||
"ifHaveWebSocket": "0", | "ifHaveWebSocket": "0", | ||||
"ifHaveCarModular": "1" | "ifHaveCarModular": "1" | ||||
}, | }, | ||||
"name": "富茂望京测试版", | |||||
"weappId": "wx9f3a77763caa7c89", | |||||
"name": "金泸商务", | |||||
"weappId": "wx649b3be73c1afe47", | |||||
"appVersion": "C.test.5.2.0" | "appVersion": "C.test.5.2.0" | ||||
}, | }, | ||||
"debug": false, | "debug": false, | ||||
@@ -69,7 +73,7 @@ | |||||
"provider": "wx2b03c6e691cd7370" | "provider": "wx2b03c6e691cd7370" | ||||
} | } | ||||
}, | }, | ||||
"extAppid": "wx9f3a77763caa7c89", | |||||
"extAppid": "wx649b3be73c1afe47", | |||||
"extEnable": true, | "extEnable": true, | ||||
"permission": { | "permission": { | ||||
"scope.userLocation": { | "scope.userLocation": { | ||||
@@ -382,15 +382,15 @@ Page({ | |||||
let num = wx.getStorageSync('couponNum'); | let num = wx.getStorageSync('couponNum'); | ||||
let num1 = wx.getStorageSync('couponNum2'); | 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) { | if (app.globalData.score) { | ||||
that.setData({ | that.setData({ | ||||
@@ -244,9 +244,9 @@ Page({ | |||||
*/ | */ | ||||
let num = wx.getStorageSync('couponNum'); | let num = wx.getStorageSync('couponNum'); | ||||
let num1 = wx.getStorageSync('couponNum2'); | let num1 = wx.getStorageSync('couponNum2'); | ||||
wx.hideTabBarRedDot({ | |||||
index: 3 | |||||
}); | |||||
// wx.hideTabBarRedDot({ | |||||
// index: 3 | |||||
// }); | |||||
if (num == 'couponNum1') { | if (num == 'couponNum1') { | ||||
wx.setStorage({ | wx.setStorage({ | ||||
key: 'couponNum', | key: 'couponNum', | ||||
@@ -51,9 +51,9 @@ Page({ | |||||
key: 'couponNum2', | key: 'couponNum2', | ||||
data: "couponNum3", | data: "couponNum3", | ||||
}) | }) | ||||
wx.hideTabBarRedDot({ | |||||
index: 3 | |||||
}) | |||||
// wx.hideTabBarRedDot({ | |||||
// index: 3 | |||||
// }) | |||||
}, | }, | ||||
userule: function() { | userule: function() { | ||||
wx.navigateTo({ | wx.navigateTo({ | ||||
@@ -107,7 +107,7 @@ Page({ | |||||
status: 0, | status: 0, | ||||
merchantIds: id, | merchantIds: id, | ||||
pageNum: that.data.page, | pageNum: that.data.page, | ||||
pageSize: 4, | |||||
pageSize: 5, | |||||
} | } | ||||
Http.post({ | Http.post({ | ||||
url: config.api.listByMerchant, | url: config.api.listByMerchant, | ||||
@@ -117,16 +117,16 @@ Page({ | |||||
return | return | ||||
} | } | ||||
let dataLsit = [] | 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)=>{ | dataLsit.map((item,index)=>{ | ||||
if (item.id == that.data.couponChannelId){ | if (item.id == that.data.couponChannelId){ | ||||
dataLsit.splice(index,1) | dataLsit.splice(index,1) | ||||
} | } | ||||
}) | }) | ||||
if (that.data.page>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({ | that.setData({ | ||||
couponList: tmpeLsit, | couponList: tmpeLsit, | ||||
}) | }) | ||||
@@ -48,9 +48,9 @@ Page({ | |||||
key: 'couponNum', | key: 'couponNum', | ||||
data: "couponNum1", | data: "couponNum1", | ||||
}) | }) | ||||
wx.hideTabBarRedDot({ | |||||
index:2 | |||||
}) | |||||
// wx.hideTabBarRedDot({ | |||||
// index:2 | |||||
// }) | |||||
}, | }, | ||||
goback: function () { | goback: function () { | ||||
wx.switchTab({ | wx.switchTab({ | ||||
@@ -110,7 +110,7 @@ | |||||
</view> | </view> | ||||
</view> | </view> | ||||
<!-- 问卷调查 --> | <!-- 问卷调查 --> | ||||
<view class="b1" style="opacity:{{opacity}};display: {{display}};position: fixed;bottom: 0px;left: 0px;right: 0px;background: rgba(0, 0, 0, 0.8);overflow: hidden;z-index: 10;" animation="{{queueData}}"> | |||||
<view class="b1" style="opacity:{{opacity}};display: {{display}};position: fixed;top:{{navigationBarHeight}};bottom: 0px;left: 0px;right: 0px;background: rgba(0, 0, 0, 0.8);overflow: hidden;z-index: 13;" animation="{{queueData}}"> | |||||
<view id='con' class='con'> | <view id='con' class='con'> | ||||
<image class='wmclose' mode='widthFix' src="{{closedUrl}}" bindtap="closeQuestion"></image> | <image class='wmclose' mode='widthFix' src="{{closedUrl}}" bindtap="closeQuestion"></image> | ||||
<image class='ques_gou' mode='widthFix' src="{{quesGouUrl}}"></image> | <image class='ques_gou' mode='widthFix' src="{{quesGouUrl}}"></image> | ||||
@@ -31,7 +31,7 @@ | |||||
"userConfirmedUseCompilerModuleSwitch": false | "userConfirmedUseCompilerModuleSwitch": false | ||||
}, | }, | ||||
"compileType": "miniprogram", | "compileType": "miniprogram", | ||||
"libVersion": "2.9.5", | |||||
"libVersion": "2.16.0", | |||||
"appid": "wxfa336cad86ed598d", | "appid": "wxfa336cad86ed598d", | ||||
"projectname": "oldC", | "projectname": "oldC", | ||||
"isGameTourist": false, | "isGameTourist": false, | ||||