Merge branch 'branch_dev' of http://gitlab.renniting.cn/web_developers/HSpark into branch_dev

王富生
2 parents edc38b57 d5176e0b
Showing 5 changed files with 15 additions and 16 deletions
src/components/VHeader.vue
src/router/index.js
src/styles/index.scss
src/views/payback/index.vue
src/views/service.vue
@@ -2,7 +2,7 @@
     <div class="header-wrap">
       <div class="header">
         <div class="fl logo-bg" @click="$router.push({name:'home'})"></div>
-        <div class="fr login-cont">
+        <!--<div class="fr login-cont">
           <router-link class="no-login " :to="{path:list.routerLink}"
                        v-for="(list, index) in loginList"
                        :key="index">{{list.name}}</router-link>
@@ -11,7 +11,7 @@
             </div>
             <div class="loginout fl"><a>退出</a></div>
           </div>
-        </div>
+        </div>-->
         <ul class="fr nav">
           <!--<li>首页</li>-->
           <!--<li>停车服务</li>-->
@@ -43,9 +43,7 @@ export default {
         {name:'黄石停车',routerLink:'/park'},
         {name:'关于我们',routerLink:'/about'},
       ],
-      loginList:[
-        {name:'请登录',routerLink:'/login'},
-      ],
+
     }
   }
@@ -59,7 +59,6 @@ export const constantRoutes = [
     component: () => import('@/views/service'),
     meta: {
       title: '停车服务'
-
     },
     children:[
       {
@@ -106,7 +105,7 @@ export const constantRoutes = [
         path: '/service/myevaluate',
         component: () => import('@/views/myevaluate/index'),
         meta: { title: '我的评价',icon: 'skill' }
-      }
+      },
     ]
   },
   {
@@ -88,9 +88,11 @@ p{
 }
 .table-title {
-  color: #99a9bf;
+  color: #1F2D3D;
   padding: 15px;
   border-bottom: 1px solid #409EFF;
+  text-align: left;
+  font-weight: bold;
 }
 .el-form-item__error{
@@ -15,7 +15,7 @@
           </el-col>
           <el-col :xs="8" :sm="6" :md="7" :lg="7" :xl="1">
             <el-form-item label="车牌">
-              <el-input v-model="form.name" maxlength="10" />
+              <el-input v-model="form.carNum" maxlength="10" />
             </el-form-item>
           </el-col>
           <el-col :xs="8" :sm="6" :md="3" :lg="3" :xl="1">
@@ -206,8 +206,8 @@
           plNos.push(this.form.plNos);
         }
         let req = {
-          //custId:userInfo.custId,
-          custId:'501519113641649119232',
+          custId:userInfo.custId,
+          //custId:'501519113641649119232',
           orderStates:[52],
           plNos:plNos,
           orgId:this.form.orgId,
@@ -2,16 +2,16 @@
 <template>
   <div >
     <el-container style="min-height: 550px">
-      <el-aside width="210px" style="background-color: rgb(84, 92, 100);">
+      <el-aside width="210px" style="background-color: #f8f8f9;">
         <!--左侧菜单组件-->
         <el-menu
           default-active="2"
           class="el-menu-vertical-demo"
           @open="handleOpen"
           @close="handleClose"
-          background-color="#545c64"
-          text-color="#fff"
-          active-text-color="#409eff" router>
+          background-color="#f8f8f9"
+          text-color="#909399"
+          active-text-color="#f64556" router style="border-right: none">
           <el-menu-item index="/service/dashboard" class="is-active">
             <i class="el-icon-menu "></i>
             <span slot="title">服务首页</span>
@@ -47,7 +47,7 @@
         </el-menu>
       </el-aside>
-      <el-main class="app-container">
+      <el-main class="app-container" style="background-color: #f0f2f5;">
         <router-view :key="key" />
       </el-main>
     </el-container>