Merge remote-tracking branch 'origin/developer' into developerC

# Conflicts:
#	src/main/resources/templates/product/list.html

src/main/resources/static/js/product/list.js

@@ -316,7 +316,7 @@ var productList = new Vue({
     created: function () {
         var _self = this
         if(isPC){
-            this.params.size = getUrlParam("pageSize") ? getUrlParam("pageSize") * 1 : 20;
+            this.params.size = getUrlParam("pageSize") ? getUrlParam("pageSize") * 1 : 24;
             this.params.num = getUrlParam("pageNum") ? getUrlParam("pageNum") * 1 : 1;
             this.hrefBrandId = getUrlParam("bpn") ? getUrlParam("bpn") : null; //bpn 品牌链接参数
             this.params.promotionFlag = getUrlParam("pro") ? getUrlParam("pro")*1 : 0; // pro 促销商品链接参数

src/main/resources/templates/product/instruelist.html

@@ -130,21 +130,21 @@
                             @click="toSortList('sales',0)"><span>销量</span></li>
                             <li v-else-if="params.sortField == 'sales' && params.sortType == 0" class="up"
                             @click="toSortList('sales',1)"><span>销量</span></li>
-                            <li v-else @click="toSortList('sales',0)"><span>销量</span></li>
+                            <li v-else @click="toSortList('sales',1)"><span>销量</span></li>
                         </template>
                         <template>
                              <li v-if="params.sortField == 'favorite' && params.sortType == 1" class="down"
                             @click="toSortList('favorite',0)"><span>人气</span></li>
                             <li v-else-if="params.sortField == 'favorite' && params.sortType == 0" class="up"
                             @click="toSortList('favorite',1)"><span>人气</span></li>
-                            <li v-else @click="toSortList('favorite',0)"><span>人气</span></li>
+                            <li v-else @click="toSortList('favorite',1)"><span>人气</span></li>
                         </template>
                         <template>
                              <li v-if="params.sortField == 'price' && params.sortType == 1" class="down"
                             @click="toSortList('price',0)"><span>价格</span></li>
                             <li v-else-if="params.sortField == 'price' && params.sortType == 0" class="up"
                             @click="toSortList('price',1)"><span>价格</span></li>
-                            <li v-else @click="toSortList('price',0)"><span>价格</span></li>
+                            <li v-else @click="toSortList('price',1)"><span>价格</span></li>
                         </template>
                         <template v-if="!isPC">
                             <li class="screen" @click="showIsProductScreen">

src/main/resources/templates/product/list.html

@@ -99,21 +99,21 @@
                         @click="toSortList('sales',0)"><span>销量</span></li>
                     <li v-else-if="params.sortField == 'sales' && params.sortType == 0" class="up"
                         @click="toSortList('sales',1)"><span>销量</span></li>
-                    <li v-else @click="toSortList('sales',0)"><span>销量</span></li>
+                    <li v-else @click="toSortList('sales',1)"><span>销量</span></li>
                 </template>
                 <template>
                     <li v-if="params.sortField == 'favorite' && params.sortType == 1" class="down"
                         @click="toSortList('favorite',0)"><span>人气</span></li>
                     <li v-else-if="params.sortField == 'favorite' && params.sortType == 0" class="up"
                         @click="toSortList('favorite',1)"><span>人气</span></li>
-                    <li v-else @click="toSortList('favorite',0)"><span>人气</span></li>
+                    <li v-else @click="toSortList('favorite',1)"><span>人气</span></li>
                 </template>
                 <template>
                     <li v-if="params.sortField == 'price' && params.sortType == 1" class="down"
                         @click="toSortList('price',0)"><span>价格</span></li>
                     <li v-else-if="params.sortField == 'price' && params.sortType == 0" class="up"
                         @click="toSortList('price',1)"><span>价格</span></li>
-                    <li v-else @click="toSortList('price',0)"><span>价格</span></li>
+                    <li v-else @click="toSortList('price',1)"><span>价格</span></li>
                 </template>
                 <template v-if="!isPC">
                     <li class="screen" @click="showIsProductScreen">