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

src/main/java/com/uas/platform/b2c/prod/commodity/model/GoodsSimple.java

@@ -62,6 +62,31 @@ public class GoodsSimple {
 	 */
 	@Column(name = "go_b2cmindelivery")
 	private Short b2cMinDelivery;
+
+	/**
+	 * 商城送货到大陆最长交期
+	 */
+	@Column(name = "go_deliverydemaxtime")
+	private Short b2cDeliveryDemMaxTime;
+
+	/**
+	 * 商城送货到大陆最短交期
+	 */
+	@Column(name = "go_deliverydemintime")
+	private Short b2cDeliveryDemMinTime;
+
+
+	/**
+	 * 商城送货到香港最长交期
+	 */
+	@Column(name = "go_deliveryhkmaxtime")
+	private Short b2cDeliveryHKMaxTime;
+
+	/**
+	 * 商城送货到香港最小交期
+	 */
+	@Column(name = "go_deliveryhkmintime")
+	private Short b2cDeliveryHKMinTime;
 	
 	/**
 	 * 大陆交期[供应商送平台的时间]
@@ -515,6 +540,10 @@ public class GoodsSimple {
 		this.qtyPrice = goods.getQtyPrice();
 		this.b2cMaxDelivery = goods.getB2cMaxDelivery();
 		this.b2cMinDelivery = goods.getB2cMinDelivery();
+		this.b2cDeliveryDemMaxTime = goods.getB2cDeliveryDemMaxTime();
+		this.b2cDeliveryDemMinTime = goods.getB2cDeliveryDemMinTime();
+		this.b2cDeliveryHKMaxTime = goods.getB2cDeliveryHKMaxTime();
+		this.b2cDeliveryHKMinTime = goods.getB2cDeliveryHKMinTime();
 		this.produceDate = goods.getProduceDate();
 		this.createdDate = goods.getCreatedDate();
 		this.reserve = goods.getReserve();
@@ -533,6 +562,43 @@ public class GoodsSimple {
 		this.lastReserve = goods.getLastReserve();
 		this.status = goods.getStatus();
 	}
+
+	public Short getB2cDeliveryDemMaxTime() {
+		return b2cDeliveryDemMaxTime;
+	}
+
+	public GoodsSimple setB2cDeliveryDemMaxTime(Short b2cDeliveryDemMaxTime) {
+		this.b2cDeliveryDemMaxTime = b2cDeliveryDemMaxTime;
+		return this;
+	}
+
+	public Short getB2cDeliveryDemMinTime() {
+		return b2cDeliveryDemMinTime;
+	}
+
+	public GoodsSimple setB2cDeliveryDemMinTime(Short b2cDeliveryDemMinTime) {
+		this.b2cDeliveryDemMinTime = b2cDeliveryDemMinTime;
+		return this;
+	}
+
+	public Short getB2cDeliveryHKMaxTime() {
+		return b2cDeliveryHKMaxTime;
+	}
+
+	public GoodsSimple setB2cDeliveryHKMaxTime(Short b2cDeliveryHKMaxTime) {
+		this.b2cDeliveryHKMaxTime = b2cDeliveryHKMaxTime;
+		return this;
+	}
+
+	public Short getB2cDeliveryHKMinTime() {
+		return b2cDeliveryHKMinTime;
+	}
+
+	public GoodsSimple setB2cDeliveryHKMinTime(Short b2cDeliveryHKMinTime) {
+		this.b2cDeliveryHKMinTime = b2cDeliveryHKMinTime;
+		return this;
+	}
+
 	/*
 	 * public GoodsSimpleUas converUas(){ GoodsSimpleUas uas = new
 	 * GoodsSimpleUas(); uas.setBatchCode(this.batchCode);

src/main/java/com/uas/platform/b2c/trade/order/model/OrderDetail.java

@@ -863,6 +863,15 @@ public class OrderDetail extends Document implements Serializable{
 		}
 	}
 
+	public void setDeliveryTime(Goods goods) {
+		if(goods.getB2cMaxDelivery() != null) {
+			this.b2cMaxDelivery = goods.getB2cMaxDelivery();
+			this.b2cMinDelivery = goods.getB2cMinDelivery();
+		}else {
+			this.b2cMaxDelivery = goods.getCurrencyName().indexOf("USD") > -1 ? goods.getB2cDeliveryHKMaxTime() : goods.getB2cDeliveryDemMaxTime();
+			this.b2cMinDelivery = goods.getCurrencyName().indexOf("USD") > -1 ? goods.getB2cDeliveryHKMinTime() : goods.getB2cDeliveryDemMinTime();
+		}
+	}
 	/**
 	 * Gets taxes.
 	 *

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderDetailServiceImpl.java

@@ -199,12 +199,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
 		orderDetail.setImg(goods.getImg());
 		orderDetail.setStoreid(goods.getStoreid());
 		orderDetail.setStoreName(goods.getStoreName());
-		if (goods.getB2cMaxDelivery() != null){
-			orderDetail.setB2cMaxDelivery(goods.getB2cMaxDelivery());
-		}
-		if (goods.getB2cMinDelivery() != null){
-			orderDetail.setB2cMinDelivery(goods.getB2cMinDelivery());
-		}
+		orderDetail.setDeliveryTime(goods);
 		String detailid = EncodingRulesConstant.ORDER_DETAIL.replace("_TIMESTAP_NUMBER", createNumberService.getTimeNumber("trade$order_detail", 9));
 		orderDetail.setDetailid(detailid);
 		return orderDetail;

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -45,6 +45,7 @@ import com.uas.platform.b2c.prod.product.component.modal.Component;
 import com.uas.platform.b2c.prod.product.component.service.ComponentService;
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 import com.uas.platform.b2c.prod.store.model.StoreIn;
+import com.uas.platform.b2c.prod.store.model.StoreStatus;
 import com.uas.platform.b2c.trade.aftersale.model.AfterSaleStatus;
 import com.uas.platform.b2c.trade.deprecated.model.OrderRelationInfo;
 import com.uas.platform.b2c.trade.deprecated.model.UserInfoForOrder;
@@ -756,8 +757,8 @@ public class OrderServiceImpl implements OrderService {
             or.setOrderRemark(remarkMap.getString(storeid));
 
             StoreIn storeIn = storeInDao.findByUuid(storeid);
-            if (storeIn == null) {
-                throw new IllegalOperatorException("对应的店铺的信息不存在");
+            if (storeIn == null && storeIn.getStatus() != StoreStatus.OPENED) {
+                throw new IllegalOperatorException("该公司还未开店，产品不能自营销售");
             }
             or.setStoreid(storeid);
             or.setStoreName(storeIn.getStoreName());
@@ -830,10 +831,16 @@ public class OrderServiceImpl implements OrderService {
                 detailInfo = (JSONObject) object;
                 if (id.equals(detailInfo.getLong("id"))) {
                     detail.setNumber(detailInfo.getDouble("number"));
-                    detail.setTaxUnitprice(detailInfo.getDouble("taxUnitprice"));
+                    Goods goods = goodsDao.findByBatchCode(detail.getBatchCode());
+                    if(goods == null) {
+                        unvailable++;
+                        continue;
+                    }
+                    detail.setNumber(goods);
+                    detail.setDeliveryTime(goods);
+                    detail.setPircesByNumber(goods.getPrices(), detail.getNumber());
                     detail.setRemark(detailInfo.getString("remark"));
                     String storeid = detailInfo.getString("storeid");
-                    Goods goods = goodsDao.findByBatchCode(detail.getBatchCode());
                     if(!goods.getStoreid().equals(storeid)) {
                         detail.setStoreid(goods.getStoreid());
                         detail.setStoreName(goods.getStoreName());

src/main/java/com/uas/platform/b2c/trade/presale/model/Cart.java

@@ -303,6 +303,9 @@ public class Cart {
 			this.number = goods.getMinBuyQty();
 			return ;
 		}
+		if(this.minPackQty == null) {
+			this.minPackQty = goods.getMinPackQty();
+		}
 		double times = NumberUtil.div(this.number, this.minPackQty);
 		double qty1 = NumberUtil.mul(times, goods.getMinPackQty());
 		if(NumberUtil.compare(qty1, goods.getMinBuyQty()) <= 0) {
@@ -501,8 +504,9 @@ public class Cart {
 	 * 只针对最新的历史库存
 	 */
 	public boolean estimateTightStock() {
+		Double lastReserve = goods.getLastReserve() == null ? goods.getReserve() : goods.getLastReserve();
 		if((NumberUtil.compare(goods.getReserve(), NumberUtil.mul(goods.getMinBuyQty(), (double) 5)) < 0) ||
-				(NumberUtil.compare(goods.getReserve(), NumberUtil.mul(goods.getLastReserve(), 0.1)) < 0)) {
+				(NumberUtil.compare(goods.getReserve(), NumberUtil.mul(lastReserve, 0.1)) < 0)) {
 			return true;
 		}else {
 			return false;

src/main/java/com/uas/platform/b2c/trade/presale/service/impl/CartServiceImpl.java

@@ -439,7 +439,7 @@ public class CartServiceImpl implements CartService {
 		}else {
 			cart.setNumber(commodity);
 		}
-		cart.setCurrencyName(commodity.getCurrencyName());
+		cart.setCurrencyName(commodity.getCurrencyName() == "USD" ? "USD" : "RMB");
 		cart.setReturnInWeek(commodity.getReturnInWeek());
 		cart.setSupply(commodity.getOriginal());
 		cart.setPack(commodity.getPackaging());

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

@@ -351,9 +351,9 @@ define(["app/app", 'jquery-summernote'], function(app) {
 					}
 					//添加相应的数据。
 					if(c.buyCurrency.indexOf("RMB") > -1 ) {
-						c.price = "￥"+ $filter('number')(c.rMBPrice, 6);
+						c.price = "￥"+ $filter('formateNumber')(c.rMBPrice, 6);
 					}else {
-						c.price = "$" + $filter('number')(c.uSDPrice, 6);
+						c.price = "$" + $filter('formateNumber')(c.uSDPrice, 6);
 					}
 					return;
 				}

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

@@ -141,11 +141,9 @@ define(['app/app'], function(app) {
 		$scope.loadShippingAddress = function () {
 			return ShippingAddress.get({send : false}, function(data) {
 				$scope.sendAddress = data;
-				angular.forEach($scope.sendAddress, function (shippingAddress) {
-					if (shippingAddress.num == 1) {
-						$scope.selectAdd(shippingAddress);
-					}
-				})
+				if(data.length != 0) {
+					$scope.selectAdd($scope.sendAddress[0]);
+				}
 			}, function(response) {
 				toaster.pop("error", "获取收货地址信息失败 "  + response.data);
 			});

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

@@ -159,6 +159,9 @@
 		height: 130px;
 		line-height: 130px;
 	}
+	.shopCar .oder_list dl .line02 span.sure_oder{
+		background: none;
+	}
 	.shopCar .oder_list dl .pro_xq img{
 		margin-top: 33px;
 	}
@@ -568,16 +571,24 @@
 								</div>
                         	</span>
 							<span class="wd02">
-								<p class="f14" ng-if="cart.goods.b2cMinDelivery">
+								<p class="f14">
 									交期&nbsp;:&nbsp;
-									<i ng-if="cart.goods.b2cMinDelivery == cart.goods.b2cMaxDelivery" ng-bind="cart.goods.b2cMinDelivery"></i>
-									<i ng-if="cart.goods.b2cMinDelivery != cart.goods.b2cMaxDelivery" ng-bind="cart.goods.b2cMinDelivery + '-' + cart.goods.b2cMaxDelivery"></i>
+									<i ng-if="cart.goods.b2cMinDelivery&&(cart.goods.b2cMinDelivery == cart.goods.b2cMaxDelivery)" ng-bind="cart.goods.b2cMinDelivery"></i>
+									<i ng-if="cart.goods.b2cMinDelivery&&(cart.goods.b2cMinDelivery != cart.goods.b2cMaxDelivery)" ng-bind="cart.goods.b2cMinDelivery + '-' + cart.goods.b2cMaxDelivery"></i>
+									<i ng-if="!cart.goods.b2cMinDelivery&&(cart.buyCurrency == 'RMB')&&(cart.goods.b2cDeliveryDemMinTime == cart.goods.b2cDeliveryDemMaxTime)" ng-bind="cart.goods.b2cDeliveryDemMaxTime"></i>
+									<i ng-if="!cart.goods.b2cMinDelivery&&(cart.buyCurrency == 'RMB')&&(cart.goods.b2cDeliveryDemMinTime != cart.goods.b2cDeliveryDemMaxTime)" ng-bind="cart.goods.b2cDeliveryDemMinTime + '-' + cart.goods.b2cDeliveryDemMaxTime"></i>
+									<i ng-if="!cart.goods.b2cMinDelivery&&(cart.buyCurrency == 'USD')&&(cart.goods.b2cDeliveryHKMinTime == cart.goods.b2cDeliveryHKMaxTime)" ng-bind="cart.goods.b2cDeliveryHKMaxTime"></i>
+									<i ng-if="!cart.goods.b2cMinDelivery&&(cart.buyCurrency == 'USD')&&(cart.goods.b2cDeliveryHKMinTime != cart.goods.b2cDeliveryHKMaxTime)" ng-bind="cart.goods.b2cDeliveryHKMinTime + '-' + cart.goods.b2cDeliveryHKMaxTime"></i>
 								</p>
 								<!--<p class="f14" ng-if="cart.buyCurrency == 'RMB'">大陆{{cart.goods.b2cMinDelivery}}-{{cart.goods.b2cMaxDelivery}}</p>-->
 								<!--<p class="f14" ng-if="cart.buyCurrency == 'USD'">香港{{cart.goods.b2cMinDelivery}}-{{cart.goods.b2cMaxDelivery}}</p>-->
 							</span>
-							<span>
-									<p ng-bind="cart.price" class="f14"></p>
+							<span class="sure_oder">
+								<p ng-if="cart.goods.currencyName.indexOf('RMB-USD') == -1" ng-bind="cart.price" class="f14"></p>
+								<select ng-disabled="cart.isSelect || cart.status == 1" ng-if="cart.goods.currencyName.indexOf('RMB-USD') > -1" class="select" style="opacity: 1;padding-left: 10px;" ng-model="cart.buyCurrency" ng-change="selectCurr(cart, cart.buyCurrency)">
+									<option value="RMB" selected="selected" ng-bind="cart.rMBPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></option>
+									<option value="USD" ng-bind="cart.uSDPrice | formateNumber : 6 | currencySysmbol : 'USD'"></option>
+								</select>
 							</span>
 							<span>
 								<div class="btn-wrap">

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

@@ -465,8 +465,12 @@
                         </span>
 						<span class="wd01" ng-if="order.status == 501">
 							交期 :
-							<i ng-if="detail.goodsHistory.b2cMinDelivery == detail.goodsHistory.b2cMaxDelivery" ng-bind="detail.goodsHistory.b2cMinDelivery"></i>
-							<i ng-if="detail.goodsHistory.b2cMinDelivery != detail.goodsHistory.b2cMaxDelivery" ng-bind="detail.goodsHistory.b2cMinDelivery + '-' + detail.goodsHistory.b2cMaxDelivery"></i>
+							<i ng-if="(!detail.goodsHistory.b2cMinDelivery)&&(detail.currencyName == 'RMB')&&(detail.goodsHistory.b2cDeliveryDemMinTime==detail.goodsHistory.b2cDeliveryDemMaxTime)" ng-bind="detail.goodsHistory.b2cDeliveryDemMinTime"></i>
+							<i ng-if="(!detail.goodsHistory.b2cMinDelivery)&&(detail.currencyName == 'RMB')&&(detail.goodsHistory.b2cDeliveryDemMinTime!=detail.goodsHistory.b2cDeliveryDemMaxTime)" ng-bind="detail.goodsHistory.b2cDeliveryDemMinTime + '-' + detail.goodsHistory.b2cDeliveryDemMaxTime"></i>
+							<i ng-if="(!detail.goodsHistory.b2cMinDelivery)&&(detail.currencyName == 'USD')&&(detail.goodsHistory.b2cDeliveryHKMinTime==detail.goodsHistory.b2cDeliveryHKMaxTime)" ng-bind="detail.goodsHistory.b2cDeliveryHKMinTime"></i>
+							<i ng-if="(!detail.goodsHistory.b2cMinDelivery)&&(detail.currencyName == 'USD')&&(detail.goodsHistory.b2cDeliveryHKMinTime!=detail.goodsHistory.b2cDeliveryHKMaxTime)" ng-bind="detail.goodsHistory.b2cDeliveryHKMinTime + '-' + detail.goodsHistory.b2cDeliveryHKMaxTime"></i>
+							<i ng-if="detail.goodsHistory.b2cMinDelivery&&(detail.goodsHistory.b2cMinDelivery == detail.goodsHistory.b2cMaxDelivery)" ng-bind="detail.goodsHistory.b2cMinDelivery"></i>
+							<i ng-if="detail.goodsHistory.b2cMinDelivery&&(detail.goodsHistory.b2cMinDelivery != detail.goodsHistory.b2cMaxDelivery)" ng-bind="detail.goodsHistory.b2cMinDelivery + '-' + detail.goodsHistory.b2cMaxDelivery"></i>
 							<!--{{detail.goodsHistory.b2cMinDelivery}}-{{detail.goodsHistory.b2cMaxDelivery}}-->
 						</span>
 						<span class="wd01" ng-if="order.status != 501">
@@ -474,8 +478,14 @@
 						<i ng-if="detail.b2cMinDelivery == detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery"></i>
 						<i ng-if="detail.b2cMinDelivery != detail.b2cMaxDelivery" ng-bind="detail.b2cMinDelivery + '-' + detail.b2cMaxDelivery"></i>
 						</span>
-						<span class="wd01" ng-bind="detail.rmbUnitPrice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.goodsHistory.currencyName.indexOf('RMB') > -1 && order.status == 501"></span>
-						<span class="wd01" ng-bind="detail.usdUnitPrice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.goodsHistory.currencyName.indexOf('USD') > -1 && order.status == 501"></span>
+						<span>
+							<select class="select" ng-model="detail.currencyName" ng-if="order.buyNow&&(order.status == 501)&&(detail.goodsHistory.currencyName=='RMB-USD')" ng-change="changeCurrency(detail)">
+								<option value="RMB" selected="selected" ng-bind="detail.rmbUnitPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></option>
+								<option value="USD" ng-bind="detail.usdUnitPrice | formateNumber : 6 | currencySysmbol : 'USD'"></option>
+							</select>
+						</span>
+						<span class="wd01" ng-if="(order.status == 501)&&(detail.goodsHistory.currencyName == 'RMB')" ng-bind="detail.rmbUnitPrice | formateNumber : 6 | currencySysmbol : 'RMB'"></span>
+						<span class="wd01" ng-if="(order.status == 501)&&(detail.goodsHistory.currencyName == 'USD')" ng-bind="detail.usdUnitPrice | formateNumber : 6 | currencySysmbol : 'USD'"></span>
 						<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'RMB'" ng-if="detail.currencyName.indexOf('RMB') > -1 && order.status != 501"></span>
 						<span class="wd01" ng-bind="detail.taxUnitprice | formateNumber : 6 | currencySysmbol : 'USD'" ng-if="detail.currencyName.indexOf('USD') > -1 && order.status != 501"></span>
 						<span class="wd01">

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

@@ -458,66 +458,6 @@
     .public-tab.table tr td.middle .img,.vendor-tab.table td .wid135{
         margin-top: 15px;
     }
-
-    /* 预览框 end */
-    #image-box .x-floating-wrap {
-        position: fixed;
-        z-index: 99998;
-        background: #000;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        opacity: 0.5;
-    }
-    #image-box .x-floating {
-        position: fixed;
-        z-index: 99999;
-        width: 970px;
-        height: 600px;
-        top: 50%;
-        left: 50%;
-        margin-left: -485px;
-        margin-top: -300px;
-        line-height: 560px;
-        text-align: center;
-        vertical-align: middle;
-    }
-    #image-box .x-floating img {
-        margin: auto auto;
-        max-width: 970px !important;
-        max-height: 600px !important;
-        -webkit-user-select: none;
-        -moz-user-select: none;
-        -ms-user-select: none;
-        user-select: none
-    }
-
-    #image-box .x-close-wrap {
-        position: fixed;
-        top: 0;
-        right: 0;
-        z-index: 100000;
-        width: 120px;
-        height: 120px;
-        margin: -60px -60px 0 0;
-        border-radius: 100%;
-        background: #000;
-        opacity: .3
-    }
-
-    #image-box .x-close-wrap a {
-        position: absolute;
-        left: 25px;
-        bottom: 25px;
-        font-size: 42px;
-        color: #fff
-    }
-
-    #image-box .x-close-wrap:hover {
-        opacity: .7
-    }
-
     .edit-form .error{
         border: #f00 1px solid !important;
     }
