修改bug

修改bug

src/api/chat.js

@@ -291,4 +291,13 @@ export function topicStatus(data) {
     data
   })
 }
+
+//6.10 审核话题
+export function applyTopic(data) {
+  return request({
+    url: '/chat/applyTopic',
+    method: 'post',
+    data
+  })
+}
 //6.商圈 end ------------------------------------->

src/api/complaint.js

@@ -64,4 +64,14 @@ export function downloadFile(params) {
     params
   })
 }
+
+//1.7 删除投诉举报
+export function delLetterOfComplaint(data) {
+  return request({
+    url: '/public/delLetterOfComplaint',
+    method: 'post',
+    data
+  })
+}
+
 //1.投诉举报信息 end ------------------------------------->

src/layout/components/template/pages/index/component.vue

@@ -1,162 +0,0 @@
-<template>
-  <div class="componentMenuBox" id="componentMenuBox">
-    <div class="componentMenuTitle">
-      <div v-if="type == 'sector'">可选板块：</div>
-      <div v-if="type == 'component'">可选组件：</div>
-    </div>
-    <div v-if="type == 'sector'">
-      <el-scrollbar wrap-class="scrollbar-wrapper">
-        <div class="sectorBox">
-          <div class="sectorItemBox" @click="addModule('headSector',19)">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/headSector.png" />
-            </div>
-            <div class="sectorItemTitle">页头</div>
-          </div>
-          <div class="sectorItemBox" @click="addModule('menuSector',2)">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/menuSector.png" />
-            </div>
-            <div class="sectorItemTitle">网站导航</div>
-          </div>
-          <div class="sectorItemBox" @click="addModule('imgTitleSector',6)">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/imgTitleSector.png" />
-            </div>
-            <div class="sectorItemTitle">图片标题</div>
-          </div>
-          <div class="sectorItemBox">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/bannerSector.png" @click="addModule('bannerSector',34)"/>
-            </div>
-            <div class="sectorItemTitle">焦点图</div>
-          </div>
-          <div class="sectorItemBox">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/moreServicesSector.png" @click="addModule('manyPictureSector',41)"/>
-            </div>
-            <div class="sectorItemTitle">多图菜单</div>
-          </div>
-          <div class="sectorItemBox">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/commentSector.png" @click="addModule('commentSector',40)"/>
-            </div>
-            <div class="sectorItemTitle">文章列表带评论</div>
-          </div>
-          <div class="sectorItemBox">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/newsSector.png" @click="addModule('listSector',28)"/>
-            </div>
-            <div class="sectorItemTitle">文章列表</div>
-          </div>
-          <div class="sectorItemBox">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/imgSector.png" @click="addModule('onlyImgSector',24)"/>
-            </div>
-            <div class="sectorItemTitle">纯图片组合</div>
-          </div>
-          <div class="sectorItemBox">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/linkSector.png" @click="addModule('friendShipLinkSector',15)"/>
-            </div>
-            <div class="sectorItemTitle">友情链接</div>
-          </div>
-          <div class="sectorItemBox">
-            <div class="sectorItem">
-              <img src="@/assets/template/sector/footerSector.png" @click="addModule('footerSector',38)"/>
-            </div>
-            <div class="sectorItemTitle">页尾板块</div>
-          </div>
-        </div>
-      </el-scrollbar>
-    </div>
-    <!-- <div v-if="type == 'component'" class="componentBox">
-      组件
-    </div> -->
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: 'componentMenu',
-  props: {
-    type: {
-      type: String, //sector component
-      required: true
-    },
-  },
-  data() {
-    return {
-      data: null
-    }
-  },
-  methods: {
-    addModule(type,h){
-      let data = {
-        type: type,
-        h: h
-      }
-      console.log(data);
-      this.$store.commit('template/addModule',data);
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-  .componentMenuBox {
-    transition: width 0.28s;
-    width: 290px !important;
-    background: #2F2F2F;
-    height: 100%;
-    position: fixed;
-    font-size: 0px;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 1001;
-    overflow: hidden;
-    .sectorBox {
-      height: 100%;
-    }
-    .el-scrollbar {
-      height: calc(100vh - 100px);
-    }
-    .componentMenuTitle {
-      padding: 37px 0 30px 0;
-      color: #fff;
-      font-size: 18px;
-      div {
-        border-left: 3px solid #5570F1;
-        padding-left: 25px;
-      }
-    }
-    .sectorItemBox {
-      box-sizing: border-box;
-      padding: 0 20px 40px 20px;
-      height: 130px;
-      cursor: pointer;
-      .sectorItem {
-        border: 1px solid #333644;
-        padding: 10px;
-        border-radius: 8px;
-        &:hover {
-          background: #333644;
-          transform: scale(1.1);
-          transition: all 0.2s ease-in-out;
-        }
-        img {
-          display: block;
-          width: 100%;
-        }
-      }
-      .sectorItemTitle {
-        color: #fff;
-        font-size: 14px;
-        padding: 10px 0 0 0;
-        text-align: center;
-      }
-    }
-  }
-</style>

src/layout/components/template/pages/index/sector.vue

@@ -24,7 +24,7 @@
       </div>
       <div class="sectorItemTitle">焦点图</div>
     </div>
-    <div class="sectorItemBox" @click="addModule('manyPictureSector',41,manyPictureSector)">
+    <div class="sectorItemBox" @click="addModule('manyPictureSector',49,manyPictureSector)">
       <div class="sectorItem">
         <img src="@/assets/template/sector/moreServicesSector.png"/>
       </div>

src/store/modules/chat.js

@@ -2,7 +2,7 @@ import {getTalkSessionList,addFriend,getFriendsList,delFriend,updateFriend,getFr
   applyFriend,isFriend,getConversation,getChatRecords,addGroup,getGroupMembers,searchFriend,getFriendInfo,
   getGroupList,getGroupInfo,joinGroup,getGroupChatRecords,delGroup,updateGroup,
   getTopicsList,addTopic,getTopicInfo,updateTopic,delTopic,addReply,getTopicReply,topicType,
-  topicStatus,updateGroupMembers,quitGroup
+  topicStatus,updateGroupMembers,quitGroup,applyTopic
 } from '@/api/chat'
 
 const state = {
@@ -316,6 +316,15 @@ const actions = {
         reject(error)
       })
     })
