Browse Source

Squashed commit of the following:

commit 06cb60b71f
Author: [caserKing] <[wkx12138@126.com]>
Date:   Mon May 11 23:12:26 2020 +0800

    【浮层banner】【修改】【授权和海报引起的跳转和显示问题】

commit b0cab33120
Author: [caserKing] <[wkx12138@126.com]>
Date:   Mon May 11 12:38:55 2020 +0800

    【浮层广告】【修改】【砍价拼团按钮问题】

commit eccf1bbb05
Author: [caserKing] <[wkx12138@126.com]>
Date:   Sun May 10 13:32:10 2020 +0800

    test空

commit 06d9e10fff
Author: 刘晖 <huima.liu@wiwide.com>
Date:   Sat May 9 23:33:54 2020 +0800

    [切换测试环境]
siChuanBan_2019.10.29
Stormeye Wu 5 years ago
parent
commit
352fe1a405
10 changed files with 135 additions and 9 deletions
  1. +1
    -0
      app.wxss
  2. +5
    -1
      components/advertisement/advertisement.js
  3. +2
    -1
      components/banner/index.js
  4. +32
    -1
      components/shareposter/index.js
  5. +28
    -1
      pages/coupon/detail/index.js
  6. +10
    -1
      pages/getuserinfo/index.js
  7. +4
    -1
      pages/index/index.js
  8. +25
    -1
      pages/index/searchbar/detail/index.js
  9. +27
    -1
      pages/spellGroup/mySpellGroup/index.js
  10. +1
    -1
      project.config.json

+ 1
- 0
app.wxss View File

@@ -9,6 +9,7 @@
url("//at.alicdn.com/t/font_777313_jq7td4d3uab.ttf") format("truetype"), url("//at.alicdn.com/t/font_777313_jq7td4d3uab.ttf") format("truetype"),
url("//at.alicdn.com/t/font_777313_jq7td4d3uab.svg#iconfont") format("svg"); url("//at.alicdn.com/t/font_777313_jq7td4d3uab.svg#iconfont") format("svg");
} }

