12/29

src/App.vue

@@ -3,8 +3,7 @@
     <div class="centerContent">
       <sidebar v-if="showSidebar"></sidebar>
       <div id="right">
-        <topbar v-if="showSidebar" :key="1"></topbar>
-        <el-divider v-if="showSidebar"></el-divider>
+        <topbar v-if="showSidebar"></topbar>
           <tabbar v-if="showSidebar" :clickIndex='nowindex' :dataList='editableTabs' @itemclick='itemclick' @remove="remove"></tabbar>
           <div class="content">
             <keep-alive :include="include">

src/app.less

@@ -13,20 +13,21 @@ html, body {
     color: #2c3e50;
     .centerContent{
         display:flex;
-        flex:1;
+        height:100%;
+        width: 100%;
         #right{
             display:flex;
-            flex:1;
             flex-direction: column;
+            overflow-y: auto;
             width: 100%;
-            height:100%;
+            height: 100%;
         }
         .content{
             background:#F6F8F9;
-            height:100%;
+            height:auto;
+            width: 100%;
         }
         #main{
-            flex:1;
             overflow-y: auto;
             -webkit-overflow-scrolling: touch;
             background:white;

src/components/sidebar/menuList.vue

@@ -60,6 +60,8 @@
   border-radius: 5px;
   margin: 4px;
   color: #060101;
+  padding-top: 5px;
+    padding-bottom: 5px;
   .iconfont{
   font-size: 24px;
   margin-bottom: 2px;
@@ -73,6 +75,8 @@
     background: #060101;
     color: white;
     margin: 4px;
+    padding-top: 5px;
+    padding-bottom: 5px;
     border-radius: 5px;
     .iconfont{
         font-size: 24px;

src/components/tabbar.vue

@@ -78,7 +78,6 @@
                 flex-direction: row;
                 align-items: center;
             }
-
             .mid {
                 background: white;
                 width: 100px;

src/components/topbar.vue

@@ -1,4 +1,5 @@
 <template>
+  <div class="topbarall flex column">
   <div class="flex align-center topbar">
     <div class="title">
       <i :class="[pageicon, 'iconfont']"></i>
@@ -36,6 +37,8 @@
       </el-form>
     </dialog-tel>
   </div>
+  <div class="line"></div>
+  </div>
 </template>
 
 <script>
@@ -184,6 +187,15 @@
   };
 </script>
 <style lang="less" scoped>
+.topbarall{
+  margin-bottom: 10px;
+}
+  .line{
+    background:#DEDEDE;
+    height: 1px;
+    width: 100%;
+    margin-top: 20px;
+  }
   .topbar{
     background: #fff;
     font-size:14px;

src/components/upload.vue

@@ -1,15 +1,6 @@
 <template>
   <div>
     <div class="flex">
-      <!-- <div v-if="acceptType =='.jpg, .jpeg, .png'">
-        <div v-for="(item, index) in fileList" :key="index" class="file-list">
-          <img :src="item.url"/>
-          <div class="mask" v-if="!disabled">
-            <i class="el-icon-zoom-in" @click="view(index)"></i>
-            <i class="el-icon-delete" @click="del(index)"></i>
-          </div>
-        </div>
-      </div> -->
       <el-upload
         class="avatar-uploader"
         list-type="picture-card"

src/pages/brand/addBrand/index.vue

@@ -238,6 +238,7 @@
             },
             initPage() {
                 this.loading = false
+                this.$refs.form.clearValidate()
                 if (this.$route.params.isNew) {
                     this.form = {
                         brand_audit_type: '',
@@ -278,21 +279,20 @@
         flex-direction: row;
         background: #F6F8F9 !important;
         padding: 0px !important;
-
         .table {
             display: flex;
             flex-direction: column;
             align-items: center;
             background: white !important;
             border-radius: 5px;
-            width: 36%;
+            width: 37%;
             margin-left: 10px;
 
             .title {
                 font-weight: bold;
-                width: 100%;
+                width: 90%;
                 text-align: left;
-                margin-left: 50px;
+                margin-left: 10px;
                 margin-top: 20px;
             }
 
@@ -313,9 +313,9 @@
 
             .title {
                 font-weight: bold;
-                width: 100%;
+                width: 90%;
                 text-align: left;
-                margin-left: 50px;
+                margin-left: 10px;
                 margin-top: 10px;
             }
 

src/pages/brand/brandDetail/index.vue

@@ -289,6 +289,7 @@
             initPage() {
                 this.loading = false
                 this.isDisable = false
+                this.$refs.form.clearValidate()
                 if (this.$route.params.brand_info_id) {
                     this.brand_info_id = this.$route.params.brand_info_id
                     this.getDetail()
@@ -315,14 +316,14 @@
             align-items: center;
             background: white !important;
             border-radius: 5px;
-            width: 36%;
+            width: 37%;
             margin-left: 10px;
 
             .title {
                 font-weight: bold;
-                width: 100%;
+                width: 90%;
                 text-align: left;
-                margin-left: 50px;
+                margin-left: 10px;
                 margin-top: 20px;
             }
 
@@ -378,9 +379,9 @@
 
             .title {
                 font-weight: bold;
-                width: 100%;
+                width: 90%;
                 text-align: left;
-                margin-left: 50px;
+                margin-left: 10px;
                 margin-top: 10px;
             }
 

src/pages/goods/addGoods/index.vue

@@ -270,6 +270,7 @@
             initPage() {
                 this.loading = false
                 this.isdisable = false
+                this.$refs.form.clearValidate()
                 if (this.$route.params.outProductId) { //新增获取详情
                     this.outProductId = this.$route.params.outProductId
                     this.getDetail()
@@ -316,14 +317,12 @@
         display: flex;
         flex-direction: column;
         align-items: center;
-
         .title {
             font-weight: bold;
-            width: 100%;
+            width: 90%;
             text-align: left;
             margin-left: 100px;
         }
-
         .form {
             margin-top: 20px;
             width: 75%;

src/pages/goods/goodsDetail/index.vue

@@ -199,7 +199,7 @@
 
         .title {
             font-weight: bold;
-            width: 100%;
+            width: 90%;
             text-align: left;
             margin-left: 100px;
         }

src/pages/goods/index.vue

@@ -171,7 +171,7 @@
               this.type2Count = element.count
             }
             if (element.type == 3) {
-              this.type4Count = element.count
+              this.type3Count = element.count
             }
 
           });

src/pages/qualification/addCategory/index.vue

@@ -135,6 +135,7 @@
             },
             initPage() {
                 this.loading = false
+                this.$refs.form.clearValidate()
                 if (this.$route.params.isNew) {
                     this.form = {
                         level1: '',
@@ -168,7 +169,7 @@
 
         .title {
             font-weight: bold;
-            width: 100%;
+            width: 90%;
             text-align: left;
             margin-left: 100px;
         }

src/pages/qualification/categoryDetail/index.vue

@@ -226,6 +226,7 @@
                 this.loading = false
                 this.isDisable = false
                 this.isSuccessEdit = true
+                this.$refs.form.clearValidate()
                 if (this.$route.params.category_info_id) {
                     this.category_info_id = this.$route.params.category_info_id
                     this.getDetail()
@@ -248,7 +249,7 @@
 
         .title {
             font-weight: bold;
-            width: 100%;
+            width: 90%;
             text-align: left;
             margin-left: 100px;
         }