Commit 548b56d5 by 赵雅纹

Merge branch 'feature-zyw-sc' into 'dev_7.1.0'

Feature zyw sc

See merge request !115
parents fd813fc2 9cf25111
......@@ -111,6 +111,7 @@
wx:for="{{myExtendList}}"
wx:key="{{index}}"
wx:for-item="extendItem"
>
<navigator url="/subPackage/page/pages/orderBenefit/orderBenefit?type={{extendItem.type}}&id={{extendItem.id}}" hover-class="none">
<view class="order-header">
......@@ -120,7 +121,7 @@
<text class="order-status">查看收益</text>
</view>
<view class="pro-list" wx:if="{{extendItem.contentArr}}" >
<image class="pro-img" wx:for="{{extendItem.contentArr}}" wx:for-item="contentItem" wx:key="{{index}}" src="{{contentItem.url}}" />
<image class="pro-img" wx:for="{{extendItem.contentArr}}" wx:for-item="contentItem" wx:key="{{index}}" wx:if="{{index<4}}" src="{{contentItem.url}}" />
<!-- <image class="pro-img" />
<image class="pro-img" />
<image class="pro-img" /> -->
......
......@@ -44,7 +44,7 @@
bindtap="switchPoster"
>
<image class="poster-img" src="{{navItem}}"></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>
......@@ -58,11 +58,13 @@
<view class="poster-tips">
<image src="/assets/imgs/7_1_0/poster-tips.png" mode="widthFix"></image>
</view>
</view>
<!-- 测试 -->
<view class="test" >
<painter customStyle='margin-left:40rpx;z-index:-99999' palette="{{template}}" bind:imgOK="onImgOK" />
<painter palette="{{template}}" bind:imgOK="onImgOK" />
</view>
</view>
<!--goHome-->
<go-home />
\ No newline at end of file
......@@ -16,6 +16,7 @@ page{
background: #f9f9f9;
position: relative;
z-index: 9999;
}
swiper {
......@@ -75,6 +76,7 @@ swiper-item{
position: fixed;
bottom: 20rpx;
padding: 0 18rpx 0 18rpx;
z-index: 9999;
}
.scroll-view_H {
......@@ -146,8 +148,8 @@ swiper-item{
/* 测试 */
.test{
position: absolute;
bottom: 0;
transform: translateY(100%);
bottom:-400rpx;
transform: translateY(-200%);
width: 100vw;
height: 100vh;
/* background: #ffffff; */
......
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