.iconfont { .iconfont {
font-family: "iconfont" !important; font-family: "iconfont" !important;
font-size: 36rpx; font-size: 36rpx;


+ 5
- 1
components/advertisement/advertisement.js View File

@@ -14,9 +14,13 @@ Component({
}, },
methods: { methods: {
gotoGg: function (e) { gotoGg: function (e) {
console.log(this.data.ggdata)
let that = this; let that = this;
wx.navigateTo({
/* wx.navigateTo({
url: '/pages/coupon/detail/index?couponChannelId=' + e.currentTarget.dataset.data.produceId+'&g=1', url: '/pages/coupon/detail/index?couponChannelId=' + e.currentTarget.dataset.data.produceId+'&g=1',
}) */
wx.navigateTo({
url: `/${that.data.ggdata.pagePath}&g=1`,
}) })
}, },
a: function () { a: function () {


+ 2
- 1
components/banner/index.js View File

@@ -30,7 +30,8 @@ Component({
let id = (e.currentTarget.dataset.data.pagePath).substring(indexOf); let id = (e.currentTarget.dataset.data.pagePath).substring(indexOf);
let type = (e.currentTarget.dataset.data.pagePath).substr(23,2) let type = (e.currentTarget.dataset.data.pagePath).substr(23,2)
console.log(indexOf, id, type); console.log(indexOf, id, type);
if(type == 'cd'){
console.log(e.currentTarget.dataset.data.pagePath)
if(type == 'cd' || type == 'sd'){
wx.navigateTo({ wx.navigateTo({
url: `/${e.currentTarget.dataset.data.pagePath}`, url: `/${e.currentTarget.dataset.data.pagePath}`,
}) })


+ 32
- 1
components/shareposter/index.js View File

@@ -30,11 +30,42 @@ Component({
/** /**
* 显示分享海报 * 显示分享海报
*/ */
showPoster: function() {
/* showPoster: function() {
//跳转到海报生成页 //跳转到海报生成页
wx.navigateTo({ wx.navigateTo({
url: `/pages/canvas/index?merchantId=${this.data.id}` url: `/pages/canvas/index?merchantId=${this.data.id}`
}) })
}, */
showPoster: function() {
//跳转到海报生成页
console.log(this.data.fromflag)
let that = this;
Http.get({
url: config.api.checkUserStatus,
data: {
token: app.globalData.token
}
}).then(res => {
wx.navigateTo({
url: `/pages/canvas/index?couponChannelId=${that.data.id}`
})
}).catch(err => {
console.log(err)
if (err.code == 11004) {
// 用户昵称未授权
wx.redirectTo({
url: `/pages/getuserinfo/index?couponChannelId=${that.data.id}&fromflag=poster`
})
}
})

}, },




} }
}); });

+ 28
- 1
pages/coupon/detail/index.js View File

@@ -104,11 +104,38 @@ Page({
/** /**
* 显示分享海报 * 显示分享海报
*/ */
showPoster: function() {
/* showPoster: function() {
//跳转到海报生成页 //跳转到海报生成页
console.log(this.data.canIUse)

// return;
wx.navigateTo({ wx.navigateTo({
url: `/pages/canvas/index?couponChannelId=${this.data.data.id}` url: `/pages/canvas/index?couponChannelId=${this.data.data.id}`
}) })
}, */
showPoster: function() {
//跳转到海报生成页
let that = this;
Http.get({
url: config.api.checkUserStatus,
data: {
token: app.globalData.token
}
}).then(res => {
wx.navigateTo({
url: `/pages/canvas/index?couponChannelId=${that.data.data.id}`
})
}).catch(err => {
console.log(err)
if (err.code == 11004) {
// 用户昵称未授权
wx.redirectTo({
url: `/pages/getuserinfo/index?couponChannelId=${that.data.data.id}&fromflag=poster`
})
}
})
}, },
swiperChange: function (e) { swiperChange: function (e) {
this.setData({ this.setData({


+ 10
- 1
pages/getuserinfo/index.js View File

@@ -117,6 +117,14 @@ Page({
}) })
.then( .then(
function (res) { function (res) {
// debugger;
if (that.data.fromflag == 'poster') {
wx.redirectTo({
url: `/pages/canvas/index?couponChannelId=${that.data.couponChannelId}`
})
return;
}
//
if (that.data.optionData.orderGroupId){ if (that.data.optionData.orderGroupId){
wx.reLaunch({ wx.reLaunch({
url: `/pages/joinFrDpell/index?couponId=${that.data.optionData.couponId}&orderGroupId=${that.data.optionData.orderGroupId}&couponChannelId=${that.data.optionData.couponChannelId}&orderId=${that.data.optionData.orderId}&avatarUrl=${that.data.optionData.avatarUrl}&nickName=${that.data.optionData.nickName}` url: `/pages/joinFrDpell/index?couponId=${that.data.optionData.couponId}&orderGroupId=${that.data.optionData.orderGroupId}&couponChannelId=${that.data.optionData.couponChannelId}&orderId=${that.data.optionData.orderId}&avatarUrl=${that.data.optionData.avatarUrl}&nickName=${that.data.optionData.nickName}`
@@ -129,7 +137,8 @@ Page({
}); });
} else { } else {
//返回主页 //返回主页
if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') {
// if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup||that.data.couponChannelId && !that.data.cuserId&&app.globalData.type == 'cd') {
if (that.data.couponChannelId && !that.data.cuserId && !that.data.spellGroup && app.globalData.type == 'cd') {
// 跳转普通券/消费卡/限时秒杀/砍价详情 // 跳转普通券/消费卡/限时秒杀/砍价详情
wx.navigateTo({ wx.navigateTo({
url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}` url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}`


+ 4
- 1
pages/index/index.js View File

@@ -130,6 +130,7 @@ Page({
}, },
checkuserstatus(options) { checkuserstatus(options) {
let that = this; let that = this;
Http.get({ Http.get({
url: config.api.checkUserStatus, url: config.api.checkUserStatus,
data: { data: {
@@ -137,6 +138,8 @@ Page({
} }
}) })
.then(res => { .then(res => {
// res = JSON.parse('{"code":11004,"message":"用户昵称未授权,请跳转到用户昵称授权页!","data":{}}')
//参与拼团 //参与拼团
if (options && options.orderGroupId) { if (options && options.orderGroupId) {
wx.redirectTo({ wx.redirectTo({
@@ -160,7 +163,7 @@ Page({
}) })
}) })
} else if (options && options.couponChannelId && !options.spellGroup && app.globalData.type != 'sd') { } else if (options && options.couponChannelId && !options.spellGroup && app.globalData.type != 'sd') {
console.log(3333333333333333)
// 转赠判断 // 转赠判断
if (options.cuserId) { if (options.cuserId) {
wx.redirectTo({ wx.redirectTo({


+ 25
- 1
pages/index/searchbar/detail/index.js View File

@@ -94,11 +94,35 @@ Page({
/** /**
* 显示分享海报 * 显示分享海报
*/ */
showPoster: function() {
/* showPoster: function() {
//跳转到海报生成页 //跳转到海报生成页
wx.navigateTo({ wx.navigateTo({
url: `/pages/canvas/index?merchantId=${this.data.id}` url: `/pages/canvas/index?merchantId=${this.data.id}`
}) })
}, */
showPoster: function() {
//跳转到海报生成页
let that = this;
Http.get({
url: config.api.checkUserStatus,
data: {
token: app.globalData.token
}
}).then(res => {
wx.navigateTo({
url: `/pages/canvas/index?couponChannelId=${that.data.id}`
})
}).catch(err => {
console.log(err)
if (err.code == 11004) {
// 用户昵称未授权
wx.redirectTo({
url: `/pages/getuserinfo/index?couponChannelId=${that.data.id}&fromflag=poster`
})
}
})
}, },
//点击切换 //点击切换
clickTab: function(e) { clickTab: function(e) {


+ 27
- 1
pages/spellGroup/mySpellGroup/index.js View File

@@ -68,11 +68,37 @@ Page({
/** /**
* 显示分享海报 * 显示分享海报
*/ */
showPoster: function() {
/* showPoster: function() {
//跳转到海报生成页 //跳转到海报生成页
wx.navigateTo({ wx.navigateTo({
url: `/pages/canvas/index?couponChannelId=${this.data.data.id}` url: `/pages/canvas/index?couponChannelId=${this.data.data.id}`
}) })
}, */
showPoster: function() {
console.log(this.data.data)
let that = this;
Http.get({
url: config.api.checkUserStatus,
data: {
token: app.globalData.token
}
}).then(res => {
wx.navigateTo({
url: `/pages/canvas/index?couponChannelId=${that.data.data.id}`
})
}).catch(err => {
console.log(err)
if (err.code == 11004) {
// 用户昵称未授权
wx.redirectTo({
url: `/pages/getuserinfo/index?couponChannelId=${that.data.data.id}&fromflag=poster`
})
}
})

//跳转到海报生成页
}, },
/** /**
* 显示分享弹框 * 显示分享弹框


+ 1
- 1
project.config.json View File

@@ -14,7 +14,7 @@
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "2.5.0", "libVersion": "2.5.0",
"appid": "wx453ae0d37f3550d0",
"appid": "wxfa336cad86ed598d",
"projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F", "projectname": "C%E7%AB%AF%E5%B0%8F%E7%A8%8B%E5%BA%8F",
"isGameTourist": false, "isGameTourist": false,
"simulatorType": "wechat", "simulatorType": "wechat",


Loading…
Cancel
Save