Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/view/usercenter/header.html

@@ -219,18 +219,18 @@
             </ul>
         </div>
         <div id="mall-search" class="search-right fr" ng-controller="SearchCtrl">
-            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="型号/类目/品牌" />
+            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="品牌/类目/型号" />
             <a class="seek" ng-click="search()">搜索</a>
             <ul class="association" ng-show="associate || associateEnter"  ng-class="{'none': !associate || !associateEnter}" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()">
-                <li class="similar-title" ng-if="associates.component && associates.component.length > 0">型号：</li>
-                <li ng-repeat="as in associates.component" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.code)"></li>
                 <li class="similar-title" ng-if="associates.component && associates.brand.length > 0">品牌：</li>
                 <li ng-repeat="as in associates.brand" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
                     ng-click="onAssociateClick(as.nameCn)"></li>
                 <li class="similar-title" ng-if="associates.component && associates.kind.length > 0">类目：</li>
                 <li ng-repeat="as in associates.kind" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
                     ng-click="onAssociateClick(as.nameCn)"></li>
+                <li class="similar-title" ng-if="associates.component && associates.component.length > 0">型号：</li>
+                <li ng-repeat="as in associates.component" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.code)"></li>
             </ul>
         </div>
     </div>

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1975,7 +1975,7 @@
 							{{item.userName}}（{{item.userUU}}）
 						</li>
 					</ul>-->
-					<input type="text" class="form-control keyword-material" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/型号/品牌"/>
+					<input type="text" class="form-control keyword-material" ng-model="param.keyword" ng-search="onSearch()" placeholder="品牌/类目/型号"/>
 					<button ng-click="onSearch()">搜索</button>
 					<!--<a ng-click="download()">批量导出</a>-->
 				</div>

src/main/webapp/resources/view/vendor/forstore/vendor_material_person.html

@@ -1833,7 +1833,7 @@
 		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
 			<div class="search-check">
 				<div class="search fl">
-					<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="类目/型号/品牌"/>
+					<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="品牌/类目/型号"/>
 					<button ng-click="onSearch()">搜索</button>
 					<!--<a ng-click="download()">批量导出</a>-->
 				</div>

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -973,7 +973,7 @@
         </div>
         <div class="search-check">
             <div class="search fl check">
-                <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch()" placeholder="产品型号/品牌/编码"/>
+                <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch()" placeholder="品牌/产品型号/编码"/>
                 <button ng-click="onSearch()" style="float: left;">搜索</button>
                 <!--<a ng-click="downGoods()" class="down-goods-btn">批量导出</a>-->
                 <div class="operate-btn more-operate">

src/main/webapp/resources/view/vendor/forstore/vendor_undercarriage.html

@@ -584,7 +584,7 @@
         </div>
         <div class="search-check">
             <div class="search fl">
-                <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch()" placeholder="类目/品牌/型号"/>
+                <input type="text" class="form-control" ng-model="keyword" ng-search="onSearch()" placeholder="品牌/类目/型号"/>
                 <button ng-click="onSearch()">搜索</button>
                 <a ng-click="downGoods()" class="down-goods-btn" style="margin-top:0px">批量导出</a>
                 <form style="display: none;" id="down-load-goods" method="get">

src/main/webapp/resources/view/vendor/header.html

@@ -216,18 +216,19 @@
             </ul>
         </div>
         <div id="mall-search" class="search-right fr" ng-controller="SearchCtrl">
-            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="型号/类目/品牌" />
+            <input type="text" ng-model="keyword" ng-change="onChange()" ng-search="search()" ng-focus="onFocus()" ng-blur="onBlur()" ng-keyup="onKeyup()"placeholder="品牌/类目/型号" />
             <a class="seek" ng-click="search()">搜索</a>
             <ul class="association" ng-show="associate || associateEnter" ng-mouseenter="onAssociateEnter()" ng-mouseleave="onAssociateLeave()" ng-class="{'none': !associate || !associateEnter}">
-                <li class="similar-title" ng-if="associates.component && associates.component.length > 0">型号：</li>
-                <li ng-repeat="as in associates.component" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
-                    ng-click="onAssociateClick(as.code)"></li>
                 <li class="similar-title" ng-if="associates.component && associates.brand.length > 0">品牌：</li>
                 <li ng-repeat="as in associates.brand" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
                     ng-click="onAssociateClick(as.nameCn)"></li>
                 <li class="similar-title" ng-if="associates.component && associates.kind.length > 0">类目：</li>
                 <li ng-repeat="as in associates.kind" ng-bind="as.nameCn" ng-class="{'active': $index==selectIndex}"
                     ng-click="onAssociateClick(as.nameCn)"></li>
+                <li class="similar-title" ng-if="associates.component && associates.component.length > 0">型号：</li>
+                <li ng-repeat="as in associates.component" ng-bind="as.code" ng-class="{'active': $index==selectIndex}"
+                    ng-click="onAssociateClick(as.code)"></li>
+
             </ul>
         </div>
     </div>

src/main/webapp/resources/view/vendor/modal/recommend_product_modal.html

@@ -297,7 +297,7 @@ input[type="number"] {
     <div class="menu">
         <div class="fl">请选择要推荐的产品<em ng-if="isBatch">({{countOfProduct}}/10)</em></div>
         <div class="fr">
-            <span><input type="search" class="form-control search" placeholder="类目/型号/品牌" ng-model="keyword" ng-search="searchProduct()"></span>
+            <span><input type="search" class="form-control search" placeholder="品牌/类目/型号" ng-model="keyword" ng-search="searchProduct()"></span>
             <span>价格:</span>
             <span><input type="text" class="form-control" ng-model="minPrice" min="0" ng-blur="checkPrice('MIN_PRICE')" ng-class="{'error-message': showMinPriceMessage}"></span>
             <span>-</span>