Tartarus пре 2 година
родитељ
комит
fe3ee5edcb

+ 9 - 0
src/api/supplier.js

xqd
@@ -15,3 +15,12 @@ export function getSupplierSearch(data) {
     data
   })
 }
+
+/* 获取供应商个人信息 */
+export function getSupplierInfo() {
+  return request({
+    url: '/api/Supplier',
+    method: 'get',
+  })
+}
+

+ 15 - 0
src/api/user.js

xqd
@@ -30,3 +30,18 @@ export function addTicketdrawer() {
     method: 'post'
   })
 }
+
+
+/* 获取业务管理员个人信息 */
+
+
+export function getAccountInfo() {
+  return request({
+    url: '/api/Account',
+    method: 'get',
+  })
+}
+
+
+
+

+ 69 - 28
src/layout/components/Navbar.vue

xqd xqd xqd xqd
@@ -1,23 +1,29 @@
 <template>
   <div class="navbar">
-    <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
     <breadcrumb class="breadcrumb-container" />
 
     <div class="right-menu">
+      <span class="nav-userName">
+        <i class="el-icon-s-custom"></i>
+        您好,{{ userName || supplierName }},欢迎您登录
+      </span>
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
-          <img src="../../assets/img/logo.png" class="user-avatar">
+          <img src="../../assets/img/logo.png" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <router-link to="/">
-            <el-dropdown-item>
-              首页
-            </el-dropdown-item>
+          <router-link to="/contracts/contracts">
+            <el-dropdown-item > 首页 </el-dropdown-item>
           </router-link>
           <el-dropdown-item divided @click.native="logout">
-            <span style="display:block;">退出</span>
+            <span style="display: block">退出</span>
           </el-dropdown-item>
           <!-- <router-link to="/login">
             <el-dropdown-item>
@@ -31,30 +37,58 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import Hamburger from '@/components/Hamburger'
+import { mapGetters } from "vuex";
+import Breadcrumb from "@/components/Breadcrumb";
+import Hamburger from "@/components/Hamburger";
+import { getAccountInfo } from "@/api/user";
+import { getSupplierInfo } from "@/api/supplier";
 
 export default {
   components: {
     Breadcrumb,
-    Hamburger
+    Hamburger,
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
+    ...mapGetters(["sidebar", "avatar", "roles"]),
+  },
+  data() {
+    return {
+      userName: "", //管理员名称
+      supplierName: "", //供应商名称
+    };
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch("app/toggleSideBar");
     },
+    /* 退出登录 */
     async logout() {
-      await this.$store.dispatch('user/ActionLogout')
-    }
-  }
-}
+      await this.$store.dispatch("user/ActionLogout");
+    },
+   
+
+
+    //获取数据方法
+    async getData() {
+      if (this.roles[0] === "admin") {
+        let res = await getAccountInfo();
+        //数据赋值
+        this.userName = res.data.account;
+      } else if(this.roles[0] === "salesman") {
+         let res = await getAccountInfo();
+        //数据赋值
+        this.userName = res.data.account;
+      }else {
+        let req = await getSupplierInfo();
+        this.supplierName = req.data.account;
+        console.log(req);
+      }
+    },
+  },
+  mounted() {
+    this.getData();
+  },
+};
 </script>
 
 <style lang="scss" >
