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
0a1648a7
Commit
0a1648a7
authored
Sep 24, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fixbug-ZYW' into 'dev_7.1.0'
Fixbug zyw See merge request
!153
parents
ef6bf2b6
c482af98
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
29 additions
and
10 deletions
+29
-10
cardModal.wxml
src/component/cardModal/cardModal.wxml
+3
-2
cardModal.wxss
src/component/cardModal/cardModal.wxss
+10
-2
sharePoster.wxml
src/component/sharePoster/sharePoster.wxml
+2
-1
sharePoster.wxss
src/component/sharePoster/sharePoster.wxss
+11
-2
myRelease.wxml
src/subPackage/page/pages/myRelease/myRelease.wxml
+1
-1
myRelease.wxss
src/subPackage/page/pages/myRelease/myRelease.wxss
+1
-1
share.wxml
src/subPackage/page/pages/share/share.wxml
+1
-1
No files found.
src/component/cardModal/cardModal.wxml
View file @
0a1648a7
...
@@ -16,8 +16,9 @@
...
@@ -16,8 +16,9 @@
<view class="save-btn-desc">适用于发给小伙伴或聊天群</view>
<view class="save-btn-desc">适用于发给小伙伴或聊天群</view>
</view>
</view>
</view>
</view>
<view class="quick-share" bindtap="gotoPoster" hidden='{{!showCardModal}}'>
<view class="quick-share" bindtap="gotoPoster" hidden='{{!showCardModal}}'>
生成朋友圈海报
<image class="share-image" mode="widthFix" src="/assets/imgs/7_1_0/quick-share-white.png" />
<text class="share-text">生成朋友圈海报</text>
</view>
</view>
</view>
</view>
<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>
...
...
src/component/cardModal/cardModal.wxss
View file @
0a1648a7
...
@@ -90,10 +90,18 @@
...
@@ -90,10 +90,18 @@
line-height: 88rpx;
line-height: 88rpx;
width: 750rpx;
width: 750rpx;
text-align: center;
text-align: center;
z-index: 9999;
background-color: #999;
}
.share-image{
width: 24rpx;
vertical-align: middle;
margin-right: 10rpx;
}
.share-text{
color: #ffffff;
color: #ffffff;
font-size: 26rpx;
font-size: 26rpx;
z-index: 9999;
vertical-align: middle;
background-color: rgba(255, 255, 255, 0.2);
}
}
.card_content{
.card_content{
...
...
src/component/sharePoster/sharePoster.wxml
View file @
0a1648a7
...
@@ -9,7 +9,8 @@
...
@@ -9,7 +9,8 @@
</view>
</view>
</view>
</view>
<view class="quick-share" bindtap="quickShare" hidden='{{!showpost}}'>
<view class="quick-share" bindtap="quickShare" hidden='{{!showpost}}'>
快速分享
<image class="share-image" mode="widthFix" src="/assets/imgs/7_1_0/quick-share-white.png" />
<text class="share-text">快速分享</text>
</view>
</view>
<!-- <image src="{{codeImg}}"></image> -->
<!-- <image src="{{codeImg}}"></image> -->
...
...
src/component/sharePoster/sharePoster.wxss
View file @
0a1648a7
...
@@ -212,8 +212,16 @@
...
@@ -212,8 +212,16 @@
line-height: 88rpx;
line-height: 88rpx;
width: 750rpx;
width: 750rpx;
text-align: center;
text-align: center;
z-index: 9999;
background-color: #999;
}
.share-image{
width: 24rpx;
vertical-align: middle;
margin-right: 10rpx;
}
.share-text{
color: #ffffff;
color: #ffffff;
font-size: 26rpx;
font-size: 26rpx;
z-index: 9999;
vertical-align: middle;
background-color: rgba(255, 255, 255, 0.2);
}
}
\ No newline at end of file
src/subPackage/page/pages/myRelease/myRelease.wxml
View file @
0a1648a7
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
</view>
</view>
</view>
</view>
<view class="diy-banner">
<view class="diy-banner">
<image src="{{bannerUrl ? bannerUrl : '/assets/imgs/7_1_0/coming-soon.jpg'}}" />
<image src="{{bannerUrl ? bannerUrl : '/assets/imgs/7_1_0/coming-soon.jpg'}}"
mode="widthFix"
/>
</view>
</view>
<button
<button
wx:if="{{!currentHasUserInfo}}"
wx:if="{{!currentHasUserInfo}}"
...
...
src/subPackage/page/pages/myRelease/myRelease.wxss
View file @
0a1648a7
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
width: 712rpx;
width: 712rpx;
/* height: 200rpx; */
/* height: 200rpx; */
border-radius: 17rpx;
border-radius: 17rpx;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
margin: 10rpx auto;
margin: 10rpx auto;
text-align: center;
text-align: center;
/* line-height: 200rpx; */
/* line-height: 200rpx; */
...
@@ -25,6 +24,7 @@
...
@@ -25,6 +24,7 @@
width: 712rpx;
width: 712rpx;
/* height: 200rpx; */
/* height: 200rpx; */
border-radius: 17rpx;
border-radius: 17rpx;
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
}
}
.num {
.num {
color: rgba(51, 51, 51, 1);
color: rgba(51, 51, 51, 1);
...
...
src/subPackage/page/pages/share/share.wxml
View file @
0a1648a7
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
bindtap="switchPoster"
bindtap="switchPoster"
>
>
<image class="poster-img" src="{{navItem}}"
mode="aspectFit"
></image>
<image class="poster-img" src="{{navItem}}"></image>
<view class="select-plus" wx:if="{{idx == currentTab}}">
<view class="select-plus" wx:if="{{idx == currentTab}}">
<view class="circle-radio theme-color">
<view class="circle-radio theme-color">
<image class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image>
<image class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image>
...
...
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