公公样式

public/css/common.scss

@@ -77,18 +77,6 @@ textarea {
   opacity: 0.69;
 }
 
-//input placeholder
-input::-webkit-input-placeholder {
-  color: #C8CBE0 !important;
-  font-size: 14px;
-  //color:red;
-}
-.el-input.is-disabled .el-input__inner{
-  background-color: #E8EAF3 !important;
-  color:#565B79 !important;
-  border-color:#C8CBE0 !important;
-}
-
 /****清除浮动****/
 .clearFix {
   clear: both;
@@ -338,30 +326,6 @@ input.el-input__inner {
   cursor: not-allowed;
 }
 
-.el-button {
-  font-weight: bold !important;
-}
-
-.el-button--primary {
-  background-color: #5D78FF !important;
-}
-
-.el-button--primary, .el-button--primary:hover, .el-button--primary:focus, .el-button--primary:active {
-  border-color: #5D78FF !important;
-}
-
-.el-button.is-plain:focus, .el-button.is-plain:hover {
-  border-color: #5D78FF !important;
-  color: #5D78FF !important;
-}
-
-.el-button--primary.is-plain {
-  color: #5D78FF !important;
-  border-color: #5D78FF !important;
-  background: #fff !important;
-  height: 40px !important;
-}
-
 .buttonWidth180px{
   width: 180px;
 }
@@ -418,7 +382,7 @@ input.el-input__inner {
   font-weight: 500;
 }
 
-.flagItem {
+.flagItem {//国旗样式
   position: relative;
   & .el-select {
     position: absolute;
@@ -582,24 +546,6 @@ button.loginButton, button.loginButton:hover, button.loginButton:focus, button.l
   background: #5D78FF !important;
 }
 
-.el-checkbox {
-  color: #69697A;
-}
-
-//下拉框选中
-.el-select-dropdown__item.selected, .el-checkbox__input.is-checked + .el-checkbox__label {
-  color: #5D78FF !important;
-}
-
-.el-checkbox__input.is-checked + .el-checkbox__label {
-  color: #69697A !important;
-}
-
-.el-checkbox__input.is-checked .el-checkbox__inner, .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  background-color: #5D78FF !important;
-  border-color: #5D78FF !important;
-}
-
 i {
   font-style: normal;
 }
@@ -618,9 +564,6 @@ i {
 
 .el-dropdown-menu {
   padding: 5px 0 !important;
-  & .el-dropdown-menu__item:hover {
-    color: #5D78FF !important;
-  }
 }
 
 .user-info {
@@ -632,10 +575,6 @@ i {
   cursor: pointer;
 }
 
-.el-input.is-active .el-input__inner, .el-input__inner:focus {
-  border-color: #5D78FF !important;
-}
-
 //动画淡入淡出
 @-webkit-keyframes fadeInOut {
   0% {
@@ -724,26 +663,14 @@ i {
 }
 
 //tag
-.el-tag,.el-tag--plain{
-  height: 40px !important;
-  line-height: 40px !important;
-  font-weight: 400;
-  border-radius: 3px;
-}
-.el-tag--plain.el-tag--success {
-  background-color: #E6F8F3 !important;
-  color: #0ABB87 !important;
-  border-color: #0ABB87 !important;
+.el-tag.el-tag--success {
   & .tag-btn{
     color: #0ABB87 !important;
     text-decoration: underline;
     cursor: pointer;
   }
 }
-.el-tag--plain.el-tag--warning {
-  background-color: #FFF8EF !important;
-  color: #FF9E29 !important;
-  border-color: #FF9E29 !important;
+.el-tag.el-tag--warning {
   & .tag-btn{
     color: #FF9E29 !important;
     text-decoration: underline;
@@ -751,12 +678,7 @@ i {
   }
 }
 
-.el-tag--plain.el-tag--danger {
-  background-color: #FFEFEF !important;
-  color: #FF5D5D !important;
-  border-color: #FF5D5D !important;
-  height: 40px;
-  line-height: 40px;
+.el-tag.el-tag--danger {
   & .tag-btn{
     color: #FF5D5D !important;
     text-decoration: underline;
@@ -777,6 +699,19 @@ i {
   -ms-animation: fadeInOut 3s;
   -o-animation: fadeInOut 3s;
 }
+.addTagItem{
+  .el-tag{
+    margin-right:10px;
+  }
+  .el-tag .el-tag__close{
+    color:#9197B4;
+  }
+  .el-tag .el-tag__close:hover{
+    background-color: #5D78FF;
+  }
+}
+
+
 //抽屉
 .el-drawer.userInfo-drawer {
   width: 20% !important;
@@ -947,18 +882,6 @@ i {
   cursor: pointer;
 }
 
-//面包屑
-.el-breadcrumb {
-  .el-breadcrumb__inner, .el-breadcrumb__inner a, .el-breadcrumb__inner.is-link, .el-breadcrumb__item:last-child .el-breadcrumb__inner, .el-breadcrumb__item:last-child .el-breadcrumb__inner a, .el-breadcrumb__item:last-child .el-breadcrumb__inner a:hover, .el-breadcrumb__item:last-child .el-breadcrumb__inner:hover {
-    color: #565B79;
-    font-weight: 400;
-    font-size: 14px;
-  }
-  .el-breadcrumb__inner a:hover, .el-breadcrumb__inner.is-link:hover {
-    color: #565B79 !important;
-  }
-}
-
 //tab导航
 .wrapperContent {
   padding: 0 30px;
@@ -967,22 +890,13 @@ i {
     background: transparent !important;
     height: 1px !important;
   }
-  .el-form-item__label{
-    color:#565B79;
-    font-weight: 500;
-  }
   .el-tabs__header {
     padding-left: 30px;
     margin: 0;
     border-bottom: 1px solid #E7E9F5;
   }
-  //.el-tabs__nav{
-  //  height: 66px;
-  //  line-height:66px;
-  //}
   .el-tabs__item {
     font-size: 16px;
-    color: #9197B4;
     height: 66px;
     line-height: 66px;
   }
@@ -1024,6 +938,9 @@ i {
   .el-form-item{
     margin-bottom: 20px;
   }
+  .el-upload--picture-card{
+    background-color:unset;
+  }
   .el-upload--picture-card, .el-upload-list--picture-card .el-upload-list__item {
     width: 100px;
     height: 100px;
@@ -1117,11 +1034,30 @@ i {
 
 
 //文字提示
+.ques{
+  margin-left: 10px;
+  display: inline-block;
+  opacity:0.54;
+  .el-button:focus, .el-button:hover{
+    color:#565B79;
+    border-color: #565B79;
+    background-color: unset;
+  }
+}
 .ques .el-button{
   padding:0;
-  border:none;
   width:14px;
   height:14px;
+  line-height: 12px;
+  -webkit-border-radius: 50%;
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  border:1px solid #565B79;
+  color:#565B79;
+  & span{
+    font-weight: normal;
+    font-size:8px;
+  }
 }
 .ques .el-popover{
   background-color:#ffe6ad;

src/components/authentication/personalAuth.vue

@@ -32,7 +32,7 @@
         <el-tag
           class="tagWidth300px"
           :type="messageObj.type"
-          effect="plain">
+          >
           {{ messageObj.message }}
         </el-tag>
       </el-form-item>

src/components/bigbusiness/addSecondStep.vue

+<template>
+    
+</template>
+
+<script>
+    export default {
+        name: "addSecondStep"
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

src/components/login/emailLoginCmpt.vue

@@ -46,7 +46,7 @@
                         <el-tag
                                 class="tagWidth320px"
                                 :type="messageObj.type"
-                                effect="plain">
+                                >
                             {{ messageObj.message }}
                         </el-tag>
                     </el-form-item>

src/components/login/mobileLoginCmpt.vue

@@ -47,7 +47,7 @@
                         <el-tag
                                 class="tagWidth320px"
                                 :type="messageObj.type"
-                                effect="plain">
+                               >
                             {{ messageObj.message }}
                         </el-tag>
                     </el-form-item>

src/main.js

@@ -7,7 +7,8 @@ import '../public/css/common.scss'
 import './assets/font/iconfont.css'
 import vueSwiper from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'  //引入样式
-import 'element-ui/lib/theme-chalk/index.css'
+// import 'element-ui/lib/theme-chalk/index.css'
+import "../public/css/index.css";
 import md5 from 'js-md5'
 import VueI18n from 'vue-i18n'
 import api from '../src/views/loginregister/api/api'

src/views/accountmanage/pages/edit.vue

@@ -10,9 +10,9 @@
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane :label="$t('personalAuth.personalAuth')" name="first">
           <div class="authFormWrapper">
-            <el-tag type="success" effect="plain" v-if="userInfo.authenticationState==2">您的认证已通过审核！您可以提前<span class="tag-btn">发项目</span></el-tag>
-            <el-tag type="danger" effect="plain" v-if="userInfo.authenticationState==3">您的认证未通过审核，驳回原因：xxxxxxxxxxxxxxxxxxxxxxxxxx。您仍可以提前<span class="tag-btn">发项目</span></el-tag>
-            <el-tag type="warning" effect="plain" v-if="userInfo.authenticationState==1">您的认证正在审核中，请您耐心等待！您可以提前<span class="tag-btn">发项目</span></el-tag>
+            <el-tag type="success" v-if="userInfo.authenticationState==2">您的认证已通过审核！您可以提前<span class="tag-btn">发项目</span></el-tag>
+            <el-tag type="danger" v-if="userInfo.authenticationState==3">您的认证未通过审核，驳回原因：xxxxxxxxxxxxxxxxxxxxxxxxxx。您仍可以提前<span class="tag-btn">发项目</span></el-tag>
+            <el-tag type="warning" v-if="userInfo.authenticationState==1">您的认证正在审核中，请您耐心等待！您可以提前<span class="tag-btn">发项目</span></el-tag>
             <personalAuthCmpt v-if="isEdit" @authSuccess="authSuccess"></personalAuthCmpt>
             <personalAuthDetailCmpt v-if="!isEdit" @edit="handleEdit"></personalAuthDetailCmpt>
           </div>

src/views/bigbusiness/api/api.js

+import api from '../../../api/api';
+import Qs from 'qs';
+let baseUrl = "/business";
+export default {
+    //获取公司规模
+    getCompanyScale(params){
+        return api.fetchGet(baseUrl+"/dict/selectDictList",params);
+    },
+
+    //获取所在地
+    getCityTreeDataList(params){
+        // return api.fetchGet(baseUrl+"/geo/")
+    }
+}
\ No newline at end of file

src/views/bigbusiness/pages/add.vue

+<template>
+    <div class="loginedWrapper">
+        <div class="breadcrumb">
+            <el-breadcrumb separator="/">
+                <el-breadcrumb-item><a href="/#/editAuth">{{$t("workPlace.myworkPlace")}}</a></el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/' }">{{activeName=='first'?$t("workPlace.tabBasicInfo"):$t("personalAuth.addRequire")}}</el-breadcrumb-item>
+            </el-breadcrumb>
+        </div>
+        <div class="wrapperContent">
+            <el-tabs v-model="activeName">
+                <el-tab-pane :label="'01'+$t('workPlace.tabBasicInfo')" name="first">
+                    <firstStepCmpt></firstStepCmpt>
+                </el-tab-pane>
+            </el-tabs>
+            <el-tab-pane :label="'02'+$t('workPlace.addRequire')" name="second">
+                <secondStepCmpt></secondStepCmpt>
+            </el-tab-pane>
+        </div>
+    </div>
+</template>
+
+<script>
+    import firstStepCmpt from '../../../components/bigbusiness/addFirstStep';
+    import secondStepCmpt from '../../../components/bigbusiness/addSecondStep';
+    export default {
+        name: "addRequire",
+        components:{
+            firstStepCmpt,
+            secondStepCmpt
+        },
+        data(){
+            return{
+                activeName:"first",
+            }
+        }
+    }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file

src/views/loginregister/pages/emailRegisterCmpt.vue

@@ -24,7 +24,7 @@
                         <el-tag
                                 class="tagWidth320px"
                                 :type="messageObj.type"
-                                effect="plain">
+                                >
                             {{ messageObj.message }}
                         </el-tag>
                     </el-form-item>

src/views/loginregister/pages/mobileRegisterCmpt.vue

@@ -24,7 +24,7 @@
                     <el-form-item v-if="showMessageInfo" class="message-item">
                         <el-tag class="tagWidth320px"
                                 :type="messageObj.type"
-                                effect="plain">
+                                >
                             {{ messageObj.message }}
                         </el-tag>
                     </el-form-item>

src/views/workplace/api/api.js

-import api from '../../../api/api';
-import Qs from 'qs';
-export default {
-
-}
\ No newline at end of file

src/views/workplace/pages/add.vue

-<template>
-    <div class="loginedWrapper">
-        <div class="breadcrumb">
-            <el-breadcrumb separator="/">
-                <el-breadcrumb-item><a href="/#/editAuth">{{$t("personalAuth.setAccount")}}</a></el-breadcrumb-item>
-                <el-breadcrumb-item :to="{ path: '/' }">{{activeName=='first'?$t("personalAuth.personalAuth"):$t("personalAuth.modifyPwd")}}</el-breadcrumb-item>
-            </el-breadcrumb>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "addRequire"
-    }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file