@@ -63,22 +97,29 @@ export default {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+  .nav-userName {
+    position: relative;
+    top: -6px;
+    left: -35px;
+    font-size: 14px;
+    color: #298be2;
+  }
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
-  .right-menu .el-dropdown-menu__item{
-    padding:0 30px !important;
+  .right-menu .el-dropdown-menu__item {
+    padding: 0 30px !important;
   }
   .breadcrumb-container {
     float: left;
@@ -103,10 +144,10 @@ export default {
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }

+ 16 - 0
src/layout/components/Sidebar/SidebarItem.vue

xqd
@@ -95,3 +95,19 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.svg-icon{
+  margin-left: 4px;
+}
+.el-tooltip{
+  position: absolute !important;
+  left: 0px !important;
+  top: 0px;
+  height: 100%;
+  width: 100%;
+  display: inline-block;
+  box-sizing: border-box;
+  padding: 0px -20px;
+}
+
+</style>

+ 0 - 6
src/utils/request.js

xqd
@@ -77,18 +77,12 @@ service.interceptors.response.use(
   response => {
     const res = response.data
     // if the custom code is not 20000, it is judged as an error.
-
-	console.log(response,"response")
-	console.log(res,"res")
-
     // if (res.code !== 200) {
     //   Message({
     //     message: res.msg || 'Error',
     //     type: 'error',
     //     duration: 5 * 1000
     //   })
-
-
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
       // if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
       //   // to re-login

+ 23 - 6
src/views/contracts/index.vue

xqd xqd xqd
@@ -5,15 +5,26 @@
       <div class="grid-content bg-purple">
         <el-input
           v-model="formData.name"
-          placeholder="合同名称/编号、承兑人名称或出票人名称"
-
+          placeholder="合同名称/编号、承兑人名称..."
           clearable
-          style="width:350px"
+          style="width: 160px"
           @change="Search"
         >
           <i slot="prefix" class="el-input__icon el-icon-search" />
         </el-input>
       </div>
+      <!-- 供应商查询 -->
+      <div class="grid-content bg-purple">
+        <el-input
+          v-model="formData.supplierName"
+          placeholder="请输入供应商名称"
+          clearable
+          style="width: 180px"
+          @change="searchName"
+        >
+          <i slot="prefix" class="el-input__icon el-icon-search" />
+        </el-input>
+      </div>
       <!-- 合同状态 -->
       <div class="grid-content bg-purple">
         <el-dropdown @command="handleCommand">
@@ -584,9 +595,9 @@ export default {
     startEndTime(item) {
       if (item == null) {
         item = [];
-         this.formData.startTime = ''
-        this.formData.endTime = '';
-         this.currentPage = 1;
+        this.formData.startTime = "";
+        this.formData.endTime = "";
+        this.currentPage = 1;
         this.searchForm = { ...this.formData };
         this.getData(this.searchForm);
       } else {
@@ -603,6 +614,12 @@ export default {
       this.searchForm = { ...this.formData };
       this.getData(this.searchForm);
     },
+    // 供应商查询
+    searchName() {
+      this.currentPage = 1;
+      this.searchForm = { ...this.formData };
+      this.getData(this.searchForm);
+    },
 
     handleSelectionChange(data) {
       this.multipleSelection = data;

+ 4 - 5
src/views/delivery/index.vue

xqd xqd xqd
@@ -17,7 +17,7 @@
         <el-dropdown @command="handleCommand">
           <div class="pulldown">
             <span v-if="!providerStatus" class="el-dropdown-link">
-              审核状态
+              供应商状态
             </span>
             <span v-if="providerStatus" class="el-dropdown-link">
               {{ providerStatus }}
@@ -36,7 +36,7 @@
         <el-dropdown @command="AhandleCommand">
           <div class="pulldown">
             <span v-if="!Auditstatus" class="el-dropdown-link">
-              供应商状态
+              审核状态
             </span>
             <span v-if="Auditstatus" class="el-dropdown-link">
               {{ Auditstatus }}
@@ -118,13 +118,12 @@
       >
       </el-table-column>
       <el-table-column
-        label="供应商状态"
-        width="180"
+        label="审核状态"
         align="center"
         prop="statusText"
       >
       </el-table-column>
-      <el-table-column label="审核状态" align="center" prop="isDeletedText">
+      <el-table-column label="供应商状态" align="center" prop="isDeletedText"  width="120">
       </el-table-column>
       <el-table-column align="center" prop="createdAt" label="时间" width="180">
       </el-table-column>

+ 270 - 256
src/views/login/index.vue

xqd xqd xqd xqd xqd
@@ -15,15 +15,22 @@
               auto-complete="on"
               label-position="left"
             >
-
               <div class="title-container">
                 <h3 class="title">登录</h3>
               </div>
               <div class="checkbox flex1">
-                <div class="business " :class="checked==0 ? 'bnesper' : 'actbnes' " @click="checked=0">
+                <div
+                  class="business"
+                  :class="checked == 0 ? 'bnesper' : 'actbnes'"
+                  @click="checked = 0"
+                >
                   <p class="asp">业务人员</p>
                 </div>
-                <div class="business " :class="checked==1 ? 'applyper' : 'actapp' " @click="checked=1">
+                <div
+                  class="business"
+                  :class="checked == 1 ? 'applyper' : 'actapp'"
+                  @click="checked = 1"
+                >
                   <p class="asp">供应商</p>
                 </div>
               </div>
@@ -41,9 +48,7 @@
               </el-form-item>
 
               <el-form-item prop="password">
-                <span class="svg-container">
-                  密码
-                </span>
+                <span class="svg-container"> 密码 </span>
                 <el-input
                   :key="passwordType"
                   ref="password"
@@ -56,7 +61,11 @@
                   @keyup.enter.native="handleLogin"
                 />
                 <span class="show-pwd" @click="showPwd">
-                  <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+                  <svg-icon
+                    :icon-class="
+                      passwordType === 'password' ? 'eye' : 'eye-open'
+                    "
+                  />
                 </span>
               </el-form-item>
 
@@ -68,139 +77,146 @@
                   <p class="asp">忘记密码?</p>
                 </div>
               </div>
-              <el-button :loading="loading" type="primary" class="loginbtn" @click.native.prevent="handleLogin">登录
+              <el-button
+                :loading="loading"
+                type="primary"
+                class="loginbtn"
+                @click.native.prevent="handleLogin"
+                >登录
               </el-button>
             </el-form>
           </div>
         </el-col>
       </el-col>
-
     </el-row>
   </div>
 </template>
 
 <script>
-import logo from '/src/assets/img/logo.png'
+import logo from "/src/assets/img/logo.png";
 import router from "@/router";
 export default {
-  name: 'Login',
+  name: "Login",
   data() {
     const validateUsername = (rule, value, callback) => {
       if (value.length === 0) {
-        callback(new Error('请输入账户名称'))
+        callback(new Error("请输入账户名称"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     const validatePassword = (rule, value, callback) => {
       if (value.length < 6) {
-        callback(new Error('请输入大于6位数密码'))
+        callback(new Error("请输入大于6位数密码"));
       } else {
-        callback()
+        callback();
       }
-    }
-    const validateloginType = (rule, value, callback) => {
-
-    }
+    };
+    const validateloginType = (rule, value, callback) => {};
     return {
       loginForm: {
-        username: 'admin',
-        password: '123456',
-        loginType: 0
+        username: "admin",
+        password: "123456",
+        loginType: 0,
       },
       loginRules: {
-        username: [{
-          required: true,
-          trigger: 'blur',
-          validator: validateUsername
-        }],
-        password: [{
-          required: true,
-          trigger: 'blur',
-          validator: validatePassword
-        }],
-        loginType: [{
-          required: true,
-          trigger: 'blur',
-          validator: validateloginType
-        }]
+        username: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validateUsername,
+          },
+        ],
+        password: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validatePassword,
+          },
+        ],
+        loginType: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validateloginType,
+          },
+        ],
       },
       loading: false,
-      passwordType: 'password',
+      passwordType: "password",
       redirect: undefined,
       src: logo,
-      checked: 0
-    }
+      checked: 0,
+    };
   },
   watch: {
     $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect
+      handler: function (route) {
+        this.redirect = route.query && route.query.redirect;
       },
-      immediate: true
-    }
+      immediate: true,
+    },
   },
   mounted() {
     if (this.$route.query.checked) {
-      this.checked = this.$route.query.checked
+      this.checked = this.$route.query.checked;
     }
   },
   methods: {
     showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
+      if (this.passwordType === "password") {
+        this.passwordType = "";
       } else {
-        this.passwordType = 'password'
+        this.passwordType = "password";
       }
       this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
+        this.$refs.password.focus();
+      });
     },
     registerNum() {
       this.$router.push({
-        path: '/register',
+        path: "/register",
         query: {
-          checked: this.checked
-        }
-      })
+          checked: this.checked,
+        },
+      });
     },
     open() {
-      const h = this.$createElement
+      const h = this.$createElement;
       this.$msgbox({
-        title: '',
-        message: h('p', null, [
-          h('span', null, '请电话联系管理员,进行密码确定 ')
+        title: "",
+        message: h("p", null, [
+          h("span", null, "请电话联系管理员,进行密码确定 "),
         ]),
         showCancelButton: true,
         showConfirmButton: true,
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         beforeClose: (action, instance, done) => {
-          if (action === 'confirm') {
-            done()
+          if (action === "confirm") {
+            done();
           } else {
-            done()
+            done();
           }
-        }
-      }).then(action => {
+        },
+      }).then((action) => {
         // this.$message({
         //   type: 'info',
         //   message: 'action: ' + action
         // })
-      })
+      });
     },
     handleLogin() {
-      this.loginForm.loginType = this.checked + 1
-      this.$refs.loginForm.validate(valid => {
+      this.loginForm.loginType = this.checked + 1;
+      this.$refs.loginForm.validate((valid) => {
         if (!valid) {
-          this.$message.error('请检查表单')
-          return
+          this.$message.error("请检查表单");
+          return;
         }
-        this.$store.dispatch('user/ActionLogin', this.loginForm)
-		this.$store.commit('user/getAdmin', this.checked)
-		
-      })
-    }
+        this.$store.dispatch("user/ActionLogin", this.loginForm);
+        this.$store.commit("user/getAdmin", this.checked);
+      });
+    },
     //  handleLogin() {
     //   that.loginForm.loginType = that.checked + 1
     //   console.log(this.loginForm, 88)
