浏览代码

样式重叠

howie 3 年之前
父节点
当前提交
858d8246bb

+ 2 - 2
src/views/basic_data/material/components/modify_list-apply.vue

@@ -783,7 +783,7 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page="currentPage"
-            :page-sizes="[5]"
+            :page-sizes="[10]"
             :page-size="10"
             layout="total, sizes, prev, pager, next, jumper"
             :total="listTotal"
@@ -1069,7 +1069,7 @@ export default {
       this.listLoading = true;
       let params = {
         pageNum: this.currentPage,
-        pageSize: 5 || this.pageSize,
+        pageSize: 10 || this.pageSize,
         keyword: this.screenForm.keyword,
         bindMain: true,
       };

+ 6 - 8
src/views/login/index.vue

@@ -46,8 +46,8 @@
                     微信登录
                   </div>
                 </div>
-
-                <div v-if="acitve == 'pas'">
+                  <transition name="slide">
+                  <div v-if="acitve == 'pas'">
                   <el-form-item prop="username" class="input-box">
                     <span class="svg-container">
                       <el-image
@@ -165,6 +165,8 @@
                     <div class="wei-item-text">网页版微信需要配合手机使用</div>
                   </div>
                 </div>
+                  </transition>
+
               </div>
             </div>
           </div>
@@ -486,8 +488,8 @@ $back: #333;
   .slide-fade-leave-active {
     transition: all 0.8s cubic-bezier(1, 0.5, 0.8, 1);
   }
-  .slide-fade-enter, .slide-fade-leave-to
-/* .slide-fade-leave-active for below version 2.1.8 */ {
+
+  .slide-fade-leave-active  {
     transform: translateX(10px);
     opacity: 0;
   }
@@ -591,7 +593,6 @@ $light_gray: #eee;
 .el-carousel__item:nth-child(2n) {
   background-color: #99a9bf;
 }
-
 .el-carousel__item:nth-child(2n + 1) {
   background-color: #d3dce6;
 }
@@ -600,7 +601,6 @@ $light_gray: #eee;
   width: 100%;
   background-color: $bg;
   overflow: hidden;
-
   .login-form {
     position: relative;
     width: 1920px;
@@ -611,13 +611,11 @@ $light_gray: #eee;
     flex-direction: column;
     align-items: center;
   }
-
   .image-container {
     width: 700px;
     height: 516px;
     //  overflow: hidden;
   }
-
   .right-container {
     width: 440px;
     height: 516px;

+ 18 - 22
src/views/sales_policy/components/Transfer.vue

@@ -29,14 +29,13 @@
             <el-checkbox-group
               v-model="leftData"
               class="left_box_flex"
-
               @change="handleLeft"
             >
               <el-checkbox
                 v-for="(item, index) in dataL"
                 :key="index"
                 :label="item.id"
-                    :disabled="item.disabled"
+                :disabled="item.disabled"
               >
                 {{ item.name }}</el-checkbox
               >
@@ -92,7 +91,12 @@
             >
           </el-row>
         </el-col>
-        <el-col class="right_box" :span="9" @mouseover="type=1" @mouseleave="type=2">
+        <el-col
+          class="right_box"
+          :span="9"
+          @mouseover="type = 1"
+          @mouseleave="type = 2"
+        >
           <h4 class="transfer_title">已选经销商</h4>
           <el-checkbox-group
             v-model="rightData"
@@ -134,12 +138,7 @@ export default {
       dataL: [],
       dataR: [],
       rightData: [],
-      options: [
-        {
-          value: "选项1",
-          label: "黄金糕",
-        },
-      ],
+      options: [],
       value: "",
       region: "",
       keyword: "",
@@ -159,7 +158,7 @@ export default {
       // 获取经销商列表
       getCrList(customerParams).then((res) => {
         for (let i = 0; i < res.data.records.length; i++) {
-          res.data.records[i].disabled=false
+          res.data.records[i].disabled = false;
         }
         this.dataL = res.data.records;
         console.log(res, "获取经销商列表");
@@ -187,10 +186,9 @@ export default {
         for (let i = 0; i < this.dataL.length; i++) {
           for (let k = 0; k < this.leftData.length; k++) {
             if (this.dataL[i].id == this.leftData[k]) {
-              this.dataR = [...new Set([...this.dataR,this.dataL[i]])]
+              this.dataR = [...new Set([...this.dataR, this.dataL[i]])];
               // this.rightData =[...this.rightData,this.leftData[k]]
               // this.dataL[i].disabled = true
-
             }
           }
         }
@@ -199,20 +197,18 @@ export default {
     },
     handleDelete() {
       if (this.type == 2) {
-        const dataArr = JSON.parse(JSON.stringify(this.dataR))
-        const dataArrs =JSON.parse(JSON.stringify(this.rightData))
+        const dataArr = JSON.parse(JSON.stringify(this.dataR));
+        const dataArrs = JSON.parse(JSON.stringify(this.rightData));
         for (let i = 0; i < this.rightData.length; i++) {
           for (let k = 0; k < this.dataR.length; k++) {
-                          if (this.rightData.includes(this.dataR[k].id) ) {
-                              dataArr.splice(i, 1);
-                              dataArrs.splice(k,1)
-                          }
-
-
+            if (this.rightData.includes(this.dataR[k].id)) {
+              dataArr.splice(i, 1);
+              dataArrs.splice(k, 1);
+            }
           }
         }
-        this.dataR = dataArr
-        this.rightData = dataArrs
+        this.dataR = dataArr;
+        this.rightData = dataArrs;
       }
     },
     handleSubmit() {