@@ -681,11 +621,15 @@
                             </div>
                         </td>
                         <td>
-                            <div ng-if="commodity.b2cDeliveryDemMinTime">
-                                <span  ng-bind="'国内：' + commodity.b2cDeliveryDemMinTime + '-' + commodity.b2cDeliveryDemMaxTime"></span>
+                            <div ng-if="commodity.currencyName.indexOf('RMB') > -1">
+                                <span ng-if="(commodity.b2cDeliveryDemMinTime != commodity.b2cDeliveryDemMaxTime)&&!commodity.b2cMaxDelivery"  ng-bind="'大陆：' + commodity.b2cDeliveryDemMinTime + '-' + commodity.b2cDeliveryDemMaxTime"></span>
+                                <span ng-if="(commodity.b2cDeliveryDemMinTime == commodity.b2cDeliveryDemMaxTime)&&!commodity.b2cMaxDelivery"  ng-bind="'大陆：' + commodity.b2cDeliveryDemMinTime"></span>
+                                <span ng-if="commodity.b2cMaxDelivery" ng-bind="'大陆：' + commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery"></span>
                             </div>
-                            <div ng-if="commodity.b2cDeliveryHKMinTime">
-                                <span  ng-bind="'香港：' + commodity.b2cDeliveryHKMinTime + '-' + commodity.b2cDeliveryHKMaxTime"></span>
+                            <div ng-if="commodity.currencyName.indexOf('USD') > -1">
+                                <span ng-if="(commodity.b2cDeliveryHKMinTime != commodity.b2cDeliveryHKMaxTime)&&!commodity.b2cMaxDelivery" ng-bind="'香港：' + commodity.b2cDeliveryHKMinTime + '-' + commodity.b2cDeliveryHKMaxTime"></span>
+                                <span ng-if="(commodity.b2cDeliveryHKMinTime == commodity.b2cDeliveryHKMaxTime)&&!commodity.b2cMaxDelivery" ng-bind="'香港：' + commodity.b2cDeliveryHKMinTime"></span>
+                                <span ng-if="commodity.b2cMaxDelivery" ng-bind="'香港：' + commodity.b2cMinDelivery + '-'+ commodity.b2cMaxDelivery"></span>
                             </div>
                         </td>
                         <td>
