@@ -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": { | |||
@@ -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) { | |||
@@ -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}`; | |||
@@ -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) | |||
@@ -85,6 +85,8 @@ | |||
<view class='right-button' wx:if='{{item.couponStatus!=1&&item.orderStatus==15}}' data-data='{{item}}' data-status='{{item.status}}' catchtap='gotoPay' style="width:auto;display:inline-block;padding:0 8rpx;">{{item.statusText}}</view> | |||
<!-- 拼团发起未支付 --> | |||
<view class='right-button' wx:if='{{item.couponStatus!=1&&item.orderStatus==16&&item.orderGroupId!="0"}}' data-status='{{item.status}}' catchtap='gotoEdit' style="width:auto;display:inline-block;background:#B5B5B5;padding:0 8rpx;">{{item.statusText}}</view> | |||
<view class='right-button' wx:if='{{item.couponStatus!=1&&item.orderStatus==98&&item.orderGroupId!="0"}}' data-status='{{item.status}}' catchtap='gotoEdit' style="width:auto;display:inline-block;background:#B5B5B5;padding:0 8rpx;">{{item.statusText}}</view> | |||
<view class='right-button' wx:if='{{item.couponStatus!=1&&item.orderStatus==99&&item.orderGroupId!="0"}}' data-status='{{item.status}}' catchtap='gotoEdit' style="width:auto;display:inline-block;background:#B5B5B5;padding:0 8rpx;">{{item.statusText}}</view> | |||
<!-- <view class='right-button' wx:if='{{item.couponStatus!=1&&item.orderStatus==16&&item.orderGroupId!="0"}}' data-data='{{item}}' data-status='{{item.status}}' bindtap='gotoPay' style="width:auto;display:inline-block;padding:0 8rpx;">{{item.statusText}}</view> --> | |||
</view> | |||
</view> | |||
@@ -32,7 +32,7 @@ | |||
}, | |||
"compileType": "miniprogram", | |||
"libVersion": "2.5.0", | |||
"appid": "wx453ae0d37f3550d0", | |||
"appid": "wxfa336cad86ed598d", | |||
"projectname": "oldC", | |||
"isGameTourist": false, | |||
"simulatorType": "wechat", | |||
@@ -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={ | |||