diff --git a/components/m-search-revision/m-search-revision.vue b/components/m-search-revision/m-search-revision.vue index 4beacb0..4318471 100644 --- a/components/m-search-revision/m-search-revision.vue +++ b/components/m-search-revision/m-search-revision.vue @@ -1,20 +1,21 @@ - - diff --git a/components/ms-dropdown/dropdown-menu.vue b/components/ms-dropdown/dropdown-menu.vue deleted file mode 100644 index 5d26ed2..0000000 --- a/components/ms-dropdown/dropdown-menu.vue +++ /dev/null @@ -1,35 +0,0 @@ - - - - - diff --git a/components/uni-icons/icons.js b/components/uni-icons/icons.js deleted file mode 100644 index 9160518..0000000 --- a/components/uni-icons/icons.js +++ /dev/null @@ -1,132 +0,0 @@ -export default { - "pulldown": "\ue588", - "refreshempty": "\ue461", - "back": "\ue471", - "forward": "\ue470", - "more": "\ue507", - "more-filled": "\ue537", - "scan": "\ue612", - "qq": "\ue264", - "weibo": "\ue260", - "weixin": "\ue261", - "pengyouquan": "\ue262", - "loop": "\ue565", - "refresh": "\ue407", - "refresh-filled": "\ue437", - "arrowthindown": "\ue585", - "arrowthinleft": "\ue586", - "arrowthinright": "\ue587", - "arrowthinup": "\ue584", - "undo-filled": "\ue7d6", - "undo": "\ue406", - "redo": "\ue405", - "redo-filled": "\ue7d9", - "bars": "\ue563", - "chatboxes": "\ue203", - "camera": "\ue301", - "chatboxes-filled": "\ue233", - "camera-filled": "\ue7ef", - "cart-filled": "\ue7f4", - "cart": "\ue7f5", - "checkbox-filled": "\ue442", - "checkbox": "\ue7fa", - "arrowleft": "\ue582", - "arrowdown": "\ue581", - "arrowright": "\ue583", - "smallcircle-filled": "\ue801", - "arrowup": "\ue580", - "circle": "\ue411", - "eye-filled": "\ue568", - "eye-slash-filled": "\ue822", - "eye-slash": "\ue823", - "eye": "\ue824", - "flag-filled": "\ue825", - "flag": "\ue508", - "gear-filled": "\ue532", - "reload": "\ue462", - "gear": "\ue502", - "hand-thumbsdown-filled": "\ue83b", - "hand-thumbsdown": "\ue83c", - "hand-thumbsup-filled": "\ue83d", - "heart-filled": "\ue83e", - "hand-thumbsup": "\ue83f", - "heart": "\ue840", - "home": "\ue500", - "info": "\ue504", - "home-filled": "\ue530", - "info-filled": "\ue534", - "circle-filled": "\ue441", - "chat-filled": "\ue847", - "chat": "\ue263", - "mail-open-filled": "\ue84d", - "email-filled": "\ue231", - "mail-open": "\ue84e", - "email": "\ue201", - "checkmarkempty": "\ue472", - "list": "\ue562", - "locked-filled": "\ue856", - "locked": "\ue506", - "map-filled": "\ue85c", - "map-pin": "\ue85e", - "map-pin-ellipse": "\ue864", - "map": "\ue364", - "minus-filled": "\ue440", - "mic-filled": "\ue332", - "minus": "\ue410", - "micoff": "\ue360", - "mic": "\ue302", - "clear": "\ue434", - "smallcircle": "\ue868", - "close": "\ue404", - "closeempty": "\ue460", - "paperclip": "\ue567", - "paperplane": "\ue503", - "paperplane-filled": "\ue86e", - "person-filled": "\ue131", - "contact-filled": "\ue130", - "person": "\ue101", - "contact": "\ue100", - "images-filled": "\ue87a", - "phone": "\ue200", - "images": "\ue87b", - "image": "\ue363", - "image-filled": "\ue877", - "location-filled": "\ue333", - "location": "\ue303", - "plus-filled": "\ue439", - "plus": "\ue409", - "plusempty": "\ue468", - "help-filled": "\ue535", - "help": "\ue505", - "navigate-filled": "\ue884", - "navigate": "\ue501", - "mic-slash-filled": "\ue892", - "search": "\ue466", - "settings": "\ue560", - "sound": "\ue590", - "sound-filled": "\ue8a1", - "spinner-cycle": "\ue465", - "download-filled": "\ue8a4", - "personadd-filled": "\ue132", - "videocam-filled": "\ue8af", - "personadd": "\ue102", - "upload": "\ue402", - "upload-filled": "\ue8b1", - "starhalf": "\ue463", - "star-filled": "\ue438", - "star": "\ue408", - "trash": "\ue401", - "phone-filled": "\ue230", - "compose": "\ue400", - "videocam": "\ue300", - "trash-filled": "\ue8dc", - "download": "\ue403", - "chatbubble-filled": "\ue232", - "chatbubble": "\ue202", - "cloud-download": "\ue8e4", - "cloud-upload-filled": "\ue8e5", - "cloud-upload": "\ue8e6", - "cloud-download-filled": "\ue8e9", - "headphones":"\ue8bf", - "store":"\ue609" -} diff --git a/components/uni-icons/uni-icons.vue b/components/uni-icons/uni-icons.vue deleted file mode 100644 index 5f303e4..0000000 --- a/components/uni-icons/uni-icons.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/components/uni-status-bar/uni-status-bar.vue b/components/uni-status-bar/uni-status-bar.vue deleted file mode 100644 index af15275..0000000 --- a/components/uni-status-bar/uni-status-bar.vue +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/pages.json b/pages.json index f82445a..0690b0b 100644 --- a/pages.json +++ b/pages.json @@ -40,9 +40,16 @@ "style": { "navigationBarTitleText": "搜索", "navigationStyle": "custom", + "app-plus": { //app页面不显示滚动条 - "scrollIndicator": "none" + "scrollIndicator": "none", + "bottom": "0", + "contentAdjust": "false", + "bounce": "none", + "safearea": { + "bottom": "none" + } } } }, { @@ -443,14 +450,7 @@ { "root": "pages/promotion", - "pages": [{ - "path": "sale", - "style": { - "navigationBarTitleText": "特惠推荐", - "navigationStyle": "custom" - - } - }, { + "pages": [ { "path": "seckill", "style": { "navigationBarTitleText": "限时抢购", @@ -473,13 +473,6 @@ "bounce": "none" } } - }, { - "path": "recommend", - "style": { - "navigationBarTitleText": "人气推荐", - "navigationStyle": "custom" - - } },{ "path": "lives", "style": { @@ -718,7 +711,7 @@ ] } ], - "globalStyle": { + "globalStyle": { "navigationBarTextStyle": "black", "navigationBarTitleText": "Lili商城", "titleColor": "#303133", diff --git a/pages/mine/set/feedBack.vue b/pages/mine/set/feedBack.vue index c2f3400..a12ad6d 100644 --- a/pages/mine/set/feedBack.vue +++ b/pages/mine/set/feedBack.vue @@ -2,7 +2,7 @@

猜你想问

- @@ -130,6 +130,10 @@ export default { margin: 0 auto; border-radius: 100px; } +.active{ + color: $light-color !important; + font-weight: bold; +} .feedBack { padding-bottom: 100rpx; } diff --git a/pages/navigation/search/search.scss b/pages/navigation/search/search.scss index dd0b84e..e4f2fdd 100644 --- a/pages/navigation/search/search.scss +++ b/pages/navigation/search/search.scss @@ -35,13 +35,6 @@ } } } - -/deep/ .u-row { - // #ifdef MP-WEIXIN - padding: 0 5%; - // #endif -} - .status_bar { height: var(--status-bar-height); background: #fff !important; @@ -121,7 +114,7 @@ page { font-size: 24rpx; } .flex { - margin: 30rpx 0; + flex-wrap: wrap; align-items: center; > .sort-brand-item { @@ -138,47 +131,36 @@ page { height: 100vh; overflow: hidden; } -.storeSellerBox { - // #ifndef MP-WEIXIN - padding: 16rpx !important; - - // #endif -} -.goodsClass { - padding: 0 20rpx; - - /deep/ .u-row { - } -} .index-nav-arrow:last-child { margin-top: -22rpx; } - +.line1-store-name{ + font-size: 24rpx; + color: #999; +} +.to-store{ + font-size: 24rpx; + color: #333; + margin-left: 10rpx; +} .img { width: 26rpx; height: 26rpx; } -.goodsRow { - /deep/ .u-row { - // #ifdef MP-WEIXIN - padding: 0%; - background: #fff; - // padding: 16rpx; - border-radius: 0.4em; - margin: 0 !important; - - // #endif - } - +.goods-row { background: #fff; - border-radius: 0.4em; - margin: 20rpx 0; - // #ifdef MP-WEIXIN - margin: 10rpx 0; - // #endif - padding: 0 16rpx; - width: 100%; + padding: 16rpx; + + >.goods-col{ + display: flex; + >.goods-img{ + flex: 4; + } + >.goods-detail{ + flex: 7; + } + } } .add1 { @@ -192,21 +174,14 @@ page { border-bottom: 1px solid #eeeeee; } -.logimg { - width: 40rpx; - height: 40rpx; - vertical-align: middle; -} .clamp3 { - padding-top: 30rpx; margin-bottom: 10rpx; font-size: 28rpx; color: #333333; - font-weight: 400; display: -webkit-box; - line-height: 40rpx; + height: 80rpx; -webkit-box-orient: vertical; -webkit-line-clamp: 2 !important; @@ -217,25 +192,12 @@ page { } } -.switchType1 { - width: 50%; - overflow: hidden; - text-align: center; - > .img { - width: 182rpx; - height: 200rpx; - } -} -.imgGoods { - width: 182rpx; - height: 200rpx; -} view { display: block; } -.storeSellerName { +.store-seller-name { color: #666; overflow: hidden; @@ -248,7 +210,7 @@ view { } } -.countConfig { +.count-config { padding: 10rpx 0; color: #666; display: flex; @@ -635,16 +597,15 @@ view { overflow: hidden; } - .countConfig, - .storeSellerName { + .count-config, + .store-seller-name { font-size: $font-sm; } - .textHidden { + .text-hidden { + overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } } diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue index 6d387b0..a3f80af 100644 --- a/pages/navigation/search/searchPage.vue +++ b/pages/navigation/search/searchPage.vue @@ -82,53 +82,49 @@
-
- - - - - - - -
{{ item.content.goodsName }}
- -
- ¥{{ formatPrice(item.content.price )[0] }} .{{ +
+
+
+
+ + + +
+
+
{{ item.content.goodsName }}
+ +
+ ¥{{ formatPrice(item.content.price )[0] }} .{{ formatPrice(item.content.price )[1] }} +
+ +
+
+ 劵 + 满减 + 秒杀 +
- -
-
+
+ 已售 {{ item.content.buyCount || '0' }} + {{ item.content.commentNum || '0' }}条评论 +
+
+
+ + {{ item.content.storeName }} + 进店 +
+ + + +
+
+
- 劵 - 满减 - 秒杀 -
-
-
- 已售 {{ item.buyCount || '0' }} - {{ item.commentNum || '0' }}条评论 -
- - -
-
- - - {{ item.storeName }} -
- - - -
- - +
@@ -153,36 +149,33 @@ - - + + -
{{ item.content.goodsName }}
- +
{{ item.content.goodsName }}
+
- ¥{{ formatPrice(item.content.price )[0] }} .{{ formatPrice(item.content.price )[1] }}
-
+
- 劵 满减 秒杀
-
+
已售 {{ item.content.buyCount || "0" }} {{ item.content.commentNum || "0" }}条评论
-
-
+
+
{{ item.content.storeName || "暂无" }} @@ -275,6 +268,7 @@ + @@ -287,6 +281,7 @@ import storage from "@/utils/storage"; export default { data() { return { + scrollTop: 0, loadIndex: 10, oldKeywordIndex: "", selectedWay: { @@ -345,9 +340,13 @@ export default { routerVal: "", }; }, + onPageScroll(e) { + console.log(e) + this.scrollTop = e.scrollTop; + }, onLoad(val) { this.init(); -// this.initSortGoods(); + // this.initSortGoods(); // 接收分类的数据 this.routerVal = val; @@ -367,7 +366,6 @@ export default { this.isShowSeachGoods = true; } this.loadData(); - }, components: { mSearch, @@ -546,11 +544,18 @@ export default { delta: 1, }); }, + // 跳转到商品详情 navigateToDetailPage(item) { uni.navigateTo({ url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`, }); }, + // 跳转地址 + navigateToStoreDetailPage(item) { + uni.navigateTo({ + url: `/pages/product/shopPage?id=${item.content.storeId}`, + }); + }, loadmore() { this.params.pageNumber++; this.loadData(); diff --git a/pages/order/afterSales/afterSalesSelect.vue b/pages/order/afterSales/afterSalesSelect.vue index 779eca3..876db31 100644 --- a/pages/order/afterSales/afterSalesSelect.vue +++ b/pages/order/afterSales/afterSalesSelect.vue @@ -34,7 +34,7 @@ 退货 退回收到的商品 - + @@ -46,7 +46,7 @@ 退款 退款商品返还金额 - + @@ -55,13 +55,8 @@ - - diff --git a/pages/promotion/sale.vue b/pages/promotion/sale.vue deleted file mode 100644 index 6c36be8..0000000 --- a/pages/promotion/sale.vue +++ /dev/null @@ -1,251 +0,0 @@ - - - - -