+  },
+  applyTopic({commit},data) {
+    return new Promise((resolve, reject) => {
+      applyTopic(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
   }
   //6.商圈 end ------------------------------------->
 }

src/store/modules/complaint.js

@@ -1,5 +1,5 @@
 import {getComplaint,getLetterOfComplaintInfo,addComplaint,upComplaint,
-  getLetterType,checkMeasure,downloadFile} from '@/api/complaint'
+  getLetterType,checkMeasure,downloadFile,delLetterOfComplaint} from '@/api/complaint'
 
 const state = {
 
@@ -80,8 +80,18 @@ const actions = {
         reject(error)
       })
     })
+  },
+  //删除投诉举报
+  delLetterOfComplaint({commit},data) {
+    return new Promise((resolve, reject) => {
+      delLetterOfComplaint(data).then(response => {
+        resolve(response)
+      }).catch(error => {
+        reject(error)
+      })
+    })
   }
-  //资讯中心 end ---------------------------------------->
+  //投诉管理 end ---------------------------------------->
 }
 
 

src/store/modules/user.js

@@ -8,7 +8,8 @@ const state = {
   avatar: '',
   introduction: '',
   roles: [],
-  userid:''
+  userid:'',
+  role_id:''
 }
 
 const mutations = {
@@ -24,6 +25,9 @@ const mutations = {
   SET_AVATAR: (state, avatar) => {
     state.avatar = avatar
   },
+  SET_ROLE_ID: (state, role_id) => {
+    state.role_id = role_id
+  },
   SET_ROLES: (state, roles) => {
     state.roles = roles
   },
@@ -65,7 +69,7 @@ const actions = {
         // }
         // 所有用户的身份都为admin
         const roles = ['admin']
-        const { real_name, avatar, introduction } = data
+        const { real_name, avatar, introduction,role_id } = data
         data.roles = roles
         // roles must be a non-empty array
         // 判断是否包含权限
@@ -77,6 +81,7 @@ const actions = {
         commit('SET_NAME', real_name)
         commit('SET_AVATAR', avatar)
         commit('SET_INTRODUCTION', introduction)
+        commit('SET_ROLE_ID', role_id)
         resolve(data)
       }).catch(error => {
         reject(error)

src/views/chat/hall.vue

@@ -407,8 +407,12 @@
               <div class="rightSlideUserItem" v-for="item in groupUserList" :key="item.user_id">
                 <div class="rightSlideUserItemIcon">
                   <span class="el-dropdown-link">
-                    <img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
-                    <img src="@/assets/chat/user/admin.png" v-else>
+                    <!-- {{ creatorId }} {{ item.user_id }} -->
+                    <div class="rightSlideUserGroupLeader" v-if="creatorId == item.user_id">群主</div>
+                    <div>
+                      <img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
+                      <img src="@/assets/chat/user/admin.png" v-else>
+                    </div>
                   </span>
                 </div>
                 <div class="rightSlideUserItemName">
@@ -965,6 +969,7 @@
               <div class="searchWindowUserIcon">
                 <img :src="item.avatar" v-if="item.avatar!=null&&item.avatar!=''">
                 <img src="@/assets/chat/user/admin.png" v-else>
+                <div class="rightSlideUserGroupLeader" v-if="creatorId == item.user_id">群主</div>
                 <div class="searchWindowDeleteUser" @click="editRemoveGroupUser(item.user_id)" v-if="Number(creatorId)==Number(myUserId)&&item.user_id!=myUserId">
                   <i class="el-icon-close"></i>
                 </div>
@@ -2227,6 +2232,8 @@ export default {
         console.log("来自单聊消息:"+this.receiverId,message.user_id)
         this.chatrecords.push(receiveMessage);
         console.log(message)
+        //滚动条滚动到底部
+        this.scorllBottom();
       }
       
     },
@@ -2842,6 +2849,8 @@ export default {
               background: #5570F1;
               position: relative;
               min-height: 50px;
+              word-wrap:break-word;
+              word-break:break-all;
             }
             .otherUserMessageText::before {
               content: '';
@@ -2879,6 +2888,9 @@ export default {
               position: relative;
               min-height: 50px;
               cursor: pointer;
+              word-wrap:break-word;
+              word-break:break-all;
+              //width: 100%;
             }
             .meUserMessageText::before {
               content: '';
@@ -3237,7 +3249,20 @@ export default {
               .el-dropdown-link {
                 width: 58px;
                 height: 58px;
-                
+                position: relative;
+                .rightSlideUserGroupLeader{
+                  font-size: 12px;
+                  color: #FEAF50;
+                  background: #FFEAD1;
+                  width: 36px;
+                  height: 20px;
+                  border-radius: 4px;
+                  position: absolute;
+                  bottom: 0;
+                  right: -10px;
+                  text-align: center;
+                  line-height: 20px;
+                }
               }
               .addUserIcon {
                 width: 58px;
@@ -3682,6 +3707,19 @@ export default {
               top: -3px;
               cursor: pointer;
             }
+            .rightSlideUserGroupLeader{
+              font-size: 12px;
+              color: #FEAF50;
+              background: #FFEAD1;
+              width: 36px;
+              height: 20px;
+              border-radius: 4px;
+              position: absolute;
+              bottom: 0;
+              right: -10px;
+              text-align: center;
+              line-height: 20px;
+            }
             img {
               width: 58px;
               height: 58px;

src/views/chat/topic.vue

@@ -274,7 +274,7 @@ export default {
         id:this.editId + "",
         status:this.form.radio + ""
       }
-      this.$store.dispatch('chat/updateTopic',data).then(res=> {
+      this.$store.dispatch('chat/applyTopic',data).then(res=> {
         console.log(res)
         this.getData();
         this.auditStatus = false;

src/views/complaint/complaintList.vue

@@ -83,9 +83,10 @@
             <el-table-column prop="mobile" label="电话"></el-table-column>
             <el-table-column prop="status_name" label="状态"></el-table-column>
             <el-table-column prop="created_at" label="创建时间"></el-table-column>
-            <el-table-column fixed="right" label="操作" width="120" header-align="center">
+            <el-table-column fixed="right" label="操作" width="200" header-align="center">
               <template slot-scope="scope">
                 <div class="listBtnBox">
+                  <div class="listDeleteBtn" @click="delRow(scope.row.id)" v-if="ifAdmin == true"><i class="el-icon-delete"></i>删除</div>
                   <div class="listEditBtn" @click="editRow(scope.row)"><i class="el-icon-edit-outline"></i>编辑</div>
                 </div>
               </template>
@@ -225,6 +226,7 @@
             <el-radio-group v-model="form.status">
               <!-- <el-radio label="100">待审核</el-radio> -->
               <el-radio label="101">已接案</el-radio>
+              <el-radio label="127">审核中</el-radio>
               <el-radio label="102">已拒绝</el-radio>
               <el-radio label="103">已完结</el-radio>
             </el-radio-group>
@@ -301,6 +303,7 @@ export default {
       typeData:[],//所有类型
       typeLevelData:[],//所有类型进度
       statusData:[],//所有状态 
+      ifAdmin:false,//是否为管理员
 
       //暂存所有进度
       allNetureLevelData:[],//性质
@@ -399,6 +402,9 @@ export default {
             case 103:
               item.status = "已完结";
               break;
+            case 127:
+              item.status = "审核中";
+              break;
             default:
               item.status = "";
               break;
@@ -724,6 +730,9 @@ export default {
             case "已完结":
               this.form.status = "103";
               break;
+            case "审核中":
+              this.form.status = "127";
+              break;
             default:
               this.form.status = "0"; // 可选：处理未定义的状态
               break;
@@ -756,6 +765,41 @@ export default {
       this.form.nature_name3 = "";
       this.form.other = "";
     },
+    //删除投诉举报数据
+    delRow(id){
+      let data = {
+        id:id,
+        is_admin:1
+      }
+      //id
+      //is_admin
+      this.$confirm('确定要删除本条投诉信息吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        console.log("当前删除：" + id)
+        this.$store.dispatch('complaint/delLetterOfComplaint',data).then(res=> {
+          if(res.code == 200){
+            this.$message({
+              type: 'success',
+              message: '删除成功！'
+            });
+            this.getData();
+          }else{
+            this.$message({
+              type: 'warning',
+              message: res.msg
+            });
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'warning',
+          message: '已取消删除'
+        });
+      });
+    },
     //提交编辑
     editData(){
       //判断什么时候需要需要提交other
@@ -807,6 +851,12 @@ export default {
     this.getData();
     //查询状态
     this.getStatus();
+    //是管理员再显示删除按钮
+    if(this.$store.state.user.role_id == 24){
+      this.ifAdmin = true;
+    }else{
+      this.ifAdmin = false;
+    }
   }
 }
 </script>

src/views/role/roleList.vue

@@ -145,7 +145,7 @@ export default {
         role_name:"",//角色名称
         rule:[],//权限
         remark:"",//职能描述
-        sort:""//排序
+        sort:0//排序
       },
       expandedKeys:[],//展开的节点  
       checkedKeys:[],//选中的节点 
@@ -276,6 +276,10 @@ export default {
     //4.添加 start ------------------------------------------------------------>
     addData(){
       this.form.id = this.editId;
+      //如果排序不填，默认排序传递数字
+      if(this.form.sort == ""){
+        this.form.sort = 0;
+      }
       //半选的节点
       let supplement = [];
       let allKeys = this.$refs.tree.getHalfCheckedNodes();
@@ -369,6 +373,10 @@ export default {
     //提交编辑
     editData(){
       this.form.id = this.editId;
+      //如果排序不填，默认排序传递数字
+      if(this.form.sort == ""){
+        this.form.sort = 0;
+      }
       //半选的节点
       let supplement = [];
       let allKeys = this.$refs.tree.getHalfCheckedNodes();

src/views/template/public/componentWindow.vue

@@ -6,16 +6,16 @@
         开发助手：当前窗口在正式版本中将被移除。
       </div>
       <div class="testAssistantContent">
-        <div class="testAssistantContentItem"><span>板块id:</span>{{this.$store.state.template.editSectorId}}</div>
-        <div class="testAssistantContentItem"><span>组件sort:</span>{{this.$store.state.template.editComponentSort}}</div>
-        <div class="testAssistantContentItem"><span>组件type:</span>{{this.$store.state.template.editComponentType}}</div>
-        <div class="testAssistantContentItem"><span>原始的组件style:</span>{{this.$store.state.template.pageData.index[this.$store.state.template.editSectorId].content.componentList[this.$store.state.template.editComponentSort].component_style}}</div>
-        <div class="testAssistantContentItem"><span>现在的组件style:</span>{{this.$store.state.template.editComponentStyle}}</div>
+        <div class="testAssistantContentItem"><span>板块:</span>{{this.$store.state.template.editSectorId}}</div>
+        <div class="testAssistantContentItem"><span>组件位置:</span>{{this.$store.state.template.editComponentSort}}</div>
+        <div class="testAssistantContentItem"><span>组件种类:</span>{{this.$store.state.template.editComponentType}}</div>
+        <div class="testAssistantContentItem"><span>原组件样式:</span>{{this.$store.state.template.pageData.index[this.$store.state.template.editSectorId].content.componentList[this.$store.state.template.editComponentSort].component_style}}</div>
+        <div class="testAssistantContentItem"><span>当前组件样式:</span>{{this.$store.state.template.editComponentStyle}}</div>
       </div>
     </div>
     <div class="componentStyleBox">
       <div class="componentStyleBoxContent">
-        <!--1=标题组件 3=广告组件-->
+        <!--1.网站核心大标题组件 start---------------------------------------->
         <div v-if="this.$store.state.template.editComponentType == 1" class="componentScrollBox">
           <table>
             <tr>
@@ -32,12 +32,20 @@
             </tr>
           </table>
         </div>
-
-
-
-
-
-
+        <!--1.网站核心大标题组件 end---------------------------------------->
+        <!--2.板块文字标题 start---------------------------------------->
+        <div v-if="this.$store.state.template.editComponentType == 2" class="componentScrollBox">
+          <table>
+            <tr>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 1 ? 'active' : '']" @click="selectUseStyleNumber(1)">
+                  <img src="@/assets/template/component/title1.png"/>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <!--2.板块文字标题 end---------------------------------------->
         <!--3.广告组件 start---------------------------------------->
         <div v-if="this.$store.state.template.editComponentType == 3" class="componentScrollBox">
           <table>
@@ -65,9 +73,64 @@
             </tr>
           </table>
         </div>
-        <!--3.广告组件 end---------------------------------------->
+        <!--4.banner组件 start---------------------------------------->
+        <div v-if="this.$store.state.template.editComponentType == 4" class="componentScrollBox">
+          <table>
+            <tr>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 1 ? 'active' : '']" @click="selectUseStyleNumber(1)">
+                  <img src="@/assets/template/component/banner_pic1.png"/>
+                </div>
+              </td>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 2 ? 'active' : '']" @click="selectUseStyleNumber(2)">
+                  <img src="@/assets/template/component/banner_pic2.png"/>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <!--4.banner组件 end---------------------------------------->
+        <!--5.tabs start---------------------------------------->
+        <div v-if="this.$store.state.template.editComponentType == 5" class="componentScrollBox">
+          <table>
+            <tr>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 1 ? 'active' : '']" @click="selectUseStyleNumber(1)">
+                  <img src="@/assets/template/component/tabsList1.png"/>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <!--5.tabs end---------------------------------------->
+        <!--6.list列表组件 start---------------------------------------->
+        <div v-if="this.$store.state.template.editComponentType == 6" class="componentScrollBox">
+          <table>
+            <tr>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 1 ? 'active' : '']" @click="selectUseStyleNumber(1)">
+                  <img src="@/assets/template/component/list1.png"/>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <!--6.list列表组件 end---------------------------------------->
+        <!--7.staticHtml静态组件 start---------------------------------------->
+        <div v-if="this.$store.state.template.editComponentType == 7" class="componentScrollBox">
+          <table>
+            <tr>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 1 ? 'active' : '']" @click="selectUseStyleNumber(1)">
+                  <img src="@/assets/template/component/fivePicture.png"/>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <!--7.staticHtml静态组件 end---------------------------------------->
 
-        
       </div>
     </div>
     <div class="componentWindowBoxFooter">

src/views/template/public/editWindow.vue

@@ -9,8 +9,8 @@
         </div>
         <div class="testAssistantContent">
           <div class="testAssistantContentItem"><span>板块id:</span>{{this.$store.state.template.editSectorId}}</div>
-          <div class="testAssistantContentItem"><span>组件sort:</span>{{this.$store.state.template.editComponentSort}}</div>
-          <div class="testAssistantContentItem"><span>组件type:</span>{{this.$store.state.template.editComponentType}}</div>
+          <div class="testAssistantContentItem"><span>组件位置:</span>{{this.$store.state.template.editComponentSort}}</div>
+          <div class="testAssistantContentItem"><span>数据类型:</span>{{this.$store.state.template.editComponentType}}</div>
           <div class="testAssistantContentItem"><span>展示条数:</span>{{this.$store.state.template.editComponentSize}}</div>
         </div>
       </div>
@@ -88,7 +88,6 @@
           </el-form-item>
         </el-form>
       </div>
-
     </div>
     <div class="editWindowBoxFooter">
       <el-button type="info" @click="closeEditWindow">取消</el-button>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="bannerBox">
     <div class="itemTopBox">
-      <editBtn :id="id" :sort="0" :type="1" :size="1"/>
+      <editBtn :id="id" :sort="0" :type="6" :size="1"/>
       <convertBtn :id="id" :sort="0" :type="1"/>
       <div v-if="this.$store.state.template.pageData.index[id].content.componentList[0].component_style == 1">
         <mainTitleStyle1 />
@@ -12,36 +12,51 @@
     </div>
     <div class="itemBottomBox">
       <div class="bannerLayerBox">
-        <banner :id="id" :sort="2"/>
+        <editBtn :id="id" :sort="1" :type="1" :size="3"/>
+        <convertBtn :id="id" :sort="1" :type="4"/>
+        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[1].component_style == 1">
+          <banner1Style />
+        </div>
+        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[1].component_style == 2">
+          <banner2Style />
+        </div>
       </div>
       <div class="NewsListBox">
-        <!-- <tabsNews :id="id" :sort="3"/> -->
-        <bgGreyNews :id="id" :sort="3"/>
+        <editBtn :id="id" :sort="2" :type="2" :size="5"/>
+        <convertBtn :id="id" :sort="2" :type="5"/>
+        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[2].component_style == 1">
+          <tabs1Style />
+        </div>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import mainTitle from './components/mainTitle.vue'
-import banner from './components/banner.vue'
-import tabsNews from './components/tabsNews.vue'
-import bgGreyNews from './components/bgGreyNews.vue'
+//编辑按钮
 import editBtn from '../../public/editBtn.vue'
 import convertBtn from '../../public/convertBtn.vue'
+//标题组件
 import mainTitleStyle1 from './components/mainTitle/1.vue'
 import mainTitleStyle2 from './components/mainTitle/2.vue'
+//banner组件
+import banner from './components/banner.vue'
+import banner1Style from './components/banner/1.vue'
+import banner2Style from './components/banner/2.vue'
+//tabs组件
+import tabs1Style from './components/tabs/1.vue'
 
 export default {
   components: {
-    mainTitle,
+    //mainTitle,
     banner,
-    tabsNews,
-    bgGreyNews,
     editBtn,
     convertBtn,
     mainTitleStyle1,
-    mainTitleStyle2
+    mainTitleStyle2,
+    banner1Style,
+    banner2Style,
+    tabs1Style
   },
   props: {
     id:{

src/views/template/style/1/components/banner/1.vue

@@ -0,0 +1,69 @@
+<template>
+  <div class="bannerItemBox">
+    <el-carousel height="226px">
+      <el-carousel-item :key="1">
+        <div class="bannerItemPositioningBox">
+          <div class="shadowBox">banner样式1标题标题标题标题标题标题</div>
+          <img src="@/assets/template/component/banner1.png" /> 
+        </div>
+      </el-carousel-item>
+      <el-carousel-item :key="2">
+        <div class="bannerItemPositioningBox">
+          <div class="shadowBox">banner样式1标题标题标题标题标题标题</div>
+          <img src="@/assets/template/component/banner2.png" /> 
+        </div>
+      </el-carousel-item>
+      <el-carousel-item :key="3">
+        <div class="bannerItemPositioningBox">
+          <div class="shadowBox">banner样式1标题标题标题标题标题标题</div>
+          <img src="@/assets/template/component/banner3.png" /> 
+        </div>
+      </el-carousel-item>
+    </el-carousel>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    
+  },
+  data() {
+    return {
+      
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .bannerItemBox {
+    width: 100%;
+    .bannerItemPositioningBox {
+      position: relative;
+      height: 100%;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+      .shadowBox {
+        position: absolute;
+        width: 100%;
+        bottom: 0;
+        width: 100%;
+        left: 0;
+        background: rgba(0,0,0,0.5);
+        color: #fff;
+        font-size: 14px;
+        padding: 10px;
+      }
+    }
+  }
+</style>
+

src/views/template/style/1/components/banner/2.vue

@@ -0,0 +1,42 @@
+<template>
+  <div class="bannerItemBox">
+    <el-carousel height="226px">
+      <el-carousel-item :key="1">
+        <img src="@/assets/template/component/banner5.png" /> 
+      </el-carousel-item>
+      <el-carousel-item :key="2">
+        <img src="@/assets/template/component/banner4.png" />
+      </el-carousel-item>
+    </el-carousel>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    
+  },
+  data() {
+    return {
+      
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .bannerItemBox {
+    width: 100%;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+</style>
+

src/views/template/style/1/components/list/1.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="listNewsBox">
+    <div class="listNewsTitle">
+      <div class="listNewsStyleBorder">新闻列表标题</div>
+    </div>
+    <ul class="listNewsUl">
+      <li>
+        <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+        <div>11-29</div>
+      </li>
+      <li>
+        <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+        <div>11-29</div>
+      </li>
+      <li>
+        <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+        <div>11-29</div>
+      </li>
+      <li>
+        <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+        <div>11-29</div>
+      </li>
+      <li>
+        <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+        <div>11-29</div>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    
+  },
+  data() {
+    return {
+      
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .listNewsBox {
+    position: relative;
+    .listNewsTitle {
+      color: #19499F;
+      font-size: 22px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px solid #D9D9D9;
+      .listNewsStyleBorder {
+        border-bottom: 2px solid #19499F;
+        padding-bottom: 18px;
+        padding-top: 18px;
+      }
+    }
+    .listNewsUl {
+      padding: 0;
+      li {
+        list-style-type: none;
+        height: 20px;
+        padding: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        a {
+          display: block;
+          background: url('../../../../../../assets/template/component/listyle.png') no-repeat left center;
+          box-sizing: border-box;
+          padding-left: 20px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          flex: 1;
+          font-size: 16px;
+        }
+        div {
+          color: #999;
+          width: 50px;
+        }
+      }
+    }
+  }
+</style>
+

src/views/template/style/1/components/mainTitle/1.vue

@@ -27,6 +27,7 @@ export default {
 <style scoped lang="less">
   .mainTitleBox {
     width: 100%;
+    height: 60px;
     display: flex;
     align-items: center;
     justify-content: center;

src/views/template/style/1/components/mainTitle/2.vue

@@ -4,9 +4,6 @@
       <div>头</div>
       <div>条</div>
     </div>
-
-
-
     <div class="mainTitleText">习近平对新一届澳门特别行政区政府提出4点希望</div>
   </div>
 </template>
@@ -37,11 +34,22 @@ export default {
     align-items: center;
     justify-content: center;
     position: relative;
+    height: 60px;
     .mainTitleBoxIcon {
       position: absolute;
       top: 0;
       left: 60px;
-      //background: url('@/assets/template/component/mainStyle2Left.png') no-repeat center center;
+      width: 40px;
+      height: 60px;
+      background: url('../../../../../../assets/template/component/mainStyle2Left.png') no-repeat center center;
+      background-size: 100% 100%;
+      div {
+        font-size: 18px;
+        color: #fff;
+        font-weight: bold;
+        padding-left: 14px;
+        padding-top: 5px;
+      }
     }
     img {
       width: 54px;
@@ -50,7 +58,12 @@ export default {
     }
     .mainTitleText {
       font-size: 30px;
-      color: #19499F;
+      text-align: center;
+      box-shadow: 0 0 5px rgba(0,0,0,0.3);
+      width: 100%;
+      height: 44px;
+      line-height: 44px;
+      color: #27925C;
       font-weight: bold;
       white-space: nowrap;
       overflow: hidden;

src/views/template/style/1/components/staticHtml/1.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="fivePictureBox">
+    <div class="fivePictureItem"><img src="@/assets/template/component/pictureTitle1.png"/></div>
+    <div class="fivePictureItem"><img src="@/assets/template/component/pictureTitle2.png"/></div>
+    <div class="fivePictureItem"><img src="@/assets/template/component/pictureTitle3.png"/></div>
+    <div class="fivePictureItem"><img src="@/assets/template/component/pictureTitle4.png"/></div>
+    <div class="fivePictureItem"><img src="@/assets/template/component/pictureTitle5.png"/></div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    id:{
+      type:Number,
+      default:0
+    },
+    sort:{
+      type:Number,
+      default:0
+    }
+  },
+  data() {
+    return {
+     
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+    
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .fivePictureBox {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 20px 0;
+    position: relative;
+    .fivePictureItem {
+      width: 20%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      img {
+        display: block;
+        width: 90%;
+      }
+    }
+  }
+</style>

src/views/template/style/1/components/tabs/1.vue

@@ -0,0 +1,97 @@
+<template>
+  <div class="tabsNewsBox">
+    
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="地方动态" name="first">
+        <ul class="newsListBox">
+          <li>
+            <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+            <div>11-29</div>
+          </li>
+          <li>
+            <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+            <div>11-29</div>
+          </li>
+          <li>
+            <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+            <div>11-29</div>
+          </li>
+          <li>
+            <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+            <div>11-29</div>
+          </li>
+          <li>
+            <a href="javascript:;">资讯标题资讯标题资讯标题资讯标题资讯标题</a>
+            <div>11-29</div>
+          </li>
+        </ul>
+      </el-tab-pane>
+      <el-tab-pane label="农资市场" name="second"></el-tab-pane>
+      <el-tab-pane label="农产市场" name="third"></el-tab-pane>
+      <el-tab-pane label="农村市场" name="fourth"></el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    id:{
+      type:Number,
+      default:0
+    },
+    sort:{
+      type:Number,
+      default:0
+    }
+  },
+  data() {
+    return {
+      activeName:"first"
+    };
+  },
+  methods: {
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  },
+  mounted() {
+
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .tabsNewsBox {
+    .newsListBox {
+      padding: 0;
+      li {
+        list-style-type: none;
+        height: 20px;
+        padding: 0;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        a {
+          display: block;
+          background: url('../../../../../../assets/template/component/listyle.png') no-repeat left center;
+          box-sizing: border-box;
+          padding-left: 20px;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+          flex: 1;
+          font-size: 16px;
+        }
+        div {
+          color: #999;
+          width: 50px;
+        }
+      }
+      
+     
+    }
+  }
+</style>
+

src/views/template/style/1/components/title/1.vue

@@ -0,0 +1,44 @@
+<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;
+    width: 100%;
+    height: 41px;
+    text-align: center;
+    font-size: 32px;
+    font-weight: bold;
+    color: #333;
+    line-height: 41px;
+    position: relative;
+  }
+  .titleBoxStyle1{
+    background: url('../../../../../../assets/template/component/titleStyle1.png') no-repeat center center;
+  }
+</style>

src/views/template/style/1/manyPictureSector.vue

@@ -1,32 +1,56 @@
 <template>
   <div class="manyPictureSectorBox">
     <div class="manyPictureSectorBoxTitle">
-      <styleTitle :id="id" :sort="1"/>
+      <editBtn :id="id" :sort="0" :type="7" :size="1"/>
+      <convertBtn :id="id" :sort="0" :type="2"/>
+      <div v-if="this.$store.state.template.pageData.index[id].content.componentList[0].component_style == 1">
+        <title1Style />
+      </div>
     </div>
     <div class="manyPictureSectorBox">
-      <fivePicture :id="id" :sort="2"/>
+      <editBtn :id="id" :sort="1" :type="6"/>
+      <convertBtn :id="id" :sort="1" :type="7"/>
+      <div v-if="this.$store.state.template.pageData.index[id].content.componentList[1].component_style == 1">
+        <staticHtml1Style />
+      </div>
     </div>
     <div class="manyPictureNewsBox">
       <div class="manyPictureNewsItem">
-        <listNews :id="id" :sort="3"/>
+        <editBtn :id="id" :sort="2" :type="1" :size="5"/>
+        <convertBtn :id="id" :sort="2" :type="6"/>
+        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[2].component_style == 1">
+          <list1Style />
+        </div>
       </div>
       <div class="manyPictureNewsItem">
-        <listNews :id="id" :sort="4"/>
+        <!-- <listNews :id="id" :sort="4"/> -->
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import styleTitle from './components/styleTitle.vue';
-import fivePicture from './components/fivePicture.vue';
-import listNews from './components/listNews.vue';
+//编辑按钮
+import editBtn from '../../public/editBtn.vue'
+import convertBtn from '../../public/convertBtn.vue'
+//标题组件
+import title1Style from './components/title/1.vue'
+//静态组件
+import staticHtml1Style from './components/staticHtml/1.vue'
+//新闻列表组件
+import list1Style from './components/list/1.vue'
+
 
 export default {
   components: {
-    styleTitle,
-    fivePicture,
-    listNews
+    editBtn,
+    convertBtn,
+    title1Style,
+    staticHtml1Style,
+    list1Style
+    // styleTitle,
+    // fivePicture,
+    // listNews
   },
   props: {
     id:{
@@ -62,6 +86,7 @@ export default {
       display: flex;
       justify-content: center;
       align-items: center;
+      position: relative;
     }
     .manyPictureSectorBox {
       width: 80%;

src/views/template/templateCreat.vue

@@ -29,10 +29,10 @@
 
     <!-- 弹出框 start ---------------------------------------->
     <!-- 这里我去掉了:visible.sync 因为弹出框的关闭事件需要手动触发 -->
-    <el-dialog title="编辑组件" :visible="this.$store.state.template.editWindowStatus" :close-on-click-modal="false" @close="closeEditWindow">
+    <el-dialog title="编辑组件信息" :visible="this.$store.state.template.editWindowStatus" :close-on-click-modal="false" @close="closeEditWindow">
       <editWindow />
     </el-dialog>
-    <el-dialog title="选择组件展示形式" :visible="this.$store.state.template.editComponentWindowStatus" :close-on-click-modal="false" @close="closeComponentStyleWindow">
+    <el-dialog title="更换组件样式" :visible="this.$store.state.template.editComponentWindowStatus" :close-on-click-modal="false" @close="closeComponentStyleWindow">
       <componentWindow />
     </el-dialog>
     <!-- 弹出框 start ---------------------------------------->