diff --git a/app.wxss b/app.wxss
index 93d8393..6589a0a 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1,4 +1,4 @@
-
+@import "./utils/wxParse/wxParse.wxss"
/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
diff --git a/components/classify/list/index.wxml b/components/classify/list/index.wxml
index 3810e1d..25f6557 100644
--- a/components/classify/list/index.wxml
+++ b/components/classify/list/index.wxml
@@ -5,7 +5,7 @@
{{item.goods_name}}
- ${{item.shop_price}}(¥price)
+ €{{item.shop_price_eur}}(¥{{item.shop_price}})
加入购物车
diff --git a/components/index/list/commodity/index.js b/components/index/list/commodity/index.js
index f5ca40a..6f37f25 100644
--- a/components/index/list/commodity/index.js
+++ b/components/index/list/commodity/index.js
@@ -4,7 +4,8 @@ Component({
title:String,
id:String,
price:String,
- shopid:String
+ shopid:String,
+ shoppriceeur:String
},
data: {},
methods: {
diff --git a/components/index/list/commodity/index.wxml b/components/index/list/commodity/index.wxml
index bbc3df6..8804bb9 100644
--- a/components/index/list/commodity/index.wxml
+++ b/components/index/list/commodity/index.wxml
@@ -5,7 +5,7 @@
{{title}}
- ${{price}}(¥price)
+ €{{shoppriceeur}}(¥{{price}})
加入购物车
diff --git a/components/index/list/index.scss b/components/index/list/index.scss
index 8dc863c..7afe083 100644
--- a/components/index/list/index.scss
+++ b/components/index/list/index.scss
@@ -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;
+ }
}
-
-
- }
\ No newline at end of file
+}
diff --git a/components/index/list/index.wxml b/components/index/list/index.wxml
index cf3530e..f9db8b9 100644
--- a/components/index/list/index.wxml
+++ b/components/index/list/index.wxml
@@ -1,4 +1,7 @@
-
- 热门商品实时汇率:€1=¥{{huilv}}
-
-
\ No newline at end of file
+
+
+ 热门商品
+ 实时汇率:€1=¥{{huilv}}
+
+
+
\ No newline at end of file
diff --git a/components/member/membershop/membershop.js b/components/member/membershop/membershop.js
index 9c5d1e6..ec466f7 100644
--- a/components/member/membershop/membershop.js
+++ b/components/member/membershop/membershop.js
@@ -7,6 +7,7 @@ Component({
img: String,
name: String,
price: String,
+ oprice: String,
gid:String
},
diff --git a/components/member/membershop/membershop.scss b/components/member/membershop/membershop.scss
index ea50292..4071d70 100644
--- a/components/member/membershop/membershop.scss
+++ b/components/member/membershop/membershop.scss
@@ -26,6 +26,9 @@
text-align: center;
font-size: 30rpx;
color: #09BB07;
+ >view:last-child{
+ font-size: 24rpx;
+ }
}
.towline {
overflow: hidden;
diff --git a/components/member/membershop/membershop.wxml b/components/member/membershop/membershop.wxml
index f2a0674..0af713b 100644
--- a/components/member/membershop/membershop.wxml
+++ b/components/member/membershop/membershop.wxml
@@ -1,5 +1,5 @@
{{name}}
-${{price}}
+€{{oprice}}¥{{price}}
\ No newline at end of file
diff --git a/components/member/membershop/membershop.wxss b/components/member/membershop/membershop.wxss
index f56a972..977139b 100644
--- a/components/member/membershop/membershop.wxss
+++ b/components/member/membershop/membershop.wxss
@@ -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}
diff --git a/components/shopping/shoppingitem/shoppingitem.js b/components/shopping/shoppingitem/shoppingitem.js
index 37ca7cd..bc1173b 100644
--- a/components/shopping/shoppingitem/shoppingitem.js
+++ b/components/shopping/shoppingitem/shoppingitem.js
@@ -12,7 +12,8 @@ Component({
gid:Number,
num:Number,
select:Boolean,
- index:Number
+ index:Number,
+ oprice:String
},
/**
diff --git a/components/shopping/shoppingitem/shoppingitem.wxml b/components/shopping/shoppingitem/shoppingitem.wxml
index 24e4918..0bfbcb1 100644
--- a/components/shopping/shoppingitem/shoppingitem.wxml
+++ b/components/shopping/shoppingitem/shoppingitem.wxml
@@ -6,11 +6,14 @@
{{shopname}}
{{shopdesc}}
- ${{price}}
+
+ €{{oprice}}
+ ${{price}}
+
-
{{num}}
+
-
+
\ No newline at end of file
diff --git a/components/shopping/shoppingitem/shoppingitem.wxss b/components/shopping/shoppingitem/shoppingitem.wxss
index c104a67..497147c 100644
--- a/components/shopping/shoppingitem/shoppingitem.wxss
+++ b/components/shopping/shoppingitem/shoppingitem.wxss
@@ -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;
diff --git a/pages/member/member.wxml b/pages/member/member.wxml
index 8d37957..d40d94c 100644
--- a/pages/member/member.wxml
+++ b/pages/member/member.wxml
@@ -2,7 +2,7 @@
-
+
-
-
+
+
会员中心
- {{level == 2 ? "会员":"非会员"}} >
+
+ {{level == 2 ? "会员":"非会员"}}
+ >
+
-
+
我的余额
-
+
当前佣金
-
+
分 享
-
\ No newline at end of file
diff --git a/pages/personal/personal.wxss b/pages/personal/personal.wxss
index 66d9668..6a2aa13 100644
--- a/pages/personal/personal.wxss
+++ b/pages/personal/personal.wxss
@@ -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}
diff --git a/pages/product/product.scss b/pages/product/product.scss
index e5fe704..631a165 100644
--- a/pages/product/product.scss
+++ b/pages/product/product.scss
@@ -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;
diff --git a/pages/product/product.wxml b/pages/product/product.wxml
index f152433..db2c2ba 100644
--- a/pages/product/product.wxml
+++ b/pages/product/product.wxml
@@ -18,7 +18,7 @@
-->
{{info.goods.goods_name}}
- $ {{info.goods.shop_price}}
+ €{{info.goods.shop_price_eur}}¥{{info.goods.shop_price}}
加入购物车
diff --git a/pages/product/product.wxss b/pages/product/product.wxss
index 6fc4f88..a97e1c9 100644
--- a/pages/product/product.wxss
+++ b/pages/product/product.wxss
@@ -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}
diff --git a/pages/shopping/shopping.wxml b/pages/shopping/shopping.wxml
index 3138bf6..d74e81b 100644
--- a/pages/shopping/shopping.wxml
+++ b/pages/shopping/shopping.wxml
@@ -1,6 +1,6 @@
-
+