Sean 4 сар өмнө
parent
commit
23b61706e6

BIN
src/assets/template/component/titleStyle1.png


BIN
src/assets/template/component/titleStyle2.png


BIN
src/assets/template/component/titleStyle3.png


BIN
src/assets/template/component/titleStyle4.png


+ 3 - 3
src/layout/components/template/componentMenu.vue

@@ -7,7 +7,7 @@
     <div v-if="type == 'sector'">
       <el-scrollbar wrap-class="scrollbar-wrapper">
         <div class="sectorBox">
-          <div class="sectorItemBox" @click="addModule('headSector',11)">
+          <div class="sectorItemBox" @click="addModule('headSector',10)">
             <div class="sectorItem">
               <img src="@/assets/template/sector/headSector.png" />
             </div>
@@ -27,13 +27,13 @@
           </div>
           <div class="sectorItemBox">
             <div class="sectorItem">
-              <img src="@/assets/template/sector/bannerSector.png" @click="addModule('bannerSector',8)"/>
+              <img src="@/assets/template/sector/bannerSector.png" @click="addModule('bannerSector',17)"/>
             </div>
             <div class="sectorItemTitle">焦点图</div>
           </div>
           <div class="sectorItemBox">
             <div class="sectorItem">
-              <img src="@/assets/template/sector/moreServicesSector.png" />
+              <img src="@/assets/template/sector/moreServicesSector.png" @click="addModule('manyPictureSector',17)"/>
             </div>
             <div class="sectorItemTitle">多图菜单</div>
           </div>

+ 3 - 1
src/views/role/userList.vue

@@ -58,6 +58,8 @@
             <el-table-column prop="real_name" label="用户姓名" width=""></el-table-column>
             <el-table-column prop="mobile" label="联系方式" width=""></el-table-column>
             <el-table-column prop="type_name" label="用户类型" width=""></el-table-column>
+            <el-table-column prop="role_name" label="角色类型" width=""></el-table-column>
+            <el-table-column prop="admin_real_name" label="操作人" width=""></el-table-column>
             <el-table-column prop="created_at" label="创建时间" width=""></el-table-column>
             <el-table-column prop="status" label="账号状态" width="">
               <template slot-scope="scope">
@@ -69,7 +71,7 @@
                 ></el-switch>
               </template>
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="200" header-align="center">
+            <el-table-column fixed="right" label="操作" width="100" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
                   <div class="listEditBtn" @click="goEdit(scope.row.id,scope.row.type_id)"><i class="el-icon-edit-outline"></i>编辑</div>

+ 1 - 1
src/views/template/style/1/bannerSector.vue

@@ -57,7 +57,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-between;
-      padding: 20px 0;
+      padding: 22px 0;
       .bannerLayerBox {
         width: 55%;
         height: 226px

+ 40 - 0
src/views/template/style/1/components/fivePicture.vue

@@ -0,0 +1,40 @@
+<template>
+  <div>
+   
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    
+  },
+  data() {
+    return {
+     
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+    
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .styleTitleBox {
+    width: 468px;
+    height: 41px;
+    text-align: center;
+    font-size: 32px;
+    font-weight: bold;
+    color: #333;
+    line-height: 41px;
+  }
+  .titleBoxStyle1{
+    background: url('../../../../../assets/template/component/titleStyle1.png') no-repeat center center;
+    background-size: 100% 100%;
+  }
+</style>

+ 41 - 0
src/views/template/style/1/components/styleTitle.vue

@@ -0,0 +1,41 @@
+<template>
+  <div class="styleTitleBox">
+    <div :class="['titleBoxStyle' + type]">{{ text }}</div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    
+  },
+  data() {
+    return {
+      type:1,
+      text:"多图板块"
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+    
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .styleTitleBox {
+    width: 468px;
+    height: 41px;
+    text-align: center;
+    font-size: 32px;
+    font-weight: bold;
+    color: #333;
+    line-height: 41px;
+  }
+  .titleBoxStyle1{
+    background: url('../../../../../assets/template/component/titleStyle1.png') no-repeat center center;
+    background-size: 100% 100%;
+  }
+</style>

+ 1 - 1
src/views/template/style/1/components/tabsNews.vue

@@ -78,7 +78,7 @@ export default {
         }
         div {
           color: #999;
-          width: 80px;
+          width: 50px;
         }
       }
       

+ 53 - 0
src/views/template/style/1/manyPictureSector.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="manyPictureSectorBox">
+    <div class="manyPictureSectorBoxTitle">
+      <styleTitle />
+    </div>
+    <div>
+      
+    </div>
+  </div>
+  
+</template>
+
+<script>
+import styleTitle from './components/styleTitle.vue';
+export default {
+  components: {
+    styleTitle
+  },
+  props: {
+    
+  },
+  data() {
+    return {
+      
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+    
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .manyPictureSectorBox {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width:100%;
+    .manyPictureSectorBoxTitle {
+      width: 80%;
+      border: 1px dashed #5570F1;
+      height: 41px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+  
+</style>
+

+ 5 - 4
src/views/template/style/1/menuSector.vue

@@ -1,7 +1,7 @@
 <template>
-  <div class="menuSectorBox" ref="menuSectorBox">
+  <div class="menuSectorBox">
     <div class="menuBoxBg">
-      <div class="menuBox">
+      <div class="menuBox" ref="menuBox">
         <div>首页</div>
         <div v-for="item in this.$store.state.template.webSiteMenu">{{item.name}}</div>
       </div>
@@ -84,9 +84,10 @@ export default {
   mounted() {
     //获取当前元素的高度,然后修改store中的layer
     //console.log(this.id);
-    const menuSectorBoxHeight = this.$refs.menuSectorBox.clientHeight; // 获取高度
+    const menuSectorBoxHeight = this.$refs.menuBox.clientHeight; // 获取高度
     //console.log(menuSectorBoxHeight);
-    let h = Math.round(menuSectorBoxHeight / 30);
+    let h = Math.round(menuSectorBoxHeight / 10) + 1;
+    console.log(h);
     this.$store.commit('template/setModuleHeight',{i:this.id,h:h});
   },
 };

+ 7 - 1
src/views/template/templateCreat.vue

@@ -46,6 +46,10 @@
               <div v-if="item.type == 'bannerSector'" class="moduleBox">
                 <bannerSector />
               </div>
+              <!-- 多图模块 --> 
+              <div v-if="item.type == 'manyPictureSector'" class="moduleBox">
+                <manyPictureSector />
+              </div>
             </div>
           </grid-item>
         </grid-layout>
@@ -70,6 +74,7 @@ import headSector from './style/1/headSector.vue';
 import menuSector from './style/1/menuSector.vue'; 
 import imgTitleSector from './style/1/imgTitleSector.vue';
 import bannerSector from './style/1/bannerSector.vue'; 
+import manyPictureSector from './style/1/manyPictureSector.vue'; 
 //自助建站组件 end------------------------------------------------------------>
 
 export default {
@@ -80,7 +85,8 @@ export default {
     headSector,
     menuSector,
     imgTitleSector,
-    bannerSector
+    bannerSector,
+    manyPictureSector
   },
   data() {
     return {