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
b9f718bb
Commit
b9f718bb
authored
Aug 09, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: 集点_未开始状态
parent
a9d245ff
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
statusPoint.wxml
src/component/statusPoint/statusPoint.wxml
+1
-0
pointDetail.js
src/pages/pointDetail/pointDetail.js
+1
-2
pointList.js
src/pages/pointList/pointList.js
+1
-1
No files found.
src/component/statusPoint/statusPoint.wxml
View file @
b9f718bb
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
<view class="status-tips" style="background-color:rgba(5, 195, 91, 1);" wx:if="{{currentStatus == 2 && currentTimeStatus == 1}}">进行中 >></view>
<view class="status-tips" style="background-color:rgba(5, 195, 91, 1);" wx:if="{{currentStatus == 2 && currentTimeStatus == 1}}">进行中 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentStatus == 3}}"> 已失效 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentStatus == 3}}"> 已失效 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentTimeStatus == 2}}">已结束 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentTimeStatus == 2}}">已结束 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:elif="{{currentTimeStatus == 3}}">未开始 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:else>已结束 >></view>
<view class="status-tips" style="background-color:rgb(170, 170, 170);" wx:else>已结束 >></view>
<!--<image class='status-tips' src='/assets/imgs/point/status.png' mode="widthFix"/>-->
<!--<image class='status-tips' src='/assets/imgs/point/status.png' mode="widthFix"/>-->
<image wx:if="{{img}}" class='status-img' src='{{img}}' />
<image wx:if="{{img}}" class='status-img' src='{{img}}' />
...
...
src/pages/pointDetail/pointDetail.js
View file @
b9f718bb
...
@@ -33,8 +33,7 @@ wxService.page({
...
@@ -33,8 +33,7 @@ wxService.page({
hideGetBtn
:
true
,
// 默认隐藏 可领取按钮
hideGetBtn
:
true
,
// 默认隐藏 可领取按钮
showGetBtn
:
true
,
// 默认展示 未达成按钮
showGetBtn
:
true
,
// 默认展示 未达成按钮
currentStatus
:
2
,
// 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentStatus
:
2
,
// 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentTimeStatus
:
1
,
// 1 进行中 2 已结束
currentTimeStatus
:
1
,
// 1 进行中 2 已结束 3 未开始
// 状态变更为 “已结束”,“已失效”
},
},
/**
/**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
...
...
src/pages/pointList/pointList.js
View file @
b9f718bb
...
@@ -10,7 +10,7 @@ wxService.page({
...
@@ -10,7 +10,7 @@ wxService.page({
data
:
{
data
:
{
pointList
:
[],
pointList
:
[],
currentStatus
:
2
,
// 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentStatus
:
2
,
// 活动状态 1 未生效 2 生效中 3 已失效 0 已删除
currentTimeStatus
:
1
,
// 1 进行中 2 已结束
currentTimeStatus
:
1
,
// 1 进行中 2 已结束
3 未开始
},
},
/**
/**
...
...
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