2
3
yuedefeng 6 лет назад
Родитель
Сommit
ccacb45fb3

+ 6 - 6
src/dashoo.cn/frontend_web/src/components/Headbar.vue

@@ -1,11 +1,11 @@
 <template>
-  <header class="header" style="background-color:#34393D;">
+  <header class="header" style="background-color:#004EA2;">
     <!-- <h1 class="brand" style="text-align:center;margin-left:10px;margin-right:1px;">
       <router-link to="/">
         <img src="~/assets/img/logo.png" style="height:32px;">
       </router-link>
     </h1> -->
-    <div v-if="!isMenuHidden" class="brand" style="background-color:#34393D;padding-top:7px;padding-left:20px;width:180px;">
+    <div v-if="!isMenuHidden" class="brand" style="background-color:#004EA2;padding-top:7px;padding-left:20px;width:180px;">
       <router-link to="/">
         <img src="../assets/img/logo_dagang2.png" style="height:35px;" />
       </router-link>
@@ -15,14 +15,14 @@
         <img src="../assets/img/title.png" style="height:35px;" />
       </router-link>
     </div>
-    <nav class="toolbar" style="margin-top: 3px;background-color:#34393D;">
+    <nav class="toolbar" style="margin-top: 3px;background-color:#004EA2;">
       <img src="../assets/img/gongfang_right.png" style="height:35px;padding-top:5px;" />
       <div style="margin: 10px 0px 0px 20px;"></div>
       <el-tag type="text" size="mini" style="margin-top:12px">{{department}}</el-tag>
 
       <ul class="list" style="background: #004EA2;color: blue">
-        <li class="item" style="background: #34393D">
-          <a style="font-size: 90%;background: #34393D;color: white; font-weight: bold" href="#" v-if="authUser">
+        <li class="item" style="background: #004EA2">
+          <a style="font-size: 90%;background: #004EA2;color: white; font-weight: bold" href="#" v-if="authUser">
             <span style="margin-right: 20px;">
               <el-button type="text" icon="icon icon-shrink" v-if="fullscreen" @click="handleFullScreen"></el-button>
               <el-button type="text" icon="icon icon-enlarge" v-if="!fullscreen" @click="handleFullScreen"></el-button>
@@ -31,7 +31,7 @@
             <img v-if="authUser.Profile.Photo" style="background: #FFF; border: hidden" :src="'http://'+authUser.Profile.Host+authUser.Profile.Photo" class="avatar">
             <img v-else class="avatar" style="background: white; border: hidden" src="~/assets/img/avatar.svg" :alt="authUser.name">
           </a>
-          <ul class="list" style="text-align: center;background: #34393D;">
+          <ul class="list" style="text-align: center;background: #004EA2;">
             <li class="item">
               <router-link to="/system/usersetting" style="color: white; font-weight: bold">账户设置</router-link>
             </li>

+ 1 - 1
src/dashoo.cn/frontend_web/src/components/Sticky/index.vue

@@ -125,7 +125,7 @@ export default {
     width: 100%;
     margin:0px auto;
     transition: 600ms ease position;
-    background-color: #34393D; /*#EEF1F6*/
+    background-color: #004EA2; /*#EEF1F6*/
 
     .subtitle {
       font-size: 20px;

+ 3 - 2
src/dashoo.cn/frontend_web/src/components/oilsupplier/goodsinfo.vue

@@ -44,7 +44,7 @@
             <el-select v-model="formData.Country" filterable placeholder="请选择" :disabled="!canUpdateSupplier" style="width: 100%">
               <el-option
                 v-for="item in countryListOptions"
-                :key="item.value"
+                :key="item.key"
                 :label="item.value"
                 :value="item.value">
                 <span style="float: left">{{ item.value }}</span>
@@ -619,7 +619,8 @@
           this.countryListOptions.push({
             label: tmpJson[idx].split('-')[0],
             value: tmpJson[idx].split('-')[1],
-            code: tmpJson[idx].split('-')[2]
+            code: tmpJson[idx].split('-')[2],
+            key: tmpJson[idx]
           })
         }
       },

+ 2 - 2
src/dashoo.cn/frontend_web/src/pages/login.vue

@@ -136,7 +136,7 @@
 
     <div style="background-color: white">
       <div class="top-wrapper">
-        <img src="../assets/img/dagang.png" style="height:60px; margin-top: 5px;" v-if="activeIndex==0">
+        <img src="../assets/img/title_gongfang.png" style="height:60px; margin-top: 5px;" v-if="activeIndex==0">
         <el-menu  :default-active="activeIndex" @select="handleSelect" mode="horizontal">
           <el-menu-item index="0">
             <i class="el-icon-tickets"></i>
@@ -658,7 +658,7 @@ export default {
   }
 
   .back-width {
-    background-color: #CBD1D1;
+    background-color: #CBD1D1; /*#2F79F6*/
     position: fixed;
     margin: auto;
     left: 0;