Qukatie пре 4 дана
родитељ
комит
9547b20c89
3 измењених фајлова са 30 додато и 8 уклоњено
  1. 2 1
      src/page/login/userlogin.vue
  2. 10 7
      src/styles/login.scss
  3. 18 0
      src/views/store/detailsPage.vue

+ 2 - 1
src/page/login/userlogin.vue

@@ -55,12 +55,13 @@
       </el-row>
     </el-form-item>
     <el-form-item>
-      <el-checkbox v-model="rememberMe" style="color:#9c9c9c;">记住密码</el-checkbox>
+      <el-checkbox v-model="rememberMe" style="color:#FFF;">记住密码</el-checkbox>
       <el-button
           type="primary"
           size="small"
           style="margin-top: 10px"
           @click.native.prevent="handleLogin"
+          fill="#fff"
           class="login-submit">{{$t('login.submit')}}
       </el-button>
     </el-form-item>

+ 10 - 7
src/styles/login.scss

@@ -73,7 +73,7 @@
   border-left: none;
   border-radius: 40px;
   color: #fff;
-  background-color: #fff;
+  background-color: #ffffff00;
   width: 100%;
   float: left;
   box-sizing: border-box;
@@ -94,12 +94,15 @@
 }
 
 .login-title {
-  color: #333;
+  color: #fff;
   margin-bottom: 40px;
   font-weight: 500;
   font-size: 22px;
   text-align: center;
   letter-spacing: 4px;
+  .el-dropdown{
+    color: #fff;
+  }
 }
 
 .login-menu {
@@ -117,12 +120,12 @@
 .login-submit {
   width: 100%;
   height: 45px;
-  border: 1px solid #409EFF;
+  border: 1px solid #fff;
   background: none;
   font-size: 18px;
   letter-spacing: 2px;
   font-weight: 300;
-  color: #409EFF;
+  color: #fff;
   cursor: pointer;
   margin-top: 30px;
   font-family: "neo";
@@ -133,7 +136,7 @@
   margin: 10px 0;
 
   i {
-    color: #333;
+    color: #fff;
   }
 
   .el-form-item__content {
@@ -151,7 +154,7 @@
       background: transparent;
       border: none;
       border-radius: 0;
-      color: #333;
+      color: #fff;
       border-bottom: 1px solid rgb(235, 237, 242);
     }
 
@@ -177,7 +180,7 @@
   height: 38px;
   background-color: #fdfdfd;
   border: 1px solid #f0f0f0;
-  color: #333;
+  color: #fff;
   font-size: 14px;
   font-weight: bold;
   letter-spacing: 5px;

+ 18 - 0
src/views/store/detailsPage.vue

@@ -477,14 +477,32 @@ export default {
           {
             label: "店面属性",
             prop: "storeAttributes",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=storeAttributes",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
           },
           {
             label: "连锁属性",
             prop: "chainAttribute",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=chainAttribute",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
           },
           {
             label: "签约级别",
             prop: "signingLevel",
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=signingLevel",
+            props: {
+              label: "dictValue",
+              value: "dictKey",
+            },
           },
           {
             label: "签约条数",