Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -1903,7 +1903,7 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
 			product.selected = true;
 			product.averMonthSalePrice = (product && product.price) ? product.price : 0;
 			var goodQtyPrice = {start: $scope.goods.editMinBuyQty, end: $scope.maxReserve};
-			var price = (((data && data.price) ? data.price : 0) *
+			var price = (((product && product.price) ? product.price : 0) *
 			($scope.uasBatchPutOnProperty.fluctuateRate ? $scope.uasBatchPutOnProperty.fluctuateRate : 1));
 			if ('MAINLAND' == $scope.store.enType) {
 				goodQtyPrice.rMBPrice = $filter('formateNumber')(price, 6);

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

@@ -1943,7 +1943,7 @@
 													<div class="content margin10">
 														<!--<p class="title">包装/生产日期</p>-->
 														<div class="input-list">
-															<span class="tit">包装:</span><!--<input type="text" class="select" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
+															<span class="tit">包装：</span><!--<input type="text" class="select" name="packaging" ng-maxlength="10" title="包装" maxlength="10" placeholder="包装方式" style="width: 96px;" ng-model="goods.editPackaging"
 																							   ng-class="{'error' : goods.editPackagingInvalid}"
 																							   ng-blur="editPackaging(goods, true)" ng-change="changePackaging(goods)"/>-->
 															<select ng-model="goods.editPackaging" ng-init="goods.editPackaging='请选择'" class="select-adder select-package" title="包装">

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

@@ -1141,8 +1141,8 @@
 			<ul>
 				<li ng-class="{'active': status=='all'}" ng-click="setActive('all')"><a> 所有订单(<em ng-class="{'color-black': !counts['all']}" ng-bind="counts['all'] || 0"></em>)</a></li>
 				<li ng-class="{'active': status=='tobeconfirmed'}" ng-click="setActive('tobeconfirmed')"><a>待买家付款（<em ng-class="{'color-black': !counts['tobeconfirmed']}" ng-bind="counts['tobeconfirmed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待买家收货（<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>）</a></li>
-				<li ng-class="{'active': status=='inbound'}" ng-click="setActive('inbound')"><a>待收货（<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='comfirmed'}" ng-click="setActive('comfirmed')"><a>待发货（<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>）</a></li>
+				<li ng-class="{'active': status=='inbound'}" ng-click="setActive('inbound')"><a>待买家收货（<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='tobepaid'}" ng-click="setActive('tobepaid')"><a>待收款（<em ng-class="{'color-black': !counts['tobepaid']}" ng-bind="counts['tobepaid'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='completed'}" ng-click="setActive('completed')"><a>成功的订单（<em ng-class="{'color-black': !counts['completed']}" ng-bind="counts['completed'] || 0"></em>）</a></li>
 				<li ng-class="{'active': status=='unavailable'}" ng-click="setActive('unavailable')"><a>取消的订单（<em ng-class="{'color-black': !counts['unavailable']}" ng-bind="counts['unavailable'] || 0"></em>）</a></li>