Merge remote-tracking branch 'origin/developerB' into developerB

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

@@ -39,9 +39,9 @@ li{list-style:none}
     .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{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 20px 0;margin-bottom: 8px}
     .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{background: #fff;	box-shadow: 0px 3px 6px 0px rgba(34, 39, 46, 0.07);padding: 32px 0;}
     .sencondCont form{width: 500px;margin: auto}
     .sencondCont p{color: #627386;font-size: 14px;margin-bottom: 32px}
     .sencondCont p span{color: #22272e;}
@@ -52,6 +52,7 @@ li{list-style:none}
     .icon.stance:before{width: 25px;height: 25px;background-position: -273px -513px;cursor: pointer;}
     .icon.changestance:before{   width: 25px;height: 25px;background-position: -240px -513px}
     .sencondCont p.Image{width: 530px}
+    .grade{position: absolute;margin-top: -6px}
 }
 
 /**
@@ -86,7 +87,8 @@ li{list-style:none}
     .mIcon.stance:before{width: 6.3vw;height: 7.3vw;background-position:-24.8vw  -68.5vw;cursor: pointer;margin-left: 1.3vw}
     .mIcon.changestance:before{ width: 6.3vw;height: 7.3vw;background-position: -16.5vw -68.5vw}
     .process p label{display: block}
-
+    .grade{position: absolute;margin-top: 0.3vw}
+    .process p:nth-child(2){height: 13vw}
 
 }
 

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

@@ -13,7 +13,7 @@ li{list-style:none}
     .order-header .header-bt .search{height: 38px;float: left;}
     .order-header .header-bt .search .label{display: inline-block;float: left;height: 38px;line-height:38px;font-size: 12px;color: #627386;}
     .order-header .header-bt .search .search-input{width: 210px;box-sizing: border-box;padding: 0 10px;font-size: 12px;line-height: 36px;border: 1px solid #b8bfca;border-radius: 2px; }
-    .order-header .header-bt .search .select{width:114px;height:38px;box-sizing: border-box;padding: 0 10px;font-size: 12px;line-height: 38px;border: none;border-radius: 2px;border: 1px solid #b8bfca;color: #627386;}
+    .order-header .header-bt .search .select{background: #fff;width:114px;height:38px;box-sizing: border-box;padding: 0 10px;font-size: 12px;line-height: 38px;border: none;border-radius: 2px;border: 1px solid #b8bfca;color: #627386;}
     .order-header .header-bt .search-time{float: left;margin:0 15px;}
     .order-header .header-bt .search-time .label{display: inline-block;float: left;height: 38px;line-height:38px;font-size: 12px;color: #627386;}
     .order-header .header-bt .search-time .search-main{float: left;height: 38px;}
@@ -56,7 +56,7 @@ li{list-style:none}
     .header-search .search input{height: -webkit-fill-available;width: 75vw;border: none;}
     .header-search>div .label{color: #627386;margin-left: 1.7vw;line-height: 8vw}
     .header-search input::placeholder{color: #627386}
-    .header-search .search .select{height: 11.7vw;width:100%;border: none;color: #627386;border: .27vw solid rgba(184,191,202,.5)}
+    .header-search .search .select{background: #fff;padding-left: 2vw;height: 11.7vw;width:100%;border: none;color: #627386;border: .27vw solid rgba(184,191,202,.5)}
     .btn-server{width: 35.3vw;height: 11.2vw;line-height: 11.2vw;text-align: center;color: #e15616;border: .27vw solid #e15616;background: #ffe6dc;margin:2.7vw auto;display: block;}
     #orderDate .search-input{display: inline-block;}
     #orderDate{position: relative}

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

@@ -145,6 +145,7 @@ var orderPage = new Vue({
                     }else{
                         _self.orderList = [];
                         _self.orderList = data.results;
+                        _self.listRecord = data.totalRecord;
                     }
                     _self.isRequset = false;
                 }else{

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

@@ -47,7 +47,7 @@
                             <p class="feedback"><label>是否解决您的问题：</label>
                                     <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><label><em>*</em>服务态度：</label><span><i class="icon mIcon stance" v-for="i in 5" @click="currenindex(i)" :class="{'changestance':spanIndex.indexOf(i)>-1}"></i></span></p>
+                            <p><label><em>*</em>服务态度：</label><span class="grade"><i class="icon mIcon stance" v-for="i in 5" @click="currenindex(i)" :class="{'changestance':spanIndex.indexOf(i)>-1}"></i></span></p>
                             <p><label><em>*</em>您的评价：</label></p>
                             <div class="val">
                                 <textarea placeholder="请输入您的评价..." v-model="params.serviceEvaluate"> </textarea>
@@ -72,14 +72,14 @@
                             <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>
+                            <p v-if="info.status==3"><em>*</em>服务态度：<span class="grade">
                                     <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 class="from-button" @click="submit" v-if="!isPC">提交</div>
+                    <div class="from-button" @click="submit" v-if="!isPC &&info.status!=3">提交</div>
                 </div>
             </div>
         </div>

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

@@ -92,7 +92,7 @@
                         </div>
                     </div>
                     <div v-else class="empty">
-                        <img src="/img/common/empty.png">
+                        <img src="/img/order/icon-empt.svg">
                         <div class="msg"><p>暂无数据</p></div>
                     </div>
                 </div>