소스 검색

转赠链接添加时效性

tags/富茂链客4.1.0
刘晖 6 년 전
부모
커밋
c91764011f
8개의 변경된 파일19개의 추가작업 그리고 17개의 파일을 삭제
  1. +1
    -1
      pages/ConsumeDetail/ConsumeDetail.js
  2. +7
    -5
      pages/coupon/detail/index.js
  3. +1
    -1
      pages/coupon/detail/index.wxml
  4. +1
    -1
      pages/getphoneInfo/index.js
  5. +1
    -1
      pages/getuserinfo/index.js
  6. +6
    -6
      pages/index/index.js
  7. +1
    -1
      pages/order/detail/index.js
  8. +1
    -1
      pages/phoneinput/phoneinput.js

+ 1
- 1
pages/ConsumeDetail/ConsumeDetail.js 파일 보기

@@ -78,7 +78,7 @@ Page({
let _this = this; let _this = this;
return { return {
title: '领取卡', 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,
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,
success: function (res) { success: function (res) {
// 转发成功 // 转发成功


+ 7
- 5
pages/coupon/detail/index.js 파일 보기

@@ -83,10 +83,11 @@ Page({
//获取卡转赠状态 //获取卡转赠状态
getQueryCardStatus(){ getQueryCardStatus(){
let that = this; let that = this;
// console.log(util.formatTime(Number(that.data.cardData.updateDate), "yyyy-MM-dd hh:mm:ss"),44444444444)
let param={ let param={
id: this.data.cardData.couponOrderId, id: this.data.cardData.couponOrderId,
couponId: this.data.cardData.couponChannelId,
cUserId: this.data.cardData.cuserId
cUserId: this.data.cardData.cuserId,
updateDate: util.formatTime(Number(that.data.cardData.updateDate), "yyyy-MM-dd hh:mm:ss")
} }
Http.get({ Http.get({
url: config.api.queryCardStatus, url: config.api.queryCardStatus,
@@ -107,7 +108,8 @@ Page({
let that=this; let that=this;
let param = { let param = {
id: this.data.cardData.couponOrderId, id: this.data.cardData.couponOrderId,
cUserId: this.data.cardData.cuserId
cUserId: this.data.cardData.cuserId,
updateDate: util.formatTime(Number(this.data.cardData.updateDate), "yyyy-MM-dd hh:mm:ss")
} }
this.setData({ this.setData({
receivedDisabled:true receivedDisabled:true
@@ -468,12 +470,12 @@ Page({
* *
*/ */
wx.redirectTo({ wx.redirectTo({
url: "/pages/getphoneInfo/index?path=index&cuserId=" + that.data.cardData.cuserId + "&couponChannelId=" + that.data.cardData.couponChannelId + "&couponId=" + that.data.cardData.couponId + "&userName=" + that.data.cardData.userName + "&coverImg=" + that.data.cardData.coverImg + "&avatarUrl=" + that.data.cardData.avatarUrl + "&couponOrderId=" + that.data.cardData.couponOrderId,
url: "/pages/getphoneInfo/index?path=index&cuserId=" + that.data.cardData.cuserId + "&couponChannelId=" + that.data.cardData.couponChannelId + "&couponId=" + that.data.cardData.couponId + "&userName=" + that.data.cardData.userName + "&coverImg=" + that.data.cardData.coverImg + "&avatarUrl=" + that.data.cardData.avatarUrl + "&couponOrderId=" + that.data.cardData.couponOrderId + "&updateDate=" + that.data.cardData.updateDate,
}); });
} else if (err.code == 11006) { } else if (err.code == 11006) {
// 用户手机已加密 // 用户手机已加密
wx.redirectTo({ wx.redirectTo({
url: "/pages/phoneinput/phoneinput?path=index&cuserId=" + that.data.cardData.cuserId + "&couponChannelId=" + that.data.cardData.couponChannelId + "&couponId=" + that.data.cardData.couponId + "&userName=" + that.data.cardData.userName + "&coverImg=" + that.data.cardData.coverImg + "&avatarUrl=" + that.data.cardData.avatarUrl + "&couponOrderId=" + that.data.cardData.couponOrderId,
url: "/pages/phoneinput/phoneinput?path=index&cuserId=" + that.data.cardData.cuserId + "&couponChannelId=" + that.data.cardData.couponChannelId + "&couponId=" + that.data.cardData.couponId + "&userName=" + that.data.cardData.userName + "&coverImg=" + that.data.cardData.coverImg + "&avatarUrl=" + that.data.cardData.avatarUrl + "&couponOrderId=" + that.data.cardData.couponOrderId + "&updateDate=" + that.data.cardData.updateDate,
}); });
} else { } else {
wx.showToast({ wx.showToast({


+ 1
- 1
pages/coupon/detail/index.wxml 파일 보기

@@ -129,7 +129,7 @@
</view> </view>
</view> </view>
<!-- 卡转赠领取弹出框 --> <!-- 卡转赠领取弹出框 -->
<view class='shaddow' bindtap='closeAlert' wx:if='{{showCardOffer}}'></view>
<view class='shaddow' wx:if='{{showCardOffer}}'></view>
<view class='alert-box' wx:if='{{showCardOffer}}'> <view class='alert-box' wx:if='{{showCardOffer}}'>
<view class='user-img'><image src='{{cardData.avatarUrl}}'></image></view> <view class='user-img'><image src='{{cardData.avatarUrl}}'></image></view>
<view class='close' bindtap='closeAlert'><image src='{{close02}}'></image></view> <view class='close' bindtap='closeAlert'><image src='{{close02}}'></image></view>


+ 1
- 1
pages/getphoneInfo/index.js 파일 보기

@@ -70,7 +70,7 @@ Page({
}) })
} else if (that.path == 'index' && that.data.paramData.cuserId){ } else if (that.path == 'index' && that.data.paramData.cuserId){
wx.reLaunch({ wx.reLaunch({
url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&couponId=' + that.data.paramData.couponId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId
url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&couponId=' + that.data.paramData.couponId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId + "&updateDate=" + that.data.paramData.updateDate
}) })
} else { } else {
wx.showToast({ wx.showToast({


+ 1
- 1
pages/getuserinfo/index.js 파일 보기

@@ -90,7 +90,7 @@ Page({
* 来自转赠 * 来自转赠
*/ */
wx.reLaunch({ wx.reLaunch({
url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&couponId=${that.data.couponId}&cuserId=${that.data.cuserId}&coverImg=${that.data.coverImg}&userName=${that.data.userName}&avatarUrl=${that.data.avatarUrl}&couponOrderId=${that.data.couponOrderId}`
url: `/pages/coupon/detail/index?couponChannelId=${that.data.couponChannelId}&couponId=${that.data.couponId}&cuserId=${that.data.cuserId}&coverImg=${that.data.coverImg}&userName=${that.data.userName}&avatarUrl=${that.data.avatarUrl}&couponOrderId=${that.data.couponOrderId}&updateDate=${that.data.updateDate}`
}); });
} else if (that.data.orderId) { } else if (that.data.orderId) {
wx.navigateTo({ wx.navigateTo({


+ 6
- 6
pages/index/index.js 파일 보기

@@ -37,7 +37,7 @@ Page({
/** /**
* 转赠判断 * 转赠判断
*/ */
that.userLogin(options.couponChannelId, options.couponId, null, options.cuserId, options.coverImg, options.userName, options.avatarUrl, options.couponOrderId);
that.userLogin(options.couponChannelId, options.couponId, null, options.cuserId, options.coverImg, options.userName, options.avatarUrl, options.couponOrderId, options.updateDate);
}else{ }else{
that.userLogin(options.couponChannelId, options.couponId, options.orderId); that.userLogin(options.couponChannelId, options.couponId, options.orderId);
} }
@@ -45,7 +45,7 @@ Page({
that.userLogin() that.userLogin()
} }
}, },
checkuerstatus(couponChannelId, couponId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId) {
checkuerstatus(couponChannelId, couponId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId, updateDate) {
let that = this; let that = this;
Http.post({ Http.post({
url: config.api.checkUserStatus, url: config.api.checkUserStatus,
@@ -61,7 +61,7 @@ Page({
* 转赠判断 * 转赠判断
*/ */
wx.redirectTo({ wx.redirectTo({
url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}&cuserId=${cuserId}&coverImg=${coverImg}&userName=${userName}&avatarUrl=${avatarUrl}&couponOrderId=${couponOrderId}`,
url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&couponId=${couponId}&cuserId=${cuserId}&coverImg=${coverImg}&userName=${userName}&avatarUrl=${avatarUrl}&couponOrderId=${couponOrderId}&updateDate=${updateDate}`,
}) })
} else if (orderId) { } else if (orderId) {
wx.redirectTo({ wx.redirectTo({
@@ -85,7 +85,7 @@ Page({
* 转赠判断 * 转赠判断
*/ */
wx.redirectTo({ wx.redirectTo({
url: `/pages/getuserinfo/index?couponChannelId=${couponChannelId}&couponId=${couponId}&cuserId=${cuserId}&coverImg=${coverImg}&userName=${userName}&avatarUrl=${avatarUrl}&couponOrderId=${couponOrderId}`
url: `/pages/getuserinfo/index?couponChannelId=${couponChannelId}&couponId=${couponId}&cuserId=${cuserId}&coverImg=${coverImg}&userName=${userName}&avatarUrl=${avatarUrl}&couponOrderId=${couponOrderId}&updateDate=${updateDate}`
}); });
} else if (orderId) { } else if (orderId) {
wx.redirectTo({ wx.redirectTo({
@@ -102,7 +102,7 @@ Page({
/** /**
* 用户登录 * 用户登录
*/ */
userLogin: function (couponChannelId, couponId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId) {
userLogin: function (couponChannelId, couponId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId, updateDate) {
var that = this; var that = this;
// 登录 // 登录
wx.login({ wx.login({
@@ -145,7 +145,7 @@ Page({
app.globalData.token = res.data.token; app.globalData.token = res.data.token;
Http.setToken(res.data.token); Http.setToken(res.data.token);
if (couponChannelId&&couponId || orderId){ if (couponChannelId&&couponId || orderId){
that.checkuerstatus(couponChannelId, couponId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId);
that.checkuerstatus(couponChannelId, couponId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId, updateDate);
}else{ }else{
that.checkuerstatus(); that.checkuerstatus();
} }


+ 1
- 1
pages/order/detail/index.js 파일 보기

@@ -57,7 +57,7 @@ Page({
let _this = this; let _this = this;
return { return {
title: '领取卡', title: '领取卡',
path: '/pages/index/index?couponChannelId=' + this.data.order.couponChannelId + '&cuserId=' + this.data.order.cuserId + '&couponId=' + '111' + '&coverImg=' + this.data.order.coverImg + '&userName=' + this.data.userName + '&avatarUrl=' + this.data.avatarUrl + '&couponOrderId=' + this.data.order.couponOrderId,
path: '/pages/index/index?couponChannelId=' + this.data.order.couponChannelId + '&cuserId=' + this.data.order.cuserId + '&couponId=' + '111' + '&coverImg=' + this.data.order.coverImg + '&userName=' + this.data.userName + '&avatarUrl=' + this.data.avatarUrl + '&couponOrderId=' + this.data.order.couponOrderId + '&updateDate=' + this.data.order.updateDate,
imageUrl: this.data.order.coverImg, imageUrl: this.data.order.coverImg,
success: function (res) { success: function (res) {
// 转发成功 // 转发成功


+ 1
- 1
pages/phoneinput/phoneinput.js 파일 보기

@@ -55,7 +55,7 @@ Page({
*/ */
if (this.data.paramData.cuserId){ if (this.data.paramData.cuserId){
wx.reLaunch({ wx.reLaunch({
url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&couponId=' + that.data.paramData.couponId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId
url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&couponId=' + that.data.paramData.couponId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId + "&updateDate=" + that.data.paramData.updateDate
}) })
}else{ }else{
wx.redirectTo({ wx.redirectTo({


불러오는 중...
취소
저장