修改bug

修改bug

src/store/modules/user.js

@@ -69,7 +69,7 @@ const actions = {
         // }
         // 所有用户的身份都为admin
         const roles = ['admin']
-        const { real_name, avatar, introduction,role_id } = data
+        const { nickname, avatar, introduction,role_id } = data
         data.roles = roles
         // roles must be a non-empty array
         // 判断是否包含权限
@@ -78,7 +78,7 @@ const actions = {
         // }
         commit('SET_ROLES', roles)
         commit('SET_USERID', data.id)
-        commit('SET_NAME', real_name)
+        commit('SET_NAME', nickname)
         commit('SET_AVATAR', avatar)
         commit('SET_INTRODUCTION', introduction)
         commit('SET_ROLE_ID', role_id)

src/views/profile/index.vue

@@ -40,8 +40,8 @@
                       <!--图片上传组件 end ------------------------------------------------------------>
                     </div>
                   </el-form-item>
-                  <el-form-item label="昵称：" :label-width="formLabelWidth" prop="real_name" class="custom-align-right">
-                    <el-input v-model="infoform.real_name" autocomplete="off" placeholder="请输入用户昵称.."></el-input>
+                  <el-form-item label="昵称：" :label-width="formLabelWidth" prop="nickname" class="custom-align-right">
+                    <el-input v-model="infoform.nickname" autocomplete="off" placeholder="请输入用户昵称.."></el-input>
                   </el-form-item>
                 </div>
               </div>
@@ -173,13 +173,13 @@ export default {
       //修改用户信息
       infoform:{
         avatar:"",
-        real_name:""
+        nickname:""
       },
       avatarUrl:"",//头像缩略图
       hovering:false,//鼠标悬浮状态
       infoFormRules:{
         avatar: [{ required: true, trigger: 'blur', validator: validateEmpty }],
-        real_name: [{ required: true, trigger: 'blur', validator: validateEmpty }]
+        nickname: [{ required: true, trigger: 'blur', validator: validateEmpty }]
       },
       //修改密码
       form:{
@@ -211,7 +211,7 @@ export default {
         console.log(res)
         this.avatarUrl = res.data.avatar;
         this.infoform.avatar = res.data.avatar;
-        this.infoform.real_name = res.data.real_name;
+        this.infoform.nickname = res.data.nickname;
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -325,7 +325,7 @@ export default {
               this.$message.success("修改成功！");
               //更新store中的头像和昵称
               this.$store.commit('user/SET_AVATAR', this.infoform.avatar);
-              this.$store.commit('user/SET_NAME', this.infoform.real_name);
+              this.$store.commit('user/SET_NAME', this.infoform.nickname);
             }
           }).catch(() => {  
             this.$message.error('网络错误，请重试！');

src/views/template/public/componentWindow.vue

@@ -100,6 +100,11 @@
                   <img src="@/assets/template/component/tabsList1.png"/>
                 </div>
               </td>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 2 ? 'active' : '']" @click="selectUseStyleNumber(2)">
+                  <img src="@/assets/template/component/tabsList2.png"/>
+                </div>
+              </td>
             </tr>
           </table>
         </div>
@@ -130,6 +135,20 @@
           </table>
         </div>
         <!--7.staticHtml静态组件 end---------------------------------------->
+        <!--8.表单组件 start---------------------------------------->
+        <div v-if="this.$store.state.template.editComponentType == 8" class="componentScrollBox">
+          <table>
+            <tr>
+              <td>
+                <div :class="['componentScrollBoxItem', this.$store.state.template.editComponentStyle === 1 ? 'active' : '']" @click="selectUseStyleNumber(1)">
+                  <img src="@/assets/template/component/form1.png"/>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </div>
+        <!--8.表单组件 end---------------------------------------->
+
 
       </div>
     </div>

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

@@ -10,16 +10,20 @@
     <div class="commentSectorBoxContent">
       <div class="tabsCalendarNewsBox">
         <editBtn :id="id" :sort="1" :type="1" :size="5"/>
-        <convertBtn :id="id" :sort="1" :type="6"/>
+        <convertBtn :id="id" :sort="1" :type="5"/>
         <div v-if="this.$store.state.template.pageData.index[id].content.componentList[1].component_style == 1">
           <tabs1Style />
         </div>
-        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[0].component_style == 2">
+        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[1].component_style == 2">
           <tabs2Style />
         </div>
       </div>
       <div class="calendarBox">
-        <!-- <calendar :id="id" :sort="3"/> -->
+        <editBtn :id="id" :sort="2" :type="8" :size="1"/>
+        <convertBtn :id="id" :sort="2" :type="8"/>
+        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[2].component_style == 1">
+          <form1Style />
+        </div>
       </div>
     </div>
   </div>
@@ -34,11 +38,8 @@ import title1Style from './components/title/1.vue'
 //tabs组件
 import tabs1Style from './components/tabs/1.vue'
 import tabs2Style from './components/tabs/2.vue'
-
-
-// import styleTitle from './components/styleTitle.vue';
-// import tabsCalendarNews from './components/tabsCalendarNews.vue';
-// import calendar from './components/calendar.vue';
+//留言组件
+import form1Style from './components/form/1.vue'
 
 export default {
   components: {
@@ -46,10 +47,8 @@ export default {
     convertBtn,
     title1Style,
     tabs1Style,
-    tabs2Style
-    // styleTitle,
-    // tabsCalendarNews,
-    // calendar
+    tabs2Style,
+    form1Style
   },
   props: {
     id: {
@@ -92,8 +91,10 @@ export default {
         box-sizing: border-box;
         padding-right: 20px;
         border: 1px dashed #5570F1;
+        position: relative;
       }
       .calendarBox {
+        position: relative;
         width: 30%;
         border: 1px dashed #5570F1;
       }

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

@@ -0,0 +1,81 @@
+<template>
+  <div class="calendarMainBox">
+    <div class="calendarTitle">
+      <span>三农调查</span>
+    </div>
+    <div class="calendarBg">
+      <span>问卷调查</span>
+    </div>
+    <div class="calendarItem">
+      <div class="calendarProblemItemTitle">问卷调查内容问卷调查内容问卷调查内容问卷调查..</div>
+      <el-input type="textarea" v-model="usertext" placeholder="请输入内容" rows="4"></el-input>
+      <el-button type="primary" class="calendarBtn" size="small">提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    
+  },
+  data() {
+    return {
+      usertext:"",
+    };
+  },
+  methods: {
+    
+  },
+  mounted() {
+    
+  },
+};
+</script>
+
+<style scoped lang="less">
+  .calendarMainBox {
+    overflow: hidden;
+    position: relative;
+    .calendarTitle {
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      span {
+        padding-left: 20px;
+        padding-right: 20px;
+        border-left: 5px solid #E8EDF6;
+        border-right: 5px solid #E8EDF6;
+      }
+    }
+    .calendarBg {
+      width: 100%;
+      height: 110px;
+      background: url('../../../../../../assets/template/component/calendar.png') no-repeat center center;
+      background-size: 100% 100%;
+      box-sizing: border-box;
+      padding-top: 35px;
+      padding-left: 36px;
+      span {
+        font-size: 32px;
+        color: #fff;
+        font-weight: bold;
+      }
+    }
+    .calendarItem {
+      font-size: 18px;
+      background: #EAF3FF;
+      padding:20px;
+      position: relative;
+      .calendarProblemItemTitle {
+        margin-bottom: 20px;
+        height: 48px;
+      }
+      .calendarBtn {
+        position: absolute;
+        bottom: 30px;
+        right: 30px;
+      }
+    }
+  }
+</style>

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

@@ -1,6 +1,6 @@
 <template>
   <div class="tabsCalendarMainNewsBox">
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName">
       <el-tab-pane label="市场资讯" name="sczx">
         <ul class="newsListBox">
           <li class="newsCalendarBox">
@@ -49,11 +49,13 @@ export default {
   },
   data() {
     return {
-      activeName:""
+      activeName:"sczx"
     };
   },
   methods: {
-    
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
   },
   mounted() {
 

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

@@ -1,27 +1,48 @@
 <template>
   <div class="listSectorBox">
     <div class="listSectorBoxTitle">
-      <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="listSectorBoxContent">
       <div class="listNewsLeft">
-        <listNews :id="id" :sort="2"/>
+        <editBtn :id="id" :sort="1" :type="1" :size="5"/>
+        <convertBtn :id="id" :sort="1" :type="6"/>
+        <div v-if="this.$store.state.template.pageData.index[id].content.componentList[1].component_style == 1">
+          <list1Style />
+        </div>
       </div>
       <div class="listNewsRight">
-        <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>
   </div>
 </template>
 
 <script>
-import styleTitle from './components/styleTitle.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 list1Style from './components/list/1.vue'
+// import styleTitle from './components/styleTitle.vue';
+// import listNews from './components/listNews.vue';
 
 export default {
   components: {
-    styleTitle, 
-    listNews
+    editBtn, 
+    convertBtn,
+    title1Style,
+    list1Style
   },
   props: {
     id:{
@@ -47,9 +68,7 @@ export default {
       width: 80%;
       border: 1px dashed #5570F1;
       height: 41px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+      position: relative;
     }
     .listSectorBoxContent {
       display: flex;
@@ -61,12 +80,14 @@ export default {
         box-sizing: border-box;
         border: 1px dashed #5570F1;
         padding-right: 10px;
+        position: relative;
       }
       .listNewsRight {
         width: 50%;
         box-sizing: border-box;
         border: 1px dashed #5570F1;
         padding-left: 10px;
+        position: relative;
       }
     }
   }