Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
高淑倩
7-Eleven
Commits
ae572dfa
Commit
ae572dfa
authored
Mar 02, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增领券功能
parent
aada3d3d
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
259 additions
and
63 deletions
+259
-63
index.js
src/config/index.js
+16
-1
confirmOrder.js
src/pages/confirmOrder/confirmOrder.js
+58
-2
integralMallDetail.wxss
src/pages/integralMallDetail/integralMallDetail.wxss
+3
-0
userCenter.js
src/pages/userCenter/userCenter.js
+22
-0
couponCenter.js
src/subPackage/page/pages/couponCenter/couponCenter.js
+35
-23
couponCenter.json
src/subPackage/page/pages/couponCenter/couponCenter.json
+2
-0
couponCenter.wxml
src/subPackage/page/pages/couponCenter/couponCenter.wxml
+9
-11
couponCenter.wxss
src/subPackage/page/pages/couponCenter/couponCenter.wxss
+5
-0
couponCenterInfo.js
...ubPackage/page/pages/couponCenterInfo/couponCenterInfo.js
+55
-3
couponCenterInfo.wxml
...Package/page/pages/couponCenterInfo/couponCenterInfo.wxml
+16
-12
couponCenterInfo.wxss
...Package/page/pages/couponCenterInfo/couponCenterInfo.wxss
+25
-7
currentLinkRouter.js
src/utils/currentLinkRouter.js
+13
-4
No files found.
src/config/index.js
View file @
ae572dfa
...
@@ -120,6 +120,7 @@ const prod_brand_config = {
...
@@ -120,6 +120,7 @@ const prod_brand_config = {
isMall
:
isMall
,
// 商城或门户 true 商城 false 门户
isMall
:
isMall
,
// 商城或门户 true 商城 false 门户
orderingMustOpenCard
:
false
,
//下单是否必须卡开
orderingMustOpenCard
:
false
,
//下单是否必须卡开
isOpenSelfMention
:
true
,
// 是否开启门店自提
isOpenSelfMention
:
true
,
// 是否开启门店自提
isNeedGetLocation
:
true
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【舞象星品荟-社交商城】'
,
shareTitle
:
'【舞象星品荟-社交商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
},
...
@@ -136,6 +137,7 @@ const prod_brand_config = {
...
@@ -136,6 +137,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
true
,
orderingMustOpenCard
:
true
,
isOpenSelfMention
:
true
,
// 是否开启门店自提
isOpenSelfMention
:
true
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【泰华微商城】'
,
shareTitle
:
'【泰华微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/taihua_logo.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/taihua_logo.png'
,
},
},
...
@@ -151,6 +153,7 @@ const prod_brand_config = {
...
@@ -151,6 +153,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【多多一上】'
,
shareTitle
:
'【多多一上】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/duoduoyishang_logo.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/duoduoyishang_logo.png'
,
},
},
...
@@ -166,6 +169,7 @@ const prod_brand_config = {
...
@@ -166,6 +169,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【雪岛书屋】'
,
shareTitle
:
'【雪岛书屋】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
},
...
@@ -181,6 +185,7 @@ const prod_brand_config = {
...
@@ -181,6 +185,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【苏州邻里】'
,
shareTitle
:
'【苏州邻里】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
},
...
@@ -196,6 +201,7 @@ const prod_brand_config = {
...
@@ -196,6 +201,7 @@ const prod_brand_config = {
isMall
:
isMall
,
// 商城或门户 true 商城 false 门户
isMall
:
isMall
,
// 商城或门户 true 商城 false 门户
orderingMustOpenCard
:
false
,
//下单是否必须卡开
orderingMustOpenCard
:
false
,
//下单是否必须卡开
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【LA RUTA DE VIA】'
,
//分享海报上显示的小程序title
shareTitle
:
'【LA RUTA DE VIA】'
,
//分享海报上显示的小程序title
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/laru.jpg'
,
//商户logo
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/laru.jpg'
,
//商户logo
},
},
...
@@ -211,6 +217,7 @@ const prod_brand_config = {
...
@@ -211,6 +217,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【hotwind热风微商城】'
,
shareTitle
:
'【hotwind热风微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/hotwind_logo.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/hotwind_logo.png'
,
},
},
...
@@ -226,6 +233,7 @@ const prod_brand_config = {
...
@@ -226,6 +233,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【悦芙媞微商城】'
,
shareTitle
:
'【悦芙媞微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/yufuti_logo.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/yufuti_logo.png'
,
},
},
...
@@ -241,6 +249,7 @@ const prod_brand_config = {
...
@@ -241,6 +249,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【阿特里里微商城】'
,
shareTitle
:
'【阿特里里微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
},
...
@@ -256,6 +265,7 @@ const prod_brand_config = {
...
@@ -256,6 +265,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【包鞋微商城】'
,
shareTitle
:
'【包鞋微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
},
...
@@ -271,6 +281,7 @@ const prod_brand_config = {
...
@@ -271,6 +281,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【花在花园微商城】'
,
shareTitle
:
'【花在花园微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
},
...
@@ -286,10 +297,11 @@ const prod_brand_config = {
...
@@ -286,10 +297,11 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
false
,
orderingMustOpenCard
:
false
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【阿吉豆微商城】'
,
shareTitle
:
'【阿吉豆微商城】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/logo_head.png'
,
},
},
//
//
【ACTREE】
2017
:
{
2017
:
{
appId
:
'wx2aae34874e88cdf5'
,
appId
:
'wx2aae34874e88cdf5'
,
tunnelToken
:
'5b621e41ea6ed4ad302c5d07b8685c32'
,
tunnelToken
:
'5b621e41ea6ed4ad302c5d07b8685c32'
,
...
@@ -301,6 +313,7 @@ const prod_brand_config = {
...
@@ -301,6 +313,7 @@ const prod_brand_config = {
isMall
:
isMall
,
isMall
:
isMall
,
orderingMustOpenCard
:
true
,
orderingMustOpenCard
:
true
,
isOpenSelfMention
:
false
,
// 是否开启门店自提
isOpenSelfMention
:
false
,
// 是否开启门店自提
isNeedGetLocation
:
false
,
//是否开启小程序获取位置(提交订单时获取门店信息)
shareTitle
:
'【ACTREE】'
,
shareTitle
:
'【ACTREE】'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/actree_logo.png'
,
logo
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/actree_logo.png'
,
},
},
...
@@ -390,6 +403,7 @@ let orderingMustOpenCard = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].
...
@@ -390,6 +403,7 @@ let orderingMustOpenCard = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].
let
isOpenSelfMention
=
PROJECT_ENV
==
'prod'
?
prod_brand_config
[
BRANCH_ID
].
isOpenSelfMention
:
true
;
let
isOpenSelfMention
=
PROJECT_ENV
==
'prod'
?
prod_brand_config
[
BRANCH_ID
].
isOpenSelfMention
:
true
;
let
shareTitle
=
PROJECT_ENV
==
'prod'
?
prod_brand_config
[
BRANCH_ID
].
shareTitle
:
'舞象商城'
;
let
shareTitle
=
PROJECT_ENV
==
'prod'
?
prod_brand_config
[
BRANCH_ID
].
shareTitle
:
'舞象商城'
;
let
shareLogo
=
PROJECT_ENV
==
'prod'
?
prod_brand_config
[
BRANCH_ID
].
logo
:
defaultShareLogo
;
let
shareLogo
=
PROJECT_ENV
==
'prod'
?
prod_brand_config
[
BRANCH_ID
].
logo
:
defaultShareLogo
;
let
isNeedGetLocation
=
PROJECT_ENV
==
'prod'
?
prod_brand_config
[
BRANCH_ID
].
isNeedGetLocation
:
true
;
//配置信息导出
//配置信息导出
const
envInfo
=
(()
=>
{
const
envInfo
=
(()
=>
{
...
@@ -408,6 +422,7 @@ const envInfo = (() => {
...
@@ -408,6 +422,7 @@ const envInfo = (() => {
orderingMustOpenCard
:
orderingMustOpenCard
,
//下单时是否强校验必须开卡 true 必须开卡才可下单 false 不开卡可以下单
orderingMustOpenCard
:
orderingMustOpenCard
,
//下单时是否强校验必须开卡 true 必须开卡才可下单 false 不开卡可以下单
isOpenSelfMention
:
isOpenSelfMention
,
//门店是否开启门店自提功能
isOpenSelfMention
:
isOpenSelfMention
,
//门店是否开启门店自提功能
shareTitle
:
shareTitle
,
shareTitle
:
shareTitle
,
isNeedGetLocation
:
isNeedGetLocation
,
shareLogo
:
shareLogo
,
shareLogo
:
shareLogo
,
speadProductsBanner
:
speadProductsBanner
speadProductsBanner
:
speadProductsBanner
}
}
...
...
src/pages/confirmOrder/confirmOrder.js
View file @
ae572dfa
...
@@ -3,6 +3,7 @@ const wxService = require('../../utils/wxService')
...
@@ -3,6 +3,7 @@ const wxService = require('../../utils/wxService')
const
app
=
getApp
()
const
app
=
getApp
()
const
city
=
require
(
'../../utils/city'
)
const
city
=
require
(
'../../utils/city'
)
const
utils
=
require
(
'../../utils/util'
)
const
utils
=
require
(
'../../utils/util'
)
const
envInfo
=
require
(
'../../config/index'
).
envInfo
;
wxService
.
page
({
wxService
.
page
({
/**
/**
...
@@ -43,7 +44,8 @@ wxService.page({
...
@@ -43,7 +44,8 @@ wxService.page({
storeId
:
''
,
storeId
:
''
,
storeAddress
:
''
,
storeAddress
:
''
,
storeCode
:
''
storeCode
:
''
}
},
orderStoreInfo
:
null
,
},
},
/**
/**
...
@@ -51,7 +53,52 @@ wxService.page({
...
@@ -51,7 +53,52 @@ wxService.page({
*/
*/
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
wx
.
hideShareMenu
();
wx
.
hideShareMenu
();
this
.
getMyLocationInfo
();
},
////获取位置信息并获取附近门店信息
getMyLocationInfo
(
cb
)
{
let
_this
=
this
;
if
(
!
envInfo
.
isNeedGetLocation
)
{
return
;
}
//获取本地缓存的地址信息
let
myLocation
=
wx
.
getStorageSync
(
'myLocation'
)
?
wx
.
getStorageSync
(
'myLocation'
)
:
null
;
if
(
!
myLocation
){
wx
.
getLocation
({
type
:
'wgs84'
,
success
(
res
)
{
const
latitude
=
res
.
latitude
const
longitude
=
res
.
longitude
let
obj
=
{
latitude
:
latitude
,
longitude
:
longitude
,
}
wx
.
setStorageSync
(
'myLocation'
,
obj
);
_this
.
getMyStoreInfoByPosition
(
latitude
,
longitude
);
}
});
return
;
}
this
.
getMyStoreInfoByPosition
(
myLocation
.
latitude
,
myLocation
.
longitude
);
},
//获取附近门店信息
getMyStoreInfoByPosition
(
latitude
,
longitude
){
wxService
.
post
(
`/sale/trade/buyer/getMemberStore?latitude=
${
latitude
}
&longitude=
${
longitude
}
`
).
then
(
res
=>
{
if
(
res
){
if
(
res
.
data
.
result
==
0
)
{
let
obj
=
res
.
data
.
data
?
res
.
data
.
data
:
null
;
if
(
obj
)
{
this
.
data
.
orderStoreInfo
=
{
storeId
:
obj
.
storeId
,
storeInfo
:
obj
.
storeInfo
}
}
}
}
});
},
},
/**
/**
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
...
@@ -658,6 +705,15 @@ wxService.page({
...
@@ -658,6 +705,15 @@ wxService.page({
},
},
//下单
//下单
order
(
isSelect
,
params
){
order
(
isSelect
,
params
){
if
(
this
.
data
.
orderStoreInfo
){
if
(
this
.
data
.
orderStoreInfo
.
storeId
){
params
.
storeId
=
this
.
data
.
orderStoreInfo
.
storeId
;
}
if
(
this
.
data
.
orderStoreInfo
.
storeInfo
){
params
.
storeInfo
=
this
.
data
.
orderStoreInfo
.
storeInfo
;
}
}
let
_this
=
this
;
let
_this
=
this
;
let
url
=
isSelect
?
'/sale/payment/merged/buyer/bill'
:
'/sale/trade/buyer/bill'
let
url
=
isSelect
?
'/sale/payment/merged/buyer/bill'
:
'/sale/trade/buyer/bill'
wxService
.
post
(
`
${
url
}
`
,
params
).
then
(
res
=>
{
wxService
.
post
(
`
${
url
}
`
,
params
).
then
(
res
=>
{
...
...
src/pages/integralMallDetail/integralMallDetail.wxss
View file @
ae572dfa
...
@@ -58,9 +58,11 @@
...
@@ -58,9 +58,11 @@
margin-bottom: 60rpx;
margin-bottom: 60rpx;
font-size: 27rpx;
font-size: 27rpx;
}
}
.integral-title,.integral-desc{
.integral-title,.integral-desc{
display: inline-block;
display: inline-block;
}
}
.integral-title{
.integral-title{
color: #999999;
color: #999999;
vertical-align: top;
vertical-align: top;
...
@@ -68,6 +70,7 @@
...
@@ -68,6 +70,7 @@
text-align: right;
text-align: right;
width: 120rpx;
width: 120rpx;
}
}
.integral-desc{
.integral-desc{
width: 500rpx;
width: 500rpx;
color: #666666;
color: #666666;
...
...
src/pages/userCenter/userCenter.js
View file @
ae572dfa
...
@@ -51,6 +51,11 @@ wxService.page({
...
@@ -51,6 +51,11 @@ wxService.page({
// y: utils.configSliderBlock(app).y,
// y: utils.configSliderBlock(app).y,
// })
// })
//是否开启获取地理位置
if
(
envInfo
.
isNeedGetLocation
){
this
.
getMyLocationInfo
();
}
// 判断环境是不是企业微信
// 判断环境是不是企业微信
let
env
=
wx
.
getStorageSync
(
'_qyWeChat'
);
let
env
=
wx
.
getStorageSync
(
'_qyWeChat'
);
this
.
setData
({
this
.
setData
({
...
@@ -82,6 +87,23 @@ wxService.page({
...
@@ -82,6 +87,23 @@ wxService.page({
}
}
},
},
////获取位置信息并获取附近门店信息
getMyLocationInfo
()
{
let
_this
=
this
;
wx
.
getLocation
({
type
:
'wgs84'
,
success
(
res
)
{
const
latitude
=
res
.
latitude
const
longitude
=
res
.
longitude
let
obj
=
{
latitude
:
latitude
,
longitude
:
longitude
,
}
wx
.
setStorageSync
(
'myLocation'
,
obj
);
}
})
},
//联系我插件
startmessage
(
e
){
startmessage
(
e
){
console
.
log
(
'联系我插件信息startmessage----'
,
e
)
console
.
log
(
'联系我插件信息startmessage----'
,
e
)
},
},
...
...
src/subPackage/page/pages/couponCenter/couponCenter.js
View file @
ae572dfa
...
@@ -8,12 +8,6 @@ wxService.page({
...
@@ -8,12 +8,6 @@ wxService.page({
data
:
{
data
:
{
query
:
''
,
query
:
''
,
integralCouponList
:
[],
// 积分兑换优惠券列表
integralCouponList
:
[],
// 积分兑换优惠券列表
noMore
:
false
,
isExchange
:
false
,
exchangeId
:
''
,
exchangePoint
:
0
,
dialogStockEmpty
:
false
,
dialogUserLimit
:
false
,
},
},
/**
/**
...
@@ -23,41 +17,57 @@ wxService.page({
...
@@ -23,41 +17,57 @@ wxService.page({
wx
.
hideShareMenu
();
wx
.
hideShareMenu
();
this
.
initIntegralCouponList
();
this
.
initIntegralCouponList
();
},
},
/**
// 获取优惠券活动列表
* 生命周期函数--监听页面显示
initIntegralCouponList
(
refresh
)
{
*/
onShow
:
function
()
{
},
// 积分兑换优惠券列表
initIntegralCouponList
()
{
wx
.
showLoading
({
wx
.
showLoading
({
title
:
'加载中'
title
:
'加载中'
});
});
wxService
.
get
(
`/coupon/pointsRedemptionCouponSetting/getAllValid
`
).
then
(
res
=>
{
wxService
.
post
(
`/coupon/couponCenterActivity/buyer/getValidList
`
).
then
(
res
=>
{
if
(
res
)
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
this
.
data
.
integralCouponList
=
data
?
data
:
[];
this
.
setData
({
this
.
setData
({
integralCouponList
:
data
.
reverse
()
integralCouponList
:
this
.
data
.
integralCouponList
});
});
}
}
}
}
if
(
refresh
){
wx
.
showToast
({
title
:
'刷新成功'
,
});
wx
.
stopPullDownRefresh
();
}
}).
finally
(()
=>
{
}).
finally
(()
=>
{
wx
.
hideLoading
();
wx
.
hideLoading
();
})
})
},
},
//立即兑换优惠券
//立即兑换优惠券
exchange
(
e
)
{
exchange
(
e
)
{
const
{
id
,
point
}
=
e
.
currentTarget
.
dataset
wx
.
showLoading
({
wx
.
showToast
({
title
:
'领取中..'
,
title
:
'领取成功!'
,
});
const
{
id
}
=
e
.
currentTarget
.
dataset
;
wxService
.
post
(
`/coupon/couponCenterActivity/buyer/coupon/draw?id=
${
id
}
`
).
then
(
res
=>
{
wx
.
hideLoading
();
if
(
res
){
if
(
res
.
data
.
result
==
0
){
wx
.
showToast
({
title
:
'领取成功'
,
});
}
else
{
wx
.
showToast
({
title
:
'领取失败,请稍后再试'
,
icon
:
'none'
});
}
}
});
});
},
},
//跳转到详情
//跳转到详情
...
@@ -68,7 +78,9 @@ wxService.page({
...
@@ -68,7 +78,9 @@ wxService.page({
/**
/**
* 页面相关事件处理函数--监听用户下拉动作
* 页面相关事件处理函数--监听用户下拉动作
*/
*/
onPullDownRefresh
:
function
()
{
},
onPullDownRefresh
:
function
()
{
this
.
initIntegralCouponList
(
true
);
},
/**
/**
* 页面上拉触底事件的处理函数
* 页面上拉触底事件的处理函数
...
...
src/subPackage/page/pages/couponCenter/couponCenter.json
View file @
ae572dfa
{
{
"navigationBarTitleText"
:
"领券中心"
,
"navigationBarTitleText"
:
"领券中心"
,
"backgroundTextStyle"
:
"dark"
,
"enablePullDownRefresh"
:
true
,
"usingComponents"
:
{
"usingComponents"
:
{
"no-more"
:
"/component/noMore/noMore"
,
"no-more"
:
"/component/noMore/noMore"
,
"exchange-coupon-modal"
:
"/component/exchange-coupon-modal/exchange-coupon-modal"
,
"exchange-coupon-modal"
:
"/component/exchange-coupon-modal/exchange-coupon-modal"
,
...
...
src/subPackage/page/pages/couponCenter/couponCenter.wxml
View file @
ae572dfa
...
@@ -9,16 +9,16 @@
...
@@ -9,16 +9,16 @@
wx:for-item="item"
wx:for-item="item"
wx:for-index="k"
wx:for-index="k"
wx:key="{{k}}"
wx:key="{{k}}"
data-id="{{item.
i
d}}"
data-id="{{item.
acvivityI
d}}"
>
>
<view class="coupon-item">
<view class="coupon-item">
<view class='coupon-img-title' data-id="{{item.
i
d}}" bindtap="goCouponDetail">
<view class='coupon-img-title' data-id="{{item.
acvivityI
d}}" bindtap="goCouponDetail">
<view class='coupon-img'>
<view class='coupon-img'>
<image wx:if="{{item.
thumbnail}}" src='{{item.thumbnail
}}' mode="aspectFit"/>
<image wx:if="{{item.
listPicture}}" src='{{item.listPicture
}}' mode="aspectFit"/>
<image wx:else src='
/assets/imgs/qr-code
.png' />
<image wx:else src='
https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon
.png' />
</view>
</view>
<view class='coupon-info'>
<view class='coupon-info'>
<view class='coupon-name fs-28'>{{item.
titl
e}}</view>
<view class='coupon-name fs-28'>{{item.
activityNam
e}}</view>
<view class='coupon-desc text-align-left fs-24'>查看详情</view>
<view class='coupon-desc text-align-left fs-24'>查看详情</view>
</view>
</view>
</view>
</view>
...
@@ -28,9 +28,9 @@
...
@@ -28,9 +28,9 @@
open-type='getUserInfo'
open-type='getUserInfo'
class="clear-btn positionAbs"></button>
class="clear-btn positionAbs"></button>
<view class='coupon-btn-click theme-color'
<view class='coupon-btn-click theme-color'
data-id="{{item.id}}"
data-id="{{item.acvivityId}}"
data-point="{{item.point}}"
bindtap='exchange'>立即领取</view>
bindtap='exchange'>立即领取</view>
<!-- <view class='ac-date'>{{item.startTime}}至{{item.endTime}}</view> -->
</view>
</view>
</view>
</view>
</view>
</view>
...
@@ -38,14 +38,12 @@
...
@@ -38,14 +38,12 @@
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
<view class='empty-wrap' wx:if="{{!integralCouponList.length}}">
<view class='empty-info'>
<view class='empty-info'>
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<image class='empty-img' src='/assets/imgs/empty-coupon.png' />
<view class='empty-text'>没有任何
卡
劵活动</view>
<view class='empty-text'>没有任何
领
劵活动</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
</view>
<!-- 库存没了 -->
<dialog-stock-empty show="{{dialogStockEmpty}}"/>
<dialog-user-limit show="{{dialogUserLimit}}"/>
<go-guid />
<go-guid />
<go-home/>
<go-home/>
...
...
src/subPackage/page/pages/couponCenter/couponCenter.wxss
View file @
ae572dfa
...
@@ -103,6 +103,11 @@ page {
...
@@ -103,6 +103,11 @@ page {
}
}
.ac-date{
font-size: 22rpx;
color: #999999;
}
.text-align-left{
.text-align-left{
text-align: left !important;
text-align: left !important;
}
}
...
...
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
View file @
ae572dfa
...
@@ -6,14 +6,17 @@ wxService.page({
...
@@ -6,14 +6,17 @@ wxService.page({
* 页面的初始数据
* 页面的初始数据
*/
*/
data
:
{
data
:
{
activityId
:
null
,
activityInfo
:
{}
},
},
/**
/**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
*/
*/
onLoad
:
function
(
options
)
{
onLoad
:
function
(
options
)
{
let
id
=
options
.
id
;
this
.
data
.
activityId
=
id
;
this
.
getACtivityInfo
();
},
},
/**
/**
...
@@ -23,10 +26,58 @@ wxService.page({
...
@@ -23,10 +26,58 @@ wxService.page({
},
},
//获取活动详情
getACtivityInfo
(){
wxService
.
post
(
`/coupon/couponCenterActivity/buyer/getDetail?id=
${
this
.
data
.
activityId
}
`
).
then
(
res
=>
{
if
(
res
){
let
obj
=
res
.
data
.
data
?
res
.
data
.
data
:
null
;
if
(
obj
){
console
.
log
(
obj
)
let
arr
=
obj
.
definition
?
JSON
.
parse
(
obj
.
definition
)
:
[];
obj
.
desc
=
arr
.
filter
(
item
=>
item
.
type
==
2
);
obj
.
hasExpDate
=
arr
.
filter
(
item
=>
item
.
type
==
1
).
length
>
0
;
this
.
data
.
activityInfo
=
obj
;
this
.
setData
({
activityInfo
:
this
.
data
.
activityInfo
});
}
}
})
},
//领取优惠券
onTapGetCoupon
(){
wx
.
showLoading
({
title
:
'领取中..'
,
});
let
id
=
this
.
data
.
activityId
;
wxService
.
post
(
`/coupon/couponCenterActivity/buyer/coupon/draw?id=
${
id
}
`
).
then
(
res
=>
{
wx
.
hideLoading
();
if
(
res
)
{
if
(
res
.
data
.
result
==
0
)
{
wx
.
showToast
({
title
:
'领取成功'
,
});
}
else
{
wx
.
showToast
({
title
:
'领取失败,请稍后再试'
,
icon
:
'none'
});
}
}
});
},
/**
/**
* 用户点击右上角分享
* 用户点击右上角分享
*/
*/
onShareAppMessage
:
function
()
{
onShareAppMessage
:
function
()
{
let
url
=
this
.
data
.
activityInfo
.
listPicture
?
this
.
data
.
activityInfo
.
listPicture
:
'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png'
;
return
{
title
:
`我分享给你一张“
${
this
.
data
.
activityInfo
.
couponName
}
”的优惠券,赶快领取吧~`
,
path
:
`/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=
${
this
.
data
.
activityId
}
`
,
imageUrl
:
url
,
// 可以更换分享的图片
}
}
}
})
})
\ No newline at end of file
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxml
View file @
ae572dfa
...
@@ -2,34 +2,38 @@
...
@@ -2,34 +2,38 @@
<view class="coupon-info-con">
<view class="coupon-info-con">
<view class="coupon-info-bg" style="background-image:url('https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/coupon-bg.png')">
<view class="coupon-info-bg" style="background-image:url('https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/coupon-bg.png')">
<view class="lf-coupon-Bg">
<view class="lf-coupon-Bg">
<image mode="aspectFit" src="https://img3.bigaka.com/test/1002/202003/20200302/100268e4d2cc-f33a-42a3-8ff8-2d4ff5d9c958.png"></image>
<image wx:if="{{activityInfo.listPicture}}" mode="aspectFit" src="{{activityInfo.listPicture}}"></image>
<image wx:else src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png' />
</view>
</view>
<view class="rg-coupon-info">
<view class="rg-coupon-info">
<view class="coupon-title">阿吉豆测试-满折</view>
<view class="coupon-title">{{activityInfo.couponName}}</view>
<view class="coupon-date">有效期:2020-03-02 至 2020-04-01</view>
<view class="coupon-date">{{activityInfo.startTime}} 至 {{activityInfo.endTime}}</view>
<view class="coupon-price theme-text-color">抵用券 50元</view>
<view class="coupon-price theme-text-color">
{{activityInfo.couponInfoDTO.couponSetting.typeDesc}} {{activityInfo.couponInfoDTO.couponSetting.faceAmountDesc}}
</view>
</view>
</view>
</view>
</view>
<!-- 活动说明 -->
<!-- 活动说明 -->
<view class='integral-detail'>
<view class='integral-detail'
wx:if="{{activityInfo.hasExpDate}}"
>
<view class='integral-list'>
<view class='integral-list'>
<text class='integral-title'>
活动标题
</text>
<text class='integral-title'>
有效时间
</text>
<text class='integral-desc wpl'>
这个是活动的说明信息
</text>
<text class='integral-desc wpl'>
{{activityInfo.startTime}}至{{activityInfo.endTime}}
</text>
</view>
</view>
<view class='integral-list'>
</view>
<text class='integral-title'>活动时间</text>
<view class='integral-detail' style="margin-top:20rpx;" wx:if="{{activityInfo.desc.length > 0}}">
<text class='integral-desc wpl'>这个活动时间活动时间活动时间</text>
<view class='integral-list' wx:for="{{activityInfo.desc}}" wx:key="*this">
<text class='integral-title'>{{item.label}}</text>
<text class='integral-desc wpl'>{{item.value}}</text>
</view>
</view>
</view>
</view>
<!-- 按钮 -->
<!-- 按钮 -->
<view class="get-btn positionRe">
<view class="get-btn positionRe">
<button wx:if="{{!currentHasUserInfo}}"
<button wx:if="{{!currentHasUserInfo}}"
bindgetuserinfo="_getUserInfo"
bindgetuserinfo="_getUserInfo"
open-type='getUserInfo'
open-type='getUserInfo'
class="clear-btn positionAbs">立即领取</button>
class="clear-btn positionAbs">立即领取</button>
<view wx:else class="view-btn">立即领取</view>
<view wx:else class="view-btn"
bindtap="onTapGetCoupon"
>立即领取</view>
</view>
</view>
</view>
</view>
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.wxss
View file @
ae572dfa
...
@@ -58,29 +58,47 @@ view{
...
@@ -58,29 +58,47 @@ view{
}
}
.coupon-date{
.coupon-date{
font-size: 2
4
rpx;
font-size: 2
2
rpx;
color: #999999;
color: #999999;
margin-bottom: 5rpx;
margin-bottom: 5rpx;
}
}
.exp-intro{
margin-top: 60rpx;
}
.exp-intro .exp-intro-item{
display: flex;
font-size: 28rpx;
color: #333333;
}
.exp-intro .exp-intro-item .intro-title{
flex: 0;
min-width: 100rpx;
max-width: 100rpx;
}
.exp-intro .exp-intro-item .intro-desc{
flex: 1;
color: #999999;
}
.integral-detail{
.integral-detail{
margin-top: 60rpx;
margin-top: 60rpx;
}
}
.integral-list{
.integral-list{
margin-bottom: 20rpx;
margin-bottom: 20rpx;
font-size: 2
8
rpx;
font-size: 2
4
rpx;
color: #999999;
}
}
.integral-title{
.integral-title{
font-size: 24rpx;
color: #333333;
color: #333333;
margin-right: 8rpx;
margin-right: 8rpx;
}
}
.integral-desc{
color: #999999;
}
.integral-title,.integral-desc{
.integral-title,.integral-desc{
display: inline-block;
display: inline-block;
}
}
...
...
src/utils/currentLinkRouter.js
View file @
ae572dfa
...
@@ -19,10 +19,19 @@ function currentLinkRouter(event, _this) {
...
@@ -19,10 +19,19 @@ function currentLinkRouter(event, _this) {
});
});
}
else
if
(
curItemType
.
link
.
type
==
3
)
{
}
else
if
(
curItemType
.
link
.
type
==
3
)
{
// 预览
// 预览
wx
.
previewImage
({
if
(
currentClickType
.
imageUrl
.
indexOf
(
'http'
)
>
-
1
){
current
:
`
${
app
.
globalData
.
imageUrl
}
/
${
currentClickType
.
imageUrl
}
`
,
// 当前显示图片的http链接
wx
.
previewImage
({
urls
:
[
`
${
app
.
globalData
.
imageUrl
}
/
${
currentClickType
.
link
.
url
}
`
]
// 需要预览的图片http链接列表
current
:
`
${
currentClickType
.
imageUrl
}
`
,
// 当前显示图片的http链接
})
urls
:
[
`
${
currentClickType
.
link
.
url
}
`
]
// 需要预览的图片http链接列表
})
}
else
{
wx
.
previewImage
({
current
:
`
${
app
.
globalData
.
imageUrl
}
/
${
currentClickType
.
imageUrl
}
`
,
// 当前显示图片的http链接
urls
:
[
`
${
app
.
globalData
.
imageUrl
}
/
${
currentClickType
.
link
.
url
}
`
]
// 需要预览的图片http链接列表
})
}
}
else
if
(
curItemType
.
link
.
type
==
4
)
{
}
else
if
(
curItemType
.
link
.
type
==
4
)
{
if
(
currentClickType
===
'/pages/userCenter/userCenter'
)
{
if
(
currentClickType
===
'/pages/userCenter/userCenter'
)
{
wxService
.
router
(
`
${
currentClickType
}
`
).
replace
()
// 是首页重定向
wxService
.
router
(
`
${
currentClickType
}
`
).
replace
()
// 是首页重定向
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment