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
8d8c1e7c
Commit
8d8c1e7c
authored
Oct 26, 2019
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增任务说明界面
parent
509f024c
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
138 additions
and
6 deletions
+138
-6
app.json
src/app.json
+2
-1
project.config.json
src/project.config.json
+7
-1
enlistInfo.js
src/shoppingGuid/page/pages/enlistInfo/enlistInfo.js
+10
-0
enlistInfo.wxml
src/shoppingGuid/page/pages/enlistInfo/enlistInfo.wxml
+1
-1
saleTaskInfo.js
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.js
+10
-2
saleTaskInfo.wxml
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.wxml
+1
-1
taskNotice.js
src/shoppingGuid/page/pages/taskNotice/taskNotice.js
+48
-0
taskNotice.json
src/shoppingGuid/page/pages/taskNotice/taskNotice.json
+5
-0
taskNotice.wxml
src/shoppingGuid/page/pages/taskNotice/taskNotice.wxml
+9
-0
taskNotice.wxss
src/shoppingGuid/page/pages/taskNotice/taskNotice.wxss
+45
-0
No files found.
src/app.json
View file @
8d8c1e7c
...
...
@@ -75,7 +75,8 @@
"pages/qrcode/qrcode"
,
"pages/userList/userList"
,
"pages/couponQrcode/couponQrcode"
,
"pages/welcomGuider/welcomGuider"
"pages/welcomGuider/welcomGuider"
,
"pages/taskNotice/taskNotice"
]
}
],
...
...
src/project.config.json
View file @
8d8c1e7c
...
...
@@ -39,7 +39,7 @@
"list"
:
[]
},
"miniprogram"
:
{
"current"
:
54
,
"current"
:
60
,
"list"
:
[
{
"id"
:
-1
,
...
...
@@ -436,6 +436,12 @@
"name"
:
"导购授权页面"
,
"pathName"
:
"shoppingGuid/page/pages/welcomGuider/welcomGuider"
,
"query"
:
""
},
{
"id"
:
60
,
"name"
:
"任务说明"
,
"pathName"
:
"shoppingGuid/page/pages/taskNotice/taskNotice"
,
"query"
:
"id=636202518078164992&type=2"
}
]
}
...
...
src/shoppingGuid/page/pages/enlistInfo/enlistInfo.js
View file @
8d8c1e7c
...
...
@@ -59,5 +59,14 @@ wxService.page({
}
}
})
},
//跳转到活动说明界面
onTapToNotice
()
{
let
taskId
=
this
.
options
&&
this
.
options
.
id
||
0
let
orderType
=
this
.
options
&&
this
.
options
.
type
||
1
;
wx
.
navigateTo
({
url
:
`/shoppingGuid/page/pages/taskNotice/taskNotice?id=
${
taskId
}
&type=
${
orderType
}
`
,
});
}
})
\ No newline at end of file
src/shoppingGuid/page/pages/enlistInfo/enlistInfo.wxml
View file @
8d8c1e7c
...
...
@@ -6,7 +6,7 @@
<image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix'></image>
<text>{{enlistList.task.startTime}}~{{enlistList.task.endTime}}</text>
</view>
<view class='rg'>活动说明?</view>
<view class='rg'
bindtap='onTapToNotice'
>活动说明?</view>
</view>
<view class='info-item'>
<view class='lf'>
...
...
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.js
View file @
8d8c1e7c
...
...
@@ -69,5 +69,13 @@ wxService.page({
current
:
this
.
data
.
current
});
},
//跳转到活动说明界面
onTapToNotice
(){
let
taskId
=
this
.
options
&&
this
.
options
.
id
||
0
let
orderType
=
this
.
options
&&
this
.
options
.
type
||
1
;
})
\ No newline at end of file
wx
.
navigateTo
({
url
:
`/shoppingGuid/page/pages/taskNotice/taskNotice?id=
${
taskId
}
&type=
${
orderType
}
`
,
});
}
});
\ No newline at end of file
src/shoppingGuid/page/pages/saleTaskInfo/saleTaskInfo.wxml
View file @
8d8c1e7c
...
...
@@ -6,7 +6,7 @@
<image src='/assets/imgs/shoppingGuide/kpi_task_time.png' mode='widthFix' />
<text>{{saleDetail.task.startTime}}~{{saleDetail.task.endTime}}</text>
</view>
<view class='rg'>活动说明?</view>
<view class='rg'
bindtap='onTapToNotice'
>活动说明?</view>
</view>
<view class='info-item'>
<view class='lf'>
...
...
src/shoppingGuid/page/pages/taskNotice/taskNotice.js
0 → 100644
View file @
8d8c1e7c
// shoppingGuid/page/pages/taskNotice/taskNotice.js
const
wxService
=
require
(
'../../../../utils/wxService'
)
wxService
.
page
({
/**
* 页面的初始数据
*/
data
:
{
notice
:
[],
nodata
:
false
,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad
:
function
(
options
)
{
let
id
=
options
.
id
,
type
=
options
.
type
;
this
.
getTaskInfo
(
id
,
type
);
},
//获取任务详情
getTaskInfo
(
id
,
type
){
wx
.
showLoading
({
title
:
'加载中'
});
wxService
.
post
(
`/marketing/shoppingguide/task/detail?orderType=
${
type
}
&taskId=
${
id
}
`
).
then
(
res
=>
{
if
(
res
)
{
const
{
result
,
data
}
=
res
.
data
if
(
result
==
0
)
{
let
notice
=
data
.
task
.
notice
?
JSON
.
parse
(
data
.
task
.
notice
)
:
[];
if
(
notice
.
length
==
0
){
this
.
data
.
nodata
=
true
;
}
else
{
this
.
data
.
nodata
=
false
;
}
this
.
setData
({
notice
:
notice
,
nodata
:
this
.
data
.
nodata
});
}
}
})
}
})
\ No newline at end of file
src/shoppingGuid/page/pages/taskNotice/taskNotice.json
0 → 100644
View file @
8d8c1e7c
{
"navigationBarTitleText"
:
"活动说明"
,
"usingComponents"
:
{}
}
\ No newline at end of file
src/shoppingGuid/page/pages/taskNotice/taskNotice.wxml
0 → 100644
View file @
8d8c1e7c
<!--shoppingGuid/page/pages/taskNotice/taskNotice.wxml-->
<view class='active-notice'>
<view class='notice-item' wx:for="{{notice}}" wx:key="nitice" wx:for-item="item">
<text class='title'>{{item.title}}:</text>
<text class='desc'>{{item.desc}}</text>
</view>
<!-- 未配置 -->
<view class='empty' wx:if="{{nodata}}">暂无活动说明~</view>
</view>
src/shoppingGuid/page/pages/taskNotice/taskNotice.wxss
0 → 100644
View file @
8d8c1e7c
/* shoppingGuid/page/pages/taskNotice/taskNotice.wxss */
/* shoppingGuid/page/pages/userInfo/userInfo.wxss */
page{
background: #ffffff;
box-sizing: border-box;
-webkit-box-sizing: border-box;
font-size: 28rpx;
color: #333333;
}
/* *,*::after,*::before{
box-sizing: border-box;
} */
view{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.active-notice{
width: 100%;
height: auto;
padding: 30rpx;
}
.active-notice .notice-item{
width: 100%;
height: auto;
display: flex;
margin-bottom: 20rpx;
letter-spacing: 1rpx;
line-height: 40rpx;
}
.active-notice .notice-item .title{
flex: 0;
min-width: 180rpx;
font-weight: bold;
padding-right: 20rpx;
}
.active-notice .notice-item .desc{
flex: 1;
}
\ No newline at end of file
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