소스 검색

Merge branch 'dev' into HuNan_test

tags/湖南版5.1.4
meo 6 년 전
부모
커밋
2cca24e345
10개의 변경된 파일111개의 추가작업 그리고 122개의 파일을 삭제
  1. +0
    -3
      pages/getuserinfo/index.js
  2. +6
    -19
      pages/index/detail/index.js
  3. +63
    -37
      pages/index/index.js
  4. +11
    -11
      pages/index/merchantList/index.wxml
  5. +29
    -7
      pages/integralmall/index.js
  6. +1
    -1
      pages/integralmall/index.wxml
  7. +1
    -2
      pages/main/index.js
  8. +0
    -14
      pages/spellDetail/index.js
  9. +0
    -14
      pages/spellGroup/mySpellGroup/index.js
  10. +0
    -14
      pages/spellGroup/paySpellGroup/index.js

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

@@ -13,7 +13,6 @@ Page({
}, },
onLoad: function(options) { onLoad: function(options) {
var that = this; var that = this;
console.log(options)
if (options.couponChannelId && !options.cuserId||options.orderId) { if (options.couponChannelId && !options.cuserId||options.orderId) {
that.setData({ that.setData({
couponChannelId: options.couponChannelId, couponChannelId: options.couponChannelId,
@@ -23,8 +22,6 @@ Page({
that.setData({ that.setData({
optionData: wx.getStorageSync('options') ? JSON.parse(wx.getStorageSync('options')):null optionData: wx.getStorageSync('options') ? JSON.parse(wx.getStorageSync('options')):null
}) })
console.log(that.data.optionData)
if (options&&options.path == 'index') { if (options&&options.path == 'index') {
that.setData({ that.setData({
path: options.path path: options.path


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

@@ -21,25 +21,12 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
let that=this; let that=this;
this.setData({
id: options.id
});
that.getList(options.id);
},

/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {

},

/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
let that = this;
if (options && options.id){
this.setData({
id: options.id
});
that.getList(options.id);
}
}, },
/** /**
* 拨打电话 * 拨打电话


+ 63
- 37
pages/index/index.js 파일 보기

@@ -41,7 +41,6 @@ Page({
options.couponChannelId = this.data.newArr[1]; options.couponChannelId = this.data.newArr[1];
options.path = 'daping' options.path = 'daping'
} }
//// 大屏-二维码-end
else if (this.data.newArr[0] == 't') { else if (this.data.newArr[0] == 't') {
// 普通二维码 // 普通二维码
options.type = this.data.newArr[1]; options.type = this.data.newArr[1];
@@ -82,22 +81,18 @@ Page({
data: {} data: {}
}) })
.then(res => { .then(res => {
/**
* 参与拼团
*/
//参与拼团
if (options && options.orderGroupId) { if (options && options.orderGroupId) {
wx.redirectTo({ wx.redirectTo({
url: `/pages/joinFrDpell/index?couponId=${options.couponId}&orderGroupId=${options.orderGroupId}&couponChannelId=${options.couponChannelId}&orderId=${options.orderId}&avatarUrl=${options.avatarUrl}&nickName=${options.nickName}` url: `/pages/joinFrDpell/index?couponId=${options.couponId}&orderGroupId=${options.orderGroupId}&couponChannelId=${options.couponChannelId}&orderId=${options.orderId}&avatarUrl=${options.avatarUrl}&nickName=${options.nickName}`
}) })
return; return;
} }
/**
* 来自大屏的跳转拼团券详情
*/
if (options && options.couponChannelId && options.path == 'daping') {
//来自大屏的跳转拼团券详情
else if (options && options.couponChannelId && options.path == 'daping') {
/** /**
* 主要是为了拿couponId
*/
* 主要是为了拿couponId
*/
Http.get({ Http.get({
url: config.api.couponDetail, url: config.api.couponDetail,
data: { data: {
@@ -111,26 +106,30 @@ Page({
}); });
return; return;
} }
if (options && options.couponChannelId && app.globalData.type == 'cd') {
// 跳转普通券/消费卡/限时秒杀/砍价详情
// 跳转普通券/消费卡/限时秒杀/砍价详情
else if (options && options.couponChannelId) {
wx.redirectTo({ wx.redirectTo({
url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`, url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`,
}) })
} else if (options && options.couponChannelId && options.cuserId) {
// 转赠判断
}
// 转赠判断
else if (options && options.couponChannelId && options.cuserId) {
wx.redirectTo({ wx.redirectTo({
url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`, url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`,
}) })
} else if (options && options.couponChannelId && app.globalData.type == 'sd') {
// 拼团详情页
}
// 拼团详情页(只有通过扫码进入才可能进入拼团详情页面,只有这一个入口)
else if (options && options.couponChannelId && app.globalData.type == 'sd') {
wx.redirectTo({ wx.redirectTo({
url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${options.couponChannelId}`, url: `/pages/spellGroup/mySpellGroup/index?couponChannelId=${options.couponChannelId}`,
}) })
} else if (options && options.id && app.globalData.type == 'gm') {
// 游戏页面
}
// 游戏页面
else if (options && options.id && app.globalData.type == 'gm') {
that.getGameOne(app.globalData.token, options.id) that.getGameOne(app.globalData.token, options.id)
} 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') {
// 自由图文 // 自由图文
wx.redirectTo({ wx.redirectTo({
@@ -142,77 +141,104 @@ Page({
url: `/pages/bannerdetail/index?id=${options.id}`, url: `/pages/bannerdetail/index?id=${options.id}`,
}) })
} }
} else if (options && options.id && app.globalData.type == 'td'){
}
// 专题
else if (options && options.id && app.globalData.type == 'td'){
wx.redirectTo({ wx.redirectTo({
url: `/pages/topicDetail/index?id=${options.id}` url: `/pages/topicDetail/index?id=${options.id}`
}); });
} }
else if (options && options.orderId && app.globalData.type == 'bg') {
// 参与砍价
// 参与砍价
else if (options && options.orderId) {
wx.redirectTo({ wx.redirectTo({
url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from=${"discount"}`, url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from=${"discount"}`,
}) })
} else if (app.globalData.type == 'uc') {
// 我的
}
// 我的
else if (app.globalData.type == 'uc') {
wx.switchTab({ wx.switchTab({
url: '/pages/user/index' url: '/pages/user/index'
}); });
} else if (app.globalData.type == 'pc') {
}
// 停车
else if (app.globalData.type == 'pc') {
// 停车 // 停车
wx.switchTab({ wx.switchTab({
url: '/pages/passCar/passCar' url: '/pages/passCar/passCar'
}); });
} else if (app.globalData.type == 'mc') {
}
// 我的券包
else if (app.globalData.type == 'mc') {
// 我的券包 // 我的券包
wx.redirectTo({ wx.redirectTo({
url: '/pages/couponorder/index/index' url: '/pages/couponorder/index/index'
}); });
} else if (app.globalData.type == 'mo') {
}
// 我的订单
else if (app.globalData.type == 'mo') {
// 我的订单 // 我的订单
wx.redirectTo({ wx.redirectTo({
url: '/pages/order/index/index?id=all' url: '/pages/order/index/index?id=all'
}); });
} else if (app.globalData.type == 'ca') {
}
// 我的卡包
else if (app.globalData.type == 'ca') {
// 我的卡包 // 我的卡包
wx.redirectTo({ wx.redirectTo({
url: '/pages/cardorder/index/index' url: '/pages/cardorder/index/index'
}); });
} else if (app.globalData.type == 'sc') {
}
// 特享礼遇
else if (app.globalData.type == 'sc') {
// 特享礼遇 // 特享礼遇
wx.redirectTo({ wx.redirectTo({
url: '/pages/specialcourtesy/specialcourtesy' url: '/pages/specialcourtesy/specialcourtesy'
}); });
} else if (app.globalData.type == 'rb') {
}
// 限时秒杀
else if (app.globalData.type == 'rb') {
// 限时秒杀 // 限时秒杀
wx.redirectTo({ wx.redirectTo({
url: '/pages/rushToBuy/index' url: '/pages/rushToBuy/index'
}); });
} else if (app.globalData.type == 'bl') {
}
// 砍价专场
else if (app.globalData.type == 'bl') {
// 砍价专场 // 砍价专场
wx.redirectTo({ wx.redirectTo({
url: '/pages/bargain/bargain' url: '/pages/bargain/bargain'
}); });
} else if (app.globalData.type == 'mb') {
}
// 我的砍价
else if (app.globalData.type == 'mb') {
// 我的砍价 // 我的砍价
wx.redirectTo({ wx.redirectTo({
url: '/pages/bargain/bargain?from=myhtml' url: '/pages/bargain/bargain?from=myhtml'
}); });
} else if (app.globalData.type == 'sl') {
}
// 拼团专场
else if (app.globalData.type == 'sl') {
// 拼团专场 // 拼团专场
wx.redirectTo({ wx.redirectTo({
url: '/pages/spellGroup/spellGroup' url: '/pages/spellGroup/spellGroup'
}); });
} else if (app.globalData.type == 'ms') {
}
// 我的拼团
else if (app.globalData.type == 'ms') {
// 我的拼团 // 我的拼团
wx.redirectTo({ wx.redirectTo({
url: '/pages/spellGroup/spellGroup?from=myhtml' url: '/pages/spellGroup/spellGroup?from=myhtml'
}); });
} else if (app.globalData.type == 'dc') {
}
// 消费卡
else if (app.globalData.type == 'dc') {
// 消费卡 // 消费卡
wx.redirectTo({ wx.redirectTo({
url: '/pages/discountCardList/discountCardList' url: '/pages/discountCardList/discountCardList'
}); });
} else if (app.globalData.type == 'ml') {
}
// 门店
else if (app.globalData.type == 'ml') {
// 门店 // 门店
wx.switchTab({ wx.switchTab({
url: '/pages/index/searchbar/index' url: '/pages/index/searchbar/index'


+ 11
- 11
pages/index/merchantList/index.wxml 파일 보기

@@ -1,12 +1,12 @@
<view class='merchant-detail'> <view class='merchant-detail'>
<!-- 商户列表 -->
<view class='merchant-brand'wx:for="{{shopVoList}}" wx:key="unique">
<view>
<image src='{{data.brandImg}}'></image>
</view>
<view>
<text>{{data.merchantName}}</text>
<text>{{item.shopNumber}}, {{item.buildingName}} {{item.floorName}}</text>
</view>
</view>
</view>
<!-- 商户列表 -->
<view class='merchant-brand' wx:for="{{shopVoList}}" wx:key="unique">
<view>
<image src='{{data.brandImg}}'></image>
</view>
<view>
<text>{{data.merchantName}}</text>
<text>{{item.shopNumber}}, {{item.buildingName}} {{item.floorName}}</text>
</view>
</view>
</view>

+ 29
- 7
pages/integralmall/index.js 파일 보기

@@ -21,17 +21,13 @@ Page({
actUrl: imgurl.act.url, actUrl: imgurl.act.url,
loading: true, loading: true,
content: '数据正在加载中', content: '数据正在加载中',
reloadIf: false
reloadIf: false,
creditAmount: 0
}, },
onLoad: function (options) { onLoad: function (options) {
let that = this; let that = this;
console.log(options)
if (options &&options.credit){
that.setData({
credit: options.credit
})
}
var todayDate = new Date().getTime(); var todayDate = new Date().getTime();
that.getPoints();
that.setData({ that.setData({
optionsData: options, optionsData: options,
todayDate: todayDate todayDate: todayDate
@@ -58,6 +54,31 @@ Page({
}) })
} }
}, },
// 获得积分,渲染页面
getPoints(){
let that = this;
Http.get({
url: config.api.integralList,
data: {
pageNum: 1,
pageSize: 1,
}
}).then(res => {
wx.stopPullDownRefresh();
that.setData({
creditAmount: res.data.list[0].creditAmount
});
})
.catch(err => {
wx.stopPullDownRefresh();
wx.showToast({
title: err.errMsg,
icon: 'none',
duration: 2000,
mask: false
});
})
},
gotojifen(){ gotojifen(){
wx.navigateTo({ wx.navigateTo({
url: '/pages/integralmall/integraHistory/index', url: '/pages/integralmall/integraHistory/index',
@@ -168,5 +189,6 @@ Page({
onPullDownRefresh: function (e) { onPullDownRefresh: function (e) {
let that = this; let that = this;
that.getList(1); that.getList(1);
that.getPoints();
} }
}) })

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

@@ -2,7 +2,7 @@
<view class='topbg'> <view class='topbg'>
<image bindtap='gotojifen' src='{{wangmeimeicredit}}' mode='widthFix'></image> <image bindtap='gotojifen' src='{{wangmeimeicredit}}' mode='widthFix'></image>
<text class='my'>我的积分</text> <text class='my'>我的积分</text>
<text class='score'>{{credit}}</text>
<text class='score'>{{creditAmount}}</text>
</view> </view>
<view class='no-data01' wx:if='{{lists.length==0}}'> <view class='no-data01' wx:if='{{lists.length==0}}'>
<image src='{{nodata}}'></image> <image src='{{nodata}}'></image>


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

@@ -111,9 +111,8 @@ Page({
}, },
//跳往积分商城 //跳往积分商城
gotouser:function(){ gotouser:function(){
let credit = this.data.credit;
wx.navigateTo({ wx.navigateTo({
url: `/pages/integralmall/index?credit=${credit}`
url: `/pages/integralmall/index`
}) })
}, },
//跳往砍价专场 //跳往砍价专场


+ 0
- 14
pages/spellDetail/index.js 파일 보기

@@ -214,13 +214,6 @@ Page({
}) })
}); });
}, },
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {

},

/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
@@ -258,13 +251,6 @@ Page({
this.getDetail(this.data.paramData); this.getDetail(this.data.paramData);
this.checkUser(this.data.paramData) this.checkUser(this.data.paramData)
}, },

/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/** /**
* 用户点击右上角分享 * 用户点击右上角分享
*/ */


+ 0
- 14
pages/spellGroup/mySpellGroup/index.js 파일 보기

@@ -451,13 +451,6 @@ Page({
}) })
}, },
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {

},

/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
@@ -498,11 +491,4 @@ Page({
that.getDetail(that.data.couponChannelId); that.getDetail(that.data.couponChannelId);
that.getOneSpell(that.data.couponId) that.getOneSpell(that.data.couponId)
}, },

/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {

}
}) })

+ 0
- 14
pages/spellGroup/paySpellGroup/index.js 파일 보기

@@ -244,13 +244,6 @@ Page({
}); });
}); });
}, },
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {

},

/** /**
* 生命周期函数--监听页面显示 * 生命周期函数--监听页面显示
*/ */
@@ -284,11 +277,4 @@ Page({
onPullDownRefresh: function () { onPullDownRefresh: function () {
this.getDetail(this.data.paramData); this.getDetail(this.data.paramData);
}, },

/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
}
}) })

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