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
548b56d5
Commit
548b56d5
authored
Sep 06, 2019
by
赵雅纹
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature-zyw-sc' into 'dev_7.1.0'
Feature zyw sc See merge request
!115
parents
fd813fc2
9cf25111
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
extendProduct.wxml
src/pages/extendProduct/extendProduct.wxml
+2
-1
share.wxml
src/subPackage/page/pages/share/share.wxml
+6
-3
share.wxss
src/subPackage/page/pages/share/share.wxss
+4
-2
No files found.
src/pages/extendProduct/extendProduct.wxml
View file @
548b56d5
...
...
@@ -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" /> -->
...
...
src/subPackage/page/pages/share/share.wxml
View file @
548b56d5
...
...
@@ -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
src/subPackage/page/pages/share/share.wxss
View file @
548b56d5
...
...
@@ -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(
1
00%);
bottom:
-400rpx
;
transform: translateY(
-2
00%);
width: 100vw;
height: 100vh;
/* background: #ffffff; */
...
...
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