HolyKnightIX před 2 roky
rodič
revize
19e42130ef
6 změnil soubory, kde provedl 105 přidání a 99 odebrání
  1. +24
    -26
      ext.json
  2. +1
    -1
      index/passCar.wxml
  3. +38
    -30
      pages/ConsumeDetail/ConsumeDetail.js
  4. +13
    -12
      pages/coupon/detail/index.js
  5. +28
    -29
      pages/index/index.js
  6. +1
    -1
      project.config.json

+ 24
- 26
ext.json Zobrazit soubor

@@ -2,35 +2,44 @@
"ext": { "ext": {
"attr": { "attr": {
"car": { "car": {
"tjd": {
"payPath": "",
"tjdAppId": "wx6945d1bda68d7993"
},
"etcp": { "etcp": {
"etcpAppId": "wx192b7d2e8dcbefd0",
"etcpVersion": "release",
"etcpCallbackUrl": "https://admintest.malls.iformall.com/api/carCallback/etcpPaidCallback"
}
"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"
}, },
"mchId": "1604439800", "mchId": "1604439800",
"imgProxy": [ "imgProxy": [
{ {
"newUrl": "https://ctest.malls.iformall.com/img",
"newUrl": "https://c.malls.iformall.com/img",
"orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com" "orgUrl": "https://iformall-net.formall.oss-accelerate.aliyuncs.com"
}, },
{ {
"newUrl": "https://ctest.malls.iformall.com/img1",
"newUrl": "https://c.malls.iformall.com/img1",
"orgUrl": "https://formall.oss-accelerate.aliyuncs.com" "orgUrl": "https://formall.oss-accelerate.aliyuncs.com"
}, },
{ {
"newUrl": "https://ctest.malls.iformall.com/img2",
"newUrl": "https://c.malls.iformall.com/img2",
"orgUrl": "https://wx.qlogo.cn" "orgUrl": "https://wx.qlogo.cn"
} }
], ],
"configUrl": "https://ctest.malls.iformall.com/C/api",
"businessSwitch": "1",
"configUrl": "https://c.malls.iformall.com/C/api",
"ifStoreApp": "0",
"ifHaveWebSocket": "0", "ifHaveWebSocket": "0",
"ifHaveCarModular": "1"
"ifHaveCarModular": "0"
}, },
"name": "金泸商务",
"weappId": "wx649b3be73c1afe47",
"appVersion": "C.test.5.2.0"
"name": "金茂悦茂邻荟",
"weappId": "wx7c9c7122a91946a7",
"appVersion": "C.5.1.1"
}, },
"debug": false, "debug": false,
"tabBar": { "tabBar": {
@@ -66,8 +75,7 @@
"selectedIconPath": "assets/images/user-a.png" "selectedIconPath": "assets/images/user-a.png"
} }
], ],
"color": "#abb1be",
"selectedColor": "#b2743d"
"custom": true
}, },
"window": { "window": {
"backgroundTextStyle": "dark", "backgroundTextStyle": "dark",
@@ -75,17 +83,7 @@
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#FFFFFF" "navigationBarBackgroundColor": "#FFFFFF"
}, },
"plugins": {
"auto-points-plugin": {
"version": "1.3.0",
"provider": "wxfab2bf944bfc4da6"
},
"live-player-plugin": {
"version": "1.3.4",
"provider": "wx2b03c6e691cd7370"
}
},
"extAppid": "wx649b3be73c1afe47",
"extAppid": "wx7c9c7122a91946a7",
"extEnable": true, "extEnable": true,
"permission": { "permission": {
"scope.userLocation": { "scope.userLocation": {


+ 1
- 1
index/passCar.wxml Zobrazit soubor

@@ -26,7 +26,7 @@
</view> </view>
</view> </view>
<!-- <view class='coupon clearfix' bindtap='gotoquan' wx:if="{{couponList.length>0}}"> --> <!-- <view class='coupon clearfix' bindtap='gotoquan' wx:if="{{couponList.length>0}}"> -->
<view style="padding:0 25rpx;" class='coupon clearfix' bindtap='openTicketModal' wx:if="{{couponList.length>0&&stopFees.orderId}}">
<view style="padding:0 25rpx;" class='coupon clearfix' bindtap='openTicketModal' wx:if="{{couponList.length>0&&stopFees.orderId&&stopFees.remainingFee>0}}">
<text class='fl'><text class='jians'>券</text>使用停车券:</text> <text class='fl'><text class='jians'>券</text>使用停车券:</text>
<view class="fr"> <view class="fr">
<text wx:if="{{quantitle}}">{{quantitle}}</text> <text wx:if="{{quantitle}}">{{quantitle}}</text>


+ 38
- 30
pages/ConsumeDetail/ConsumeDetail.js Zobrazit soubor

@@ -57,10 +57,10 @@ Page({
height: "", height: "",
more: "点击查看更多", more: "点击查看更多",
showMore: true, showMore: true,
supportTransfer:1,
showIndexReuturn:false
supportTransfer: 1,
showIndexReuturn: false
}, },
phone: function(e) {
phone: function (e) {
let that = this; let that = this;
wx.makePhoneCall({ wx.makePhoneCall({
phoneNumber: e.target.dataset.merchantlinkphone phoneNumber: e.target.dataset.merchantlinkphone
@@ -77,28 +77,36 @@ Page({
url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}` url: `/pages/index/searchbar/detail/index?id=${e.currentTarget.dataset.id}`
}) })
}, },
gotoIndex(){
gotoIndex() {
wx.navigateTo({ wx.navigateTo({
url: '/pages/index/index', url: '/pages/index/index',
}) })
}, },
goToTranser(){
goToTranser() {
this.onShareAppMessage(); this.onShareAppMessage();
// wx.navigateTo({ // wx.navigateTo({
// url: '/pages/index/index?couponChannelId=316424281708658688&cuserId=316369316574887936&couponId=316424281708658688&coverImg=https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn/456/90d50e2d-547c-43e1-a801-2f6e15f622d2.jpg&userName=轻泉漪溪&avatarUrl=https://wx.qlogo.cn/mmopen/vi_32/oibIKqnzXT21eZJdjKVKY91A36FqLbD3ibEFc2oxIC4iahLniccDQKVu1Tgp4kJupxRZjtEpW0ravJ9QW1HuncGVjA/132&couponOrderId=316424688259530752&updateDate=1564553135000', // url: '/pages/index/index?couponChannelId=316424281708658688&cuserId=316369316574887936&couponId=316424281708658688&coverImg=https://iformall-net.s3.cn-northwest-1.amazonaws.com.cn/456/90d50e2d-547c-43e1-a801-2f6e15f622d2.jpg&userName=轻泉漪溪&avatarUrl=https://wx.qlogo.cn/mmopen/vi_32/oibIKqnzXT21eZJdjKVKY91A36FqLbD3ibEFc2oxIC4iahLniccDQKVu1Tgp4kJupxRZjtEpW0ravJ9QW1HuncGVjA/132&couponOrderId=316424688259530752&updateDate=1564553135000',
// }) // })
}, },
onShareAppMessage: function (res) { onShareAppMessage: function (res) {
let _this = this;
console.log(_this.data, '_this');
app.globalData.previewFlag = true app.globalData.previewFlag = true
if (res.from === 'button') { if (res.from === 'button') {
console.log(this.data.cardDetail) console.log(this.data.cardDetail)
console.log(111)
// 来自页面内转发按钮 // 来自页面内转发按钮
let _this = this;
const restData = JSON.stringify({
coverImg: _this.data.cardDetail.coverImg,
avatarUrl: _this.data.avatarUrl,
couponOrderId: _this.data.cardDetail.id,
updateDate: _this.data.cardDetail.updateDate
})

return { return {
title: _this.data.userName + '赠送您一张' + _this.data.cardDetail.title, title: _this.data.userName + '赠送您一张' + _this.data.cardDetail.title,
path: '/pages/index/index?couponChannelId=' + _this.data.cardDetail.couponChannelId + '&cuserId=' + _this.data.cardDetail.ownerId + '&couponId=' + _this.data.cardDetail.couponId + '&coverImg=' + _this.data.cardDetail.coverImg + '&userName=' + _this.data.userName + '&avatarUrl=' + _this.data.avatarUrl + '&couponOrderId=' + _this.data.cardDetail.id + '&updateDate=' + _this.data.cardDetail.updateDate,
imageUrl: _this.data.cardDetail.coverImg, imageUrl: _this.data.cardDetail.coverImg,
path: `/pages/index/index?couponChannelId=${_this.data.cardDetail.couponChannelId}&avatarUrl=${_this.data.cardDetail.avatarUrl}&cuserId=${_this.data.cardDetail.ownerId}&userName=${_this.data.userName}&couponId=${_this.data.cardDetail.couponId}&couponOrderId=${_this.data.cardDetail.id}&updateDate=${_this.data.cardDetail.updateDate}&coverImg=${_this.data.cardDetail.coverImg}`,

success: function (res) { success: function (res) {
// 转发成功 // 转发成功
}, },
@@ -106,12 +114,12 @@ Page({
// 转发失败 // 转发失败
} }
} }
}else{
} else {
console.log(res, 444444444444444444) console.log(res, 444444444444444444)
} }
}, },
// 点击查看更多 // 点击查看更多
more: function() {
more: function () {
let that = this; let that = this;
if (that.data.more == '点击查看更多') { if (that.data.more == '点击查看更多') {
this.setData({ this.setData({
@@ -120,11 +128,11 @@ Page({
more: "点击收起", more: "点击收起",
showMore: true showMore: true
}) })
}
}
else { else {
this.setData({ this.setData({
hidden: "hidden", hidden: "hidden",
height: 4* 140 + 'rpx',
height: 4 * 140 + 'rpx',
more: "点击查看更多", more: "点击查看更多",
showMore: true showMore: true
}) })
@@ -133,19 +141,19 @@ Page({
onLoad(options) { onLoad(options) {
let that = this; let that = this;


if (options.cardId){
if (options.cardId) {
that.cardpayList(options.cardId); that.cardpayList(options.cardId);
that.cardDetail(options.cardId); that.cardDetail(options.cardId);
} }
if (options.from){
if (options.from) {
this.setData({ this.setData({
showIndexReuturn:true
showIndexReuturn: true
}) })
} }
wx.hideShareMenu() wx.hideShareMenu()
}, },
cardpayList: function(cardId) {
cardpayList: function (cardId) {
let that = this; let that = this;
wx.showLoading({ wx.showLoading({
title: "加载中..." title: "加载中..."
@@ -165,7 +173,7 @@ Page({
that.setData({ that.setData({
showPage: true showPage: true
}) })
} else {}
} else { }
wx.hideLoading(); wx.hideLoading();
res.data.list.map(file => { res.data.list.map(file => {
file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss") file.updateDate = util.formatTime(file.updateDate, "yyyy-MM-dd hh:mm:ss")
@@ -197,14 +205,14 @@ Page({
}) })
}) })
}, },
cardDetail: function(couponOrderId) {
cardDetail: function (couponOrderId) {
let that = this; let that = this;
Http.get({ Http.get({
url: config.api.cardDetail,
data: {
couponOrderId: couponOrderId
}
})
url: config.api.cardDetail,
data: {
couponOrderId: couponOrderId
}
})
.then(res => { .then(res => {
console.log(res) console.log(res)
if (res.code == 200) { if (res.code == 200) {
@@ -217,15 +225,15 @@ Page({
/** /**
* 若可转赠获取用户头像信息 * 若可转赠获取用户头像信息
*/ */
if (res.data.supportTransfer){
if (res.data.supportTransfer) {
that.getUserInfo() that.getUserInfo()
} }
if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length<=4){
if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length <= 4) {
that.setData({ that.setData({
height: that.data.cardDetail.merchantVoList.length * 140 + 'rpx', height: that.data.cardDetail.merchantVoList.length * 140 + 'rpx',
showMore:false
showMore: false
}) })
} else if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length > 4){
} else if (that.data.cardDetail.merchantVoList && that.data.cardDetail.merchantVoList.length > 4) {
that.setData({ that.setData({
height: 4 * 140 + 'rpx' height: 4 * 140 + 'rpx'
}) })
@@ -239,7 +247,7 @@ Page({
onShow() { onShow() {
let that = this; let that = this;
that.setData({ that.setData({
showbutton: false
})
showbutton: false
})
}, },
}); });

+ 13
- 12
pages/coupon/detail/index.js Zobrazit soubor

@@ -515,12 +515,13 @@ Page({
* 获取用户信息 * 获取用户信息
*/ */
onLoad(options) { onLoad(options) {
const dealOptions = options
console.log(dealOptions, 'options');
this.setData({ this.setData({
mouldType: app.globalData.mouldType, mouldType: app.globalData.mouldType,

}) })
let that = this; let that = this;
if (options.g) {
if (dealOptions.g) {
app.globalData.havePlayEd1 = true; app.globalData.havePlayEd1 = true;
} }
wx.showLoading({ wx.showLoading({
@@ -529,14 +530,14 @@ Page({
that.setData({ that.setData({
onshow: false onshow: false
}) })
if (options && (options.couponChannelId || options.couponIds)) {
if (options.couponIds) {
if (dealOptions && (dealOptions.couponChannelId || dealOptions.couponIds)) {
if (dealOptions.couponIds) {
this.setData({ this.setData({
couponIds: options.couponIds
couponIds: dealOptions.couponIds
}) })
that.getDetail(options.couponIds, 'notendclock');
that.getDetail(dealOptions.couponIds, 'notendclock');
} else { } else {
that.getDetail(options.couponChannelId, 'notendclock');
that.getDetail(dealOptions.couponChannelId, 'notendclock');
} }




@@ -544,20 +545,20 @@ Page({
/** /**
* 转赠判断 * 转赠判断
*/ */
if (options.cuserId) {
if (dealOptions.cuserId) {
this.setData({ this.setData({
showCardOffer: true, showCardOffer: true,
cardData: options
cardData: dealOptions
}) })
this.getUserInfo() this.getUserInfo()
} }
that.setData({ that.setData({
couponChannelId: options.couponChannelId,
couponChannelId: dealOptions.couponChannelId,
title: that.data.data.title ? that.data.data.title : '', title: that.data.data.title ? that.data.data.title : '',
}); });
if (options.cardType) {
if (dealOptions.cardType) {
that.setData({ that.setData({
cardType: options.cardType
cardType: dealOptions.cardType
}) })
} }
}, },


+ 28
- 29
pages/index/index.js Zobrazit soubor

@@ -12,16 +12,15 @@ Page({
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function(options) {
console.log("我是中转页面")
onLoad: function (options) {
console.log(options, "我是中转页面")
let that = this; let that = this;
console.log(options);
wx.showToast({ wx.showToast({
title: '加载中...', title: '加载中...',
icon: "loading", icon: "loading",
duration: 2000 duration: 2000
}) })
/** /**
* 根据接收到的参数的值,判断跳转到哪个页面 * 根据接收到的参数的值,判断跳转到哪个页面
*/ */
@@ -81,18 +80,18 @@ Page({
} }
} }
} }
wx.setStorageSync('options', JSON.stringify(options)) wx.setStorageSync('options', JSON.stringify(options))
wx.setStorageSync('imgurl', imgurl); wx.setStorageSync('imgurl', imgurl);


if (app.globalData.token) { if (app.globalData.token) {


this.updateUserInfo();
this.updateUserInfo();
if (options.couponChannelId || options.orderId || options.id) { if (options.couponChannelId || options.orderId || options.id) {
that.userStatus(options); that.userStatus(options);
} else { } else {
that.userStatus();
that.userStatus();
} }
} else { } else {
// 由于 token 是网络请求,可能会在 Page.onLoad 之后才返回 // 由于 token 是网络请求,可能会在 Page.onLoad 之后才返回
@@ -111,8 +110,8 @@ Page({
/** /**
* 检查用户的状态 * 检查用户的状态
*/ */
userStatus: function(options) {
userStatus: function (options) {
var that = this; var that = this;
if (options && (options.couponChannelId || options.orderId || options.id)) { if (options && (options.couponChannelId || options.orderId || options.id)) {
that.checkuserstatus(options); that.checkuserstatus(options);
@@ -138,9 +137,9 @@ Page({
}) })
}, },
checkuserstatus(options) { checkuserstatus(options) {
console.log(options, 'check');
let that = this; let that = this;
Http.get({ Http.get({
url: config.api.checkUserStatus, url: config.api.checkUserStatus,
data: { data: {
@@ -198,7 +197,7 @@ Page({
// 报名活动页面 // 报名活动页面
else if (options && options.id && app.globalData.type == 'ra') { else if (options && options.id && app.globalData.type == 'ra') {
wx.redirectTo({ wx.redirectTo({
url: `/pages/radetail/index?id=${options.id}`,
url: `/pages/radetail/index?id=${options.id}`,
}) })
} }
//活动签到 //活动签到
@@ -212,13 +211,13 @@ Page({
wx.redirectTo({ wx.redirectTo({
url: `/pages/questionnaire/questionnaire?id=${options.id}`, url: `/pages/questionnaire/questionnaire?id=${options.id}`,
}) })
}
}
//投诉建议 //投诉建议
else if (app.globalData.type == 'ts') { else if (app.globalData.type == 'ts') {
wx.redirectTo({ wx.redirectTo({
url: `/pages/complaint/complaint`, url: `/pages/complaint/complaint`,
}) })
}
}
// 宣传页详情 // 宣传页详情
else if (options && options.bt && options.id && app.globalData.type == 'bd') { else if (options && options.bt && options.id && app.globalData.type == 'bd') {
if (options.bt == '2') { if (options.bt == '2') {
@@ -351,19 +350,19 @@ Page({
wx.redirectTo({ wx.redirectTo({
url: `/pages2/live/livelist/index` url: `/pages2/live/livelist/index`
}); });
}
}
//活动日历 //活动日历
else if (app.globalData.type == 'arl') { else if (app.globalData.type == 'arl') {
wx.redirectTo({ wx.redirectTo({
url: `/pages/dateLsit/dateLsit` url: `/pages/dateLsit/dateLsit`
}); });
}
}
//每日签到 //每日签到
else if (app.globalData.type == 'qd') { else if (app.globalData.type == 'qd') {
wx.redirectTo({ wx.redirectTo({
url: `/pages/activityCalendar/activityCalendar` url: `/pages/activityCalendar/activityCalendar`
}); });
}
}
// 门店 // 门店
else if (app.globalData.type == 'ml') { else if (app.globalData.type == 'ml') {
wx.switchTab({ wx.switchTab({
@@ -555,25 +554,25 @@ Page({
}) })
}, },


getGameOne: function(token, id) {
getGameOne: function (token, id) {
let _this = this; let _this = this;
Http.get({ Http.get({
url: config.api.getOneGame,
data: {
token: token,
id: id
}
}).then(res => {
wx.redirectTo({
url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId,
})
url: config.api.getOneGame,
data: {
token: token,
id: id
}
}).then(res => {
wx.redirectTo({
url: '/pages/game/index?url=' + res.data.url + "&id=" + res.data.id + "&gameId=" + res.data.gameId,
}) })
})
.catch(err => { .catch(err => {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
content: err.message, content: err.message,
showCancel: false, showCancel: false,
success: function(res) {
success: function (res) {
// 如果游戏下架或者找不到,重启首页 // 如果游戏下架或者找不到,重启首页
if (res.confirm) { if (res.confirm) {
wx.reLaunch({ wx.reLaunch({


+ 1
- 1
project.config.json Zobrazit soubor

@@ -34,7 +34,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.11.2", "libVersion": "2.11.2",
"appid": "wxfa336cad86ed598d",
"appid": "wx453ae0d37f3550d0",
"projectname": "C", "projectname": "C",
"simulatorType": "wechat", "simulatorType": "wechat",
"simulatorPluginLibVersion": {}, "simulatorPluginLibVersion": {},


Načítá se…
Zrušit
Uložit