修改了客诉页面

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

@@ -101,7 +101,10 @@
         </div>
         <div class="row cl">
             <label class="form-label col-3">
-                <div class="tit-2">处理结果(<label id="customerIsSolve" style="color: red"></label>)</div>
+                <div class="tit-2">
+                    处理结果(<label id="customerIsSolve" style="color: red"></label>)
+                    <label id="postage" style="color: red"></label>
+                </div>
             </label>
             <div class="formControls col-10 col-sm-10">
             </div>
@@ -244,6 +247,23 @@
                     if (customer.customerIsSolve != 1 && customer.customerIsSolve != 2) {
                         resultshow(customer.customerIsSolve, customerCommon.relationBackStatus,customerCommon.relationSendStatus,
                                 customerCommon.maintenanceIsRepair,customerCommon.detectState);
+                        var postage = '';
+                        var postageMoney = 0;
+                        if (customerCommon.relationBackPostage != null) {
+                            postageMoney = customerCommon.relationBackPostage;
+                        }
+                        switch (customerCommon.relationIsTransfer) {
+                            case 0:
+                                postage = '不需要转账。';
+                                break;
+                            case 1:
+                                postage = '已转账邮费'+postageMoney/100+'元。';
+                                break;
+                            case 2:
+                                postage = '待转账邮费'+postageMoney/100+'元。';
+                                break;
+                        }
+                        $('#postage').html(postage);
                     }
 
                     $('#adminName').html(customer.adminName);

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

@@ -62,7 +62,8 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="backGoodsBackLogisticsCompany" id="backGoodsBackLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>

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

@@ -61,7 +61,8 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="noreasonBackBackLogisticsCompany" id="noreasonBackBackLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>

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

@@ -61,7 +61,8 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="reissueSendLogisticsCompany" id="reissueSendLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>

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

@@ -60,6 +60,7 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="renewedBackLogisticsCompany" id="renewedBackLogisticsCompany" class="select">
+                    <option value="">物流公司</option>
 					<option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
@@ -212,7 +213,8 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="renewedSendLogisticsCompany" id="renewedSendLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -628,27 +630,27 @@
         //var renewedBackMachineNo = $('#renewedBackMachineNo').val();
         if (renewedBackStatus == 1) {
             if (renewedBackLogisticsNo != null && renewedBackLogisticsNo != '') {
-                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackPostage != null && renewedBackPostage != '') {
-                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackLogisticsCompany != null && renewedBackLogisticsCompany != '') {
-                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackName != null && renewedBackName != '') {
-                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackTel != null && renewedBackTel != '') {
-                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:500});
+                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
@@ -659,27 +661,27 @@
             }*/
         } else if (renewedBackStatus == 2 || renewedBackStatus == 3) {
             if (renewedBackLogisticsNo == null || renewedBackLogisticsNo == '') {
-                layer.msg("物流信息不能为空!",{icon: 5,time:500});
+                layer.msg("物流信息不能为空!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!money.test(renewedBackPostage)) {
-                layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:500});
+                layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedBackLogisticsCompany == null || renewedBackLogisticsCompany == '') {
-                layer.msg("请选择物流公司!",{icon: 5,time:500});
+                layer.msg("请选择物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!uname.test(renewedBackName)) {
-                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
+                layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (!mobile.test(renewedBackTel)) {
-                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
+                layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
@@ -691,19 +693,19 @@
         }
         var renewedSendName = $('#renewedSendName').val();
         if (!uname.test(renewedSendName)) {
-            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:500});
+            layer.msg("寄回人信息格式不正确，请重新输入!",{icon: 5,time:1000});
             renewed_flag = false;
             return renewed_flag;
         }
         var renewedSendTel = $('#renewedSendTel').val();
         if (!mobile.test(renewedSendTel)) {
-            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:500});
+            layer.msg("寄回人电话号码格式不正确，请重新输入!",{icon: 5,time:1000});
             renewed_flag = false;
             return renewed_flag;
         }
         var renewedSendAddress = $('#renewedSendAddress').val();
         if (renewedSendAddress == null || renewedSendAddress == '') {
-            layer.msg("寄出地址不能为空!",{icon: 5,time:500});
+            layer.msg("寄出地址不能为空!",{icon: 5,time:1000});
             renewed_flag = false;
             return renewed_flag;
         }
@@ -712,23 +714,23 @@
         var renewedSendLogisticsNo = $('#renewedSendLogisticsNo').val();//寄出物流单号
         if (renewedSendLogisticsCompany == 1) {
             if (renewedSendLogisticsCompany != null && renewedSendLogisticsCompany != '') {
-                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:500});
+                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedSendLogisticsNo != null && renewedSendLogisticsNo != '') {
-                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:500});
+                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
         } else if (renewedSendLogisticsCompany == 2 || renewedSendLogisticsCompany == 3) {
             if (renewedSendLogisticsCompany == null || renewedSendLogisticsCompany == '') {
-                layer.msg("请选择寄回物流公司!",{icon: 5,time:500});
+                layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }
             if (renewedSendLogisticsNo == null || renewedSendLogisticsNo == '') {
-                layer.msg("请填写物流单号!",{icon: 5,time:500});
+                layer.msg("请填写物流单号!",{icon: 5,time:1000});
                 renewed_flag = false;
                 return renewed_flag;
             }

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

@@ -61,7 +61,8 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="repairBackLogisticsCompany" id="repairBackLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>
@@ -213,7 +214,8 @@
                 <div style="width: 100px;display: inline-block;margin-right: 10px;">
 			<span class="select-box">
 				<select name="repairSendLogisticsCompany" id="repairSendLogisticsCompany" class="select">
-					<option value="sto">申通快递</option>
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
                     <option value="yto">圆通快递</option>
                     <option value="sf">顺丰快递</option>
                     <option value="ems">邮政EMS</option>