Merge branch 'dev-mysql' into feature_release-tomysql

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_onSaleCtrl.js

@@ -514,8 +514,7 @@ define([ 'app/app' ], function(app) {
                     tag = tag.parentElement;
                 }
             };
-            window.open("/store/"+
-                commodity.storeid+"/" + commodity.batchCode);
+            window.open("/store/productDetail/" + commodity.batchCode);
         };
 
         /**

src/main/webapp/resources/view/common/sidebar.html

@@ -409,7 +409,7 @@
 						</div>
 					</dd>-->
 					<dd ng-repeat="item in history | limitTo : 8">
-						<a ng-show="item.status== 1" href="{{'store/' + item.storeid + '/' + item.batchCode}}" target="_blank"><span title="{{item.code}}" ng-bind="item.code"></span></a>
+						<a ng-show="item.status== 1" href="{{'store/productDetail/' + item.batchCode}}" target="_blank"><span title="{{item.code}}" ng-bind="item.code"></span></a>
 						<a ng-show="item.status== 0" disabled="disabled"><span sytle="color:#999;" title="{{item.code}}" ng-bind="item.code"></span></a>
 						<div class="hover-shows">
 							<em ng-class="{ 'off' : item.status== 0}"></em>

src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html

@@ -620,12 +620,12 @@
 							</span>
 							<span  class="wid24">
 								<div class="pro_xq">
-									<a href="store/{{store.arr[0].storeUuid}}/{{::cart.batchCode}}" target="_blank">
+									<a href="store/productDetail/{{::cart.batchCode}}" target="_blank">
                                         <img ng-src="{{cart.img || 'static/img/store/common/default.png'}}" width="60" height="60"/></a>
 									<div class="car_pro_xq">
 									    <i class="text-hidden" ng-if="!cart.uuid">类目：<a ng-bind="::cart.kiName || '-'" title="{{::cart.kiName}}" class="unstand"></a></i>
 									    <i class="text-hidden" ng-if="cart.uuid">类目：<a href="product/kind/{{cart.goods.kindUuid}}" target="_blank" ng-bind="::cart.kiName" title="{{::cart.kiName}}"></a></i>
-									    <i class="text-hidden">型号：<a href="store/{{store.arr[0].storeUuid}}/{{::cart.batchCode}}" target="_blank" ng-bind="::cart.code || '-'" title="{{::cart.code}}"></a></i>
+									    <i class="text-hidden">型号：<a href="store/productDetail/{{::cart.batchCode}}" target="_blank" ng-bind="::cart.code || '-'" title="{{::cart.code}}"></a></i>
 									   <i class="text-hidden" ng-if="!cart.uuid">品牌：<a ng-bind="::cart.goods.brandNameEn || '-'" title="{{::cart.goods.brandNameEn}}" class="unstand"></a></i>
 									   <i class="text-hidden" ng-if="cart.uuid">品牌：<a href="product/brand/{{::cart.goods.branduuid}}/" target="_blank" ng-bind="::cart.goods.brandNameEn" title="{{::cart.goods.brandNameEn}}"></a></i>
 									</div>
@@ -710,7 +710,7 @@
 											<ul>
 												<li ng-repeat="similar in cart.similarities">
 													<div class="img">
-														<a href="store/{{similar.storeid}}/{{::similar.batchCode}}"><img ng-src="{{similar.img || 'static/img/store/common/default.png'}}" alt="" /></a>
+														<a href="store/productDetail/{{::similar.batchCode}}"><img ng-src="{{similar.img || 'static/img/store/common/default.png'}}" alt="" /></a>
 													</div>
 													<div class="content">
 														<p class="red" ng-if="similar.minPriceRMB">

src/main/webapp/resources/view/usercenter/forstore/buyer_order.html

@@ -842,11 +842,11 @@
 						</span>
 						<span class="wd02" ng-class="{true : 'order-border-bottom-solid',false : 'order-border-bottom-dashed'}[$index == order.orderDetails.length - 1 || $index == 2]">
 							<div class="pro_xq">
-								<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
+								<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
 								<p>
 									类目：<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="::detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
 									<a class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="!detail.uuid"/>
-									型号：<a href="store/{{::order.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a><br/>
+									型号：<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="::detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a><br/>
 									品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid"><em ng-bind="::detail.brName || '-'" title="{{::detail.brName}}"></em></a>
 									<a  class="unstand" ng-if="!detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a>
 								</p>

src/main/webapp/resources/view/usercenter/forstore/home_center.html

@@ -137,7 +137,7 @@
                         <p title="{{commodity.code}}">{{commodity.code}}</p>
                         <p>产品数量：{{commodity.reserve}}</p>
                         <p title="{{commodity.kindNameCn}}">品牌名称：{{commodity.kindNameCn}}</p>
-                        <a ng-href="{{'store/' + commodity.storeid + '/' + commodity.batchCode}}" class="click_bt01 bg_red" target="_blank">点击进入</a>
+                        <a ng-href="{{'store/productDetail/' + commodity.batchCode}}" class="click_bt01 bg_red" target="_blank">点击进入</a>
                     </dd>
                 </dl>
             </div>

src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -439,7 +439,7 @@
 					<div ng-class="{'limit-3': !open}" style="width: 100%; margin: 0 auto; overflow: hidden;">
 						<dd class="oder_l" ng-repeat="detail in order.orderDetails">
                         <span class="wd02">
-                            <a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank">
+                            <a href="store/productDetail/{{::detail.batchCode}}" target="_blank">
 								<img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/>
 							</a>
                             <p class="style01" style="margin-top: 10px;" ng-if="detail.uuid">类目：
@@ -449,7 +449,7 @@
 								<a ng-bind="detail.kiName || '-'"  title="{{detail.kiName}}" class="unstand"></a>
 							</p>
 							<p class="style01">型号：
-								<a ng-bind="detail.cmpCode || '-'" href="store/{{::detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
+								<a ng-bind="detail.cmpCode || '-'" href="store/productDetail/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01" ng-if="detail.uuid">品牌：
 								<a ng-bind="detail.brName" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>

src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -721,11 +721,11 @@
 						</dd>
 						<dd class="oder_l" ng-repeat="detail in details">
                         <span class="wd02">
-                            <a  href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" href="javascript:void(0)"> <img ng-src="{{detail.img || 'static/img/store/common/default.png'}}"/></a>
+                            <a  href="store/productDetail/{{::detail.batchCode}}" target="_blank" href="javascript:void(0)"> <img ng-src="{{detail.img || 'static/img/store/common/default.png'}}"/></a>
 							<div class="style-type">
 								<p title="{{detail.kiName}}" ng-if="detail.uuid"><a href="product/kind/{{detail.goodsHistory.kindUuid}}" target="_blank" style="color: #323232">类目：<b ng-bind="detail.kiName || '-'"></b></a></p>
 								<p title="{{detail.kiName}}" ng-if="!detail.uuid"><a style="color: #323232" class="unstand">类目：<b ng-bind="detail.kiName || '-'"></b></a></p>
-								<p><a href="store/{{detail.storeid}}/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号：<b ng-bind="detail.cmpCode || '-'" title="{{detail.cmpCode}}"></b></a></p>
+								<p><a href="store/productDetail/{{::detail.batchCode}}" target="_blank" style="color: #323232">型号：<b ng-bind="detail.cmpCode || '-'" title="{{detail.cmpCode}}"></b></a></p>
 								<p  ng-if="detail.uuid"><a href="product/brand/{{detail.branduuid}}/" target="_blank" style="color: #323232">品牌：<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
 								<p ng-if="!detail.uuid"><a style="color: #323232" class="unstand">品牌：<b ng-bind="detail.brName || '-'" style="color: #323232" title="{{detail.brName}}"></b></a></p>
 							</div>

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

@@ -491,7 +491,7 @@
 					<div ng-class="{'limit-3': !open}" style="width: 100%; margin: 0 auto; overflow: hidden;">
 						<dd class="oder_l" ng-repeat="detail in purchase.purchaseDetails">
 						<span class="wd02">
-							<a href="store/{{::detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/></a>
+							<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/store/common/default.png'}}"/></a>
 							<p class="style01" style="margin-top: 10px;" ng-if="detail.uuid">类目：
 								<a ng-bind="detail.kiName || '-'" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
@@ -499,7 +499,7 @@
 								<a ng-bind="detail.kiName || '-'" title="{{detail.kiName}}" class="unstand"></a>
 							</p>
 							<p class="style01">型号：
-								<a ng-bind="detail.cmpCode || '-'" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
+								<a ng-bind="detail.cmpCode || '-'" href="store/productDetail/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01" ng-if="detail.uuid">品牌：
 								<a ng-bind="detail.brName || '-'" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>

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

@@ -1292,11 +1292,11 @@
 						<span class="wid01">&nbsp;</span>
 						<span class="wid02">
                             <div class="pro_xq">
-                               <a href="store/{{::purchase.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
+                               <a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img || 'static/img/store/common/default.png'}}" width="55" height="55"/></a>
                                 <p class="componet-info">
                                     类目：<a href="product/kind/{{::detail.kindUuid}}" target="_blank" ng-if="detail.uuid"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="detail.uuid"/>
                                     <a ng-if="!detail.uuid" class="unstand"><em ng-bind="detail.kiName || '-'" title="{{::detail.kiName}}"></em></a><br ng-if="!detail.uuid"/>
-                                    型号：<a href="store/{{::purchase.storeid}}/{{::detail.batchCode}}" target="_blank"><em ng-bind="detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a><br/>
+                                    型号：<a href="store/productDetail/{{::detail.batchCode}}" target="_blank"><em ng-bind="detail.cmpCode || '-'" title="{{::detail.cmpCode}}"></em></a><br/>
                                     品牌：<a href="product/brand/{{::detail.branduuid}}/" target="_blank" ng-if="detail.uuid"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a>
                                     <a ng-if="!detail.uuid" class="unstand"><em ng-bind="detail.brName || '-'" title="{{::detail.brName}}"></em></a>
                                 </p>