Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminSalesOrderController.java

@@ -645,7 +645,9 @@ public class AdminSalesOrderController {
     ) throws Exception {
         Admin admin = AdminUtils.getLoginAdmin();
         ResponseJson rj = new ResponseJson();
-
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String salesPayTime = request.getParameter("payTime");
+        salesOrder.setSalesPayTime(sdf.parse(salesPayTime));
         JSONArray jsonArray = JSONArray.fromObject(orderItemString);
         List<SalesOrderItem> salesOrderItemList = (List) JSONArray.toCollection(jsonArray, SalesOrderItem.class);
         for (SalesOrderItem salesOrderItem:salesOrderItemList) {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_relation.ftl

@@ -197,7 +197,7 @@
                 </div>
             </div>
         </div>
-        <div <#if procMethod.procMethodIsSend == 1><#if procMethod.procMethodIsBack == 2>class="tabCon"</#if></#if>style="display: none;">
+        <div <#if procMethod.procMethodIsSend == 1>class="tabCon"</#if>style="display: none;">
             <div class="row cl">
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>是否寄出</strong>
@@ -921,7 +921,7 @@
                 if (relationSendLogisticsCompany == null || relationSendLogisticsCompany == '') {
                     layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
                     relation_flag = false;
-                    return renewed_flag;
+                    return relation_flag;
                 }
                 if (relationSendLogisticsNo == null || relationSendLogisticsNo == '') {
                     layer.msg("请填写物流单号!",{icon: 5,time:1000});
@@ -929,7 +929,7 @@
                     return relation_flag;
                 }
                 var relationSendTel = $('#relationSendTel').val();//收件人电话
-                if (!mobile.test(renewedSendTel)) {
+                if (!mobile.test(relationSendTel)) {
                     layer.msg("收件人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
                     relation_flag = false;
                     return relation_flag;

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/add_order.ftl

@@ -167,7 +167,7 @@
             <div class="row cl" id="" style="">
                 <label class="form-label col-1 col-sm-1">支付时间：</label>
                 <div class="formControls col-2 col-sm-2">
-                    <input type="text" placeholder="购买日期" id="salesPayTime"  name="salesPayTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate: '%y-%M-%d'})"  readonly="readonly">
+                    <input type="text" placeholder="购买日期" id="salesPayTime"  name="payTime" datatype="*" class="input-text Wdate" onclick="WdatePicker({skin:'whyGreen',dateFmt:'yyyy-MM-dd HH:mm:ss',maxDate: '%y-%M-%d'})"  readonly="readonly">
                 </div>
                 <label class="form-label col-2 col-sm-2">支付方式：</label>
                 <div class="formControls col-2 col-sm-2" style="">
@@ -289,9 +289,9 @@
 
     $("#store_1").on("input",function(){
         var $options=$("#datalist_1").children();
+
         for(var i=0;i<$options.length;i++){
             if($options.eq(i).val().trim()==$("#store_1").val().trim()){
-                /*alert($options.eq(i).attr("data-id"));*/
                 $("#salesStoreId").val($options.eq(i).attr("data-id"));
                 break;
             }else{