Merge branch 'master' of git.jqlink.tech:qz-tour/wxapp

components/catalog-filter/index.js

@@ -15,14 +15,14 @@ Component({
   data: {
     filter_idx: 0,
     selected: {
-      sort: 'default',
+      order: 'default',
       region_params:{}
     },
     selected_titles: {
       region: '全部地域',
-      sort: '默认排序'
+      order: '默认排序'
     },
-    sorts: [
+    orders: [
       {
         id: 1,
         name: '默认排序',
@@ -31,11 +31,11 @@ Component({
       {
         id: 2,
         name: '最新发布',
-        value: 'latest'        
+        value: 'new'        
       }, {
         id: 3,
         name: '价格最低',
-        value: 'pricelow'        
+        value: 'price'        
       }
     ],
 
@@ -71,12 +71,12 @@ Component({
    */
   methods: {
     // 排序筛选
-    sortFilter: function (event) {
+    orderFilter: function (event) {
       let item = event.target.dataset.item
       let _selected = this.data.selected
-      _selected.sort = item.value
+      _selected.order = item.value
       let _selected_titles = this.data.selected_titles
-      _selected_titles.sort = item.name
+      _selected_titles.order = item.name
       this.setData({
         filter_idx: 0,
         selected: _selected,

components/catalog-filter/index.wxml

@@ -18,7 +18,7 @@
     <!-- 排序筛选 -->
     <i-col span="11" i-class="col-class">
       <view class="filter-item">
-        <text class="{{filter_idx==2?'active':''}}" catchtap='filterTap' data-idx="2">{{selected_titles.sort}}</text>
+        <text class="{{filter_idx==2?'active':''}}" catchtap='filterTap' data-idx="2">{{selected_titles.order}}</text>
         <image class="search-icon" src="/images/icon-down-select{{filter_idx==2?'ed':''}}.png"></image>
       </view>
     </i-col>
@@ -40,9 +40,9 @@
         </view>
         
         <!-- 排序筛选 -->
-        <view wx:if="{{filter_idx==2}}" class='filter-row' wx:for="{{sorts}}" wx:for-index="idx" wx:for-item="n" wx:key="n.id">
-          <text bindtap="sortFilter" data-idx="{{n.id}}" data-item="{{n}}" class="{{selected.sort==n.value?'seled':''}}">{{n.name}}</text>
-          <image wx:if="{{selected.sort==n.value}}" class='f-selected' src='/images/icon_filter_selected.png'></image>
+        <view wx:if="{{filter_idx==2}}" class='filter-row' wx:for="{{orders}}" wx:for-index="idx" wx:for-item="n" wx:key="n.id">
+          <text bindtap="orderFilter" data-idx="{{n.id}}" data-item="{{n}}" class="{{selected.order==n.value?'seled':''}}">{{n.name}}</text>
+          <image wx:if="{{selected.order==n.value}}" class='f-selected' src='/images/icon_filter_selected.png'></image>
         </view>
 
       </scroll-view>

pages/index/index.wxml

@@ -16,7 +16,7 @@
           <view class='title'>{{n.title}}</view>
           <view class='info'>
             <text class='text-red text-small mergin-right-2'>¥{{common.numFixed(n.vip_price, 0)}}</text>
-            <text> 起/{{n.night_num}}晚</text>
+            <text wx:if="{{n.night_num}}"> 起/{{n.night_num}}晚</text>
           </view>
         </view>
       </i-col>
@@ -34,7 +34,7 @@
           <view class='title'>{{n.title}}</view>
           <view class='info'>
             <text class='text-red text-small mergin-right-2'>¥{{common.numFixed(n.price, 0)}}</text>
-            <text> 起/{{n.night_num}}晚</text>
+            <text wx:if="{{n.night_num}}"> 起/{{n.night_num}}晚</text>
           </view>
         </view>
       </i-col>
@@ -52,7 +52,7 @@
           <view class='title'>{{n.title}}</view>
           <view class='info'>
             <text class='text-red text-small mergin-right-2'>¥{{common.numFixed(n.price, 0)}}</text>
-            <text> 起/{{n.night_num}}晚</text>
+            <text wx:if="{{n.night_num}}"> 起/{{n.night_num}}晚</text>
           </view>
         </view>
       </i-col>

pages/search/list/list.js

@@ -22,7 +22,7 @@ Page({
 
     filters: {
       region_params: {},
-      sort: 'default'
+      order: 'default'
     }
   },
 
@@ -84,7 +84,7 @@ Page({
     }
 
     // 地域和排序
-    params['sort'] = this.data.filters.sort
+    params['order'] = this.data.filters.order
     let region_params = this.data.filters.region_params
     let arr = Object.getOwnPropertyNames(region_params)
     if (arr.length > 0) {