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
2f862a5f
Commit
2f862a5f
authored
Mar 11, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
超值卡,增加触点
parent
1ff3af8e
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
55 additions
and
21 deletions
+55
-21
app.js
src/app.js
+1
-4
index.js
src/config/index.js
+12
-3
project.config.json
src/project.config.json
+4
-3
myValueCard.wxml
src/subPackage/page/pages/myValueCard/myValueCard.wxml
+6
-3
myValueCard.wxss
src/subPackage/page/pages/myValueCard/myValueCard.wxss
+27
-0
myValueCardInfo.wxml
...ubPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml
+1
-1
Http.js
src/utils/Http.js
+3
-7
wxService.js
src/utils/wxService.js
+1
-0
No files found.
src/app.js
View file @
2f862a5f
...
...
@@ -115,9 +115,6 @@ App({
imageUrl
:
envInfo
.
imgCtx
,
//图片地址
isFullSucreen
:
false
,
// 当前设备是否为 FullSucreen
commonFunc
:
commonFunc
,
// brandId: 2711,
// brandId: 2005,
// brandId: 1001,
brandId
:
1002
,
brandId
:
envInfo
.
brandId
,
}
})
src/config/index.js
View file @
2f862a5f
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
brandId
=
2711
;
//1002 测试 2711 生产
// appid_dev_wx wxc3b64b09b1d3dfc2
// appid_test_wx wxac09792264c49b5c
// appid_pre_711 wx358b56af62edbde1
...
...
@@ -37,11 +37,20 @@ const imgConfig = {
prod
:
prodImgCtx
}
const
tunulToken
=
{
dev
:
'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
,
test
:
'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
,
pre
:
'4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63'
,
prod
:
'4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63'
}
const
envInfo
=
(()
=>
{
return
{
ctx
:
config
[
PROJECT_ENV
],
env
:
PROJECT_ENV
,
imgCtx
:
imgConfig
[
PROJECT_ENV
]
imgCtx
:
imgConfig
[
PROJECT_ENV
],
brandId
:
brandId
,
tunulToken
:
tunulToken
[
PROJECT_ENV
]
}
})()
...
...
src/project.config.json
View file @
2f862a5f
...
...
@@ -13,7 +13,7 @@
},
"compileType"
:
"miniprogram"
,
"libVersion"
:
"2.8.2"
,
"appid"
:
"wx
ac09792264c49b5c
"
,
"appid"
:
"wx
700028bf32a3be66
"
,
"projectname"
:
"7-11"
,
"debugOptions"
:
{
"hidedInDevtools"
:
[]
...
...
@@ -185,10 +185,11 @@
"query"
:
""
},
{
"id"
:
-1
,
"id"
:
22
,
"name"
:
"超值卡列表"
,
"pathName"
:
"subPackage/page/pages/valueCard/valueCard"
,
"query"
:
""
"query"
:
"scene=t%3Dc9bCCU1100"
,
"scene"
:
null
},
{
"id"
:
23
,
...
...
src/subPackage/page/pages/myValueCard/myValueCard.wxml
View file @
2f862a5f
...
...
@@ -17,10 +17,13 @@
mode='widthFix'></image>
<!-- 过期时间展示 -->
<!-- <view class='top-left-days'><label>剩{{item.leftTimes}}天</label></view> -->
<view class="left-days">
<label wx:if="{{item.useResidueDays > 0}}">剩余{{item.leftTimes}}次/{{item.useResidueDays}}天后过期</label>
</view>
<view class='card-top-info-desc'>
<text
wx:if="{{item.useResidueDays <= 0}}"
></text>
<
label wx:if="{{item.useResidueDays > 0}}">剩{{item.leftTimes}}次,{{item.useResidueDays}}天过期</label>
<image class='qrcode' src='/assets/imgs/711_11
.png' mode='aspectFit'></image>
<text ></text>
<
image class='qrcode'
src='https://img3.bigaka.com/prd/3001/202003/20200309/3001b0c7b943-a805-4550-a179-8b963913b513
.png' mode='aspectFit'></image>
</view>
</view>
<!-- 具体信息 -->
...
...
src/subPackage/page/pages/myValueCard/myValueCard.wxss
View file @
2f862a5f
...
...
@@ -56,6 +56,8 @@ view{
align-items: center;
}
.my-value-card-list .my-value-card-item .card-top-info{
width: 100%;
height: auto;
...
...
@@ -73,6 +75,31 @@ view{
align-items: center;
}
.left-days{
position: absolute;
top: 20rpx;
width: 100%;
height: 70rpx;
padding: 0 30rpx;
display: flex;
justify-content: flex-end;
align-items: center;
}
.left-days label{
height: 50rpx;
width: auto;
padding: 0 30rpx;
border-radius: 25rpx;
background: #ffffff;
color: #333333;
font-weight: bold;
font-size: 24rpx;
display: flex;
align-items: center;
justify-content: center;
}
.my-value-card-list .my-value-card-item .card-top-info .top-left-days label{
height: 50rpx;
width: auto;
...
...
src/subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml
View file @
2f862a5f
<!--subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml-->
<view class='my-card-info'>
<image src='{{valueCardInfo.backGroundUrl}}' mode='widthFix'></image>
<label>剩
{{valueCardInfo.leftTimes}}次,{{valueCardInfo.useResidueDays}}天
过期</label>
<label>剩
余{{valueCardInfo.leftTimes}}次/{{valueCardInfo.useResidueDays}}天后
过期</label>
</view>
<view class='left-num-container'>
...
...
src/utils/Http.js
View file @
2f862a5f
...
...
@@ -95,9 +95,7 @@ class Http {
url
,
method
:
'GET'
,
header
:
{
'tunnel-token'
:
'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
,
// 测试
// 'tunnel-token' : 'd6db651f8b9c7db4176465accfc1c913843fd9ad328cd5f4fe201d918072c9e8', // 生产 3001
// 'tunnel-token' : '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
'tunnel-token'
:
envInfo
.
tunulToken
,
// 生产 2711
'tentacle-content'
:
this
.
getTentacle
()
},
data
:
parmas
...
...
@@ -125,8 +123,7 @@ class Http {
url
,
method
:
'POST'
,
header
:
{
'tunnel-token'
:
'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
,
// 测试
// 'tunnel-token': '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
'tunnel-token'
:
envInfo
.
tunulToken
,
// 生产 2711
'tentacle-content'
:
this
.
getTentacle
()
},
data
:
parmas
,
...
...
@@ -139,8 +136,7 @@ class Http {
url
,
method
:
'POST'
,
header
:
{
'tunnel-token'
:
'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
,
// 测试
// 'tunnel-token': '4c8d641cb2b8a576317ee5f6ead1f36474463041d61fb5d4289364565b0c6c63', // 生产 2711
'tunnel-token'
:
envInfo
.
tunulToken
,
// 生产 2711
'tentacle-content'
:
this
.
getTentacle
()
},
data
:
parmas
,
...
...
src/utils/wxService.js
View file @
2f862a5f
...
...
@@ -16,6 +16,7 @@ import utils from './util'
let
openCardLister
=
null
const
pathData
=
require
(
'./currentAccessiblePath.js'
)
import
*
as
watch
from
"./watch.js"
;
import
{
Integer
}
from
'./integerDigitalConvertion'
/**
* 单例
...
...
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