@@ -774,18 +718,19 @@
                             </div>
                         </td>
                         <td>
-                            <div ng-if="commodity.currencyName.indexOf('USD') >  -1">
-                                <span>香港：</span>
-                                <span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.selfHkMinTimeinValid}" ng-blur="changeDelivery(commodity.editSelfDeliveryHKMinTime, commodity.editSelfDeliveryHKMaxTime, true, true, commodity)" ng-model="commodity.editSelfDeliveryHKMinTime" class="wid25 form-control"/></span>
-                                <span>-</span>
-                                <span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.selfHkMaxTimeinValid}" ng-blur="changeDelivery(commodity.editSelfDeliveryHKMinTime, commodity.editSelfDeliveryHKMaxTime, false, true, commodity)" ng-model="commodity.editSelfDeliveryHKMaxTime" class="wid25 form-control"/></span>
-                            </div>
                             <div ng-if="commodity.currencyName.indexOf('RMB') >  -1">
                                 <span>大陆：</span>
                                 <span><input type="text" ng-class="{'error' : commodity.selfDemMinTimeinValid}" ng-blur="changeDelivery(commodity.editSelfDeliveryDemMinTime, commodity.editSelfDeliveryDemMaxTime, true, false, commodity)" placeholder="大陆最短交期" ng-model="commodity.editSelfDeliveryDemMinTime" class="wid25 form-control"/></span>
                                 <span>-</span>
                                 <span><input type="text" ng-class="{'error' : commodity.selfDemMaxTimeinValid}" ng-blur="changeDelivery(commodity.editSelfDeliveryDemMinTime, commodity.editSelfDeliveryDemMaxTime, false, false, commodity)" placeholder="大陆最长交期" ng-model="commodity.editSelfDeliveryDemMaxTime" class="wid25 form-control"/></span>
                             </div>
