Commit 0a1648a7 by 赵雅纹

Merge branch 'fixbug-ZYW' into 'dev_7.1.0'

Fixbug zyw

See merge request !153
parents ef6bf2b6 c482af98
......@@ -17,7 +17,8 @@
</view>
</view>
<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>
<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>
......
......@@ -90,10 +90,18 @@
line-height: 88rpx;
width: 750rpx;
text-align: center;
z-index: 9999;
background-color: #999;
}
.share-image{
width: 24rpx;
vertical-align: middle;
margin-right: 10rpx;
}
.share-text{
color: #ffffff;
font-size: 26rpx;
z-index: 9999;
background-color: rgba(255, 255, 255, 0.2);
vertical-align: middle;
}
.card_content{
......
......@@ -9,7 +9,8 @@
</view>
</view>
<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>
<!-- <image src="{{codeImg}}"></image> -->
......
......@@ -212,8 +212,16 @@
line-height: 88rpx;
width: 750rpx;
text-align: center;
z-index: 9999;
background-color: #999;
}
.share-image{
width: 24rpx;
vertical-align: middle;
margin-right: 10rpx;
}
.share-text{
color: #ffffff;
font-size: 26rpx;
z-index: 9999;
background-color: rgba(255, 255, 255, 0.2);
vertical-align: middle;
}
\ No newline at end of file
......@@ -10,7 +10,7 @@
</view>
</view>
<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>
<button
wx:if="{{!currentHasUserInfo}}"
......
......@@ -16,7 +16,6 @@
width: 712rpx;
/* height: 200rpx; */
border-radius: 17rpx;
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
margin: 10rpx auto;
text-align: center;
/* line-height: 200rpx; */
......@@ -25,6 +24,7 @@
width: 712rpx;
/* height: 200rpx; */
border-radius: 17rpx;
box-shadow: 0px 0px 10rpx 0px rgba(0, 0, 0, 0.1);
}
.num {
color: rgba(51, 51, 51, 1);
......
......@@ -44,7 +44,7 @@
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="circle-radio theme-color">
<image class="tick-success" src="/assets/imgs/7_1_0/tick-success.png" mode="widthFix"></image>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment