diff --git a/app.wxss b/app.wxss
index b934552..6493ef4 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/addaddress/shuru/shuru.scss b/components/addaddress/shuru/shuru.scss
index d97cf43..5b3b250 100644
--- a/components/addaddress/shuru/shuru.scss
+++ b/components/addaddress/shuru/shuru.scss
@@ -25,11 +25,10 @@
color: #333333;
}
.arrow {
- width: 14rpx;
+ width: 21rpx;
height: 25rpx;
- background-color: #999999;
margin: auto 0;
- margin-left: 27rpx;
+ margin-left: 20rpx;
}
}
}
\ No newline at end of file
diff --git a/components/addaddress/shuru/shuru.wxml b/components/addaddress/shuru/shuru.wxml
index 656aec5..ac61d10 100644
--- a/components/addaddress/shuru/shuru.wxml
+++ b/components/addaddress/shuru/shuru.wxml
@@ -2,7 +2,7 @@
{{left}}
{{right}}
-
+
diff --git a/components/addaddress/shuru/shuru.wxss b/components/addaddress/shuru/shuru.wxss
index a162ced..946a7ad 100644
--- a/components/addaddress/shuru/shuru.wxss
+++ b/components/addaddress/shuru/shuru.wxss
@@ -1 +1 @@
-.shuru{width:670rpx;height:100rpx;border-bottom:2rpx solid #E8E8E8;margin:0 auto;display:flex;justify-content:space-between;line-height:100rpx;font-size:28rpx}.shuru .left{color:#333333}.shuru .right{margin:auto 0;display:flex}.shuru .right .shuru1{width:280rpx;text-align:right}.shuru .right .shurupla{color:#999999;font-size:28rpx}.shuru .right .shurupla1{color:#333333}.shuru .right .arrow{width:14rpx;height:25rpx;background-color:#999999;margin:auto 0;margin-left:27rpx}
+.shuru{width:670rpx;height:100rpx;border-bottom:2rpx solid #E8E8E8;margin:0 auto;display:flex;justify-content:space-between;line-height:100rpx;font-size:28rpx}.shuru .left{color:#333333}.shuru .right{margin:auto 0;display:flex}.shuru .right .shuru1{width:280rpx;text-align:right}.shuru .right .shurupla{color:#999999;font-size:28rpx}.shuru .right .shurupla1{color:#333333}.shuru .right .arrow{width:21rpx;height:25rpx;margin:auto 0;margin-left:20rpx}
diff --git a/pages/classify/classify.js b/pages/classify/classify.js
index a3c657f..ee9df71 100644
--- a/pages/classify/classify.js
+++ b/pages/classify/classify.js
@@ -14,20 +14,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function(options) {
- request({
- url: "Goods/goodsCategoryList",
- data: {
- parent_id: 2
- }
-
- }).then((res) => {
- // console.log(res)
- this.setData({
- type: res.data.result
- })
- this.select({detail:{id:res.data.result[0].id}})
- console.log(this.data.type, 150)
- })
+
},
select(a){
@@ -59,7 +46,20 @@ Page({
* 生命周期函数--监听页面显示
*/
onShow: function() {
-
+ request({
+ url: "Goods/goodsCategoryList",
+ data: {
+ parent_id: 2
+ }
+
+ }).then((res) => {
+ // console.log(res)
+ this.setData({
+ type: res.data.result
+ })
+ this.select({detail:{id:res.data.result[0].id}})
+ console.log(this.data.type, 150)
+ })
},
/**
diff --git a/pages/index/index.js b/pages/index/index.js
index ce05ab8..ec46ade 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -7,6 +7,12 @@ Page({
adlist:[]
},
onLoad(){
+
+ },
+ searchs(){
+ console.log(10)
+ },
+ onShow(){
request({
url:"Goods/hotGoodsList",
data:{
@@ -34,8 +40,5 @@ Page({
adlist:res.data.data
})
})
- },
- searchs(){
- console.log(10)
}
})
diff --git a/pages/personal/personal.js b/pages/personal/personal.js
index c6199a0..4e7baf6 100644
--- a/pages/personal/personal.js
+++ b/pages/personal/personal.js
@@ -105,7 +105,7 @@ Page({
this.setData({
username:res.data.data.nick_name,
img:res.data.data.head_pic,
- frozen_money:res.data.data.frozen_money,
+ frozen_money:res.data.data.user_money,
level:res.data.data.level,
yj:res.data.data.is_distribut
})
diff --git a/pages/product/product.scss b/pages/product/product.scss
index 631a165..51ea603 100644
--- a/pages/product/product.scss
+++ b/pages/product/product.scss
@@ -1,5 +1,6 @@
.box{
+ @import "../../utils/wxParse/wxParse.wxss";
border-top: 1rpx solid #eaeaea;
display: flex;
flex-direction: column;
diff --git a/pages/product/product.wxss b/pages/product/product.wxss
index a97e1c9..c9dbd9e 100644
--- a/pages/product/product.wxss
+++ b/pages/product/product.wxss
@@ -1 +1 @@
-.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}
+@import "../../utils/wxParse/wxParse.wxss";.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/yue/yue.wxml b/pages/yue/yue.wxml
index e8beb72..87738ea 100644
--- a/pages/yue/yue.wxml
+++ b/pages/yue/yue.wxml
@@ -9,7 +9,7 @@
￥
-
+
确定
diff --git a/utils/img/right.png b/utils/img/right.png
new file mode 100644
index 0000000..f18d4ba
Binary files /dev/null and b/utils/img/right.png differ