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
8d5c1657
Commit
8d5c1657
authored
Aug 14, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add: 关联商品_列表
parent
57acef2a
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
255 additions
and
67 deletions
+255
-67
relatedOrderItem.js
src/component/relatedOrderItem/relatedOrderItem.js
+34
-0
relatedOrderItem.json
src/component/relatedOrderItem/relatedOrderItem.json
+5
-0
relatedOrderItem.wxml
src/component/relatedOrderItem/relatedOrderItem.wxml
+48
-0
relatedOrderItem.wxss
src/component/relatedOrderItem/relatedOrderItem.wxss
+159
-0
selectRelatedGoods.json
src/component/selectRelatedGoods/selectRelatedGoods.json
+4
-1
selectRelatedGoods.wxml
src/component/selectRelatedGoods/selectRelatedGoods.wxml
+3
-26
selectRelatedGoods.wxss
src/component/selectRelatedGoods/selectRelatedGoods.wxss
+1
-39
grassCommunity.js
src/subPackage/page/pages/grassCommunity/grassCommunity.js
+1
-1
No files found.
src/component/relatedOrderItem/relatedOrderItem.js
0 → 100644
View file @
8d5c1657
// component/relatedOrderItem/relatedOrderItem.js
var
app
=
getApp
()
const
wxService
=
require
(
'../../utils/wxService'
)
const
utils
=
require
(
'../../utils/util'
)
const
envInfo
=
require
(
'../../config/index'
).
envInfo
Component
({
/**
* 组件的属性列表
*/
properties
:
{
},
attached
()
{
},
/**
* 组件的初始数据
*/
data
:
{
isSelect
:
false
},
/**
* 组件的方法列表
*/
methods
:
{
selectCoupon
()
{
console
.
log
(
'2222'
)
this
.
setData
({
isSelect
:
!
this
.
data
.
isSelect
})
},
}
})
src/component/relatedOrderItem/relatedOrderItem.json
0 → 100644
View file @
8d5c1657
{
"component"
:
true
,
"usingComponents"
:
{}
}
\ No newline at end of file
src/component/relatedOrderItem/relatedOrderItem.wxml
0 → 100644
View file @
8d5c1657
<!--component/relatedOrderItem/relatedOrderItem.wxml-->
<!--<view class="grass-item weui-flex border_box">
<view class="grass-img-box">
<image class="grass-img" src="./../../assets/imgs/7_1_0/scancode.png" mode="widthFix" lazy-load="false" binderror="" bindload="" />
</view>
<view class="grass-item-desc border_box">
<view class="item-name">商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称商品名称</view>
</view>
<view class="select-radio">
<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
<image
wx:if="{{isSelect}}"
class="tick-success"
src="/assets/imgs/7_1_0/tick-success.png"
mode="widthFix"
/>
</view>
</view>
</view>-->
<view class="grass-item weui-flex border_box" bindtap="selectCoupon">
<view class="grass-img-box">
<image
class="grass-img"
src="./../../assets/imgs/7_1_0/scancode.png"
mode="widthFix"
lazy-load="false"
binderror=""
bindload=""
/>
</view>
<view class="grass-item-desc border_box">
<view class="item-name">商品名称称商品名称称称商品名称商品名称</view>
</view>
<view class="select-radio">
<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
<image
wx:if="{{isSelect}}"
class="tick-success"
src="/assets/imgs/7_1_0/tick-success.png"
mode="widthFix"
/>
</view>
</view>
</view>
src/component/relatedOrderItem/relatedOrderItem.wxss
0 → 100644
View file @
8d5c1657
/* component/relatedOrderItem/relatedOrderItem.wxss */
@import '/app.wxss';
@import './../../base/base.wxss';
.grass-item {
height: 200rpx;
border-radius: 10rpx;
overflow: hidden;
background-color: rgba(255, 255, 255, 1);
box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.1);
}
.grass-img-box, .grass-img {
width: 200rpx;
height: 200rpx;
}
.grass-item-desc {
margin-left: 28rpx;
}
.item-name {
color: rgba(0, 0, 0, 1);
font-family: PingFangSC-Light;
padding: 20rpx 0 20rpx 0;
width: 400rpx;
height: 74rpx;
color: rgba(0, 0, 0, 1);
font-size: 26rpx;
}
.modal-container {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.5);
transform: translateY(100%);
opacity: 0;
transition: opacity 200ms;
z-index: 98;
}
.modal-container.active {
opacity: 1;
transform: translateY(0); }
.modal-content.active {
transform: translateY(0); }
.modal-content {
position: fixed;
z-index: 99;
width: 100%;
bottom: 0;
left: 0;
background: #ffffff;
transition: transform 300ms;
transform: translateY(100%);
height: 1000rpx;
}
.modal-content .modal-close {
position: absolute;
right: 24rpx;
top: 35rpx;
width: 25rpx;
}
.modal-to-back{
width: 18rpx;
position: absolute;
left: 24rpx;
top: 35rpx;
transform: rotate(180deg);
}
.modal-title{
color: #333333;
font-size: 32rpx;
position: absolute;
left: 295rpx;
top: 28rpx;
}
.coupon-list{
width: 702rpx;
height: 174rpx;
position: relative;
margin-bottom: 25rpx;
}
.coupon-bg{
width: 100%;
position: absolute;
top: 0;
left: 0;
z-index: -1;
}
.left-price,.right-info{
display: inline-block;
}
.left-price{
font-size: 18rpx;
color:#CB3C3C;
position: absolute;
top: 36rpx;
left: 48rpx;
}
.amount{
font-size: 54rpx;
}
.right-info{
position: absolute;
top: 33rpx;
left: 205rpx;
}
.coupon-title{
font-size: 28rpx;
color: #333333;
}
.coupon-time{
color: #aaaaaa;
font-size: 20rpx;
}
.coupon-desc{
color: #aaaaaa;
font-size: 22rpx;
margin-top: 12rpx;
}
.modal-info{
max-height: 900rpx;
overflow: scroll;
}
.empty-coupon{
width: 100%;
color: #aaaaaa;
margin-top:211rpx ;
text-align: center;
}
.coupon-radio{
width: 32rpx;
height: 32rpx;
border-radius: 50%;
border: 1rpx solid rgba(0, 0, 0, 0.2);
line-height: 26rpx;
text-align: center;
}
.tick-success{
width: 18rpx;
}
.select-radio{
position: absolute;
top: 71rpx;
right: 30rpx;
}
.theme-color{
border: none;
}
src/component/selectRelatedGoods/selectRelatedGoods.json
View file @
8d5c1657
{
{
"component"
:
true
,
"component"
:
true
,
"usingComponents"
:
{}
"usingComponents"
:
{
"relate-order-item"
:
"/component/relatedOrderItem/relatedOrderItem"
}
}
}
\ No newline at end of file
src/component/selectRelatedGoods/selectRelatedGoods.wxml
View file @
8d5c1657
...
@@ -19,31 +19,8 @@
...
@@ -19,31 +19,8 @@
</view>
</view>
<view class="coupon-list" bindtap="selectCoupon">
<view class="coupon-list" bindtap="selectCoupon">
<relate-order-item />
<image
<!--
wx:if="{{false}}"
class="coupon-bg"
src="/assets/imgs/7_1_0/coupon-bg.png"
mode="widthFix"
/>
<image class="coupon-bg" src="/assets/imgs/7_1_0/disabled-coupon.png" mode="widthFix" />
<view class="coupon-info">
<view class="left-price">
<view class="top-price">
<text>¥</text>
<text class="amount">50</text>
</view>
<view class="bottom-desc">
满99可用
</view>
</view>
<view class="right-info">
<view class="coupon-title">新人礼包劵</view>
<view class="coupon-time">有效期</view>
<view class="coupon-desc">拼团及特殊商品不可用</view>
</view>
<view class="select-radio">
<view class="select-radio">
<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
<view class="{{isSelect ? 'theme-color' : ''}} coupon-radio">
<image
<image
...
@@ -55,7 +32,7 @@
...
@@ -55,7 +32,7 @@
</view>
</view>
</view>
</view>
</view
>
--
>
</view>
</view>
<view class="empty-coupon">
<view class="empty-coupon">
...
...
src/component/selectRelatedGoods/selectRelatedGoods.wxss
View file @
8d5c1657
...
@@ -94,49 +94,11 @@
...
@@ -94,49 +94,11 @@
position: relative;
position: relative;
margin-bottom: 25rpx;
margin-bottom: 25rpx;
}
}
.coupon-bg {
width: 100%;
position: absolute;
top: 0;
left: 0;
z-index: -1;
}
.modal-info {
.modal-info {
padding: 0 24rpx;
padding: 0 24rpx;
margin-top: 95rpx;
margin-top: 95rpx;
}
}
.left-price,
.right-info {
display: inline-block;
}
.left-price {
font-size: 18rpx;
color: #cb3c3c;
position: absolute;
top: 36rpx;
left: 48rpx;
}
.amount {
font-size: 54rpx;
}
.right-info {
position: absolute;
top: 33rpx;
left: 205rpx;
}
.coupon-title {
font-size: 28rpx;
color: #333333;
}
.coupon-time {
color: #aaaaaa;
font-size: 20rpx;
}
.coupon-desc {
color: #aaaaaa;
font-size: 22rpx;
margin-top: 12rpx;
}
.modal-info {
.modal-info {
max-height: 900rpx;
max-height: 900rpx;
overflow: scroll;
overflow: scroll;
...
...
src/subPackage/page/pages/grassCommunity/grassCommunity.js
View file @
8d5c1657
...
@@ -10,7 +10,7 @@ wxService.page({
...
@@ -10,7 +10,7 @@ wxService.page({
*/
*/
data
:
{
data
:
{
pics
:[],
pics
:[],
showSelectRelatedGoods
:
fals
e
showSelectRelatedGoods
:
tru
e
},
},
/**
/**
...
...
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