+                            <div ng-if="commodity.currencyName.indexOf('USD') >  -1">
+                                <span>香港：</span>
+                                <span><input type="text" placeholder="香港最短交期" ng-class="{'error' : commodity.selfHkMinTimeinValid}" ng-blur="changeDelivery(commodity.editSelfDeliveryHKMinTime, commodity.editSelfDeliveryHKMaxTime, true, true, commodity)" ng-model="commodity.editSelfDeliveryHKMinTime" class="wid25 form-control"/></span>
+                                <span>-</span>
+                                <span><input type="text" placeholder="香港最长交期" ng-class="{'error' : commodity.selfHkMaxTimeinValid}" ng-blur="changeDelivery(commodity.editSelfDeliveryHKMinTime, commodity.editSelfDeliveryHKMaxTime, false, true, commodity)" ng-model="commodity.editSelfDeliveryHKMaxTime" class="wid25 form-control"/></span>
+                            </div>
+
                         </td>
                         <td>
                             <div>
@@ -856,11 +801,11 @@
 
 <!--查看大图-->
 <div id="image-box" style="display: none">
-    <div class="x-close-wrap" title="关闭">
-        <a href="javascript:void(0);">&times;</a>
-    </div>
     <div class="x-floating-wrap"></div>
     <div class="x-floating">
