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
676da08d
You need to sign in or sign up before continuing.
Commit
676da08d
authored
Apr 19, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改字段
parent
4251d06c
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
44 additions
and
22 deletions
+44
-22
app.json
src/app.json
+6
-1
dialogStockEmpty.wxml
src/component/dialogStockEmpty/dialogStockEmpty.wxml
+1
-1
dialogUserLimit.wxml
src/component/dialogUserLimit/dialogUserLimit.wxml
+3
-2
empty.wxml
src/component/empty/empty.wxml
+2
-1
index.js
src/config/index.js
+2
-2
integralWater.js
src/pages/integralWater/integralWater.js
+1
-1
project.config.json
src/project.config.json
+13
-9
valueCardInfo.js
src/subPackage/page/pages/valueCardInfo/valueCardInfo.js
+12
-1
pointActivityGroup.js
...kageA/page/pages/pointActicityGroup/pointActivityGroup.js
+2
-2
pointActivityGroup.json
...geA/page/pages/pointActicityGroup/pointActivityGroup.json
+1
-1
pointActivityGroup.wxml
...geA/page/pages/pointActicityGroup/pointActivityGroup.wxml
+0
-0
pointActivityGroup.wxss
...geA/page/pages/pointActicityGroup/pointActivityGroup.wxss
+0
-0
pointExchangeCoupon.js
...geA/page/pages/pointExchangeCoupon/pointExchangeCoupon.js
+1
-1
pointExchangeCoupon.json
...A/page/pages/pointExchangeCoupon/pointExchangeCoupon.json
+0
-0
pointExchangeCoupon.wxml
...A/page/pages/pointExchangeCoupon/pointExchangeCoupon.wxml
+0
-0
pointExchangeCoupon.wxss
...A/page/pages/pointExchangeCoupon/pointExchangeCoupon.wxss
+0
-0
pointExchangeGoods.js
...kageA/page/pages/pointExchangeGoods/pointExchangeGoods.js
+0
-0
pointExchangeGoods.json
...geA/page/pages/pointExchangeGoods/pointExchangeGoods.json
+0
-0
pointExchangeGoods.wxml
...geA/page/pages/pointExchangeGoods/pointExchangeGoods.wxml
+0
-0
pointExchangeGoods.wxss
...geA/page/pages/pointExchangeGoods/pointExchangeGoods.wxss
+0
-0
No files found.
src/app.json
View file @
676da08d
...
@@ -32,7 +32,12 @@
...
@@ -32,7 +32,12 @@
"pages/valueCardInfo/valueCardInfo"
,
"pages/valueCardInfo/valueCardInfo"
,
"pages/myValueCard/myValueCard"
,
"pages/myValueCard/myValueCard"
,
"pages/myValueCardInfo/myValueCardInfo"
,
"pages/myValueCardInfo/myValueCardInfo"
,
"pages/valueCardRecords/valueCardRecords"
,
"pages/valueCardRecords/valueCardRecords"
]
},
{
"root"
:
"subPackageA/page"
,
"pages"
:
[
"pages/pointActicityGroup/pointActivityGroup"
,
"pages/pointActicityGroup/pointActivityGroup"
,
"pages/pointExchangeCoupon/pointExchangeCoupon"
,
"pages/pointExchangeCoupon/pointExchangeCoupon"
,
"pages/pointExchangeGoods/pointExchangeGoods"
"pages/pointExchangeGoods/pointExchangeGoods"
...
...
src/component/dialogStockEmpty/dialogStockEmpty.wxml
View file @
676da08d
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<view class='body'>
<view class='body'>
<image bindtap='onTapClose'
<image bindtap='onTapClose'
class='close'
class='close'
src='https://
bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_tips_close
.png' mode='aspectFit'></image>
src='https://
img3.bigaka.com/prd/3001/202003/20200331/30018f5b020d-1486-4b92-b32c-7c5f38d1639a
.png' mode='aspectFit'></image>
<view class='empty'>已抢光</view>
<view class='empty'>已抢光</view>
<view>很遗憾,你来晚了~</view>
<view>很遗憾,你来晚了~</view>
<view class='view-btn' bindtap='onTapViewMore'>查看其它活动</view>
<view class='view-btn' bindtap='onTapViewMore'>查看其它活动</view>
...
...
src/component/dialogUserLimit/dialogUserLimit.wxml
View file @
676da08d
...
@@ -3,8 +3,9 @@
...
@@ -3,8 +3,9 @@
<view class='body'>
<view class='body'>
<image bindtap='onTapClose'
<image bindtap='onTapClose'
class='close'
class='close'
src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_tips_close.png' mode='aspectFit'></image>
src='https://img3.bigaka.com/prd/3001/202003/20200331/30018f5b020d-1486-4b92-b32c-7c5f38d1639a.png'
<image class='tips-icon' src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/tips_icon.png' mode='aspectFit'></image>
mode='aspectFit'></image>
<image class='tips-icon' src='https://img3.bigaka.com/prd/3001/202003/20200331/3001ed2dd3ad-2dfa-4e99-9702-5fd9758c00f1.png' mode='aspectFit'></image>
<view>您已达到兑换上限</view>
<view>您已达到兑换上限</view>
</view>
</view>
</view>
</view>
src/component/empty/empty.wxml
View file @
676da08d
<!--component/empty/empty.wxml-->
<!--component/empty/empty.wxml-->
<view class='page-empty'>
<view class='page-empty'>
<image src='https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/empty.png' mode='aspectFit'></image>
<image src='https://img3.bigaka.com/prd/3001/202003/20200331/3001d0a28e03-be3f-4f81-92dd-14d229382c2f.png'
mode='aspectFit'></image>
<view>{{text}}</view>
<view>{{text}}</view>
</view>
</view>
src/config/index.js
View file @
676da08d
const
PROJECT_ENV
=
'
test
'
// 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre
const
PROJECT_ENV
=
'
prod
'
// 生产 prod, 开发1 dev,开发2 dev2, 测试 test, 预生产 pre
const
needMock
=
''
//
const
needMock
=
''
//
const
brandId
=
1002
;
//1002 测试 2711 生产
const
brandId
=
2711
;
//1002 测试 2711 生产
// appid_dev_wx wxc3b64b09b1d3dfc2
// appid_dev_wx wxc3b64b09b1d3dfc2
// appid_test_wx wxac09792264c49b5c
// appid_test_wx wxac09792264c49b5c
// appid_pre_711 wx358b56af62edbde1
// appid_pre_711 wx358b56af62edbde1
...
...
src/pages/integralWater/integralWater.js
View file @
676da08d
...
@@ -130,7 +130,7 @@ wxService.page({
...
@@ -130,7 +130,7 @@ wxService.page({
// wxService.router(`/pages/IntegralMall/IntegralMall`)
// wxService.router(`/pages/IntegralMall/IntegralMall`)
// wxService.router(`/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods`)
// wxService.router(`/subPackage/page/pages/IntegralMallGoods/IntegralMallGoods`)
//现在修改为跳转到积分活动分组列表
//现在修改为跳转到积分活动分组列表
wxService
.
router
(
`/subPackage/page/pages/pointActicityGroup/pointActivityGroup`
);
wxService
.
router
(
`/subPackage
A
/page/pages/pointActicityGroup/pointActivityGroup`
);
},
},
// 消费详情
// 消费详情
handleGoDetail
(
e
)
{
handleGoDetail
(
e
)
{
...
...
src/project.config.json
View file @
676da08d
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
},
},
"compileType"
:
"miniprogram"
,
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
ac09792264c49b5c
"
,
"appid"
:
"wx
700028bf32a3be66
"
,
"projectname"
:
"7-11"
,
"projectname"
:
"7-11"
,
"debugOptions"
:
{
"debugOptions"
:
{
"hidedInDevtools"
:
[]
"hidedInDevtools"
:
[]
...
@@ -218,21 +218,25 @@
...
@@ -218,21 +218,25 @@
"query"
:
""
"query"
:
""
},
},
{
{
"id"
:
-1
,
"id"
:
27
,
"name"
:
"活动积分分组"
,
"name"
:
"活动积分分组"
,
"pathName"
:
"subPackage/page/pages/pointActicityGroup/pointActivityGroup"
,
"pathName"
:
"subPackageA/page/pages/pointActicityGroup/pointActivityGroup"
,
"query"
:
""
"query"
:
""
,
"scene"
:
null
},
},
{
{
"id"
:
-1
,
"id"
:
28
,
"name"
:
"积分活动积分换物详情"
,
"name"
:
"积分活动积分换物详情"
,
"pathName"
:
"subPackage/page/pages/pointExchangeGoods/pointExchangeGoods"
,
"pathName"
:
"subPackageA/page/pages/pointExchangeGoods/pointExchangeGoods"
,
"query"
:
""
"query"
:
""
,
"scene"
:
null
},
},
{
{
"id"
:
-1
,
"id"
:
29
,
"name"
:
"积分活动积分兑券详情"
,
"name"
:
"积分活动积分兑券详情"
,
"pathName"
:
"subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon"
"pathName"
:
"subPackageA/page/pages/pointExchangeCoupon/pointExchangeCoupon"
,
"query"
:
""
,
"scene"
:
null
}
}
]
]
}
}
...
...
src/subPackage/page/pages/valueCardInfo/valueCardInfo.js
View file @
676da08d
...
@@ -80,7 +80,7 @@ wxService.page({
...
@@ -80,7 +80,7 @@ wxService.page({
// 判断有无开卡
// 判断有无开卡
const
userInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
const
userInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
)
// 新用户去激活领卡
// 新用户去激活领卡
if
(
userInfo
&&
userInfo
.
member
&&
!
userInfo
.
member
.
mobile
)
{
if
(
userInfo
&&
userInfo
.
member
&&
!
userInfo
.
member
.
mobile
&&
!
userInfo
.
member
.
cardNoWeixin
)
{
wxService
.
openCard
()
wxService
.
openCard
()
return
false
return
false
}
}
...
@@ -168,6 +168,17 @@ wxService.page({
...
@@ -168,6 +168,17 @@ wxService.page({
return
;
return
;
}
}
//判断是否开卡
if
(
!
member
.
cardNoWeixin
){
wx
.
showToast
({
title
:
'请先开卡后购买'
,
icon
:
'none'
});
wxService
.
openCard
()
return
;
}
let
memeberId
=
member
.
id
,
let
memeberId
=
member
.
id
,
// storeId = member.storeId;
// storeId = member.storeId;
storeId
=
''
;
storeId
=
''
;
...
...
src/subPackage/page/pages/pointActicityGroup/pointActivityGroup.js
→
src/subPackage
A
/page/pages/pointActicityGroup/pointActivityGroup.js
View file @
676da08d
...
@@ -112,13 +112,13 @@ wxService.page({
...
@@ -112,13 +112,13 @@ wxService.page({
if
(
item
.
type
==
1
){
if
(
item
.
type
==
1
){
//积分换物
//积分换物
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'/subPackage/page/pages/pointExchangeGoods/pointExchangeGoods?id='
+
item
.
id
,
url
:
'/subPackage
A
/page/pages/pointExchangeGoods/pointExchangeGoods?id='
+
item
.
id
,
});
});
}
}
else
if
(
item
.
type
==
2
){
else
if
(
item
.
type
==
2
){
//积分兑换优惠券
//积分兑换优惠券
wx
.
navigateTo
({
wx
.
navigateTo
({
url
:
'/subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon?id='
+
item
.
id
,
url
:
'/subPackage
A
/page/pages/pointExchangeCoupon/pointExchangeCoupon?id='
+
item
.
id
,
});
});
}
}
},
},
...
...
src/subPackage/page/pages/pointActicityGroup/pointActivityGroup.json
→
src/subPackage
A
/page/pages/pointActicityGroup/pointActivityGroup.json
View file @
676da08d
{
{
"navigationBarTitleText"
:
"积分
活动中心
"
,
"navigationBarTitleText"
:
"积分
商城
"
,
"enablePullDownRefresh"
:
true
,
"enablePullDownRefresh"
:
true
,
"usingComponents"
:
{
"usingComponents"
:
{
"empty"
:
"/component/empty/empty"
"empty"
:
"/component/empty/empty"
...
...
src/subPackage/page/pages/pointActicityGroup/pointActivityGroup.wxml
→
src/subPackage
A
/page/pages/pointActicityGroup/pointActivityGroup.wxml
View file @
676da08d
File moved
src/subPackage/page/pages/pointActicityGroup/pointActivityGroup.wxss
→
src/subPackage
A
/page/pages/pointActicityGroup/pointActivityGroup.wxss
View file @
676da08d
File moved
src/subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon.js
→
src/subPackage
A
/page/pages/pointExchangeCoupon/pointExchangeCoupon.js
View file @
676da08d
...
@@ -131,7 +131,7 @@ wxService.page({
...
@@ -131,7 +131,7 @@ wxService.page({
if
(
result
==
0
)
{
if
(
result
==
0
)
{
wx
.
hideLoading
()
wx
.
hideLoading
()
this
.
setData
({
this
.
setData
({
integralCouponList
:
data
.
reverse
()
integralCouponList
:
data
});
});
}
}
}
}
...
...
src/subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon.json
→
src/subPackage
A
/page/pages/pointExchangeCoupon/pointExchangeCoupon.json
View file @
676da08d
File moved
src/subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon.wxml
→
src/subPackage
A
/page/pages/pointExchangeCoupon/pointExchangeCoupon.wxml
View file @
676da08d
File moved
src/subPackage/page/pages/pointExchangeCoupon/pointExchangeCoupon.wxss
→
src/subPackage
A
/page/pages/pointExchangeCoupon/pointExchangeCoupon.wxss
View file @
676da08d
File moved
src/subPackage/page/pages/pointExchangeGoods/pointExchangeGoods.js
→
src/subPackage
A
/page/pages/pointExchangeGoods/pointExchangeGoods.js
View file @
676da08d
File moved
src/subPackage/page/pages/pointExchangeGoods/pointExchangeGoods.json
→
src/subPackage
A
/page/pages/pointExchangeGoods/pointExchangeGoods.json
View file @
676da08d
File moved
src/subPackage/page/pages/pointExchangeGoods/pointExchangeGoods.wxml
→
src/subPackage
A
/page/pages/pointExchangeGoods/pointExchangeGoods.wxml
View file @
676da08d
File moved
src/subPackage/page/pages/pointExchangeGoods/pointExchangeGoods.wxss
→
src/subPackage
A
/page/pages/pointExchangeGoods/pointExchangeGoods.wxss
View file @
676da08d
File moved
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