售后仓库地址信息更新（根据售后判断）

watero-rst-web/pom.xml

@@ -161,8 +161,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.3</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                     <compilerArguments>
                         <verbose />
                         <bootclasspath>${java.home}/lib/rt.jar</bootclasspath>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -1137,7 +1137,7 @@ public class AdminCustomerController {
                 }
                 complaintQuestionInfo.setQuestionName(null);
                 complaintQuestionInfo.setSmallClassId(null);
-                url += "/5/0";
+                url += "/" + complaintQuestionInfo.getQuestionId() + "/0";
                 switch (typeCompany) {
                     case 1:
                         con = SmsConfig.SEND_PRODUCT_SMS_WATERO;

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

@@ -300,10 +300,10 @@
             </tr>
             <tr>
                 <th width="10">签收时间：</th>
-                <td width="10" style="font-weight: normal;"><#if (order.salesSignTime)??>${order.salesSignTime?string("yyyy-MM-dd HH:mm:ss")}</td>
+                <td width="10" style="font-weight: normal;"><#if (order.salesSignTime)??>${order.salesSignTime?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
                 <td width="10"></td>
                 <th width="10">运输耗时：</th>
-                <td width="10" style="font-weight: normal;"><#if distanceTime??>&nbsp;${(distanceTime)!}</#if></#if></td>
+                <td width="10" style="font-weight: normal;"><#if distanceTime??>&nbsp;${(distanceTime)!}</#if></td>
             </tr>
             </thead>
         </table>

watero-rst-web/src/main/webapp/common/js/customer/customer.js

@@ -641,7 +641,12 @@ function initComplaintQuestionInfo(type){
     }else if(type == "m"){
         pageNo = 0;//当前页数
         pages = 1;//总页数
-        questionId = complaint_questionId;
+        let procTypeId = $("#procTypeId").val();
+        if (procTypeId === "3") {
+            questionId = complaint_questionId;
+        } else {
+            questionId = 565;
+        }
     }else if(type == "pr"){
         if(pageNo - 1 < 1){
             layer.alert("已经到第一页了");
@@ -768,7 +773,12 @@ function sendPhone(type,node){
         }*/
     }else if(type == "m"){
         phone = $("#m-phone").val();
-        questionId = complaint_questionId;
+        let procTypeId = $("#procTypeId").val();
+        if (procTypeId === "3") {
+            questionId = complaint_questionId;
+        } else {
+            questionId = 565;
+        }
     }else{
         layer.close(index);
         layer.msg("发送报错！", {icon: 5, time: 3000});