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

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

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

@@ -167,7 +167,7 @@
                 </div>
             </div>
 
-            <div class="row cl">
+            <div class="row cl" id="twiceSellEnd">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>二次售后：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box">
@@ -180,7 +180,7 @@
                     </div>
                 </div>
             </div>
-            <div class="row cl">
+            <div class="row cl" id="openTheLock">
                 <label class="form-label col-1 col-sm-1"><span class="c-red">*</span>开箱损：</label>
                 <div class="formControls col-10 col-sm-10 skin-minimal">
                     <div class="radio-box">
@@ -1009,12 +1009,16 @@
             allCustomerInfoType = parseInt($(this).val());
             if(allCustomerInfoType == 1){
                 $("#customer-process-1").iCheck('check');  //设置已解决
+                $("#twiceSellEnd").hide();
+                $("#openTheLock").hide();
                 allCustomerType = 1;
             }else{
                 $("#customer-process-3").iCheck('check');  //设置换新
+                $("#twiceSellEnd").show();
+                $("#openTheLock").show();
                 allCustomerType =3;
             }
-            initProcessResult(allCustomerType);
+            initProcessResult(allCustomerType,allCustomerInfoType);
         })
 
         var ty = parseInt($("input[name='typeId']:checked").val());