Merge branch 'xue' into 'master'

again

See merge request pigbigbig/beyond-clouds-front!29

pages/blog/release/index.vue

@@ -33,11 +33,7 @@
             <div class="header-content">
             <div class="header-content">
               <div class="select__wrap">
               <div class="select__wrap">
                 <span>*</span>
                 <span>*</span>
-<<<<<<< HEAD
                 <select-card selectType="2" :class-list="classList" @handleClass="handleBlogClass" placeholder="请选择文章分类" ></select-card>
                 <select-card selectType="2" :class-list="classList" @handleClass="handleBlogClass" placeholder="请选择文章分类" ></select-card>
-=======
-                <select-card selectType="2" :class-list="classList" placeholder="请选择文章分类" ></select-card>
->>>>>>> caa436abf80933566b76b72acbaa8d43b70d78fc
               </div>
               </div>
               <input type="text" placeholder="原文链接" style="width: 461px;" v-model="originLink" >
               <input type="text" placeholder="原文链接" style="width: 461px;" v-model="originLink" >
             </div>
             </div>
@@ -50,11 +46,7 @@
             <span>*</span>
             <span>*</span>
             <div class="editor-container">
             <div class="editor-container">
               <mavon-editor
               <mavon-editor
-<<<<<<< HEAD
                 v-model="content"
                 v-model="content"
-=======
-                v-model="blogContent"
->>>>>>> caa436abf80933566b76b72acbaa8d43b70d78fc
                 :toolbars="markdownOption"
                 :toolbars="markdownOption"
                 class="editor"
                 class="editor"
                 placeholder="问题详情...."
                 placeholder="问题详情...."
@@ -118,11 +110,7 @@
               <p>已自动存为草稿</p>
               <p>已自动存为草稿</p>
               <button class="preview" @click="readScreen">预览</button>
               <button class="preview" @click="readScreen">预览</button>
               <button class="submit" v-on:click="postBlog">提交</button>
               <button class="submit" v-on:click="postBlog">提交</button>
-<<<<<<< HEAD
             </div>
             </div>
-=======
-          </div>
->>>>>>> caa436abf80933566b76b72acbaa8d43b70d78fc
           </div>
           </div>
         </div>
         </div>
       </card-container>
       </card-container>
@@ -131,7 +119,6 @@
 </template>
 </template>
 
 
 <script>
 <script>
-<<<<<<< HEAD
   import CardContainer from "../../../components/pc/cardContainer";
   import CardContainer from "../../../components/pc/cardContainer";
   import SelectCard from "../../../components/pc/select/selectCard";
   import SelectCard from "../../../components/pc/select/selectCard";
   import config  from "../../../action/config";
   import config  from "../../../action/config";
@@ -145,91 +132,6 @@
       });
       });
 
 
       return {blogList:blogList.data.dataList}
       return {blogList:blogList.data.dataList}
-=======
-import CardContainer from "../../../components/pc/cardContainer";
-import SelectCard from "../../../components/pc/select/selectCard";
-import config  from "../../../action/config";
-export default {
-  async asyncData ({ $axios }) {
-    const blogList = await  $axios.$get(config.api.get.Blog.myList,{
-      params:{
-        page:1,
-        size:8,
-      }
-    });
-
-    return {blogList:blogList.data.dataList}
-  },
-  components: {SelectCard, CardContainer},
-  data() {
-    return {
-
-      markdownOption: {
-        bold: true, // 粗体
-        italic: true, // 斜体
-        header: true, // 标题
-        underline: true, // 下划线
-        strikethrough: true, // 中划线
-        mark: true, // 标记
-        superscript: true, // 上角标
-        subscript: true, // 下角标
-        quote: true, // 引用
-        ol: true, // 有序列表
-        ul: true, // 无序列表
-        link: true, // 链接
-        imagelink: true, // 图片链接
-        code: true, // code
-        table: true, // 表格
-        fullscreen: true, // 全屏编辑
-        readmodel: true, // 沉浸式阅读
-        htmlcode: true, // 展示html源码
-        help: false, // 帮助
-        undo: true, // 上一步
-        redo: true, // 下一步
-        trash: true, // 清空
-        save: true, // 保存（触发events中的save事件）
-        navigation: true, // 导航目录
-        alignleft: true, // 左对齐
-        subfield: true, // 单双栏模式
-        preview: true // 预览
-      },
-      zIndex: 100,           // 控制全屏时
-      value: '',
-      way: '',
-      comment: '',
-      reprint: '',
-      imgSrc: '',
-      lastSaveTime: new Date(),
-      classList: [ 'web', 'java', 'javascript']
-    }
-  },
-  methods: {
-    toDetail(){
-      this.$router.push('/detail')
-    },
-    postBlog(){
-      this.$axios.$post(config.api.post.Blog.release,{
-        allowComment: this.allowComment,//评论权限
-        allowForward: this.allowForward,//转载权限
-        blogAbstract: this.blogAbstract,
-        blogContent: this.blogContent,
-        blogTitle: this.blogTitle,
-        categoryId: 1,//文章类型
-        content: "string",
-        cover: "string",//封面图
-        originLink: this.originLink,
-        tagIds: [
-          "Java"//标签
-        ],
-        topicIds: [
-          "Java"//话题
-        ],
-        viewPrivileges: this.way //1公开，0私有
-      }).then((response)=>{
-        //处理response
-        console.log(response)
-      })
->>>>>>> caa436abf80933566b76b72acbaa8d43b70d78fc
     },
     },
     components: {SelectCard, CardContainer},
     components: {SelectCard, CardContainer},
     data() {
     data() {
@@ -377,10 +279,7 @@ export default {
     align-items: start;
     align-items: start;
     .blog-release-container__l {
     .blog-release-container__l {
       .blog-release_List{
       .blog-release_List{
-<<<<<<< HEAD
         width: 266*$length;
         width: 266*$length;
-=======
->>>>>>> caa436abf80933566b76b72acbaa8d43b70d78fc
         @extend %flex-row-spb;
         @extend %flex-row-spb;
         margin-top: 5px;
         margin-top: 5px;
         padding-left: 18*$length;
         padding-left: 18*$length;
@@ -391,12 +290,9 @@ export default {
           white-space: nowrap;
           white-space: nowrap;
           text-overflow: ellipsis;
           text-overflow: ellipsis;
         }
         }
-<<<<<<< HEAD
         :hover{
         :hover{
           color: #00AAE6;
           color: #00AAE6;
         }
         }
-=======
->>>>>>> caa436abf80933566b76b72acbaa8d43b70d78fc
 
 
       }
       }
     }
     }