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
943c4544
Commit
943c4544
authored
Sep 19, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixbug-ZYW' into 'dev_7.1.0'
Fixbug zyw See merge request
!137
parents
3204be37
ad2c1f74
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
7 deletions
+14
-7
sharePoster.wxml
src/component/sharePoster/sharePoster.wxml
+1
-1
sharePoster.wxss
src/component/sharePoster/sharePoster.wxss
+3
-3
grassCommunity.js
src/subPackage/page/pages/grassCommunity/grassCommunity.js
+8
-1
myInvite.wxml
src/subPackage/page/pages/myInvite/myInvite.wxml
+1
-1
myReleaseDetail.json
...ubPackage/page/pages/myReleaseDetail/myReleaseDetail.json
+1
-1
No files found.
src/component/sharePoster/sharePoster.wxml
View file @
943c4544
<view class="commodity_screen2" bindtap='closePoste' style='opacity: 0.5;' wx:if="{{showpost}}"></view>
<view class="commodity_screen2" bindtap='closePoste' style='opacity: 0.5;' wx:if="{{showpost}}"
catchtouchmove='false'
></view>
<view class='poste_box' bindlongpress='saveShareImg' hidden='{{!showpost}}'>
<view class='poste_box' bindlongpress='saveShareImg' hidden='{{!showpost}}'>
<view class='poste_content' id='canvas-container'>
<view class='poste_content' id='canvas-container'>
<canvas canvas-id="myCanvas" style="width:100%;height:{{imgHeight}}px;" />
<canvas canvas-id="myCanvas" style="width:100%;height:{{imgHeight}}px;" />
...
...
src/component/sharePoster/sharePoster.wxss
View file @
943c4544
...
@@ -152,7 +152,7 @@
...
@@ -152,7 +152,7 @@
overflow: hidden;
overflow: hidden;
margin-top: 153rpx;
margin-top: 153rpx;
background-color: #fff;
background-color: #fff;
position:
absolute
;
position:
fixed
;
top: 0;
top: 0;
z-index: 9999;
z-index: 9999;
border-radius: 5rpx;
border-radius: 5rpx;
...
@@ -179,13 +179,13 @@
...
@@ -179,13 +179,13 @@
border-radius: 50%;
border-radius: 50%;
}*/
}*/
.showImages{
.showImages{
position:
absolute
;
position:
fixed
;
top: 0;
top: 0;
width: 56rpx;
width: 56rpx;
height: 56rpx;
height: 56rpx;
}
}
.save-poster{
.save-poster{
position:
absolute
;
position:
fixed
;
top: 909rpx;
top: 909rpx;
z-index: 9999;
z-index: 9999;
text-align: center;
text-align: center;
...
...
src/subPackage/page/pages/grassCommunity/grassCommunity.js
View file @
943c4544
...
@@ -261,6 +261,13 @@ wxService.page({
...
@@ -261,6 +261,13 @@ wxService.page({
})
})
return
;
return
;
}
}
if
(
this
.
data
.
params
.
sspList
&&
!
this
.
data
.
params
.
sspList
[
0
].
url
)
{
wx
.
showToast
({
title
:
'请上传至少一张图片'
,
icon
:
'none'
})
return
;
}
if
(
!
e
.
detail
.
value
.
headline
){
if
(
!
e
.
detail
.
value
.
headline
){
wx
.
showToast
({
wx
.
showToast
({
title
:
'请添加标题'
,
title
:
'请添加标题'
,
...
@@ -274,7 +281,7 @@ wxService.page({
...
@@ -274,7 +281,7 @@ wxService.page({
'params.article'
:
e
.
detail
.
value
.
article
'params.article'
:
e
.
detail
.
value
.
article
})
})
this
.
data
.
params
.
sspList
.
forEach
((
item
,
index
)
=>
{
this
.
data
.
params
.
sspList
.
forEach
((
item
,
index
)
=>
{
if
(
index
==
0
){
if
(
index
==
0
){
item
.
cover
=
1
;
item
.
cover
=
1
;
}
}
});
});
...
...
src/subPackage/page/pages/myInvite/myInvite.wxml
View file @
943c4544
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
</view>
</view>
</view> -->
</view> -->
</view>
</view>
<view class="empty">
<view class="empty"
wx:if="{{!inviteMemberList || inviteMemberList.length < 1}}"
>
暂无邀请记录~
暂无邀请记录~
</view>
</view>
</view>
</view>
...
...
src/subPackage/page/pages/myReleaseDetail/myReleaseDetail.json
View file @
943c4544
{
{
"navigationBarTitleText"
:
"种草详情"
,
"navigationBarTitleText"
:
"种草详情"
,
"usingComponents"
:
{
"usingComponents"
:
{
"x-dialog"
:
"/component/dialog/dialog"
,
"x-dialog"
:
"/component/dialog
Grass
/dialog"
,
"card-modal"
:
"/component/cardModal/cardModal"
,
"card-modal"
:
"/component/cardModal/cardModal"
,
"go-home"
:
"/component/goHome/goHome"
,
"go-home"
:
"/component/goHome/goHome"
,
"x-html"
:
"/component/html2wxml/wxHtml"
,
"x-html"
:
"/component/html2wxml/wxHtml"
,
...
...
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