-        <img/>
+        <div id="item-content">
+            <div class="x-close-wrap"><a href="javascript:void(0);">×</a></div>
+            <div class="img"><img/></div>
+        </div>
     </div>
-</div>
+</div>

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

@@ -1,17 +1,17 @@
 <!--修改图片-->
 <style>
-    .view-box {
-
+    .modal-dialog{
+        width: 535px;
+        height: 345px;
     }
     .update-img{
         width: 520px;
-        height: 330px;
+        height: 324px;
     }
     .update-img .update-big-img{
-        width: 280px;
+        width: 265px;
         float: left;
-        margin-left: 48px;
-        margin-top: 10px;
+        margin-top: 5px;
     }
     .update-img .update-big-img p{
         line-height: 30px;
@@ -30,20 +30,19 @@
         height: 256px;
     }
     .update-img .update-file-btn{
-        width: 155px;
+        width: 244px;
         float: left;
-        margin-left: 10px;
-        margin-top: 200px;
+        margin-left: 3px;
     }
     .update-img .update-file-btn p{
         line-height: 30px;
         position: relative;
         text-align: center;
-        margin-bottom: 10px;
+        margin-top: 8px;
         height: 30px;
     }
     .update-img .update-file-btn p input{
-        width: 100%;
+        width: 80px;
         height: 30px;
         z-index: 10;
         position: absolute;
@@ -55,7 +54,7 @@
         position: absolute;
         left: 0;
         top: 0;
-        width: 100%;
+        width: 80px;
         display: inline-block;
         height: 30px;
         text-align: center;
@@ -80,6 +79,7 @@
         background: #5078cb;
         color: #fff;
         float: right;
+        margin-right: 44px;
     }
     .update-img .update-file-btn p a:hover,.update-img .update-file-btn p span:hover{
         background: #3f7ae3;
@@ -95,35 +95,83 @@
         top: 0;
         opacity: 0;
     }
-.update-file-btn .previewImage{
-    width: 100%;
-    height: 30px;
-}
-.update-file-btn .previewImage:hover{
-    cursor: pointer;
-}
+    .update-file-btn .previewImage{
+        width: 100%;
+        height: 30px;
+    }
+    .update-file-btn .previewImage:hover{
+        cursor: pointer;
+    }
+    .close{
+        position: absolute;
+        top: 0;
+        right: 5px;
+    }
+    .modal-body{
+        padding: 10px;
+    }
+    .file-text{
+        width: 100%;
+        margin: 0 auto;
+        margin-top: 35px;
+    }
+    .file-text h3{
+        line-height: 26px;
+        background: #e3e3e6;
+        font-size: 12px;
+        text-align: center;
+        font-weight: bold;
+    }
+    .file-text div{
+        width: 100%;
+        height: 215px;
+        background: #f6f6f7;
+        line-height: 20px;
+        font-size: 12px;
+        padding: 5px 10px;
+    }
+    .prompt{
+        font-size: 12px;
+        width: 270px;
+        display: inline-block;
+        margin-top: 5px;
+    }
 </style>
 <div class="modal-head"></div>
 <div class="modal-body">
-        <div class="view-box">
-            <div class="update-img">
-                <div class="update-big-img">
-                    <p>大图预览</p>
-                    <div class="previewImage">
-                        <img src="{{pic}}" alt="商品图片">
-                    </div>
-                    <span class="prompt"><em>*</em>  建议使用不小于 256X256px图片,大小不超过3M</span>
+    <div class="view-box">
+        <div class="update-img">
+            <a ng-click="cancel()" class="close">&times;</a>
+            <div class="update-big-img">
+                <p>大图预览</p>
+                <div class="previewImage">
+                    <img src="{{pic}}" alt="商品图片">
                 </div>
-                <div class="update-file-btn">
-                    <p>
-                        <input type="file" image-upload class="uploadImage" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png,.pdf" on-success="onUploadSuccess($data, $file)" non-preview="true">
-                        <span>重新上传</span>
-                    </p>
-                    <p>
-                        <a ng-click="cancel()" class="off">取消</a>
-                        <a ng-click="confirm()" class="ok">确定</a>
-                    </p>
+                <span class="prompt"><em style="color: #f00;">*</em>  建议使用不小于256*256px图片，大小不超过3M</span>
+            </div>
+            <div class="update-file-btn">
+                <div class="file-text">
+                    <h3>图片上传须知</h3>
+                    <div>上传的商品图片若存在以下任一情形，
+                        平台将会对产品进行下架，若情节影响
+                        严重，平台将保留追究权：<br/>
+                        1、图片与产品不相符合；<br/>
+                        2、图片存在低俗信息；<br/>
+                        3、图片拼接、不清晰或拉伸变形等；<br/>
+                        4、带有文字、色块、图形或logo等影响<br/>
+                        &nbsp;&nbsp;&nbsp;主图美观和正常查看的内容（平台会<br/>
+                        &nbsp;&nbsp;&nbsp;自动生成店铺logo，无需再使用有logo<br/>
+                        &nbsp;&nbsp;&nbsp;的图片）.
+                    </div>
                 </div>
+                <p>
+                        <span style="left:40px;">
+                            <input type="file" image-upload class="uploadImage" accept="image/jpeg,image/jpg,image/gif,image/bmp,image/png,.pdf" on-success="onUploadSuccess($data, $file)" non-preview="true">
+                            <span>选择文件</span>
+                        </span>
+                    <a ng-click="confirm()" class="ok">确定</a>
+                </p>
             </div>
         </div>
+    </div>
 </div>