@@ -222,233 +238,231 @@ export default {
     //       return false
     //     }
     //   })
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" >
-  /* 修复input 背景不协调 和光标变色 */
-  /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
+/* 修复input 背景不协调 和光标变色 */
+/* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 
-  $bg:#F6F6F6;
-  $light_gray:#BEBDBB;
-  $cursor: #BEBDBB;
+$bg: #f6f6f6;
+$light_gray: #bebdbb;
+$cursor: #bebdbb;
 
-  @supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
-    .login-container .el-input input {
-      color: $cursor;
-    }
+@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
+  .login-container .el-input input {
+    color: $cursor;
   }
+}
 
-  /* reset element-ui css */
-  .login-container {
-    background: url("../../assets/img/loginbg.png") no-repeat;
-    background-size: 100%;
-
-    .el-input {
-      display: inline-block;
+/* reset element-ui css */
+.login-container {
+  background: url("../../assets/img/loginbg.png") no-repeat;
+  background-size: 100%;
+
+  .el-input {
+    display: inline-block;
+    height: 47px;
+    width: 85%;
+    background-color: #f6f6f6;
+
+    input {
+      background: #f6f6f6;
+      border: 0px;
+      -webkit-appearance: none;
+      border-radius: 0px;
+      padding: 12px 5px 12px 15px;
+      color: $light_gray;
       height: 47px;
-      width: 85%;
-      background-color: #F6F6F6;
-
-      input {
-        background: #F6F6F6;
-        border: 0px;
-        -webkit-appearance: none;
-        border-radius: 0px;
-        padding: 12px 5px 12px 15px;
-        color: $light_gray;
-        height: 47px;
-        caret-color: $cursor;
-
-        &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
-          -webkit-text-fill-color: $cursor !important;
-        }
+      caret-color: $cursor;
+
+      &:-webkit-autofill {
+        box-shadow: 0 0 0px 1000px $bg inset !important;
+        -webkit-text-fill-color: $cursor !important;
       }
     }
+  }
 
-    .el-form-item {
-      border: 1px solid rgba(255, 255, 255, 0.1);
-      background: #F6F6F6;
-      border-radius: 5px;
-      color: #454545;
-    }
+  .el-form-item {
+    border: 1px solid rgba(255, 255, 255, 0.1);
+    background: #f6f6f6;
+    border-radius: 5px;
+    color: #454545;
   }
+}
 </style>
 
 <style lang="scss" scoped>
-  $bg:#2d3a4b;
-  $dark_gray:#F6F6F6;
-  $light_gray:#eee;
-
-  .login-container {
-    height: 100%;
-    width: 100%;
-    // background-color: $bg;
+$bg: #2d3a4b;
+$dark_gray: #f6f6f6;
+$light_gray: #eee;
+
+.login-container {
+  height: 100%;
+  width: 100%;
+  // background-color: $bg;
+  // overflow: hidden;
+
+  .login-form {
+    position: relative;
+    width: 470px;
+    max-width: 100%;
+    padding: 0 35px 0;
+    margin: 0 auto;
     // overflow: hidden;
+  }
 
-    .login-form {
-      position: relative;
-      width: 470px;
-      max-width: 100%;
-      padding: 0 35px 0;
-      margin: 0 auto;
-      // overflow: hidden;
-    }
-
-    .tips {
-      font-size: 14px;
-      color: #fff;
-      margin-bottom: 10px;
+  .tips {
+    font-size: 14px;
+    color: #fff;
+    margin-bottom: 10px;
 
-      span {
-        &:first-of-type {
-          margin-right: 16px;
-        }
+    span {
+      &:first-of-type {
+        margin-right: 16px;
       }
     }
+  }
 
-    .svg-container {
-      padding: 6px 5px 6px 15px;
-      color: #1F242A;
-      vertical-align: middle;
-      // width: 30px;
-      display: inline-block;
-    }
-
-    .title-container {
-      position: relative;
+  .svg-container {
+    padding: 6px 5px 6px 15px;
+    color: #1f242a;
+    vertical-align: middle;
+    // width: 30px;
+    display: inline-block;
+  }
 
-      .title {
-        font-size: 48px;
-        color: #1F242A;
-        margin: 0px auto 40px auto;
-        // text-align: center;
-        font-weight: bold;
-      }
-    }
+  .title-container {
+    position: relative;
 
-    .show-pwd {
-      position: absolute;
-      right: 10px;
-      top: 7px;
-      font-size: 16px;
-      color: $dark_gray;
-      cursor: pointer;
-      user-select: none;
+    .title {
+      font-size: 48px;
+      color: #1f242a;
+      margin: 0px auto 40px auto;
+      // text-align: center;
+      font-weight: bold;
     }
   }
 
-  .el-row {
-    height: 100%;
-  }
-
-  .el-col {
-    height: 100%;
+  .show-pwd {
+    position: absolute;
+    right: 10px;
+    top: 7px;
+    font-size: 16px;
+    color: $dark_gray;
+    cursor: pointer;
+    user-select: none;
   }
+}
 
-  .business {
-    width: 305px;
-    height: 90px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-    // background-color: #D8AB5A;
-    border-raotherdius: 20rpx;
-    color: #FFFFFF;
-    margin-top: 57rpx;
-  }
+.el-row {
+  height: 100%;
+}
 
-  .business {
-    width: 305rpx;
-    height: 90rpx;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    text-align: center;
-    // background-color: #D8AB5A;
-    border-raotherdius: 20rpx;
-    color: #FFFFFF;
-    margin-top: 57rpx;
-    // line-height: 110rpx;
-  }
+.el-col {
+  height: 100%;
+}
 
-  .bnesper {
-    background-size: 100%;
-    background-image: url("../../assets/img/loginbtn4.png");
-    background-repeat: no-repeat;
-    padding-top: 10rpx;
-    color: #FFF1D8;
+.business {
+  width: 305px;
+  height: 90px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  // background-color: #D8AB5A;
+  border-raotherdius: 20rpx;
+  color: #ffffff;
+  margin-top: 57rpx;
+}
 
-    .asp {
-      padding-bottom: 5px;
-    }
-  }
+.business {
+  width: 305rpx;
+  height: 90rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  text-align: center;
+  // background-color: #D8AB5A;
+  border-raotherdius: 20rpx;
+  color: #ffffff;
+  margin-top: 57rpx;
+  // line-height: 110rpx;
+}
 
-  .applyper {
-    background-image: url("../../assets/img/loginbt1.png");
-    background-repeat: no-repeat;
-    background-size: 100%;
-    padding-top: 10rpx;
-    color: #FFF1D8;
+.bnesper {
+  background-size: 100%;
+  background-image: url("../../assets/img/loginbtn4.png");
+  background-repeat: no-repeat;
+  padding-top: 10rpx;
+  color: #fff1d8;
 
-    .asp {
-      padding-bottom: 5px;
-    }
+  .asp {
+    padding-bottom: 5px;
   }
+}
 
-  .actapp {
-    background-image: url("../../assets/img/loginbtn3.png");
-    background-repeat: no-repeat;
-    background-size: 100%;
-    color: #D05C39;
-    margin-bottom: 80rpx;
-
-    .asp {
-      padding-bottom: 20px;
-    }
+.applyper {
+  background-image: url("../../assets/img/loginbt1.png");
+  background-repeat: no-repeat;
+  background-size: 100%;
+  padding-top: 10rpx;
+  color: #fff1d8;
 
-    // line-height: 180rpx;
+  .asp {
+    padding-bottom: 5px;
   }
+}
 
-  .actbnes {
-    background-image: url("../../assets/img/loginbt2.png");
-    background-repeat: no-repeat;
-    background-size: 100%;
-    color: #D05C39;
+.actapp {
+  background-image: url("../../assets/img/loginbtn3.png");
+  background-repeat: no-repeat;
+  background-size: 100%;
+  color: #d05c39;
+  margin-bottom: 80rpx;
 
-    .asp {
-      padding-bottom: 20px;
-    }
+  .asp {
+    padding-bottom: 20px;
   }
 
-  .loginbtn {
-    width: 100%;
-    margin-bottom: 30px;
-    background: linear-gradient(to right, #FFE1AD, #D07539);
-    border: none;
-
-    height: 56px;
-    border-radius: 10px;
+  // line-height: 180rpx;
+}
 
-    font-size: 24px;
+.actbnes {
+  background-image: url("../../assets/img/loginbt2.png");
+  background-repeat: no-repeat;
+  background-size: 100%;
+  color: #d05c39;
 
+  .asp {
+    padding-bottom: 20px;
   }
+}
 
-  .registerbtn {
-    margin-top: -20px;
-    margin-bottom: 30px;
-    font-size: 16px;
+.loginbtn {
+  width: 100%;
+  margin-bottom: 30px;
+  background: linear-gradient(to right, #ffe1ad, #d07539);
+  border: none;
 
-    .forgect {
-      cursor: pointer;
-    }
+  height: 56px;
+  border-radius: 10px;
 
-    .nes {
-      color: #D05C39;
-    }
+  font-size: 24px;
+}
 
+.registerbtn {
+  margin-top: -20px;
+  margin-bottom: 30px;
+  font-size: 16px;
+
+  .forgect {
+    cursor: pointer;
+  }
+
+  .nes {
+    color: #d05c39;
   }
+}
 </style>