修改

src/App.vue

@@ -32,6 +32,12 @@ export default {
 </script>
 
 <style>
+@import "./font-style/font.css";
+
+body {
+  font-family: PingFang;
+}
+
 .pagination-container {
   margin-top: 10px;
 }

src/font-style/font.css

@@ -0,0 +1,6 @@
+@font-face {
+    font-family: 'PingFang';
+    src: url('./PingFang.ttf');
+    font-weight: normal;
+    font-style: normal;
+}

src/layout/components/Sidebar/Logo.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
+      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/index">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
-      <router-link v-else key="expand" class="sidebar-logo-link" to="/">
+      <router-link v-else key="expand" class="sidebar-logo-link" to="/index">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>

src/layout/components/TagsView/index.vue

@@ -1,7 +1,6 @@
 <template>
-   <!-- id="tags-view-container" class="tags-view-container" -->
+  <div id="tags-view-container" class="tags-view-container">
-  <div>
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-    <!-- <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link
         v-for="tag in visitedViews"
         ref="tag"
@@ -25,7 +24,7 @@
       <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>
       <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
       <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
-    </ul> -->
+    </ul>
   </div>
 </template>
 
@@ -142,7 +141,6 @@ export default {
     },
     moveToCurrentTag() {
       const tags = this.$refs.tag
-      if (tags) {
       this.$nextTick(() => {
         for (const tag of tags) {
           if (tag.to.path === this.$route.path) {
@@ -155,7 +153,6 @@ export default {
           }
         }
       })
-    }
     },
     refreshSelectedTag(view) {
       this.$tab.refreshPage(view);
@@ -185,7 +182,7 @@ export default {
       })
     },
     closeOthersTags() {
-      this.$router.push(this.selectedTag).catch(()=>{});
+      this.$router.push(this.selectedTag.fullPath).catch(()=>{});
       this.$tab.closeOtherPage(this.selectedTag).then(() => {
         this.moveToCurrentTag()
       })

src/views/login.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">{{ $appVariant.SIGN_UP_TITLE }}</h3>
+      <h3 class="title">
+        <img :src="$appVariant.SIDEBAR_TITLE_IMAGE_URI" alt="" srcset="" class="titleImg">
+        {{ $appVariant.SIGN_UP_TITLE }}
+      </h3>
       <el-form-item prop="username">
         <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="后台账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -201,6 +204,7 @@ export default {
   width: 155x;
   height: 194px;
 }
+
 .righttop {
   position: absolute;
   right: 100px;
@@ -208,6 +212,7 @@ export default {
   width: 316x;
   height: 135px;
 }
+
 .lefttop {
   position: absolute;
   left: 0;
@@ -289,6 +294,16 @@ export default {
   color: #000;
   font-weight: 600;
   font-size: 37px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+
+  .titleImg {
+    width: 58px;
+    height: 58px;
+    margin-right: 10px;
+  }
 }
 
 .login-form {
@@ -395,5 +410,4 @@ export default {
 
 .login-code-img {
   height: 38px;
-}
+}</style>
-</style>

src/views/merchant/merchant/index.vue

@@ -397,9 +397,12 @@ export default {
     getValue(e) {
       payMerchant.getWithdrawConfig(this.id).then((response) => {
         if (e == 2) {
+          this.form.id = response.data.id
+          this.form.merchantId = response.data.merchantId
           this.form.singleFee = response.data.sysMerchantWithdrawConfig.singleFee
           this.form.rate = response.data.sysMerchantWithdrawConfig.rate
         } else {
+          this.form.merchantId = response.data.merchantId
           this.form.singleFee = response.data.singleFee
           this.form.rate = response.data.rate
         }
@@ -478,12 +481,15 @@ export default {
         if (this.form.rateRuleType == 2) {
           this.form = response.data.sysMerchantWithdrawConfig
           this.form.rateRuleType = response.data.rateRuleType
+          this.form.id = response.data.id
+          this.form.merchantId = response.data.merchantId
         }
         if (this.form.id == 0) {
           this.form.id = null
         }
         this.title = "提现";
         this.openWithdraw = true;
+        console.log(this.form)
       });
 
     },