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
c304da82
Commit
c304da82
authored
Sep 21, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixbug-ZYW' into 'dev_7.1.0'
Fixbug zyw See merge request
!145
parents
d3261de9
963782c6
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
3 deletions
+21
-3
goHome.wxss
src/component/goHome/goHome.wxss
+1
-0
extendProduct.wxml
src/pages/extendProduct/extendProduct.wxml
+3
-3
myShare.wxss
src/pages/myShare/myShare.wxss
+2
-0
grassCommunity.js
src/subPackage/page/pages/grassCommunity/grassCommunity.js
+14
-0
myRelease.wxss
src/subPackage/page/pages/myRelease/myRelease.wxss
+1
-0
No files found.
src/component/goHome/goHome.wxss
View file @
c304da82
...
...
@@ -14,6 +14,7 @@
font-size: 24rpx;
background-color: rgba(0, 0, 0, 0.2);
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
z-index: 99;
}
.bottom-img .img-top {
width: 82rpx;
...
...
src/pages/extendProduct/extendProduct.wxml
View file @
c304da82
...
...
@@ -151,14 +151,14 @@
<!-- </swiper-item>
</swiper> -->
</view>
<
!-- <share-modal show="{{showShareModal}}" /> --
>
<
!-- <
card-modal
<
share-modal show="{{showShareModal}}" /
>
<card-modal
show-card-modal="{{showCardModal}}"
card-title="{{cardTitle}}"
card-url="{{cardUrl}}"
page-path="{{pagePath}}"
/>
<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}" productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
-->
<share-poster id="getPoster" bindmyevent="myEventListener" avater="{{cardUrl}}" productDesc="{{cardTitle}}" userAvatar="http://t2.hddhhn.com/uploads/tu/201806/9999/91480c0c87.jpg" bind:showMiniCard="_showMiniCard" pagePath="{{pagePath}}" code-img="{{codeImg}}"></share-poster>
<!--goHome-->
<go-home/>
src/pages/myShare/myShare.wxss
View file @
c304da82
...
...
@@ -65,6 +65,8 @@ scroll-view{
position: fixed;
right: 22rpx;
bottom: 35rpx;
z-index: 99;
}
...
...
src/subPackage/page/pages/grassCommunity/grassCommunity.js
View file @
c304da82
...
...
@@ -230,6 +230,9 @@ wxService.page({
sspList
.
splice
(
event
.
currentTarget
.
dataset
.
index
,
1
)
}
}
this
.
setData
({
'params.sspList'
:
sspList
})
},
// 上传视频
...
...
@@ -250,11 +253,15 @@ wxService.page({
sspList
.
splice
(
i
,
1
)
}
}
this
.
setData
({
'params.sspList'
:
sspList
})
},
// 发布笔记
formSubmit
(
e
){
console
.
log
(
'3333'
,
this
.
data
.
params
.
sspList
)
console
.
log
(
'requesting'
,
this
.
data
.
requesting
)
if
(
this
.
data
.
requesting
){
return
;
...
...
@@ -273,6 +280,13 @@ wxService.page({
})
return
;
}
if
(
this
.
data
.
params
.
sspList
&&
this
.
data
.
params
.
sspList
[
0
].
videoUrl
&&
!
this
.
data
.
params
.
sspList
[
1
].
url
)
{
wx
.
showToast
({
title
:
'请上传至少一张图片'
,
icon
:
'none'
})
return
;
}
if
(
!
e
.
detail
.
value
.
headline
){
wx
.
showToast
({
title
:
'请添加标题'
,
...
...
src/subPackage/page/pages/myRelease/myRelease.wxss
View file @
c304da82
...
...
@@ -49,5 +49,6 @@
position: fixed;
right: 22rpx;
bottom: 35rpx;
z-index: 99;
}
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