From 3902f2ae2dbd8f13ea8f60c218fee435f427e825 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Tue, 1 Jan 2019 02:53:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/appmini/old/wechat/app.wxss | 16 +++---- .../wechat/components/icon-nav/icon-nav.js | 2 +- .../wechat/components/icon-nav/icon-nav.wxml | 8 ++-- .../wechat/components/icon-nav/icon-nav.wxss | 28 +++++++---- .../old/wechat/components/popup/popup.wxss | 1 + .../old/wechat/components/slider/slider.wxml | 4 +- .../old/wechat/components/slider/slider.wxss | 7 ++- .../node_modules/mini-antui/es/grid/index.js | 2 +- .../mini-antui/es/swipe-action/index.js | 2 +- .../node_modules/mini-antui/es/tabs/index.js | 2 +- .../node_modules/mini-antui/es/vtabs/index.js | 2 +- .../wechat/pages/answer-form/answer-form.js | 2 +- .../wechat/pages/answer-list/answer-list.js | 2 +- public/appmini/old/wechat/pages/buy/buy.js | 4 +- public/appmini/old/wechat/pages/cart/cart.js | 12 ++--- .../pages/goods-attribute/goods-attribute.js | 2 +- .../pages/goods-category/goods-category.js | 37 +++++++------- .../pages/goods-category/goods-category.json | 2 - .../pages/goods-category/goods-category.wxml | 37 +++++++------- .../pages/goods-category/goods-category.wxss | 48 ++++++++++++++++--- .../wechat/pages/goods-detail/goods-detail.js | 9 +++- .../pages/goods-detail/goods-detail.wxml | 9 ++-- .../pages/goods-detail/goods-detail.wxss | 15 ++++-- .../wechat/pages/goods-search/goods-search.js | 4 +- .../pages/goods-search/goods-search.json | 2 +- .../pages/goods-search/goods-search.wxml | 6 +-- .../pages/goods-search/goods-search.wxss | 19 +++++--- .../appmini/old/wechat/pages/index/index.js | 10 ---- .../appmini/old/wechat/pages/login/login.js | 2 +- .../old/wechat/pages/message/message.js | 2 +- .../user-address-save/user-address-save.js | 2 +- .../wechat/pages/user-address/user-address.js | 2 +- .../user-answer-list/user-answer-list.js | 2 +- .../old/wechat/pages/user-faovr/user-faovr.js | 6 +-- .../user-goods-browse/user-goods-browse.js | 6 +-- .../pages/user-integral/user-integral.js | 2 +- .../user-order-detail/user-order-detail.js | 2 +- .../old/wechat/pages/user-order/user-order.js | 18 +++---- public/appmini/old/wechat/pages/user/user.js | 2 +- 39 files changed, 195 insertions(+), 145 deletions(-) diff --git a/public/appmini/old/wechat/app.wxss b/public/appmini/old/wechat/app.wxss index 2c4e8c478..69bb3c302 100755 --- a/public/appmini/old/wechat/app.wxss +++ b/public/appmini/old/wechat/app.wxss @@ -229,21 +229,21 @@ textarea { } .bg-main, .bg-primary, .bg-warning { - color: #fff; + color: #fff !important; border: 0; font-size: 34rpx; } .bg-main { - background: #d2364c; + background-color: #d2364c !important; } .bg-primary { - background: #ed6977; + background-color: #ed6977 !important; } .bg-warning { - background: #F37B1D; + background-color: #F37B1D !important; } .bg-active-main { - background: #d2364c !important; + background-color: #d2364c !important; color: #fff !important; } @@ -254,15 +254,15 @@ textarea { border-radius: 0; } .bg-main.a-button-disabled { - background: #fbe0e5; + background-color: #fbe0e5; color: #f7b6c2; } .bg-warning.a-button-disabled { - background: #ffcda6; + background-color: #ffcda6; color: #fdae70; } .bg-primary.a-button-disabled { - background: #ffd2d7; + background-color: #ffd2d7; color: #ffa0ab; } diff --git a/public/appmini/old/wechat/components/icon-nav/icon-nav.js b/public/appmini/old/wechat/components/icon-nav/icon-nav.js index 0a3fb3e59..f3d8e94b8 100755 --- a/public/appmini/old/wechat/components/icon-nav/icon-nav.js +++ b/public/appmini/old/wechat/components/icon-nav/icon-nav.js @@ -5,7 +5,7 @@ Component({ propData: Array }, methods: { - nav_event(e) { + navigation_event(e) { app.operation_event(e); }, }, diff --git a/public/appmini/old/wechat/components/icon-nav/icon-nav.wxml b/public/appmini/old/wechat/components/icon-nav/icon-nav.wxml index 7290f708d..d2c567708 100755 --- a/public/appmini/old/wechat/components/icon-nav/icon-nav.wxml +++ b/public/appmini/old/wechat/components/icon-nav/icon-nav.wxml @@ -1,10 +1,10 @@ - + - - + + - {{item.name}} + {{item.name}} \ No newline at end of file diff --git a/public/appmini/old/wechat/components/icon-nav/icon-nav.wxss b/public/appmini/old/wechat/components/icon-nav/icon-nav.wxss index 3547f4a38..f704c0df8 100755 --- a/public/appmini/old/wechat/components/icon-nav/icon-nav.wxss +++ b/public/appmini/old/wechat/components/icon-nav/icon-nav.wxss @@ -1,20 +1,28 @@ .data-list { - overflow: hidden; + overflow: hidden; + background: #fff; + margin-bottom: 20rpx; } .data-list .items { - width: calc(25% - 60rpx); - float: left; - padding: 30rpx; + width: calc(25% - 60rpx); + float: left; + padding: 30rpx; } .items-content { - border-radius: 50%; - padding: 20rpx; + border-radius: 50%; + padding: 20rpx; } .data-list .items image { - width: 80rpx !important; - height: 80rpx !important; + width: 80rpx !important; + height: 80rpx !important; } .data-list .items .title { - margin-top: 10rpx; - font-size: 32rpx; + margin-top: 10rpx; + font-size: 32rpx; + text-align:center; + -o-text-overflow: ellipsis; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + max-width: 100%; } \ No newline at end of file diff --git a/public/appmini/old/wechat/components/popup/popup.wxss b/public/appmini/old/wechat/components/popup/popup.wxss index e0cd78583..ac62b9017 100644 --- a/public/appmini/old/wechat/components/popup/popup.wxss +++ b/public/appmini/old/wechat/components/popup/popup.wxss @@ -1,5 +1,6 @@ .am-popup-content { position: fixed; + background:#fff; } .am-popup-mask { diff --git a/public/appmini/old/wechat/components/slider/slider.wxml b/public/appmini/old/wechat/components/slider/slider.wxml index 1c84cbd0c..a2d9c5923 100755 --- a/public/appmini/old/wechat/components/slider/slider.wxml +++ b/public/appmini/old/wechat/components/slider/slider.wxml @@ -4,11 +4,11 @@ indicator-active-color="{{indicator_active_color}}" autoplay="{{propData.length > 0}}" circular="{{circular}}" - class="banner bg-white spacing-mb" + class="banner" wx:if="{{propData.length > 0}}"> - + \ No newline at end of file diff --git a/public/appmini/old/wechat/components/slider/slider.wxss b/public/appmini/old/wechat/components/slider/slider.wxss index c3a6ff6f0..9feda56c4 100755 --- a/public/appmini/old/wechat/components/slider/slider.wxss +++ b/public/appmini/old/wechat/components/slider/slider.wxss @@ -1,3 +1,8 @@ .banner { - height: 320rpx!important; + height: 320rpx!important; + background: #fff; + margin-bottom: 20rpx; +} +.banner image { + width: 100%; } \ No newline at end of file diff --git a/public/appmini/old/wechat/node_modules/mini-antui/es/grid/index.js b/public/appmini/old/wechat/node_modules/mini-antui/es/grid/index.js index 2f075a2cb..de2a03e97 100755 --- a/public/appmini/old/wechat/node_modules/mini-antui/es/grid/index.js +++ b/public/appmini/old/wechat/node_modules/mini-antui/es/grid/index.js @@ -24,7 +24,7 @@ Component({ onGridItemClick: function onGridItemClick(e) { this.props.onGridItemClick({ detail: { - index: e.target.dataset.index + index: e.currentTarget.dataset.index } }); } diff --git a/public/appmini/old/wechat/node_modules/mini-antui/es/swipe-action/index.js b/public/appmini/old/wechat/node_modules/mini-antui/es/swipe-action/index.js index 5cf891c53..0c5363d93 100755 --- a/public/appmini/old/wechat/node_modules/mini-antui/es/swipe-action/index.js +++ b/public/appmini/old/wechat/node_modules/mini-antui/es/swipe-action/index.js @@ -213,7 +213,7 @@ Component({ var holdSwipe = this.data.holdSwipe; if (onRightItemClick) { - var index = e.target.dataset.index; + var index = e.currentTarget.dataset.index; onRightItemClick({ index: index, diff --git a/public/appmini/old/wechat/node_modules/mini-antui/es/tabs/index.js b/public/appmini/old/wechat/node_modules/mini-antui/es/tabs/index.js index ec8894a55..2268837e3 100755 --- a/public/appmini/old/wechat/node_modules/mini-antui/es/tabs/index.js +++ b/public/appmini/old/wechat/node_modules/mini-antui/es/tabs/index.js @@ -54,7 +54,7 @@ Component({ } }, handleTabClick: function handleTabClick(e) { - var index = e.target.dataset.index; + var index = e.currentTarget.dataset.index; if (this.props.onTabClick) { diff --git a/public/appmini/old/wechat/node_modules/mini-antui/es/vtabs/index.js b/public/appmini/old/wechat/node_modules/mini-antui/es/vtabs/index.js index 9bd7b3042..eea5d0129 100755 --- a/public/appmini/old/wechat/node_modules/mini-antui/es/vtabs/index.js +++ b/public/appmini/old/wechat/node_modules/mini-antui/es/vtabs/index.js @@ -75,7 +75,7 @@ Component({ } }, handleTabClick: function handleTabClick(e) { - var _e$target$dataset = e.target.dataset, + var _e$target$dataset = e.currentTarget.dataset. anchor = _e$target$dataset.anchor, index = _e$target$dataset.index; diff --git a/public/appmini/old/wechat/pages/answer-form/answer-form.js b/public/appmini/old/wechat/pages/answer-form/answer-form.js index 458ce1ca8..78864b406 100755 --- a/public/appmini/old/wechat/pages/answer-form/answer-form.js +++ b/public/appmini/old/wechat/pages/answer-form/answer-form.js @@ -7,7 +7,7 @@ Page({ onLoad() {}, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.answer_form}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.answer_form}); this.init(); }, diff --git a/public/appmini/old/wechat/pages/answer-list/answer-list.js b/public/appmini/old/wechat/pages/answer-list/answer-list.js index 2dd67d265..b8bcdd4f3 100755 --- a/public/appmini/old/wechat/pages/answer-list/answer-list.js +++ b/public/appmini/old/wechat/pages/answer-list/answer-list.js @@ -13,7 +13,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.answer_list}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.answer_list}); }, get_data_list(is_mandatory) { diff --git a/public/appmini/old/wechat/pages/buy/buy.js b/public/appmini/old/wechat/pages/buy/buy.js index af52962f5..d134c3bc7 100755 --- a/public/appmini/old/wechat/pages/buy/buy.js +++ b/public/appmini/old/wechat/pages/buy/buy.js @@ -36,7 +36,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.buy}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.buy}); this.init(); this.setData({is_first: 0}); }, @@ -194,7 +194,7 @@ Page({ // 支付方式选择 payment_event(e) { - this.setData({ payment_id: e.target.dataset.value}); + this.setData({ payment_id: e.currentTarget.dataset.value}); this.payment_list_data(this.data.payment_list); }, diff --git a/public/appmini/old/wechat/pages/cart/cart.js b/public/appmini/old/wechat/pages/cart/cart.js index d4ad24260..1d059d8b5 100755 --- a/public/appmini/old/wechat/pages/cart/cart.js +++ b/public/appmini/old/wechat/pages/cart/cart.js @@ -12,7 +12,7 @@ Page({ }, onShow() { - wx.setNavigationBar({ title: app.data.common_pages_title.cart }); + wx.setNavigationBarTitle({ title: app.data.common_pages_title.cart }); this.init(); }, @@ -105,15 +105,15 @@ Page({ // 数量输入事件 goods_buy_number_blur(e) { - var index = e.target.dataset.index || 0; + var index = e.currentTarget.dataset.index || 0; var buy_number = parseInt(e.detail.value) || 1; this.goods_buy_number_func(index, buy_number); }, // 数量操作事件 goods_buy_number_event(e) { - var index = e.target.dataset.index || 0; - var type = parseInt(e.target.dataset.type) || 0; + var index = e.currentTarget.dataset.index || 0; + var type = parseInt(e.currentTarget.dataset.type) || 0; var temp_buy_number = parseInt(this.data.data_list[index]['stock']); if (type == 0) { var buy_number = temp_buy_number - 1; @@ -280,7 +280,7 @@ Page({ // 选中处理 selectedt_event(e) { - var type = e.target.dataset.type || null; + var type = e.currentTarget.dataset.type || null; if (type != null) { var temp_data_list = this.data.data_list; @@ -296,7 +296,7 @@ Page({ // 节点操作 case 'node' : - var index = e.target.dataset.index || 0; + var index = e.currentTarget.dataset.index || 0; temp_data_list[index]['selected'] = (temp_data_list[index]['selected'] == true) ? false : true; break; } diff --git a/public/appmini/old/wechat/pages/goods-attribute/goods-attribute.js b/public/appmini/old/wechat/pages/goods-attribute/goods-attribute.js index 86cd33e2a..8259322f7 100755 --- a/public/appmini/old/wechat/pages/goods-attribute/goods-attribute.js +++ b/public/appmini/old/wechat/pages/goods-attribute/goods-attribute.js @@ -20,6 +20,6 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.goods_attribute}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_attribute}); }, }); diff --git a/public/appmini/old/wechat/pages/goods-category/goods-category.js b/public/appmini/old/wechat/pages/goods-category/goods-category.js index b63bdd5a9..2b91cfda7 100755 --- a/public/appmini/old/wechat/pages/goods-category/goods-category.js +++ b/public/appmini/old/wechat/pages/goods-category/goods-category.js @@ -7,10 +7,11 @@ Page({ data_list_loding_status: 1, data_bottom_line_status: false, data_list: [], + data_content: [], }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.goods_category}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_category}); this.init(); }, @@ -32,15 +33,15 @@ Page({ wx.stopPullDownRefresh(); if (res.data.code == 0) { var data = res.data.data; - - // tabs - for(var i in data) { - data[i]['title'] = data[i]['name']; - data[i]['anchor'] = data[i]['id']; + var data_content = []; + if (data.length > 0) + { + data[0]['active'] = 'nav-active'; + data_content = data[0]['items']; } - this.setData({ data_list: data, + data_content: data_content, data_list_loding_status: data.length == 0 ? 0 : 3, data_bottom_line_status: true, }); @@ -76,22 +77,22 @@ Page({ this.init(); }, - // 处理事件 - handle_event(index) { + // 导航事件 + nav_event(e) { + var index = e.currentTarget.dataset.index; + var temp_data = this.data.data_list; + for(var i in temp_data) + { + temp_data[i]['active'] = (index == i) ? 'nav-active' : ''; + } this.setData({ - tab_active: index, - }); - }, - - // tab改变 - change_event(index) { - this.setData({ - tab_active: index, + data_list: temp_data, + data_content: temp_data[index]['items'], }); }, // 事件 category_event(e) { - wx.navigateTo({url: '/pages/goods-search/goods-search?category_id='+e.target.dataset.value}); + wx.navigateTo({ url: '/pages/goods-search/goods-search?category_id=' + e.currentTarget.dataset.value}); } }); \ No newline at end of file diff --git a/public/appmini/old/wechat/pages/goods-category/goods-category.json b/public/appmini/old/wechat/pages/goods-category/goods-category.json index d381efdd2..b55b5a254 100755 --- a/public/appmini/old/wechat/pages/goods-category/goods-category.json +++ b/public/appmini/old/wechat/pages/goods-category/goods-category.json @@ -1,6 +1,4 @@ { "usingComponents": { - "vtabs": "mini-antui/es/vtabs/index", - "vtab-content": "mini-antui/es/vtabs/vtab-content/index" } } \ No newline at end of file diff --git a/public/appmini/old/wechat/pages/goods-category/goods-category.wxml b/public/appmini/old/wechat/pages/goods-category/goods-category.wxml index 745a38eda..f55960e21 100755 --- a/public/appmini/old/wechat/pages/goods-category/goods-category.wxml +++ b/public/appmini/old/wechat/pages/goods-category/goods-category.wxml @@ -1,25 +1,20 @@ - - - - - - - - {{v.name}} - - - - + + + + {{item.name}} + - + + + + + + + {{v.name}} + + + + diff --git a/public/appmini/old/wechat/pages/goods-category/goods-category.wxss b/public/appmini/old/wechat/pages/goods-category/goods-category.wxss index 7d0a85424..6b9bb2497 100755 --- a/public/appmini/old/wechat/pages/goods-category/goods-category.wxss +++ b/public/appmini/old/wechat/pages/goods-category/goods-category.wxss @@ -1,9 +1,45 @@ -.content { - border-left: 1px solid #eee; - box-sizing: border-box; - overflow: hidden; - padding-bottom: 120rpx; - min-height: 100vh; +/** + 左侧导航 +*/ +.left-nav { + height: 100vh; + background: #ececec; + width: 230rpx; + overflow-x: hidden; + overflow-y: auto; +} +.left-nav .items { + height: 120rpx; + line-height: 120rpx; + font-size: 34rpx; + padding: 0 10rpx; + text-align: center; + color: #666; + border-left: 3px solid #ececec; + border-right: 3px solid #ececec; +} +.left-nav .items:not(:last-child) { + border-bottom: 1px solid #e6e6e6; +} +.nav-active { + border-left: 3px solid #e23f36 !important; + border-right: 3px solid #fff !important; + color: #e23f36; + background: #fff; +} + + +/** + 右侧内容 +*/ +.right-content { + height: 100vh; + width: calc( 100% - 230rpx ); + overflow-x: hidden; + overflow-y: auto; + position: absolute; + top: 0; + right: 0; } .content-items { float: left; diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.js b/public/appmini/old/wechat/pages/goods-detail/goods-detail.js index c330a7fc8..084fe1da9 100755 --- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.js @@ -37,7 +37,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.goods_detail}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_detail}); }, // 获取数据列表 @@ -616,9 +616,14 @@ Page({ // 商品相册图片查看 goods_photo_view_event(e) { var index = e.currentTarget.dataset.index; + var all = []; + for (var i in this.data.goods_photo) + { + all.push(this.data.goods_photo[i]['images']); + } wx.previewImage({ current: index, - urls: this.data.goods_photo + urls: all }); }, diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml index b1783a37b..1d56656fc 100755 --- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml +++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml @@ -10,7 +10,7 @@ wx:if="{{goods_photo.length > 0}}"> - + @@ -20,16 +20,16 @@ {{goods.title}} - - + ￥{{goods.price}} ￥{{goods.original_price}} - + 销量 {{goods.sales_count}} @@ -77,7 +77,6 @@ - diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss index e2915e59e..d51b63f3c 100755 --- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss +++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxss @@ -1,4 +1,4 @@ -.goods-photo .swiper-item { +.goods-photo .swiper-item, swiper { height: 65vh !important; display: block; } @@ -166,11 +166,16 @@ .goods-base { padding: 15rpx 10rpx; } -.goods-base .goods-price .fr { - line-height: 50rpx; +.goods-base button { + background: #fff; +} +.goods-base .goods-price .sales { + position: absolute; + top: 0; + right: 0; } .goods-base .goods-title { - width: calc(100% - 100rpx); + width: calc(100% - 130rpx); font-size: 32rpx; line-height: 44rpx; font-weight: 500; @@ -187,6 +192,8 @@ } .goods-base .goods-price { margin-top: 10rpx; + padding-right: 160rpx; + position: relative; } .page { padding-bottom: 100rpx; diff --git a/public/appmini/old/wechat/pages/goods-search/goods-search.js b/public/appmini/old/wechat/pages/goods-search/goods-search.js index ee1f01c1c..a3955014f 100755 --- a/public/appmini/old/wechat/pages/goods-search/goods-search.js +++ b/public/appmini/old/wechat/pages/goods-search/goods-search.js @@ -23,7 +23,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.goods_search}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.goods_search}); }, // 初始化 @@ -167,7 +167,7 @@ Page({ // 筛选 nav_sort_event(e) { - var index = e.target.dataset.index || 0; + var index = e.currentTarget.dataset.index || 0; var temp_post_data = this.data.post_data; var temp_search_nav_sort = this.data.search_nav_sort_list; var temp_sort = (temp_search_nav_sort[index]['sort'] == 'desc') ? 'asc' : 'desc'; diff --git a/public/appmini/old/wechat/pages/goods-search/goods-search.json b/public/appmini/old/wechat/pages/goods-search/goods-search.json index 2a4ca3ef8..7d179bfd5 100755 --- a/public/appmini/old/wechat/pages/goods-search/goods-search.json +++ b/public/appmini/old/wechat/pages/goods-search/goods-search.json @@ -1,6 +1,6 @@ { "enablePullDownRefresh": true, "usingComponents": { - "popup": "mini-antui/es/popup/index" + "component-popup": "/components/popup/popup" } } \ No newline at end of file diff --git a/public/appmini/old/wechat/pages/goods-search/goods-search.wxml b/public/appmini/old/wechat/pages/goods-search/goods-search.wxml index 5fcaffb09..dc49f49c6 100755 --- a/public/appmini/old/wechat/pages/goods-search/goods-search.wxml +++ b/public/appmini/old/wechat/pages/goods-search/goods-search.wxml @@ -1,7 +1,7 @@ - + {{item.name}} @@ -37,7 +37,7 @@ - +
价格区间(元) @@ -53,4 +53,4 @@ -
 \ No newline at end of file + \ No newline at end of file diff --git a/public/appmini/old/wechat/pages/goods-search/goods-search.wxss b/public/appmini/old/wechat/pages/goods-search/goods-search.wxss index 4c0158677..76de1c8fe 100755 --- a/public/appmini/old/wechat/pages/goods-search/goods-search.wxss +++ b/public/appmini/old/wechat/pages/goods-search/goods-search.wxss @@ -13,6 +13,9 @@ width: 30rpx; height: 30rpx; } +.nav-sort-content .item text, .nav-sort-content .item image { + vertical-align:middle; +} .screening-submit { width: 50rpx; height: 50rpx; @@ -59,8 +62,7 @@ * 条件 */ .popup-form { - height: calc(100vh - 20rpx); - padding: 20rpx 20rpx 0 20rpx; + height: 100vh; } .popup-form input { font-size: 24rpx; @@ -68,19 +70,22 @@ line-height: 50rpx; background: #fbfbfb; border-radius: 6rpx; + padding: 0 6rpx; } .screening-price input { - width: 220rpx; + width: calc(50% - 32rpx); } .screening-price .separator { - margin-top: 20rpx; + margin-top: 10rpx; width: 30rpx; } -.popup-form .keywords input { - width: 490rpx; +.popup-form .item { + width: 480rpx; + padding: 0 20rpx; + margin-top: 20rpx; } .popup-form .item:not(:last-child) { - margin-bottom: 50rpx; + margin-bottom: 30rpx; } .popup-form .item .title { margin-bottom: 10rpx; diff --git a/public/appmini/old/wechat/pages/index/index.js b/public/appmini/old/wechat/pages/index/index.js index b2e0034cb..228a09b73 100755 --- a/public/appmini/old/wechat/pages/index/index.js +++ b/public/appmini/old/wechat/pages/index/index.js @@ -94,16 +94,6 @@ Page({ this.init(); }, - // 轮播事件 - banner_event(e) { - app.operation_event(e); - }, - - // 导航事件 - navigation_event(e) { - app.operation_event(e); - }, - // 自定义分享 onShareAppMessage() { return { diff --git a/public/appmini/old/wechat/pages/login/login.js b/public/appmini/old/wechat/pages/login/login.js index 10ebc8e4f..293a89dea 100755 --- a/public/appmini/old/wechat/pages/login/login.js +++ b/public/appmini/old/wechat/pages/login/login.js @@ -17,7 +17,7 @@ Page({ */ onLoad(option) { // 标题设置 - wx.setNavigationBar({title: '手机绑定'}); + wx.setNavigationBarTitle({title: '手机绑定'}); // 设置用户信息 this.setData({params: option, user: app.GetUserCacheInfo()}); diff --git a/public/appmini/old/wechat/pages/message/message.js b/public/appmini/old/wechat/pages/message/message.js index 3a8497ff3..17d88263b 100755 --- a/public/appmini/old/wechat/pages/message/message.js +++ b/public/appmini/old/wechat/pages/message/message.js @@ -9,7 +9,7 @@ Page({ }, onShow() { - wx.setNavigationBar({ title: app.data.common_pages_title.message }); + wx.setNavigationBarTitle({ title: app.data.common_pages_title.message }); this.init(); }, diff --git a/public/appmini/old/wechat/pages/user-address-save/user-address-save.js b/public/appmini/old/wechat/pages/user-address-save/user-address-save.js index ccd954a2d..828cbda12 100755 --- a/public/appmini/old/wechat/pages/user-address-save/user-address-save.js +++ b/public/appmini/old/wechat/pages/user-address-save/user-address-save.js @@ -27,7 +27,7 @@ Page({ } else { var title = app.data.common_pages_title.user_address_save_edit; } - wx.setNavigationBar({title: title}); + wx.setNavigationBarTitle({title: title}); this.init(); }, diff --git a/public/appmini/old/wechat/pages/user-address/user-address.js b/public/appmini/old/wechat/pages/user-address/user-address.js index dab0fb422..cfb8a8d4d 100755 --- a/public/appmini/old/wechat/pages/user-address/user-address.js +++ b/public/appmini/old/wechat/pages/user-address/user-address.js @@ -13,7 +13,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.user_address}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.user_address}); this.init(); }, diff --git a/public/appmini/old/wechat/pages/user-answer-list/user-answer-list.js b/public/appmini/old/wechat/pages/user-answer-list/user-answer-list.js index 651b57c9c..af97d8729 100755 --- a/public/appmini/old/wechat/pages/user-answer-list/user-answer-list.js +++ b/public/appmini/old/wechat/pages/user-answer-list/user-answer-list.js @@ -11,7 +11,7 @@ Page({ onLoad() {}, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.user_answer_list}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.user_answer_list}); this.init(); }, diff --git a/public/appmini/old/wechat/pages/user-faovr/user-faovr.js b/public/appmini/old/wechat/pages/user-faovr/user-faovr.js index 2cac25dab..2d9d939aa 100755 --- a/public/appmini/old/wechat/pages/user-faovr/user-faovr.js +++ b/public/appmini/old/wechat/pages/user-faovr/user-faovr.js @@ -9,7 +9,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.user_favor}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.user_favor}); this.init(); }, @@ -136,8 +136,8 @@ Page({ success: result => { if (result.confirm) { // 参数 - var id = e.target.dataset.value; - var index = e.target.dataset.index; + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; // 加载loding wx.showLoading({ content: "处理中..." }); diff --git a/public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.js b/public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.js index 149f7fc3f..fb8604aa5 100755 --- a/public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.js +++ b/public/appmini/old/wechat/pages/user-goods-browse/user-goods-browse.js @@ -9,7 +9,7 @@ Page({ }, onShow() { - wx.setNavigationBar({ title: app.data.common_pages_title.user_goods_browse }); + wx.setNavigationBarTitle({ title: app.data.common_pages_title.user_goods_browse }); this.init(); }, @@ -135,8 +135,8 @@ Page({ success: result => { if (result.confirm) { // 参数 - var id = e.target.dataset.value; - var index = e.target.dataset.index; + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; // 加载loding wx.showLoading({ content: "处理中..." }); diff --git a/public/appmini/old/wechat/pages/user-integral/user-integral.js b/public/appmini/old/wechat/pages/user-integral/user-integral.js index 9f42f8419..9d572d020 100755 --- a/public/appmini/old/wechat/pages/user-integral/user-integral.js +++ b/public/appmini/old/wechat/pages/user-integral/user-integral.js @@ -9,7 +9,7 @@ Page({ }, onShow() { - wx.setNavigationBar({ title: app.data.common_pages_title.user_integral }); + wx.setNavigationBarTitle({ title: app.data.common_pages_title.user_integral }); this.init(); }, diff --git a/public/appmini/old/wechat/pages/user-order-detail/user-order-detail.js b/public/appmini/old/wechat/pages/user-order-detail/user-order-detail.js index a6ab1e1f6..c0fc8da51 100755 --- a/public/appmini/old/wechat/pages/user-order-detail/user-order-detail.js +++ b/public/appmini/old/wechat/pages/user-order-detail/user-order-detail.js @@ -15,7 +15,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.user_order_detail}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.user_order_detail}); }, init() { diff --git a/public/appmini/old/wechat/pages/user-order/user-order.js b/public/appmini/old/wechat/pages/user-order/user-order.js index 92ee8e28a..eec25ebd1 100755 --- a/public/appmini/old/wechat/pages/user-order/user-order.js +++ b/public/appmini/old/wechat/pages/user-order/user-order.js @@ -45,7 +45,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.user_order}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.user_order}); }, init() { @@ -198,8 +198,8 @@ Page({ pay_event(e) { this.setData({ is_show_payment_popup: true, - temp_pay_value: e.target.dataset.value, - temp_pay_index: e.target.dataset.index, + temp_pay_value: e.currentTarget.dataset.value, + temp_pay_index: e.currentTarget.dataset.index, }); }, @@ -210,7 +210,7 @@ Page({ // 支付弹窗发起支付 popup_payment_event(e) { - var payment_id = e.target.dataset.value || 0; + var payment_id = e.currentTarget.dataset.value || 0; this.setData({payment_id: payment_id}); this.payment_popup_event_close(); this.pay_handle(this.data.temp_pay_value, this.data.temp_pay_index); @@ -299,8 +299,8 @@ Page({ success: result => { if (result.confirm) { // 参数 - var id = e.target.dataset.value; - var index = e.target.dataset.index; + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; // 加载loding wx.showLoading({ content: "处理中..." }); @@ -352,8 +352,8 @@ Page({ success: result => { if (result.confirm) { // 参数 - var id = e.target.dataset.value; - var index = e.target.dataset.index; + var id = e.currentTarget.dataset.value; + var index = e.currentTarget.dataset.index; // 加载loding wx.showLoading({ content: "处理中..." }); @@ -406,7 +406,7 @@ Page({ // 导航事件 nav_event(e) { this.setData({ - nav_status_index: e.target.dataset.index || 0, + nav_status_index: e.currentTarget.dataset.index || 0, data_page: 1, }); this.get_data_list(1); diff --git a/public/appmini/old/wechat/pages/user/user.js b/public/appmini/old/wechat/pages/user/user.js index 3ad1df792..7e96a74f0 100755 --- a/public/appmini/old/wechat/pages/user/user.js +++ b/public/appmini/old/wechat/pages/user/user.js @@ -47,7 +47,7 @@ Page({ }, onShow() { - wx.setNavigationBar({title: app.data.common_pages_title.user}); + wx.setNavigationBarTitle({title: app.data.common_pages_title.user}); this.init(); },