修改

src/main/java/com/supplier/controller/PersonalController.java

@@ -1,5 +1,6 @@
 package com.supplier.controller;
 
+import com.supplier.jwt.JWTUtil;
 import com.supplier.model.Supplier;
 import com.supplier.service.PersonalServce;
 import com.supplier.util.ParsingToken;
@@ -57,7 +58,12 @@ public class PersonalController {
             supplier.setCode((String) userMap.get("code"));
             int count = personalServce.checkCaptcha(supplier);//校验验证码是否正确
             if(count > 0){
+                //生成token传参
+                Map<String, String> payload = new HashMap<String, String>(){{put("phone", supplier.getPhone());put("code", supplier.getCode());}};
+                // 生成jwt的令牌
+                String token = JWTUtil.getToken(payload);
                 personalServce.updatePhone(supplier);
+                map.put("data", token);
                 map.put("msg", "200");
             } else {
                 map.put("errMsg", "手机号或验证码不正确");
@@ -83,6 +89,8 @@ public class PersonalController {
             //获取token
             Map<String, Object> userMap = ParsingToken.tokenParsing(request);
             supplier.setCode((String) userMap.get("code"));
+
+            System.out.println((String) userMap.get("phone"));
             personalServce.updatePhone(supplier);
             map.put("msg", "200");
         } catch (Exception e){

src/main/resources/config/mapping/PersonalMapper.xml

@@ -27,4 +27,8 @@
         from sys_supplier
         where phone=#{phone} and captcha=#{captcha}
     </select>
+    <!-- 校验验证码 -->
+    <select id="checkCaptcha" resultType="int">
+        select count(*) from sys_supplier where code=#{code} and captcha=#{captcha}
+    </select>
 </mapper>

src/main/resources/config/mapping/privateOrderMapper.xml

@@ -5,7 +5,7 @@
     <!-- 查询私人订制 -->
     <select id="getPrivateOrder" resultType="PrivateOrder">
         SELECT
-            top ${limit} b.*
+            top ${limit} b.*,${orderType} as orderType
         FROM
         bus_private_ordering AS b
         JOIN ( SELECT code,demand_uuid FROM bus_private_ordering_type WHERE code = #{code} and order_type = #{orderType}) as c on b.uuid = c.demand_uuid
@@ -27,7 +27,7 @@
     <!-- 查询私人订制特殊 -->
     <select id="getPrivateOrderZeor" resultType="PrivateOrder">
         SELECT
-            top ${limit} b.*
+            top ${limit} b.*,${orderType} as orderType
         FROM
         bus_private_ordering AS b
         JOIN ( SELECT code,uuid FROM bus_private_ordering WHERE uuid NOT IN ( SELECT demand_uuid FROM bus_private_ordering_type WHERE code = #{code} AND order_type != 0 ) ) AS c ON b.uuid = c.uuid

src/main/resources/static/css/demandForSingle/offer.css

@@ -810,4 +810,13 @@
     background-image: linear-gradient(to bottom,#015eea,#00c0fa);
     font-size: 16px;
     border: unset;
+}
+.opinion_div_update{
+    display: none;
+}
+.opinion_div_update textarea{
+    color: red;
+}
+.pre-actived:before{
+    border: 3px solid #ffb003!important;
 }

src/main/resources/static/js/demandForSingle/index/function.js

@@ -36,12 +36,16 @@ function getQuotation(page, limit, startTime, endTime){
                 $(".content_div div").remove();
                 $.each(data.data, (index, item) => {
                     var type = "待回答";
+                    var buttonElem = "<button class=\"ignore_button button_div_head\" onclick='ignoreClick(this)'><img src=\"/images/demandForSingle/ban.png\"/>忽略</button>\n" +
+                        "<button class=\"offer_button button_div_head\" onclick='offerClick(this)'><img src=\"/images/demandForSingle/offer.png\"/>提供报价</button>\n"
                     if(item.orderType == 0){
                         type = "待回答";
                     }else if(item.orderType == 1){
                         type = "已回答";
+                        buttonElem = "<button class=\"offer_button button_div_head\" onclick='offerClick(this)'><img src=\"/images/demandForSingle/offer.png\"/>修改报价</button>\n";
                     }else if(item.orderType == 2){
                         type = "已付费";
+                        buttonElem = "<button class=\"offer_button button_div_head\" onclick='offerClick(this)'><img src=\"/images/demandForSingle/offer.png\"/>查看</button>\n";
                     }else if(item.orderType == 3){
                         type = "行程开始";
                     }else if(item.orderType == 4){
@@ -52,6 +56,7 @@ function getQuotation(page, limit, startTime, endTime){
                         type = "不感兴趣";
                     }else if(item.orderType == 9){
                         type = "取消行程";
+                        buttonElem = "<button class=\"offer_button button_div_head\" onclick='offerClick(this)'><img src=\"/images/demandForSingle/offer.png\"/>查看</button>\n";
                     }
                     $(".content_div").append("<div uuid="+ item.uuid +" class=\"content_column\">\n" +
                         "<div class=\"content_div_input\">\n" +
@@ -66,8 +71,7 @@ function getQuotation(page, limit, startTime, endTime){
                         "<div class=\"head_name\" style=\"width: 10%;\">"+ item.budgetMin +" - "+ item.budgetMax +"</div>\n" +
                         "<div class=\"head_name\" style=\"width: 10%;\">"+ type +"</div>\n" +
                         "<div class=\"head_name\" style=\"width: 20%;\">\n" +
-                        "<button class=\"ignore_button button_div_head\" onclick='ignoreClick(this)'><img src=\"/images/demandForSingle/ban.png\"/>忽略</button>\n" +
-                        "<button class=\"offer_button button_div_head\" onclick='offerClick(this)'><img src=\"/images/demandForSingle/offer.png\"/>提供报价</button>\n" +
+                        buttonElem +
                         "</div>\n" +
                         "</div>\n" +
                         "</div>")

src/main/resources/static/js/demandForSingle/offer/function.js

@@ -107,6 +107,9 @@ function addDay(addTiemVal){
         "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">地点介绍</p>\n" +
         "                            <textarea placeholder=\"地点介绍\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
         "                        </div>\n" +
+        "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">修改意见内容</p>\n" +
+        "                            <textarea placeholder=\"修改意见内容\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+        "                        </div>\n" +
         "                        <!-- 关闭按钮 -->\n" +
         "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
         "                           <i class=\"layui-icon layui-icon-close\"></i>\n" +
@@ -152,6 +155,9 @@ function addDay(addTiemVal){
         "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">酒店介绍</p>\n" +
         "                            <textarea placeholder=\"酒店介绍\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
         "                        </div>\n" +
+        "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">修改意见内容</p>\n" +
+        "                            <textarea placeholder=\"修改意见内容\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+        "                        </div>\n" +
         "                        <!-- 关闭按钮 -->\n" +
         "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
         "                           <i class=\"layui-icon layui-icon-close\"></i>\n" +
@@ -180,6 +186,9 @@ function addDay(addTiemVal){
         "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">包车，司机介绍</p>\n" +
         "                            <textarea placeholder=\"包车，司机介绍\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
         "                        </div>\n" +
+        "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">修改意见内容</p>\n" +
+        "                            <textarea placeholder=\"修改意见内容\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+        "                        </div>\n" +
         "                        <!-- 关闭按钮 -->\n" +
         "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
         "                           <i class=\"layui-icon layui-icon-close\"></i>\n" +
@@ -240,6 +249,9 @@ function addPlace(obj){
         "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">地点介绍</p>\n" +
         "                            <textarea placeholder=\"地点介绍\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
         "                        </div>\n" +
+        "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">修改意见内容</p>\n" +
+        "                            <textarea placeholder=\"修改意见内容\" maxlength=\"2000\" data-v-400c2eb9=\"\"></textarea>\n" +
+        "                        </div>\n" +
         "                        <span class=\"content-length\" data-v-400c2eb9=\"\">0/2000</span>\n" +
         "                        <!-- 关闭按钮 -->\n" +
         "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
@@ -467,6 +479,9 @@ function elementDrawing(data){
                 "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">景点介绍</p>\n" +
                 "                            <textarea placeholder=\"景点介绍\"  maxlength=\"2000\" data-v-400c2eb9=\"\">"+ elem.content + "</textarea>\n" +
                 "                        </div>\n" +
+                "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">修改意见内容</p>\n" +
+                "                            <textarea placeholder=\"修改意见内容\" maxlength=\"2000\" data-v-400c2eb9=\"\">用户修改意见："+ elem.updateContent +"</textarea>\n" +
+                "                        </div>\n" +
                 "                        <!-- 关闭按钮 -->\n" +
                 "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
                 "                            <i class=\"layui-icon layui-icon-close\"></i>\n" +
@@ -513,6 +528,9 @@ function elementDrawing(data){
                 "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">酒店介绍</p>\n" +
                 "                            <textarea placeholder=\"酒店介绍\" maxlength=\"2000\" data-v-400c2eb9=\"\">"+ elem.content + "</textarea>\n" +
                 "                        </div>\n" +
+                "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">修改意见内容</p>\n" +
+                "                            <textarea placeholder=\"修改意见内容\" maxlength=\"2000\" data-v-400c2eb9=\"\">用户修改意见："+ elem.updateContent +"</textarea>\n" +
+                "                        </div>\n" +
                 "                        <!-- 关闭按钮 -->\n" +
                 "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
                 "                            <i class=\"layui-icon layui-icon-close\"></i>\n" +
@@ -541,6 +559,9 @@ function elementDrawing(data){
                 "                        <div class=\"editor-content\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">包车，司机介绍</p>\n" +
                 "                            <textarea placeholder=\"包车，司机介绍\" maxlength=\"2000\" data-v-400c2eb9=\"\">"+ elem.content + "</textarea>\n" +
                 "                        </div>\n" +
+                "                        <div class=\"editor-content opinion_div_update\" data-v-400c2eb9=\"\"><p data-v-400c2eb9=\"\">修改意见内容</p>\n" +
+                "                            <textarea placeholder=\"修改意见内容\" maxlength=\"2000\" data-v-400c2eb9=\"\">用户修改意见："+ elem.updateContent +"</textarea>\n" +
+                "                        </div>\n" +
                 "                        <!-- 关闭按钮 -->\n" +
                 "                        <div class=\"close_play_button\" onClick=\"delPlay(this)\">\n" +
                 "                            <i class=\"layui-icon layui-icon-close\"></i>\n" +
@@ -583,6 +604,10 @@ function elementDrawing(data){
         for(var j = 0; j < videoUrlArray.lengthl; j++){
             $("."+ elem.uuid + "-" + elem.typeVal +" .editor-assets-content").append("<video src="+ videoUrlArray[j] +" controls=\"\" data-v-400c2eb9=\"\"></video>");
         }
+        //如果有修改内容的话则显示修改框
+        if(elem.updateContent != null && elem.updateContent != ""){
+            $("."+ elem.uuid + "-" + elem.typeVal +" .opinion_div_update").show();
+        }
     })
     addUrl(uuid);
 }

src/main/resources/static/js/demandForSingle/offer/index.js

@@ -51,8 +51,8 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         elem: '.file_contract' //绑定元素
         ,url: '/upload/uploadFile' //上传接口
         ,method: 'post'  //可选项。HTTP类型，默认post
-        ,accept: 'file'
-        // ,acceptMime: 'file/pdf'
+        ,accept: 'pdf'
+        ,acceptMime: 'file/pdf'
         ,headers: {token: token}
         ,done: function(res){
             contractFile = res.data;
@@ -79,6 +79,7 @@ layui.use(["layer", "form", "laydate", "upload"], function(){
         // ,acceptMime: 'file/pdf'
         ,headers: {token: token}
         ,done: function(res){
+            layer.msg("上传成功", {icon: 1});
             titleImg = res.data;
         }
         ,error: function(){

src/main/resources/static/js/indexHome/function.js

@@ -77,10 +77,10 @@ function removeThis(obj){
     // $(obj).parent().prev().click();
     var name = $(obj).parent().attr("name");//当前模块名称
     var prevName = $(obj).parent().prev().attr("name");//上一个模块名称
-    $(obj).parent().remove();
     if(prevName == "首页"){
         $(obj).parent().prev().click();
     }
+    $(obj).parent().remove();
 
     $.each($(".layui-nav-tree li"), function(index, item){
         //自动关闭第一级
@@ -162,7 +162,6 @@ function registerUser(){
         conn.updateOwnUserInfo(options);
         //查询列表
         conn.getSessionList().then((res) => {
-            console.log(res)
             $(".left_el_scrollbar div").remove();//删除所有记录重新渲染
             $.each(res.data.channel_infos, (index, item) => {
                 var dataVal = JSON.parse(item.meta.payload);//最新消息

src/main/resources/static/js/personal/index.js

@@ -3,7 +3,7 @@ layui.use(["layer", "form", "laydate", 'laypage'], function() {
     form = layui.form;
     layer = layui.layer;
 
-    // load(); //信息初始化
+    load(); //信息初始化
 
     //昵称修改
     $(".name_div_val").on("click", (e) => {
@@ -50,7 +50,7 @@ layui.use(["layer", "form", "laydate", 'laypage'], function() {
     //手机号修改
     $(".phone_update").on("click", (e) => {
         let str = "<div class='phoneBox'>"
-            +"<div class='phoneSmBox'>原手机号码 <input type='text' name='oldPhone' lay-verify='oldPhone' autocomplete='off' class='layui-input'></div>"
+            // +"<div class='phoneSmBox'>原手机号码 <input type='text' name='oldPhone' lay-verify='oldPhone' autocomplete='off' class='layui-input'></div>"
             +"<div class='phoneSmBox'>新手机号码 <input type='text' name='phone' lay-verify='newPhone' autocomplete='off' class='layui-input'></div>"
             +"<div class='phoneSmBox2'><input type='text' name='yzNum' lay-verify='yzNum' autocomplete='off' class='layui-input'>"
             +"<div class='getCode'>获取验证码</div></div>"
@@ -78,6 +78,7 @@ layui.use(["layer", "form", "laydate", 'laypage'], function() {
                     if(data.msg == "200"){
                         layer.closeAll();
                         parent.layer.msg("修改成功", {icon: 1});
+                        localStorage.setItem("token", data.data);
                         load();
                     } else if(data.msg == "300"){
                         layer.closeAll("loading");
@@ -95,19 +96,19 @@ layui.use(["layer", "form", "laydate", 'laypage'], function() {
     //发送验证码
     $(document).on("click", ".getCode", (e) => {
         let phone = $("input[name=phone]").val();//新手机号
-        let oldPhone = $("input[name=oldPhone]").val();//新手机号
-        if(!(/^1[3456789]\d{9}$/.test(oldPhone))){
-            layer.alert("手机号格式不正确", {icon: 2});
-            return false;
-        }
+        // let oldPhone = $("input[name=oldPhone]").val();//新手机号
+        // if(!(/^1[3456789]\d{9}$/.test(oldPhone))){
+        //     layer.alert("手机号格式不正确", {icon: 2});
+        //     return false;
+        // }
         if(!(/^1[3456789]\d{9}$/.test(phone))){
             layer.alert("手机号格式不正确", {icon: 2});
             return false;
         }
         //发送验证码
         $.ajax({
-            url: "http://116.62.173.33:3033/api/supplier/checkTele",
-            type: "get",
+            url: "http://www.tuyatrip.com/api/supplier/updatePhoneSupplier",
+            type: "post",
             data: {
                 "phone": phone
             },
@@ -117,6 +118,8 @@ layui.use(["layer", "form", "laydate", 'laypage'], function() {
             success: (data) => {
                if(data.msg == "500"){
                     layer.alert(data.errMsg, {icon: 1});
+               } else {
+                   layer.alert("发送成功", {icon: 0});
                }
             },
             error: () => {

src/main/resources/templates/demandForSingle/offer.html

@@ -129,6 +129,9 @@
                         <div class="editor-content" data-v-400c2eb9=""><p data-v-400c2eb9="">地点介绍</p>
                             <textarea placeholder="地点介绍" maxlength="2000" data-v-400c2eb9=""></textarea>
                         </div>
+                        <div class="editor-content opinion_div_update" data-v-400c2eb9=""><p data-v-400c2eb9="">修改意见内容</p>
+                            <textarea placeholder="修改意见内容" maxlength="2000" data-v-400c2eb9=""></textarea>
+                        </div>
                         <!-- 关闭按钮 -->
                         <div class="close_play_button" onClick="delPlay(this)">
                             <i class="layui-icon layui-icon-close"></i>
@@ -174,6 +177,9 @@
                         <div class="editor-content" data-v-400c2eb9=""><p data-v-400c2eb9="">酒店介绍</p>
                             <textarea placeholder="酒店介绍" maxlength="2000" data-v-400c2eb9=""></textarea>
                         </div>
+                        <div class="editor-content opinion_div_update" data-v-400c2eb9=""><p data-v-400c2eb9="">修改意见内容</p>
+                            <textarea placeholder="修改意见内容" maxlength="2000" data-v-400c2eb9=""></textarea>
+                        </div>
                         <!-- 关闭按钮 -->
                         <div class="close_play_button" onClick="delPlay(this)">
                             <i class="layui-icon layui-icon-close"></i>
@@ -201,6 +207,9 @@
                         <div class="editor-content" data-v-400c2eb9=""><p data-v-400c2eb9="">包车，司机介绍</p>
                             <textarea placeholder="包车，司机介绍" maxlength="2000" data-v-400c2eb9=""></textarea>
                         </div>
+                        <div class="editor-content opinion_div_update" data-v-400c2eb9=""><p data-v-400c2eb9="">修改意见内容</p>
+                            <textarea placeholder="修改意见内容" maxlength="2000" data-v-400c2eb9=""></textarea>
+                        </div>
                         <!-- 关闭按钮 -->
                         <div class="close_play_button" onClick="delPlay(this)">
                             <i class="layui-icon layui-icon-close"></i>