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
4f1b830f
Commit
4f1b830f
authored
May 18, 2020
by
谢中龙
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改集点订阅
parent
bd15988d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
8 deletions
+19
-8
authorization-modal-point.wxss
.../authorization-modal-point/authorization-modal-point.wxss
+1
-0
imageDialog.wxss
src/component/imageDialog/imageDialog.wxss
+1
-1
pointDetail.js
src/pages/pointDetail/pointDetail.js
+7
-3
pointDetail.wxml
src/pages/pointDetail/pointDetail.wxml
+3
-1
pointDetail.wxss
src/pages/pointDetail/pointDetail.wxss
+6
-2
project.config.json
src/project.config.json
+1
-1
No files found.
src/component/authorization-modal-point/authorization-modal-point.wxss
View file @
4f1b830f
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
bottom: 0;
bottom: 0;
top: 0;
top: 0;
background-color: transparent;
background-color: transparent;
z-index: 13;
}
}
.auto-old {
.auto-old {
display: flex;
display: flex;
...
...
src/component/imageDialog/imageDialog.wxss
View file @
4f1b830f
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.ad-modal-bg{
.ad-modal-bg{
position: fixed;
position: fixed;
z-index: 9
999
;
z-index: 9;
width: 100vw;
width: 100vw;
height: 100vh;
height: 100vh;
background: rgba(0, 0, 0, 0.5);
background: rgba(0, 0, 0, 0.5);
...
...
src/pages/pointDetail/pointDetail.js
View file @
4f1b830f
...
@@ -41,7 +41,8 @@ wxService.page({
...
@@ -41,7 +41,8 @@ wxService.page({
isAuthorization
:
false
,
isAuthorization
:
false
,
donateImgUrl
:
''
,
donateImgUrl
:
''
,
showDonateImgUrl
:
false
,
showDonateImgUrl
:
false
,
showTempalteModal
:
true
showTempalteModal
:
true
,
userHasBaseInfo
:
false
,
},
},
/**
/**
* 生命周期函数--监听页面加载
* 生命周期函数--监听页面加载
...
@@ -120,12 +121,16 @@ wxService.page({
...
@@ -120,12 +121,16 @@ wxService.page({
//查询订阅模板
//查询订阅模板
let
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
let
baseUserInfo
=
wx
.
getStorageSync
(
'_baseUserInfo'
);
wxService
.
post
(
`
${
'/merchant/message/wxSubMsgMapping/getListByParams'
}
`
,
{
wxService
.
post
(
`
${
'/merchant/message/wxSubMsgMapping/getListByParams'
}
`
,
{
scenarioIds
:
[
'
ordersend'
,
'orderconfirm
'
],
scenarioIds
:
[
'
pcstart'
,
'pccomplete
'
],
sourceFrom
:
2
,
sourceFrom
:
2
,
switchType
:
3
switchType
:
3
}).
then
(
res
=>
{
}).
then
(
res
=>
{
let
tempArr
=
res
.
data
.
data
?
res
.
data
.
data
:
[];
let
tempArr
=
res
.
data
.
data
?
res
.
data
.
data
:
[];
let
tempids
=
[];
let
tempids
=
[];
if
(
tempArr
.
length
==
0
){
return
;
}
tempArr
.
map
(
item
=>
{
tempArr
.
map
(
item
=>
{
tempids
.
push
(
item
.
templateId
);
tempids
.
push
(
item
.
templateId
);
});
});
...
@@ -404,7 +409,6 @@ wxService.page({
...
@@ -404,7 +409,6 @@ wxService.page({
* 生命周期函数--监听页面显示
* 生命周期函数--监听页面显示
*/
*/
onShow
:
function
()
{
onShow
:
function
()
{
},
},
/**
/**
...
...
src/pages/pointDetail/pointDetail.wxml
View file @
4f1b830f
...
@@ -74,7 +74,9 @@
...
@@ -74,7 +74,9 @@
</view>
</view>
<view class="modal-footer-btns">
<view class="modal-footer-btns">
<view class="footer-btn" bindtap="onTapCloseModalTemplate">下一次</view>
<view class="footer-btn" bindtap="onTapCloseModalTemplate">下一次</view>
<view class="footer-btn" bindtap="onTapSureSubTemplate">同意</view>
<view class="footer-btn" bindtap="onTapSureSubTemplate">
同意
</view>
</view>
</view>
</view>
</view>
</view>
</view>
...
...
src/pages/pointDetail/pointDetail.wxss
View file @
4f1b830f
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
top: 0;
top: 0;
width: 100%;
width: 100%;
height: 100%;
height: 100%;
z-index: 1;
z-index: 1
0
;
}
}
.modal-tamplate-body{
.modal-tamplate-body{
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
top: 50%;
top: 50%;
margin-top: -150rpx;
margin-top: -150rpx;
background: #ffffff;
background: #ffffff;
z-index:
2
;
z-index:
11
;
display: flex;
display: flex;
flex-direction: column;
flex-direction: column;
border-radius: 8rpx;
border-radius: 8rpx;
...
@@ -142,6 +142,10 @@
...
@@ -142,6 +142,10 @@
height: 100%;
height: 100%;
}
}
.modal-tamplate-body .modal-footer-btns .footer-btn button{
color: rgba(5, 195, 91, 1);
}
.modal-tamplate-body .modal-footer-btns .footer-btn:first-child{
.modal-tamplate-body .modal-footer-btns .footer-btn:first-child{
border-bottom-left-radius: 8rpx;
border-bottom-left-radius: 8rpx;
border-right: solid 1rpx #dddddd;
border-right: solid 1rpx #dddddd;
...
...
src/project.config.json
View file @
4f1b830f
...
@@ -142,7 +142,7 @@
...
@@ -142,7 +142,7 @@
"id"
:
15
,
"id"
:
15
,
"name"
:
"集点详情"
,
"name"
:
"集点详情"
,
"pathName"
:
"pages/pointDetail/pointDetail"
,
"pathName"
:
"pages/pointDetail/pointDetail"
,
"query"
:
"id=7
02214327956017152
"
,
"query"
:
"id=7
11941259182346240
"
,
"scene"
:
null
"scene"
:
null
},
},
{
{
...
...
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