Browse Source

Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2c into dev

huxz 8 years ago
parent
commit
1b8dc6c90d

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/order_detail.html

@@ -324,7 +324,7 @@
 								<a ng-bind="detail.kiName" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							<p class="style01">型号:
-								<a ng-bind="detail.cmpCode" href="store/{{::order.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
+								<a ng-bind="detail.cmpCode" href="store/{{::detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01">品牌:
 								<a ng-bind="detail.brName" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>

+ 4 - 4
src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -367,15 +367,15 @@
 					<div ng-class="{'limit-3': !open}">
 						<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/{{::detail.storeid}}/{{::detail.batchCode}}" target="_blank"><img ng-src="{{detail.img ? detail.img : 'static/img/user/images/pro02.jpg'}}"/></a>
 							<p class="style01" style="margin-top: 10px;">类目:
-								<a ng-bind="detail.kiName" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.kiName}}" target="_blank"></a>
+								<a ng-bind="detail.kiName" href="product/kind/{{::detail.kindUuid}}" title="{{detail.kiName}}" target="_blank"></a>
 							</p>
 							<p class="style01">型号:
 								<a ng-bind="detail.cmpCode" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.cmpCode}}" target="_blank"></a>
 							</p>
 							<p class="style01">品牌:
-								<a ng-bind="detail.brName" href="store/{{detail.storeid}}/{{::detail.batchCode}}" title="{{detail.brName}}" target="_blank"></a>
+								<a ng-bind="detail.brName" href="product/brand/{{::detail.branduuid}}/" title="{{detail.brName}}" target="_blank"></a>
 							</p>
 						</span>
 						<span class="wd01">交期:
@@ -401,7 +401,7 @@
 					</dd>
 					</div>
 					<div class="open-more row" ng-class="{'none': purchase.purchaseDetails.length < 3}">
-						<a href="javascript:void(0)" ng-click="open=!open" ng-class="{'active': open}">
+						<a href="javascript:void(0)" ng-click="$open=!open" ng-class="{'active': open}">
 							<em ng-bind="open ? '收起' : '查看所有产品'"></em>
 							<i class="fa fa-angle-up" ng-if="open"></i>
 							<i class="fa fa-angle-down" ng-if="!open"></i>