diff --git a/litemall-wx/pages/goods/goods.wxml b/litemall-wx/pages/goods/goods.wxml
index 8c9c6f0e..c61ee742 100644
--- a/litemall-wx/pages/goods/goods.wxml
+++ b/litemall-wx/pages/goods/goods.wxml
@@ -54,7 +54,10 @@
评价({{comment.count > 999 ? '999+' : comment.count}})
- 查看全部
+
+ 查看全部
+
+
diff --git a/litemall-wx/pages/goods/goods.wxss b/litemall-wx/pages/goods/goods.wxss
index 942677f3..2f4ff42a 100644
--- a/litemall-wx/pages/goods/goods.wxss
+++ b/litemall-wx/pages/goods/goods.wxss
@@ -136,8 +136,7 @@
border: 1px solid #f48f18;
font-size: 25rpx;
color: #f48f18;
- border-radius: 4px;
- background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/detailTagArrow-18bee52dab.png) 95% center no-repeat;
+ border-radius: 4rpx;
background-size: 10.75rpx 18.75rpx;
}
@@ -220,14 +219,13 @@
line-height: 100.5rpx;
width: 718.75rpx;
padding-right: 16rpx;
- border-bottom: 1px solid #d9d9d9;
}
.comments .h .t {
display: block;
float: left;
width: 50%;
- font-size: 38.5rpx;
+ font-size: 30rpx;
color: #333;
}
@@ -237,7 +235,6 @@
width: 164rpx;
height: 100.5rpx;
line-height: 100.5rpx;
- background: url(http://nos.netease.com/mailpub/hxm/yanxuan-wap/p/20150730/style/img/icon-normal/address-right-990628faa7.png) right center no-repeat;
background-size: 52rpx;
}
@@ -250,6 +247,7 @@
height: auto;
width: 720rpx;
overflow: hidden;
+ border-top: 1px solid #d9d9d9;
}
.comments .info {
diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml
index 6d224862..89a1269a 100644
--- a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml
+++ b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxml
@@ -9,7 +9,6 @@
-
尚未参加任何团购
diff --git a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss
index fe1199c6..f73efa37 100644
--- a/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss
+++ b/litemall-wx/pages/groupon/myGroupon/myGroupon.wxss
@@ -43,7 +43,7 @@ page {
.no-order .c {
width: 100%;
height: auto;
- margin-top: 200rpx;
+ margin-top: 400rpx;
}
.no-order .c image {
diff --git a/litemall-wx/pages/index/index.wxml b/litemall-wx/pages/index/index.wxml
index 3be5afa4..31c77f42 100644
--- a/litemall-wx/pages/index/index.wxml
+++ b/litemall-wx/pages/index/index.wxml
@@ -2,7 +2,7 @@
-
+
商品搜索, 共{{goodsCount}}款好物
diff --git a/litemall-wx/pages/index/index.wxss b/litemall-wx/pages/index/index.wxss
index 2d7fa338..a1011994 100644
--- a/litemall-wx/pages/index/index.wxss
+++ b/litemall-wx/pages/index/index.wxss
@@ -512,6 +512,10 @@
align-items: center;
}
+.search .van-icon-search {
+ line-height: 59rpx;
+}
+
.search .input {
width: 690rpx;
height: 56rpx;
@@ -522,13 +526,6 @@
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 .txt {
height: 42rpx;
line-height: 42rpx;
diff --git a/litemall-wx/pages/search/search.wxml b/litemall-wx/pages/search/search.wxml
index e146bf56..c33dd505 100644
--- a/litemall-wx/pages/search/search.wxml
+++ b/litemall-wx/pages/search/search.wxml
@@ -1,9 +1,9 @@
@@ -11,7 +11,7 @@
历史记录
-
+
{{item.keyword}}
diff --git a/litemall-wx/pages/search/search.wxss b/litemall-wx/pages/search/search.wxss
index 47c50c07..cf719ab5 100644
--- a/litemall-wx/pages/search/search.wxss
+++ b/litemall-wx/pages/search/search.wxss
@@ -21,6 +21,10 @@ page {
color: #333;
}
+.search-header .van-icon-search {
+ line-height: 59rpx;
+}
+
.search-header .input-box {
position: relative;
margin-top: 16rpx;
diff --git a/litemall-wx/pages/topicDetail/topicDetail.wxml b/litemall-wx/pages/topicDetail/topicDetail.wxml
index 45fd7e3a..aa968f69 100644
--- a/litemall-wx/pages/topicDetail/topicDetail.wxml
+++ b/litemall-wx/pages/topicDetail/topicDetail.wxml
@@ -27,7 +27,7 @@
diff --git a/litemall-wx/pages/ucenter/collect/collect.wxml b/litemall-wx/pages/ucenter/collect/collect.wxml
index c417b3b2..4bbb7c94 100644
--- a/litemall-wx/pages/ucenter/collect/collect.wxml
+++ b/litemall-wx/pages/ucenter/collect/collect.wxml
@@ -1,7 +1,6 @@
-
还没有收藏
diff --git a/litemall-wx/pages/ucenter/collect/collect.wxss b/litemall-wx/pages/ucenter/collect/collect.wxss
index 14a805f6..49e44f72 100644
--- a/litemall-wx/pages/ucenter/collect/collect.wxss
+++ b/litemall-wx/pages/ucenter/collect/collect.wxss
@@ -20,15 +20,7 @@ page {
.no-collect .c {
width: 100%;
height: auto;
- margin-top: 200rpx;
-}
-
-.no-collect .c image {
- margin: 0 auto;
- display: block;
- text-align: center;
- width: 258rpx;
- height: 258rpx;
+ margin-top: 400rpx;
}
.no-collect .c text {
diff --git a/litemall-wx/pages/ucenter/footprint/footprint.wxml b/litemall-wx/pages/ucenter/footprint/footprint.wxml
index 004115fc..678c8368 100644
--- a/litemall-wx/pages/ucenter/footprint/footprint.wxml
+++ b/litemall-wx/pages/ucenter/footprint/footprint.wxml
@@ -1,7 +1,6 @@
diff --git a/litemall-wx/pages/ucenter/footprint/footprint.wxss b/litemall-wx/pages/ucenter/footprint/footprint.wxss
index 3bedfe22..81eac666 100644
--- a/litemall-wx/pages/ucenter/footprint/footprint.wxss
+++ b/litemall-wx/pages/ucenter/footprint/footprint.wxss
@@ -20,15 +20,7 @@ page {
.no-footprint .c {
width: 100%;
height: auto;
- margin-top: 200rpx;
-}
-
-.no-footprint .c image {
- margin: 0 auto;
- display: block;
- text-align: center;
- width: 258rpx;
- height: 258rpx;
+ margin-top: 400rpx;
}
.no-footprint .c text {
diff --git a/litemall-wx/pages/ucenter/order/order.wxml b/litemall-wx/pages/ucenter/order/order.wxml
index e22d479d..bfd12557 100644
--- a/litemall-wx/pages/ucenter/order/order.wxml
+++ b/litemall-wx/pages/ucenter/order/order.wxml
@@ -18,7 +18,6 @@
-
还没有任何订单呢
diff --git a/litemall-wx/pages/ucenter/order/order.wxss b/litemall-wx/pages/ucenter/order/order.wxss
index 723d4944..c13456be 100644
--- a/litemall-wx/pages/ucenter/order/order.wxss
+++ b/litemall-wx/pages/ucenter/order/order.wxss
@@ -43,15 +43,7 @@ page {
.no-order .c {
width: 100%;
height: auto;
- margin-top: 200rpx;
-}
-
-.no-order .c image {
- margin: 0 auto;
- display: block;
- text-align: center;
- width: 258rpx;
- height: 258rpx;
+ margin-top: 400rpx;
}
.no-order .c text {
diff --git a/litemall-wx/static/images/checkbox.png b/litemall-wx/static/images/checkbox.png
deleted file mode 100644
index 2a686c7e..00000000
Binary files a/litemall-wx/static/images/checkbox.png and /dev/null differ
diff --git a/litemall-wx/static/images/del-address.png b/litemall-wx/static/images/delete.png
similarity index 100%
rename from litemall-wx/static/images/del-address.png
rename to litemall-wx/static/images/delete.png
diff --git a/litemall-wx/static/images/edit-address.png b/litemall-wx/static/images/edit.png
similarity index 100%
rename from litemall-wx/static/images/edit-address.png
rename to litemall-wx/static/images/edit.png