Merge remote-tracking branch 'origin/feature-commodity-0901-v1' into feature-commodity-0901-v1

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -41,6 +41,11 @@ define(['app/app'], function(app) {
             });
         };
 
+        $scope.deliveryMethod = {
+			1301 : '第三方配送',
+			1302 : '卖家配送',
+			1303 : '上门自提'
+		};
 
         //选择相应的发票信息
 		$scope.selectBill = function(kind) {

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

@@ -523,19 +523,20 @@
 						</dd>
 						<dd class="oder-remark">
 							<span style="width: 100%">
-								<em>订单备注：</em>
-								<input type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]"/>
+								<em style="font-size: 14px">订单备注：</em>
+								<input ng-if="order.status == 501" type="text"  class="form-control" placeholder="请填写订单备注" ng-model="remarkList[details[0].storeid]"/>
+								<em ng-if="order.status != 501" ng-bind="order.orderRemark" style="margin-left: 0;"></em>
 							</span>
 						</dd>
-						<dd class="line60">
-							<span class="style01" style="width: 60%;">配送方式：
+						<dd class="line60"style="height: 50px;">
+							<span class="style01" style="width: 60%;font-size: 14px;line-height: 40px;">配送方式：
 								<select ng-if="order.status == 501" class="select" ng-switch="order.deliverytype" style="opacity: 1;" >
 									<option ng-switch-when="1301">第三方配送</option>
 									<!--<option ng-switch-when="1301">卖家配送</option>-->
 									<!--<option ng-switch-when="1301">上门自提</option>-->
 									<!--<option ng-switch-when="1302">上门自提</option>-->
 								</select>
-								<em ng-if="order.status != 501">物流配送</em>
+								<em ng-if="order.status != 501" style="color: #333; font-size: 14px">{{deliveryMethod[order.deliverytype]}}</em>
 								<!--<i>满1000元包邮，未满足的订单收取运费20元</i>-->
 							</span>
 								<span class="total-price">