Merge branch 'developerB' of D:\xuwei_dev\caimei-caimei365-www with conflicts.

src/main/resources/config/dev/application-dev.yml

@@ -52,7 +52,7 @@ logging:
 
 # 服务域名
 caimei:
-  spiServer: http://192.168.2.75:8008
+  spiServer: http://192.168.2.68:8008
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

src/main/resources/static/css/user-center/address/list.css

@@ -8,13 +8,14 @@ li{list-style:none}
     .navLayout .right{float:right;width:968px}
     .order-header{width: 100%;height: 78px;box-sizing: border-box;padding: 20px;background-color: #FFF;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .order-header .header-bt {height: 38px;float: left;}
-    .order-header .header-bt p{float: left;font-size: 14px;line-height: 38px;text-align: left;color: #22272e;}
+    .order-header .header-bt p{float: left;font-size: 14px;line-height: 38px;text-align: left;color: #627386;}
     .order-header .header-bt p span{color: #E15616;margin: 0 5px;}
     .order-header .header-button{height: 38px;float: right;}
     .order-header .header-button .btn-server{width: 128px;height: 36px;display: block;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;font-size: 14px;color: #e15616;line-height: 36px;text-align: center;}
-    .container{width: 100%;height: auto;box-sizing: border-box;margin-top: 15px;position: relative;}
+    .container{width: 100%;height: auto;box-sizing: border-box;position: relative;margin-top: 10px}
     .container .empty{background-color:#FFF;}
-    .container .section.address-none{height: 318px;position: absolute;left: 0;top:0;background-color: #FFF;box-shadow: 0px 4px 6px 0px rgba(0, 0, 0, 0.4);z-index: 999;padding: 16px 0;box-sizing: border-box;}
+    .container .section.address-none{height: 318px;left: 0;top:0;background-color: #FFF;box-shadow: 0px 3px 6px 0px
+		rgba(34, 39, 46, 0.07);z-index: 999;padding: 16px 0;box-sizing: border-box;margin-bottom: 10px}
     .addressWrap{padding:16px;position:relative}
     .addressWrap .formLine{padding-bottom:16px;font-size:14px;position:relative;padding-left:90px;text-align:left;width:450px}
     .addressWrap .formLine .label{position:absolute;left:0;top:0;width:90px;text-align:right;line-height:36px;font-size:14px}
@@ -52,7 +53,9 @@ li{list-style:none}
     .container .section .list .list-defalut .icon{height: 24px;width: 24px;display: block;float: left;margin-right: 5px;}
     .container .section .list .list-defalut .icon:before{height: 24px;width: 24px;background-position: -255px -330px;}
     .container .section .list .list-defalut .span-s{display: inline-block;height: 24px;line-height:24px;padding: 0 15px;background-color: #f94b4b;font-size: 12px;color: #FFFFFF;border-radius: 12px;text-align: center;cursor: pointer;}
-
+    input[type=checkbox]:checked:after{background: #1890f9;border: 1px solid #1890f9}
+    input[type=checkbox]:after{border: 1px solid #1890f9;}
+    input::placeholder,textarea::placeholder{color: #9aa5b5}
 }
 
 /**
@@ -91,7 +94,8 @@ li{list-style:none}
     .addressWrap .btnBox .group .check input{vertical-align:top;margin-right:2vw}
     .addressWrap .btnBox .group .btn{display:inline-block;width:40vw;height:11vw;line-height:11vw;text-align:center;font-size:3.4vw;color:#e15616;border:1px solid #e15616;background:#FFE6DC}
     .addressWrap .btnBox .group .btn.save{background-color:#E15616;color:#FFF;border-color:#E15616}
-
-
+    input[type=checkbox]:checked:after{background: #1890f9;border: 1px solid #1890f9}
+    input[type=checkbox]:after{border: 1px solid #1890f9;}
+    input::placeholder,textarea::placeholder{color: #9aa5b5}
 
 }

src/main/resources/static/css/user-center/order/logistics.css

@@ -26,7 +26,7 @@ li {list-style: none; }
      .package-status .status-list>li:first-child:before {background-color: #e15616;border: 2px solid #e15616}
      .package-status .status-list>li {height: auto;width: 95%;}
      .package-status .status-box:before {content: " ";background-color: #f3f3f3;display: block;position: absolute;top: -8px;left: 20px;width: 10px;height: 4px}
-     .status-content-before {text-align: left;margin-left: 20px;margin-top: -10px;width: 70%;    vertical-align: text-top;word-break: break-all;overflow: hidden;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
+     .status-content-before {text-align: left;margin-left: 15px;margin-top: -10px;width: 70%;    vertical-align: text-top;word-break: break-all;overflow: hidden;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
      .status-time-before {text-align: left;margin-left: 15px;font-size: 14px;}
      .status-time-latest {text-align: left;margin-left: 25px;color: #0278D8;font-size: 10px;margin-top: 5px;}
      .package-status .status-list>li div{display: inline-block;color: #22272e;}
@@ -58,7 +58,7 @@ li {list-style: none; }
      .package-status .status-list>li:before { /* 流程点的样式 */content: '';border: .27vw solid #e2e7ef;background-color: #e2e7ef;display: inline-block;width: 1.6vw;height: 1.6vw;border-radius: 50%;margin-left: -1.33vw;}
      .package-status .status-list>li {height: auto;}
      .package-status .status-box:before {content: " ";background-color: #f3f3f3;display: block;position: absolute;top: -8px;left: 20px;width: 10px;height: 4px}
-     .status-content-before {margin-left:2.7vw;width: 90%}
+     .status-content-before {margin-left:2.7vw;width: 92%}
      .status-time-before {text-align: left;margin-left: 5.5vw;}
      .package-status .status-list>li div{display: inline-block;color: #9aa5b5;font-size: 3vw;line-height: 6.4vw;}
      .status-list li .status-date{margin: 0 4vw;}

src/main/resources/static/css/user-center/order/orderlist.css

@@ -91,6 +91,7 @@ li{list-style:none}
     .popup-layer .popup-button .btn{height: 30px;line-height: 28px;margin: 5px 5px 0;padding: 0 15px;border: 1px solid #dedede;background-color: #fff;color: #333;border-radius: 2px;font-weight: 400;cursor: pointer;text-decoration: none;display: inline-block;}
     .popup-layer .popup-button .btn.btn-confim{border-color: #E15616;background-color: #E15616;color: #fff;}
     .popup-layer .popup-button .btn.btn-onlinePayConfim{border-color: #E15616;background-color: #E15616;color: #fff;}
+    input::placeholder{color: #9AA5B5}
 }
 
 /**
@@ -122,6 +123,6 @@ li{list-style:none}
 .user-main.order .order-botton{text-align:right;margin-top:2vw}
 .user-main.order .order-botton .btn{display:inline-block;width:22.4vw;height:9.5vw;line-height:9.5vw;text-align:center;background-color:#ffe6dc;border-radius:2px;border:solid 1px #e15616;color:#e15616;font-size:3.4vw;margin-left:2.6vw}
 .user-main.order .order-botton .primary{background:#e15616;color:#FFF;}
-
+input::placeholder{color: #9AA5B5}
 }
 

src/main/resources/static/css/user-center/repair/detail.css

@@ -6,7 +6,7 @@ li{list-style:none}
 @media screen and (min-width:768px){
     /*个人中心右侧*/
     .navLayout .right{float:right;width:968px}
-    .container{width: 100%;height: auto;background-color: #ffffff;box-sizing: border-box;padding:32px 225px;}
+    .container{width: 100%;height: auto;background-color: #ffffff;box-sizing: border-box;padding:32px 225px;border-bottom: solid 1px #e2e7ef}
     .container .formLine{width: 100%;float: left;}
     .container .formLine.file{margin-top: 16px;}
     .container .formLine .upload-image{width: 100%;height: 92px;margin: 5px 0;}
@@ -23,23 +23,34 @@ li{list-style:none}
     .container .formLine .address.mark textarea{margin-top: 0;}
     .container .formLine .btn{width: 208px;height: 50px;display: block;font-size: 14px;color: #FFF;text-align: center;line-height: 50px; margin: 0 auto;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;}
     .container .formLine .btn.disabled{background-color: #999999;}
-    .release-stepbox .stepSpan{display: inline-block;width: 32%;
-    text-align: center}
-    .stepSpan p{
-        display: inline-block;
-        color: #9aa5b5;
-    }
-    .stepSpan span{
-        width: 20px;
-    height: 20px;
-    background: #9aa5b5;
-    display: inline-block;
-    border-radius: 50%;
-    color: #fff;
-    line-height: 20px;
-    text-align: center
-    }
 
+
+    .release-stepbox .stepSpan{display: inline-block;width: 32%;text-align: center}
+    .stepSpan p{display: inline-block;color: #9aa5b5;}
+    .stepSpan span{width: 20px;height: 20px;background: #9aa5b5;display: inline-block;border-radius: 50%;color: #fff;line-height: 20px;text-align: center}
+    .release-stepbox .stepSpan.active span{color: #fff;background: #E15616}
+    .release-stepbox .stepSpan.active p{color: #e15616}
+    .process p{color: #627386;font-size: 14px;margin-bottom: 35px}
+    .process .feedback span{position: relative;border-radius: 2px; padding: 0 15px 0 28px;height: 30px;line-height: 32px;text-align: center;color: #b8bfca;border: 1px solid #b8bfca;margin-right: 15px;display: inline-block;cursor: pointer;}
+    em{color: #e15616;margin-right: 5px}
+    .process .feedback span.style{border: 1px solid #e15616;color: #e15616}
+    .process textarea{width: 496px;height: 116px;padding: 10px;resize: none;border: solid 1px #b8bfca;}
+    textarea::placeholder{color: #9aa5b5}
+    .process>div span{color:#9aa5b5;    position: absolute;bottom: 10px;right: 10px;font-size: 12px }
+    .process>div{position: relative}
+    .from-button{width: 232px;height: 50px;cursor:pointer;line-height: 50px;text-align: center;color: #fff;background-color: #e15616;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);border-radius: 2px;font-size: 18px;margin: 15px auto;}
+    .mainconten{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 20px 0}
+    .mainconten form{width: 500px;margin: auto}
+    .sencondCont{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 32px 0;margin-top: 10px;}
+    .sencondCont form{width: 500px;margin: auto}
+    .sencondCont p{color: #627386;font-size: 14px;margin-bottom: 32px}
+    .sencondCont p span{color: #22272e;}
+    .process p:nth-child(3){margin-bottom: 10px}
+    .sencondCont .Image img{width: 80px;height: 80px;margin-inline-start: 10px}
+    .icon.solve:before{width: 25px;height: 25px;background-position: -171px -512px;position: absolute;left: 5px}
+    .icon.unsolved:before{width: 25px;height: 25px;background-position: -205px -512px;position: absolute;left: 5px}
+    .icon.stance:before{width: 25px;height: 25px;background-position: -273px -513px;cursor: pointer;}
+    .icon.changestance:before{   width: 25px;height: 25px;background-position: -240px -513px}
 }
 
 /**

src/main/resources/static/css/user-center/repair/form.css

@@ -26,7 +26,7 @@ li{list-style:none}
     .container .formLine .btn.disabled{background-color: #999999;}
     */
     .repair{width: 100%;height: auto;background-color: #ffffff;box-sizing: border-box;padding:32px 225px;}
-    .repair .title{height:42px;line-height:42px;font-weight:bold;font-size:32px;color:#22272e;text-align:center;padding:30px}
+    .repair .title{height:42px;line-height:42px;font-size:32px;color:#22272e;text-align:center;padding:30px}
     .repair form{width:498px;margin:0 auto}
     .repair .fileInfo{font-size:14px;line-height:24px;color:#f94b4b}
     .formLine .formLine-file {width: 92px;height: 92px;position: relative;}

src/main/resources/static/css/user-center/repair/list.css

@@ -30,7 +30,7 @@ li{list-style:none}
     .container .section .title{width: 100%;height: 54px;border-bottom: 1px solid #e2e7ef;}
     .container .section .content{width: 100%;height: auto;}
     .container .section .list{width: 100%;height: 44px;}
-    .container .section .td{height: 54px;font-size: 14px;color:#627386;float: left;line-height:54px;text-align: center;}
+    .container .section .td{height: 54px;font-size: 14px;color:#22272e;float: left;line-height:54px;text-align: left;}
     .container .section .td.td-1{width:11%;}
     .container .section .td.td-2{width:14%;text-align: center;}
     .container .section .td.td-3{width:19%;text-align: center;}
@@ -43,6 +43,8 @@ li{list-style:none}
     .container .section .td.td-8 a{text-decoration: underline;}
     .container .section .td.td-8 .eva{color: #1890f9;}
     .container .section .td>span{display:none;}
+    input::placeholder{color:  #9AA5B5}
+    .container .section .title .td{color: #627386}
 }
 
 /**
@@ -70,5 +72,5 @@ li{list-style:none}
     .container .section .td.td-1{color:#e15616}
     .container .section .td-8 a{width:22.4vw;height:9.6vw;line-height:9.6vw;text-align:center;color:#1890f9;background-color:#e0f1ff;border-radius:5vw;border:solid 1px #1890f9;position:absolute;bottom:3.2vw;right:3.2vw}
     .navLayout .link{display:block;margin:2vw auto;width:100%;height:11.2vw;line-height:11.2vw;background-color:#e15616;border-radius:.2vw;text-align:center;font-size:3.4vw;color:#FFF}
-
+    input::placeholder{color:  #9AA5B5}
 }

src/main/resources/static/js/common/serviceapi/repair.service.js

@@ -18,5 +18,19 @@ var RepairApi = {
                 callback(res);
             });
         },
+         /* 维修详情 */
+        MaintenanceDetail: function (params, callback) {
+            Http.AjaxService({ url:'/pcCenter/maintenance/detail', type:'GET', data:params, json:false})
+            .then(function(res){
+                callback(res);
+            });
+        },
+        /* 维修详情 提交评论 */
+       evaluation: function (params, callback) {
+            Http.AjaxService({ url:'/pcCenter/maintenance/evaluation', type:'POST', data:params, json:false})
+            .then(function(res){
+                callback(res);
+            });
+        },
 
-};
+};

src/main/resources/static/js/supplier-center/dashboard.js

@@ -42,7 +42,7 @@ var dashboard = new Vue({
                      });
                      _this.EchartsCreated2d();
                  }else {
-                     _this.isRequset = false;
+                     _this.isRequset = true;
                  }
              })
          },

src/main/resources/static/js/supplier-center/order/delivergoods.js

@@ -61,7 +61,6 @@ var delivergoods = new Vue({
          })
 
         }
-
         },
         changeCountSub:function(order) {//商品数量减
         var _this = this;
@@ -80,6 +79,10 @@ var delivergoods = new Vue({
             }
             order.inputVal = _this.inputVal;
         },
+         numberChange: function(order){
+            var _this = this;
+           order.inputVal = _this.inputVal
+        },
 
     },
     created:function(){

src/main/resources/static/js/supplier-center/order/logistics-add.js

@@ -133,7 +133,7 @@ var addlogistics = new Vue({
             _self.params.remark =_self.logisticsBatch.remark;
             if( _self.logisticsBatch.remarkImages!=null&& _self.logisticsBatch.remarkImages!=''){
                  _self.GoodsImagesList =  _self.logisticsBatch.remarkImages;
-                 _self.params.remarkImage = _self.GoodsImagesList.toString()+'##';
+                 _self.params.remarkImage = _self.GoodsImagesList.join('##').substring();
             }
             _self.orderList = res.data.logisticsBatch.logisticsRecordList;
             console.log( _self.params.remarkImage)

src/main/resources/static/js/supplier-center/order/orderlist.js

@@ -26,7 +26,7 @@ var orderList = new Vue({
         },
          pageInput: '1',
          listRecord: 0,
-         isRequset:false,
+         isRequset:true,
          requestFlag: true,
          noMore: false,
          results:[],
@@ -71,7 +71,7 @@ var orderList = new Vue({
             if(res.code==0){
                  console.log(res)
                  if(res.data.results.length > 0){
-                     _this.isRequset = true;
+                     _this.isRequset = false;
                      _this.results = res.data.results;
                      _this.listRecord = res.data.totalRecord;
                  }else {

src/main/resources/static/js/user-center/order/logistics.js

@@ -11,10 +11,10 @@ var logistics = new Vue({
        methods:{
           openpackage:function (info) {
               var _this = this;
-              if(info.routerList!=null){
+              // if(info.routerList!=null){
                   _this.showflag= !_this.showflag;
                   info.showflag = _this.showflag
-              }
+              // }
 
           },
        },

src/main/resources/static/js/user-center/repair/detail.js

@@ -3,20 +3,70 @@ var repairDetailPage = new Vue({
     el: "#repairDetailPage",
     data: {
         userId: 0,
-    },
-    filters: {
-
+        currenflag:1,
+        id:'',
+        info:{},
+        params:{
+             id:'',
+             solveStatus:'',// 0未解决 1 已解决
+             serviceRating:'',//服务频分
+             serviceEvaluate:'',//服务频率
+        },
+        spanIndex:[],
     },
     computed: {
 
     },
     methods: {
+        submit:function(){ //提交评论
+            var _this = this;
+            if( _this.params.serviceRating==0){
+                CAIMEI.Alert('必填项不能为空','确定')
+            }else if( _this.params.serviceEvaluate==''){
+                CAIMEI.Alert('请输入评论','确定')
+            }else {
+                 RepairApi.evaluation(params,function (res) {
+                    if (res.code==0){
+                        CAIMEI.dialog('提交成功')
+                    }
+               })
+            }
 
+        },
+        Evaluation:function (index) {
+            var _this = this;
+            _this.currenflag = index;
+            _this.params.solveStatus = index;
+        },
+        currenindex:function(index){
+            var _this = this;
+            var  arrIndex = _this.spanIndex.indexOf(index);
+             if(arrIndex>-1){
+                    _this.spanIndex.splice(arrIndex,1);
+                     _this.params.serviceRating =_this.spanIndex.length;
+                }else{
+                    _this.spanIndex.push(index);
+                    _this.params.serviceRating = _this.spanIndex.length;
+                }
+        },
+      Detailinfo:function () {
+        var _this = this;
+        RepairApi.MaintenanceDetail({id:_this.id},function (res) {
+           if(res.code==0){
+            console.log(res)
+            _this.info = res.data
+           }
+        })
+      }
     },
     mounted: function () {
+        var _self=this;
         if(globalUserData){
-            this.userId = globalUserData.userId;
+            _self.userId = globalUserData.userId;
         }
+        _self.id = CAIMEI.getUrlParam('id');
+        _self.params.id=CAIMEI.getUrlParam('id');
+        _self.Detailinfo();
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(0).addClass("on").find('.con').show().find('a').eq(1).addClass("on");
     }

src/main/resources/static/js/user-center/repair/repair.js

@@ -121,6 +121,9 @@ var repairForm = new Vue({
     },
     mounted: function () {
         var _self = this;
+        if(globalUserData){
+            _self.userId = globalUserData.userId;
+        }
         PublicApi.GetProvince({},function(response){ //省份
             if(response.code == 0){
                 _self.provinceArray = response.data

src/main/resources/static/js/user-center/setting/information.js

@@ -71,7 +71,8 @@ var informationPage = new Vue({
         addressfrom: {
             provinceID: '',//省id
             cityID: '',//市ID
-            townID: ''//地区ID
+            townID: '',//地区ID
+            name:'请选择'
         },
         rule:{
             name: '^[a-zA-Z\\u4e00-\\u9fa5]{2,}$',
@@ -342,6 +343,7 @@ var informationPage = new Vue({
             _self.userId = globalUserData.userId;
             _self.infoInformationData();
         }
+        _self.GetProvinceFn();
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(0).addClass("on");
     }

src/main/resources/templates/supplier-center/dashboard.html

@@ -14,15 +14,13 @@
 
 <!-- 我的采美 -->
 <div id="dashboard">
-    <div class="navLayout">
+    <div class="navLayout" v-cloak>
         <div v-if="isPC" class="crumbs">
             <span>我的采美</span>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->
             <template th:replace="supplier-center/components/tableft"></template>
-
-
             <div class="right">
                 <div class="information">
                     <div class="head">

src/main/resources/templates/supplier-center/order/delivery.html

@@ -67,7 +67,7 @@
                                         <div class="delivery-number">
                                             <span class="red">*</span>本次发货：
                                             <span class="sp-delivery-cal sp-delivery-reduce" @click="changeCountSub(order)">-</span>
-                                            <input type="number" class="del-num" v-model="inputVal" />
+                                            <input type="number" class="del-num" v-model="inputVal" @change="numberChange(order)"/>
                                             <span class="sp-delivery-cal sp-delivery-add" @click="changeaddCount(order)">+</span>
                                         </div>
                                     </div>

src/main/resources/templates/supplier-center/order/list.html

@@ -45,7 +45,11 @@
                             </div>
                                 <button type="button" class="query-btn" @click="serchBtn">查询</button>
                         </form>
-
+                            <!--loading-->
+                        <div v-if="isRequset" class="loading">
+                            <img src="/img/base/loading.gif">
+                        </div>
+                        <template v-else>
                          <div class="supplier-main order" v-for="(order,index) in results" :key="index">
                             <div class="order-title" >
                                 <div class="title-name">
@@ -114,9 +118,11 @@
                                     <div class="address">
                                         <p >收货地址：&nbsp;&nbsp;<span class="blcak">{{order.userInfo.address}}</span> </p>
                                     </div>
-                                </div>
+                             </div>
                         </div>
+                         </template>
                     </div>
+
                      <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
                      <div class="pageWrap clear" v-if="isPC && pageTotal>1">
                             <a v-if="params.pageNum>1" class="prev" @click="toPagination(params.pageNum*1-1)" href="javascript:void(0);"></a>

src/main/resources/templates/user-center/order/logistics.html

@@ -54,7 +54,7 @@
                                         <ul class="status-list" v-if="isPC">
                                             <li v-for="r in info.routerList">
                                                <div class="status-time-before">{{r.time.substring(0,10)}}</div>
-                                                <div class="status-date">周一</div>
+                                                <div class="status-date">{{r.time.substring(20,23)}}</div>
                                                 <div class="status-time">{{r.time.substring(10,20)}}</div>
                                                 <div class="status-content-before">{{r.desc}}</div>
                                             </li>

src/main/resources/templates/user-center/repair/detail.html

@@ -27,20 +27,60 @@
             <div class="right">
                 <div class="container clear">
                     <div class="release-stepbox">
-                        <div class="stepSpan active">
+                        <div class="stepSpan " :class="info.status==1 || info.status==2||info.status==3?'active':''">
                             <span>1</span>
                             <p>已提交</p>
                         </div>
-                        <div class="stepSpan" >
+                        <div class="stepSpan" :class="info.status==1 || info.status==2 ||info.status==3?'active':''">
                             <span>2</span>
                             <p>已对接</p>
                         </div>
-                        <div class="stepSpan" >
+                        <div class="stepSpan" :class="info.status==3?'active':''">
                             <span>3</span>
                             <p>已评价</p>
                         </div>
                     </div>
                 </div>
+                <div class="mainconten" v-if="info.status!=3">
+                    <form>
+                        <div class="process">
+                            <p class="feedback">是否解决您的问题：
+                                    <span @click="Evaluation(1)" :class="currenflag==1?'style':''"><i class="icon mIcon solve"></i>已解决</span>
+                                    <span @click="Evaluation(2)" :class="currenflag==2?'style':''"><i class="icon mIcon unsolved"></i>未解决</span></p>
+                            <p><em>*</em>服务态度：<span><i class="icon mIcon stance" v-for="i in 5" @click="currenindex(i)" :class="{'changestance':spanIndex.indexOf(i)>-1}"></i></span></p>
+                            <p><em>*</em>您的评价</p>
+                            <div class="val">
+                                <textarea placeholder="请输入您的评价..." v-model="params.serviceEvaluate"> </textarea>
+                                <span>不超过200字</span>
+                            </div>
+                        </div>
+                        <div class="from-button" @click="submit">提交</div>
+                    </form>
+                </div>
+                <div class="sencondCont">
+                    <form>
+                         <div>
+                            <p><em>*</em>维修订单号：<span>{{info.orderNo}}"</span></p>
+                            <p><em>*</em>仪器名称：<span>{{info.instrumentName}}</span></p>
+                            <p><em>*</em>生产厂家：<span>{{info.manufacturer}}</span></p>
+                            <p><em>*</em>联系人：<span>{{info.userContact}}</span></p>
+                            <p><em>*</em>联系电话：<span>{{info.userMobile}}</span></p>
+                            <p><em>*</em>联系地址：<span>{{info.provinceName}}{{info.cityName}}{{info.townName}}{{info.userAddress}}</span></p>
+                            <p class="Image">仪器图片：
+                               <img src="http://img-b.caimei365.com/group1/M00/02/F5/Cmgy619GAQKAH27OABai9FlfTpo329.png"/>
+                               <img src="http://img-b.caimei365.com/group1/M00/02/F5/Cmgy619GAQKAH27OABai9FlfTpo329.png"/>
+                            </p>
+                            <p><em>*</em>问题描述：<span>{{info.problemDescription}}</span></p>
+                            <p><em>*</em>仪器名称品牌/型号：<span>{{info.instrumentBrand}}</span></p>
+                            <p><em>*</em>维修数量：<span>{{info.maintenanceNum}}</span></p>
+                            <p v-if="info.status==3"><em>*</em>服务态度：<span>
+                                    <i class="icon mIcon changestance" v-for="i in info.serviceRating"></i>
+                                     <i class="icon mIcon stance" v-for="i in 5-info.serviceRating"></i>
+                             </span></p>
+                            <p v-if="info.status==3"><em>*</em>您的评价：<span>{{info.serviceEvaluate}}</span></p>
+                         </div>
+                    </form>
+                </div>
             </div>
         </div>
     </div>

src/main/resources/templates/user-center/setting/information.html

@@ -60,15 +60,15 @@
                             <div class="formLine">
                                 <p><em>*</em>联系地址：</p>
                                 <div class="address">
-                                    <select name="provinceID" id="cProvince" @change="ChangeProvince" v-model="addressfrom.provinceID">
+                                    <select name="provinceID" id="cProvince" @change="ChangeProvince">
                                         <option value="" >请选择</option>
                                         <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
                                     </select>
-                                    <select name="cityID" id="cCity" @change="ChangeGetcity($event)" v-model="addressfrom.cityID">
+                                    <select name="cityID" id="cCity" @change="ChangeGetcity($event)" >
                                         <option value="" >请选择</option>
                                         <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
                                     </select>
-                                    <select name="townID" id="cTown" @change="ChangeGetcTown($event)" v-model="addressfrom.townID">
+                                    <select name="townID" id="cTown" @change="ChangeGetcTown($event)" >
                                         <option value="" >请选择</option>
                                         <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                                     </select>