diff --git a/litemall-wx/pages/auth/accountLogin/accountLogin.wxml b/litemall-wx/pages/auth/accountLogin/accountLogin.wxml
index 0b075d7a..c9d0c664 100644
--- a/litemall-wx/pages/auth/accountLogin/accountLogin.wxml
+++ b/litemall-wx/pages/auth/accountLogin/accountLogin.wxml
@@ -16,7 +16,7 @@
-
+
-->
diff --git a/litemall-wx/pages/cart/cart.wxss b/litemall-wx/pages/cart/cart.wxss
index b445d5a8..31e5eac8 100644
--- a/litemall-wx/pages/cart/cart.wxss
+++ b/litemall-wx/pages/cart/cart.wxss
@@ -41,15 +41,7 @@ page {
.no-login .c {
width: 100%;
height: auto;
- margin-top: 200rpx;
-}
-
-.no-login .c image {
- margin: 0 auto;
- display: block;
- text-align: center;
- width: 258rpx;
- height: 258rpx;
+ margin-top: 400rpx;
}
.no-login .c text {
diff --git a/litemall-wx/pages/catalog/catalog.wxml b/litemall-wx/pages/catalog/catalog.wxml
index 6d1340a7..d6cc2282 100644
--- a/litemall-wx/pages/catalog/catalog.wxml
+++ b/litemall-wx/pages/catalog/catalog.wxml
@@ -1,7 +1,7 @@
-
+
商品搜索, 共{{goodsCount}}款好物
diff --git a/litemall-wx/pages/catalog/catalog.wxss b/litemall-wx/pages/catalog/catalog.wxss
index 0c8a2f1a..abd0513f 100644
--- a/litemall-wx/pages/catalog/catalog.wxss
+++ b/litemall-wx/pages/catalog/catalog.wxss
@@ -29,11 +29,8 @@ page {
justify-content: center;
}
-.search .icon {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/search2-2fb94833aa.png) center no-repeat;
- background-size: 100%;
- width: 28rpx;
- height: 28rpx;
+.search .van-icon-search {
+ line-height: 56rpx;
}
.search .txt {
diff --git a/litemall-wx/pages/checkout/checkout.wxss b/litemall-wx/pages/checkout/checkout.wxss
index bc6dc30b..c425cf5a 100644
--- a/litemall-wx/pages/checkout/checkout.wxss
+++ b/litemall-wx/pages/checkout/checkout.wxss
@@ -6,7 +6,6 @@ page {
.address-box {
width: 100%;
height: 166.55rpx;
- background: url('http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/address-bg-bd30f2bfeb.png') 0 0 repeat-x;
background-size: 62.5rpx 10.5rpx;
margin-bottom: 20rpx;
padding-top: 10.5rpx;
diff --git a/litemall-wx/pages/hotGoods/hotGoods.js b/litemall-wx/pages/hotGoods/hotGoods.js
index 87ddaca3..867109d0 100644
--- a/litemall-wx/pages/hotGoods/hotGoods.js
+++ b/litemall-wx/pages/hotGoods/hotGoods.js
@@ -5,7 +5,7 @@ var app = getApp();
Page({
data: {
bannerInfo: {
- 'imgUrl': 'http://yanxuan.nosdn.127.net/8976116db321744084774643a933c5ce.png',
+ 'imgUrl': '/static/images/hot.png',
'name': '大家都在买的'
},
categoryFilter: false,
diff --git a/litemall-wx/pages/hotGoods/hotGoods.wxml b/litemall-wx/pages/hotGoods/hotGoods.wxml
index 14698e18..2ef7f5f0 100644
--- a/litemall-wx/pages/hotGoods/hotGoods.wxml
+++ b/litemall-wx/pages/hotGoods/hotGoods.wxml
@@ -15,8 +15,10 @@
综合
-
+
价格
+
+
分类
diff --git a/litemall-wx/pages/hotGoods/hotGoods.wxss b/litemall-wx/pages/hotGoods/hotGoods.wxss
index d0b1d349..07800d29 100644
--- a/litemall-wx/pages/hotGoods/hotGoods.wxss
+++ b/litemall-wx/pages/hotGoods/hotGoods.wxss
@@ -62,6 +62,7 @@ page {
overflow: hidden;
padding: 0 30rpx;
display: flex;
+ align-items: center;
border-bottom: 1px solid #d9d9d9;
}
@@ -75,9 +76,6 @@ page {
}
.sort-box .item .txt {
- display: block;
- width: 100%;
- height: 100%;
color: #333;
}
@@ -85,19 +83,8 @@ page {
color: #b4282d;
}
-.sort-box .item.by-price {
- background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
-}
-
-.sort-box .item.by-price.active.asc {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
-}
-
-.sort-box .item.by-price.active.desc {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
+.sort-box .item .van-icon {
+ margin-left: 6rpx;
}
.sort-box-category {
diff --git a/litemall-wx/pages/newGoods/newGoods.js b/litemall-wx/pages/newGoods/newGoods.js
index 84d4b7c7..ed1d4734 100644
--- a/litemall-wx/pages/newGoods/newGoods.js
+++ b/litemall-wx/pages/newGoods/newGoods.js
@@ -5,7 +5,7 @@ var app = getApp();
Page({
data: {
bannerInfo: {
- 'imgUrl': 'http://yanxuan.nosdn.127.net/8976116db321744084774643a933c5ce.png',
+ 'imgUrl': '/static/images/new.png',
'name': '大家都在买的'
},
categoryFilter: false,
diff --git a/litemall-wx/pages/newGoods/newGoods.wxml b/litemall-wx/pages/newGoods/newGoods.wxml
index 14698e18..2ef7f5f0 100644
--- a/litemall-wx/pages/newGoods/newGoods.wxml
+++ b/litemall-wx/pages/newGoods/newGoods.wxml
@@ -15,8 +15,10 @@
综合
-
+
价格
+
+
分类
diff --git a/litemall-wx/pages/newGoods/newGoods.wxss b/litemall-wx/pages/newGoods/newGoods.wxss
index d0b1d349..b21d5e3e 100644
--- a/litemall-wx/pages/newGoods/newGoods.wxss
+++ b/litemall-wx/pages/newGoods/newGoods.wxss
@@ -75,9 +75,6 @@ page {
}
.sort-box .item .txt {
- display: block;
- width: 100%;
- height: 100%;
color: #333;
}
@@ -85,19 +82,8 @@ page {
color: #b4282d;
}
-.sort-box .item.by-price {
- background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
-}
-
-.sort-box .item.by-price.active.asc {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
-}
-
-.sort-box .item.by-price.active.desc {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
+.sort-box .item .van-icon {
+ margin-left: 6rpx;
}
.sort-box-category {
diff --git a/litemall-wx/pages/search/search.wxml b/litemall-wx/pages/search/search.wxml
index c33dd505..a828f44f 100644
--- a/litemall-wx/pages/search/search.wxml
+++ b/litemall-wx/pages/search/search.wxml
@@ -36,8 +36,10 @@
综合
-
+
价格
+
+
分类
@@ -59,7 +61,6 @@
-
您寻找的商品还未上架
\ No newline at end of file
diff --git a/litemall-wx/pages/search/search.wxss b/litemall-wx/pages/search/search.wxss
index cf719ab5..ece655f9 100644
--- a/litemall-wx/pages/search/search.wxss
+++ b/litemall-wx/pages/search/search.wxss
@@ -180,9 +180,6 @@ page {
}
.sort-box .item .txt {
- display: block;
- width: 100%;
- height: 100%;
color: #333;
}
@@ -190,19 +187,8 @@ page {
color: #b4282d;
}
-.sort-box .item.by-price {
- background: url(//yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/no-3127092a69.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
-}
-
-.sort-box .item.by-price.active.asc {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/up-636b92c0a5.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
-}
-
-.sort-box .item.by-price.active.desc {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/down-95e035f3e5.png) 155rpx center no-repeat;
- background-size: 15rpx 21rpx;
+.sort-box .item .van-icon {
+ margin-left: 6rpx;
}
.sort-box-category {
@@ -319,14 +305,7 @@ page {
.search-result-empty {
width: 100%;
height: 100%;
- padding-top: 300rpx;
-}
-
-.search-result-empty .icon {
- margin: 0 auto;
- display: block;
- width: 240rpx;
- height: 240rpx;
+ padding-top: 600rpx;
}
.search-result-empty .text {
diff --git a/litemall-wx/pages/topicDetail/topicDetail.wxml b/litemall-wx/pages/topicDetail/topicDetail.wxml
index aa968f69..3dc01094 100644
--- a/litemall-wx/pages/topicDetail/topicDetail.wxml
+++ b/litemall-wx/pages/topicDetail/topicDetail.wxml
@@ -49,10 +49,7 @@
diff --git a/litemall-wx/pages/topicDetail/topicDetail.wxss b/litemall-wx/pages/topicDetail/topicDetail.wxss
index 29ec4fe4..7edbfe7f 100644
--- a/litemall-wx/pages/topicDetail/topicDetail.wxss
+++ b/litemall-wx/pages/topicDetail/topicDetail.wxss
@@ -126,13 +126,7 @@
text-align: center;
font-size: 29rpx;
color: #7f7f7f;
-}
-
-.no-comments .icon {
- margin: 48rpx auto 18rpx auto;
- height: 130rpx;
- display: block;
- width: 115rpx;
+ padding-top: 150rpx;
}
.sv-goods {
diff --git a/litemall-wx/pages/ucenter/address/address.wxml b/litemall-wx/pages/ucenter/address/address.wxml
index e14e1b63..c8776aab 100644
--- a/litemall-wx/pages/ucenter/address/address.wxml
+++ b/litemall-wx/pages/ucenter/address/address.wxml
@@ -15,8 +15,7 @@
-
- 收货地址在哪里
+ 收货地址还没有~~~
新建
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/address/address.wxss b/litemall-wx/pages/ucenter/address/address.wxss
index b57371c1..374b36fb 100644
--- a/litemall-wx/pages/ucenter/address/address.wxss
+++ b/litemall-wx/pages/ucenter/address/address.wxss
@@ -11,7 +11,7 @@ page {
.address-list {
padding-left: 31.25rpx;
- background: #fff url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/address-bg-bd30f2bfeb.png) 0 0 repeat-x;
+ background: #fff;
background-size: auto 10.5rpx;
margin-bottom: 90rpx;
}
@@ -124,12 +124,6 @@ page {
justify-content: center;
}
-.empty-view .icon {
- height: 248rpx;
- width: 258rpx;
- margin-bottom: 10rpx;
-}
-
.empty-view .text {
width: auto;
font-size: 28rpx;
diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml b/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml
index ec5d436e..07a06d22 100644
--- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml
+++ b/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxml
@@ -13,7 +13,7 @@
- 设为默认地址
+ 设为默认地址
diff --git a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss b/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss
index b2ec1a34..cd31b96a 100644
--- a/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss
+++ b/litemall-wx/pages/ucenter/addressAdd/addressAdd.wxss
@@ -29,26 +29,14 @@ page {
.add-address .form-default {
border-bottom: 1px solid #d9d9d9;
height: 96rpx;
- background: #fafafa;
+ background: #fff;
padding-top: 28rpx;
font-size: 28rpx;
+ padding-left: 31.25rpx;
}
-.default-input {
- margin: 0 auto;
- display: block;
- width: 240rpx;
- height: 40rpx;
- padding-left: 50rpx;
- line-height: 40rpx;
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/checkbox-sed825af9d3-a6b8540d42.png) 1rpx -448rpx no-repeat;
- background-size: 38rpx 486rpx;
- font-size: 28rpx;
-}
-
-.default-input.selected {
- background: url(http://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/sprites/checkbox-sed825af9d3-a6b8540d42.png) 0 -192rpx no-repeat;
- background-size: 38rpx 486rpx;
+.add-address .form-default .van-checkbox .van-icon {
+ color: #fff;
}
.add-address .btns {
diff --git a/litemall-wx/pages/ucenter/couponList/couponList.wxml b/litemall-wx/pages/ucenter/couponList/couponList.wxml
index 525c0738..fcc95cf3 100644
--- a/litemall-wx/pages/ucenter/couponList/couponList.wxml
+++ b/litemall-wx/pages/ucenter/couponList/couponList.wxml
@@ -22,7 +22,10 @@
兑换
- 使用说明
+
+
+ 使用说明
+
diff --git a/litemall-wx/pages/ucenter/couponList/couponList.wxss b/litemall-wx/pages/ucenter/couponList/couponList.wxss
index f6a06976..eaf1e480 100644
--- a/litemall-wx/pages/ucenter/couponList/couponList.wxss
+++ b/litemall-wx/pages/ucenter/couponList/couponList.wxss
@@ -114,7 +114,6 @@ page {
line-height: 72rpx;
text-align: right;
padding-right: 30rpx;
- background: url(https://yanxuan.nosdn.127.net/hxm/yanxuan-wap/p/20161201/style/img/icon-normal/couponHelp-4768607555.png) 590rpx center no-repeat;
background-size: 28rpx;
color: #999;
font-size: 24rpx;
diff --git a/litemall-wx/pages/ucenter/feedback/feedback.wxml b/litemall-wx/pages/ucenter/feedback/feedback.wxml
index 75dc62ce..9efc339f 100644
--- a/litemall-wx/pages/ucenter/feedback/feedback.wxml
+++ b/litemall-wx/pages/ucenter/feedback/feedback.wxml
@@ -4,8 +4,7 @@
{{array[index]}}
-
-
+
diff --git a/litemall-wx/pages/ucenter/index/index.js b/litemall-wx/pages/ucenter/index/index.js
index 060c0759..dd20700e 100644
--- a/litemall-wx/pages/ucenter/index/index.js
+++ b/litemall-wx/pages/ucenter/index/index.js
@@ -7,7 +7,7 @@ Page({
data: {
userInfo: {
nickName: '点击登录',
- avatarUrl: 'http://yanxuan.nosdn.127.net/8945ae63d940cc42406c3f67019c5cb6.png'
+ avatarUrl: '/static/images/my.png'
},
order: {
unpaid: 0,
diff --git a/litemall-wx/pages/ucenter/index/index.wxml b/litemall-wx/pages/ucenter/index/index.wxml
index f686bd86..4c61d873 100644
--- a/litemall-wx/pages/ucenter/index/index.wxml
+++ b/litemall-wx/pages/ucenter/index/index.wxml
@@ -101,6 +101,7 @@
关于我们
+
退出登录
\ No newline at end of file
diff --git a/litemall-wx/pages/ucenter/index/index.wxss b/litemall-wx/pages/ucenter/index/index.wxss
index 3d303a96..75143ca4 100644
--- a/litemall-wx/pages/ucenter/index/index.wxss
+++ b/litemall-wx/pages/ucenter/index/index.wxss
@@ -144,7 +144,7 @@ page {
flex-wrap: wrap;
float: left;
background: #fff;
- border-bottom: 1px solid #fafafa;
+ border-bottom: 6px solid #fafafa;
}
.user_column_item_phone::after {
diff --git a/litemall-wx/static/images/about.png b/litemall-wx/static/images/about.png
deleted file mode 100644
index bfd522c8..00000000
Binary files a/litemall-wx/static/images/about.png and /dev/null differ
diff --git a/litemall-wx/static/images/address-bg-bd.png b/litemall-wx/static/images/address-bg-bd.png
deleted file mode 100644
index fe06bcd6..00000000
Binary files a/litemall-wx/static/images/address-bg-bd.png and /dev/null differ
diff --git a/litemall-wx/static/images/hot.png b/litemall-wx/static/images/hot.png
new file mode 100644
index 00000000..3bc7a726
Binary files /dev/null and b/litemall-wx/static/images/hot.png differ
diff --git a/litemall-wx/static/images/new.png b/litemall-wx/static/images/new.png
new file mode 100644
index 00000000..e003f91c
Binary files /dev/null and b/litemall-wx/static/images/new.png differ
diff --git a/litemall-wx/static/images/selnum.png b/litemall-wx/static/images/selnum.png
deleted file mode 100644
index 8699194b..00000000
Binary files a/litemall-wx/static/images/selnum.png and /dev/null differ