theluyuan/deguodaigou
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

完成

Browse Source
This commit is contained in:
pplokijuhyg 2020-01-02 18:21:37 +08:00
parent 2ca773a987
commit 00e1b237e1
23 changed files with 78 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.wxss
View File

@ -1,4 +1,4 @@
@import "./utils/wxParse/wxParse.wxss"
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */

2
components/classify/list/index.wxml
View File

@ -5,7 +5,7 @@
<view class="introduce">
<text class="towline">{{item.goods_name}}</text>
<view>
<view>${{item.shop_price}}<text>(￥price)</text></view>
<view>€{{item.shop_price_eur}}<text>(￥{{item.shop_price}})</text></view>
<view>加入购物车</view>
</view>
</view>

3
components/index/list/commodity/index.js
View File

@ -4,7 +4,8 @@ Component({
title:String,
id:String,
price:String,
shopid:String
shopid:String,
shoppriceeur:String
},
data: {},
methods: {

2
components/index/list/commodity/index.wxml
View File

@ -5,7 +5,7 @@
<text class="towline">{{title}}</text>
<view>
<view>${{price}}<text>(￥price)</text></view>
<view>€{{shoppriceeur}}<text>(￥{{price}})</text></view>
<view>加入购物车</view>
</view>
</view>

32
components/index/list/index.scss
View File

@ -1,20 +1,18 @@
.list {
width: 623rpx;
margin-top: 36rpx;
.title {
font-size: 30rpx;
color: #333;
font-weight: bold;
margin-left: 32rpx;
width: 623rpx;
margin-top: 36rpx;
.title {
font-size: 30rpx;
color: #333;
font-weight: bold;
margin-left: 32rpx;
// margin-bottom: 32rpx;
display: flex;
align-items: center;
justify-content: space-between;
>text:last-child{
font-size: 24rpx;
color: #666;
}
}
display: flex;
align-items: center;
justify-content: space-between;
> text:last-child {
font-size: 24rpx;
color: #666;
}
}
}

9
components/index/list/index.wxml
View File

@ -1,4 +1,7 @@
<view class="list">
<view class="title"><text>热门商品</text><text>实时汇率：€1=￥{{huilv}}</text></view>
<commodity wx:for="{{list}}" title="{{item.goods_name}}" price="{{item.shop_price}}" img="{{item.image}}" shopid="{{item.goods_id}}"></commodity>
<view class="list">
<view class="title">
<text>热门商品</text>
<text>实时汇率：€1=￥{{huilv}}</text>
</view>
<commodity wx:for="{{list}}" title="{{item.goods_name}}" price="{{item.shop_price}}" img="{{item.image}}" shopid="{{item.goods_id}}" shoppriceeur="{{item.shop_price_eur}}"></commodity>
</view>

1
components/member/membershop/membershop.js
View File

@ -7,6 +7,7 @@ Component({
img: String,
name: String,
price: String,
oprice: String,
gid:String
},

3
components/member/membershop/membershop.scss
View File

@ -26,6 +26,9 @@
text-align: center;
font-size: 30rpx;
color: #09BB07;
>view:last-child{
font-size: 24rpx;
}
}
.towline {
overflow: hidden;

2
components/member/membershop/membershop.wxml
View File

@ -1,5 +1,5 @@
<view class="membershop" bind:tap="nav">
<image class="pic" src="{{img}}"></image>
<view class="shopname towline">{{name}}</view>
<view class="pri">${{price}}</view>
<view class="pri"><view>€{{oprice}}</view><view>￥{{price}}</view></view>
</view>

2
components/member/membershop/membershop.wxss
View File

@ -1 +1 @@
.membershop{width:373rpx;height:557rpx;background-color:#FBFBFB}.membershop .pic{width:256rpx;height:256rpx;background-color:white;margin:0 auto;position:relative;top:64rpx;left:64rpx}.membershop .shopname{width:273rpx;color:#333333;font-size:30rpx;text-align:center;position:relative;top:111rpx;margin:0 auto}.membershop .pri{position:relative;top:127rpx;text-align:center;font-size:30rpx;color:#09BB07}.membershop .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}
.membershop{width:373rpx;height:557rpx;background-color:#FBFBFB}.membershop .pic{width:256rpx;height:256rpx;background-color:white;margin:0 auto;position:relative;top:64rpx;left:64rpx}.membershop .shopname{width:273rpx;color:#333333;font-size:30rpx;text-align:center;position:relative;top:111rpx;margin:0 auto}.membershop .pri{position:relative;top:127rpx;text-align:center;font-size:30rpx;color:#09BB07}.membershop .pri>view:last-child{font-size:24rpx}.membershop .towline{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2}

3
components/shopping/shoppingitem/shoppingitem.js
View File

@ -12,7 +12,8 @@ Component({
gid:Number,
num:Number,
select:Boolean,
index:Number
index:Number,
oprice:String
},
/**

5
components/shopping/shoppingitem/shoppingitem.wxml
View File

@ -6,7 +6,10 @@
<view class="shopinfo">
<view class="shopname">{{shopname}}</view>
<view class="shopdesc">{{shopdesc}}</view>
<view class="price">${{price}}</view>
<view class="price">
<view>€{{oprice}}</view>
<view>${{price}}</view>
</view>
</view>
<view class="numberset">
<view class="reverse" bind:tap="rm">-</view>

9
components/shopping/shoppingitem/shoppingitem.wxss
View File

@ -1,6 +1,6 @@
.shoppingitem {
width: 639rpx;
height: 186rpx;
/* height: 186rpx; */
display: flex;
justify-content: space-between;
}
@ -59,8 +59,13 @@
font-size: 32rpx;
font-weight: bold;
text-decoration: underline;
display: flex;
align-items: center;
}
.price >view:last-child{
margin-left: 10rpx;
font-size: 20rpx;
}
.numberset {
width: 85rpx;
height: 186rpx;

2
pages/member/member.wxml
View File

@ -2,7 +2,7 @@
<membertop></membertop>
<view class="membershops">
<view class="membershop" wx:for="{{list}}" wx:for-index="j" wx:key="{{j}}">
<membershop name="{{item.goods_name}}" price="{{item.shop_price}}" img="{{item.image}}" gid='{{item.goods_id}}'></membershop>
<membershop name="{{item.goods_name}}" oprice="{{item.shop_price_eur}}" price="{{item.shop_price}}" img="{{item.image}}" gid='{{item.goods_id}}'></membershop>
</view>
<!-- <view class="membershop">
<membershop></membershop>

3
pages/personal/personal.js
View File

@ -106,7 +106,8 @@ Page({
username:res.data.data.nick_name,
img:res.data.data.head_pic,
frozen_money:res.data.data.frozen_money,
level:res.data.data.level
level:res.data.data.level,
yj:res.data.data.is_distribut
})
}

8
pages/personal/personal.scss
View File

@ -3,6 +3,7 @@
display: flex;
flex-direction: column;
align-items: center;
.card{
width: 690rpx;
height: 313rpx;
@ -36,6 +37,13 @@
width: 690rpx;
margin-top: 33rpx;
flex-direction: column;
.option{
border: 0;
outline: 0;
font-weight:initial;
}
.option::after { border: none; }
.option{
width: 100%;
height: 80rpx;

18
pages/personal/personal.wxml
View File

@ -18,26 +18,28 @@
<view>地址管理</view>
<view>></view>
</view>
<view class="option" bindtap="toserver">
<button class="option" open-type="contact">
<view>在线客服</view>
<!-- <view><text style="font-size:28rpx;color:#999;">非会员 </text>></view> -->
</view>
<view class="option" bindtap="tomember">
</button>
<view class="option" bindtap="tomember">
<view>会员中心</view>
<view><text style="font-size:28rpx;color:#999;">{{level == 2 ? "会员":"非会员"}} </text>></view>
<view>
<text style="font-size:28rpx;color:#999;">{{level == 2 ? "会员":"非会员"}}</text>
>
</view>
</view>
<view class="option" bindtap="toyue">
<view class="option" bindtap="toyue">
<view>我的余额</view>
<!-- <view><text style="font-size:28rpx;color:#999;">非会员 </text>></view> -->
</view>
<view class="option" bindtap="toyongjin">
<view class="option" bindtap="toyongjin" wx:if="{{yj == '1'}}">
<view>当前佣金</view>
<!-- <view><text style="font-size:28rpx;color:#999;">非会员 </text>></view> -->
</view>
<view class="option" bindtap="share">
<view class="option" bindtap="share">
<view>分 享</view>
<!-- <view><text style="font-size:28rpx;color:#999;">非会员 </text>></view> -->
</view>
</view>
</view>

2
pages/personal/personal.wxss
View File

@ -1 +1 @@
.box{display:flex;flex-direction:column;align-items:center}.box .card{width:690rpx;height:313rpx;background-color:#47C877;display:flex;box-sizing:border-box;padding:50rpx;font-size:30rpx;flex-direction:column;color:#fff;margin-top:20rpx}.box .card .user{display:flex;align-items:center}.box .card .user .head{width:80rpx;height:80rpx;margin-right:32rpx;border-radius:50%;background-color:#fff}.box .card .balance{display:flex;flex-direction:column;margin-top:52rpx}.box .list{display:flex;width:690rpx;margin-top:33rpx;flex-direction:column}.box .list .option{width:100%;height:80rpx;margin-bottom:15rpx;box-sizing:border-box;padding:0 30rpx;box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);display:flex;align-items:center;justify-content:space-between}
.box{display:flex;flex-direction:column;align-items:center}.box .card{width:690rpx;height:313rpx;background-color:#47C877;display:flex;box-sizing:border-box;padding:50rpx;font-size:30rpx;flex-direction:column;color:#fff;margin-top:20rpx}.box .card .user{display:flex;align-items:center}.box .card .user .head{width:80rpx;height:80rpx;margin-right:32rpx;border-radius:50%;background-color:#fff}.box .card .balance{display:flex;flex-direction:column;margin-top:52rpx}.box .list{display:flex;width:690rpx;margin-top:33rpx;flex-direction:column}.box .list .option{border:0;outline:0;font-weight:initial}.box .list .option::after{border:none}.box .list .option{width:100%;height:80rpx;margin-bottom:15rpx;box-sizing:border-box;padding:0 30rpx;box-shadow:2rpx 3rpx 16rpx 1rpx rgba(51,51,51,0.1);display:flex;align-items:center;justify-content:space-between}

6
pages/product/product.scss
View File

@ -1,4 +1,4 @@
@import "../../utils/wxParse/wxParse.wxss";
.box{
border-top: 1rpx solid #eaeaea;
display: flex;
@ -24,6 +24,10 @@
font-size: 34rpx;
color: #666;
margin-bottom: 70rpx;
>text:last-child{
font-size: 20rpx;
margin-left: 20rpx;
}
}
.add{
width: 308rpx;

2
pages/product/product.wxml
View File

@ -18,7 +18,7 @@
</block> -->
</swiper>
<text class="title">{{info.goods.goods_name}}</text>
<text class="menery">$ {{info.goods.shop_price}}</text>
<view class="menery"><text>€{{info.goods.shop_price_eur}}</text><text>￥{{info.goods.shop_price}}</text></view>
<template is="wxParse" data="{{wxParseData:article.nodes}}"/>
<picker bindchange="bindPickerChange" range="{{info.goods.goods_spec_list != null?info.goods.goods_spec_list[0]:specs}}" range-key="item">
<view class="add">加入购物车</view>

2
pages/product/product.wxss
View File

@ -1 +1 @@
.wxParse{margin:0 5px;font-family:Helvetica,sans-serif;font-size:28rpx;color:#666;line-height:1.8}view{word-break:break-all;overflow:auto}.wxParse-inline{display:inline;margin:0;padding:0}.wxParse-div{margin:0;padding:0}.wxParse-h1{font-size:2em;margin:.67em 0}.wxParse-h2{font-size:1.5em;margin:.75em 0}.wxParse-h3{font-size:1.17em;margin:.83em 0}.wxParse-h4{margin:1.12em 0}.wxParse-h5{font-size:.83em;margin:1.5em 0}.wxParse-h6{font-size:.75em;margin:1.67em 0}.wxParse-h1{font-size:18px;font-weight:400;margin-bottom:.9em}.wxParse-h2{font-size:16px;font-weight:400;margin-bottom:.34em}.wxParse-h3{font-weight:400;font-size:15px;margin-bottom:.34em}.wxParse-h4{font-weight:400;font-size:14px;margin-bottom:.24em}.wxParse-h5{font-weight:400;font-size:13px;margin-bottom:.14em}.wxParse-h6{font-weight:400;font-size:12px;margin-bottom:.04em}.wxParse-h1,.wxParse-h2,.wxParse-h3,.wxParse-h4,.wxParse-h5,.wxParse-h6,.wxParse-b,.wxParse-strong{font-weight:bolder}.wxParse-i,.wxParse-cite,.wxParse-em,.wxParse-var,.wxParse-address{font-style:italic}.wxParse-pre,.wxParse-tt,.wxParse-code,.wxParse-kbd,.wxParse-samp{font-family:monospace}.wxParse-pre{white-space:pre}.wxParse-big{font-size:1.17em}.wxParse-small,.wxParse-sub,.wxParse-sup{font-size:.83em}.wxParse-sub{vertical-align:sub}.wxParse-sup{vertical-align:super}.wxParse-s,.wxParse-strike,.wxParse-del{text-decoration:line-through}.wxParse-strong,.wxParse-s{display:inline}.wxParse-a{color:deepskyblue;word-break:break-all;overflow:auto}.wxParse-video{text-align:center;margin:10px 0}.wxParse-video-video{width:100%}.wxParse-img{overflow:hidden}.wxParse-blockquote{margin:0;padding:10px 0 10px 5px;font-family:Courier, Calibri,"宋体";background:#f5f5f5;border-left:3px solid #dbdbdb}.wxParse-code,.wxParse-wxxxcode-style{display:inline;background:#f5f5f5}.wxParse-ul{margin:20rpx 10rpx}.wxParse-li,.wxParse-li-inner{display:flex;align-items:baseline;margin:10rpx 0}.wxParse-li-text{align-items:center;line-height:20px}.wxParse-li-circle{display:inline-flex;width:5px;height:5px;background-color:#333;margin-right:5px}.wxParse-li-square{display:inline-flex;width:10rpx;height:10rpx;background-color:#333;margin-right:5px}.wxParse-li-ring{display:inline-flex;width:10rpx;height:10rpx;border:2rpx solid #333;border-radius:50%;background-color:#fff;margin-right:5px}.wxParse-u{text-decoration:underline}.wxParse-hide{display:none}.WxEmojiView{align-items:center}.wxEmoji{width:16px;height:16px}.wxParse-tr{display:flex;border-right:1px solid #e0e0e0;border-bottom:1px solid #e0e0e0;border-top:1px solid #e0e0e0}.wxParse-th,.wxParse-td{flex:1;padding:5px;font-size:28rpx;border-left:1px solid #e0e0e0;word-break:break-all}.wxParse-td:last{border-top:1px solid #e0e0e0}.wxParse-th{background:#f0f0f0;border-top:1px solid #e0e0e0}.wxParse-del{display:inline}.wxParse-figure{overflow:hidden}.box{border-top:1rpx solid #eaeaea;display:flex;flex-direction:column;align-items:center}.box .swiper{margin-top:109rpx;width:389rpx;height:657rpx}.box .swiper .image{width:389rpx;height:549rpx}.box .title{font-size:32rpx;color:#333;margin-bottom:34rpx;width:540rpx}.box .menery{font-size:34rpx;color:#666;margin-bottom:70rpx}.box .add{width:308rpx;height:98rpx;background-color:#50CA80;border-radius:49rpx;line-height:98rpx;font-size:34rpx;color:#fff;text-align:center;position:fixed;bottom:50rpx;left:221rpx}
.box{border-top:1rpx solid #eaeaea;display:flex;flex-direction:column;align-items:center}.box .swiper{margin-top:109rpx;width:389rpx;height:657rpx}.box .swiper .image{width:389rpx;height:549rpx}.box .title{font-size:32rpx;color:#333;margin-bottom:34rpx;width:540rpx}.box .menery{font-size:34rpx;color:#666;margin-bottom:70rpx}.box .menery>text:last-child{font-size:20rpx;margin-left:20rpx}.box .add{width:308rpx;height:98rpx;background-color:#50CA80;border-radius:49rpx;line-height:98rpx;font-size:34rpx;color:#fff;text-align:center;position:fixed;bottom:50rpx;left:221rpx}

2
pages/shopping/shopping.wxml
View File

@ -1,6 +1,6 @@
<view class="shopping">
<view class="item" wx:for="{{list}}" wx:for-index="j" wx:key="{{j}}">
<shopping-item bindgai="gai" shopname="{{item.goods_name}}" shopdesc="{{item.spec_key_name||'默认规格'}}" price="{{item.goods_price}}" pic="{{item.image}}" num="{{item.goods_num}}" gid="{{item.id}}" index="{{j}}" select="{{select[j]}}" bindsel="sel"></shopping-item>
<shopping-item bindgai="gai" shopname="{{item.goods_name}}" shopdesc="{{item.spec_key_name||'默认规格'}}" price="{{item.goods_price}}" oprice="{{item.shop_price_eur}}" pic="{{item.image}}" num="{{item.goods_num}}" gid="{{item.id}}" index="{{j}}" select="{{select[j]}}" bindsel="sel"></shopping-item>
</view>
<!-- <view class="item">
<shopping-item shopname="J`adore - Dior" shopdesc="30支 1.30kg" price="61.78"></shopping-item>

2
pages/shopping/shopping.wxss
View File

@ -2,7 +2,7 @@
padding-bottom: 128rpx;
}
.item {
height: 186rpx;
/* height: 186rpx; */
margin-left: 46rpx;
margin-top: 59rpx;
}