Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/Share/shareCategory.vue

@@ -16,11 +16,10 @@
             @click="msg.pageIndex=1,getList()"> </span>
         </div>
         <br>
-        <el-button @click="saveSort()" size="small" type="primary">保存排序</el-button>
         <div v-loading="loading" flex="dir:left box:mean" class="cat-list" style="margin-top:20px;">
           <el-card class="card-item-box" shadow="never">
             <div slot="header" class="clearfix">
-              <span>一级分类</span>
+              <span>一级分类</span> <el-button @click="saveSort()" size="small" type="primary" style="float:right">保存排序</el-button>
             </div>
             <draggable flex v-model="dataFirst">
               <div @click="getChild(item,index)" v-for="(item,index) in dataFirst"
@@ -53,7 +52,7 @@
           </el-card>
           <el-card class="card-item-box" shadow="never">
             <div slot="header" class="clearfix">
-              <span>二级分类</span>
+              <span>二级分类</span><el-button @click="saveSort()" size="small" type="primary" style="float:right">保存排序</el-button>
             </div>
             <draggable flex v-model="dataSecond">
               <div @click="getSecond(item,index)" v-for="(item,index) in dataSecond"
@@ -86,7 +85,7 @@
           </el-card>
           <el-card class="card-item-box" shadow="never">
             <div slot="header" class="clearfix">
-              <span>三级分类</span>
+              <span>三级分类</span><el-button @click="saveSort()" size="small" type="primary" style="float:right">保存排序</el-button>
             </div>
             <draggable flex v-model="dataThird">
               <div @click="getThird(index)" v-for="(item,index) in dataThird"

src/components/Share/shareFriend.vue

@@ -39,8 +39,9 @@
           </el-table-column>
           <el-table-column label="发圈文案" width="300">
             <template slot-scope="scope">
-              {{scope.row.MaterialInfo}}<img @click="getMaterInfo(scope.row)" style="margin-left:3px;"
-                src="../../assets/img/userman/edit1.png" alt="">
+                <span v-html="scope.row.MaterialInfo"></span>
+              <!-- <img @click="getMaterInfo(scope.row)" style="margin-left:3px;"
+                src="../../assets/img/userman/edit1.png" alt=""> -->
             </template>
           </el-table-column>
           <el-table-column prop="MaterialImg" label="图片视频" width="300">
@@ -144,7 +145,8 @@
               <el-button type="text" @click="isShowGoods=true">选择商品</el-button>
             </el-form-item>
             <el-form-item label="动态文案" prop="MaterialInfo">
-              <el-input type="textarea" :rows="6" v-model="addMsg.MaterialInfo"></el-input>
+              <UeEditor style="width:750px;" :defaultMsg="defaultMsg" :config="config" :IsMultiple="true"
+                ref="UeEditor1"></UeEditor>
             </el-form-item>
             <el-form-item>
               <label slot="label">动态图片
@@ -241,15 +243,25 @@
   import ChooseImg from "@/components/global/ChooseImg.vue";
   import choiceMaterial from "@/components/common/choiceMaterial.vue";
   import choiceGood from "@/components/common/choiceGood.vue";
+  import UeEditor from "@/components/global/UE.vue";
   export default {
     components: {
       ChooseImg,
       choiceMaterial,
-      choiceGood
+      choiceGood,
+      UeEditor
     },
     data() {
       return {
+        //UeEditor配置
+        defaultMsg: "",
+        config: {
+          initialFrameWidth: null,
+          initialFrameHeight: 350
+        },
+        //编辑行号
         sort_goods_id: 0,
+        //开始时间-结束时间
         dateStr: [],
         loading: false,
         //是否显示新增分类
@@ -329,6 +341,8 @@
       submitForm(formName) {
         this.$refs[formName].validate((valid) => {
           if (valid) {
+            let content = this.$refs.UeEditor1.getUEContent();
+            this.addMsg.MaterialInfo = content;
             this.apipost("/api/Share/SetShareFriend", this.addMsg,
               res => {
                 this.loading = false;
@@ -362,6 +376,9 @@
                 this.addMsg.GoodsId = tempObj.GoodsId;
                 this.addMsg.CoverImg = tempObj.CoverImg;
                 this.addMsg.GoodsName = tempObj.GoodsName;
+                if (tempObj.MaterialInfo) {
+                  this.defaultMsg = tempObj.MaterialInfo;
+                }
                 this.addMsg.MaterialInfo = tempObj.MaterialInfo;
                 if (tempObj.LinkUrl) {
                   this.addMsg.LinkUrl = tempObj.LinkUrl;
@@ -369,9 +386,9 @@
                 this.addMsg.IsTop = tempObj.IsTop;
                 this.addMsg.SortNum = tempObj.SortNum;
                 this.addMsg.ImgList = tempObj.ImgList;
-                this.addMsg.FirstLevelName=tempObj.FirstLevelName;
-                this.addMsg.SecondLevelName=tempObj.SecondLevelName;
-                this.addMsg.ThirdLevelName=tempObj.ThirdLevelName;
+                this.addMsg.FirstLevelName = tempObj.FirstLevelName;
+                this.addMsg.SecondLevelName = tempObj.SecondLevelName;
+                this.addMsg.ThirdLevelName = tempObj.ThirdLevelName;
               }
               this.IsShowCategory = false;
             } else {
@@ -405,13 +422,14 @@
         this.addMsg.CateId = 0;
         this.addMsg.GoodsId = 0;
         this.addMsg.CoverImg = "";
-        this.addMsg.FirstLevelName="";
-        this.addMsg.SecondLevelName="";
-        this.addMsg.ThirdLevelName="";
+        this.addMsg.FirstLevelName = "";
+        this.addMsg.SecondLevelName = "";
+        this.addMsg.ThirdLevelName = "";
         this.addMsg.MaterialInfo = "";
         this.addMsg.LinkUrl = "";
         this.addMsg.IsTop = 1;
         this.addMsg.SortNum = 1;
+        this.defaultMsg="";
       },
       //更新是否置顶
       updateIsTop(item) {

src/components/sallCenter/plugin/shopinfo.vue

+<style>
+  .Useravatar-icon {
+    background: #E3E3E3;
+    border: 2px solid #fff;
+    width: 80px;
+    height: 80px;
+    border-radius: 9999px;
+    display: inline-block;
+  }
+
+</style>
+<template>
+  <div :class="{'active':shopinfoData.isCked}">
+    <div class="diy-component-options" v-if="shopinfoData.isCked">
+      <el-button type="primary" icon="el-icon-delete" style="left: -25px; top: 0px;" @click="delPlugin()"></el-button>
+      <el-button type="primary" icon="el-icon-document-copy" style="left: -25px; top: 30px;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-up" v-if="index>0" @click="resetSord(0)"
+        style="right: -25px; top: 0;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-down" v-if="index!=dataLeng-1" @click="resetSord(1)"
+        style="right: -25px; top: 30px;"></el-button>
+    </div>
+    <div class="diy-component-preview">
+      <div class="user-info-container" flex="cross:center" style=" background-color: rgba(255,255,255,1);background-size: cover;background-position: center;padding: 50px;
+       height:156px;box-shadow:0px 6px 12px 0px rgba(76,76,76,0.14);border-radius:20px;" :style="'background-image: url('+getIconLink(data.backgroundPicUrl)+');'">
+        <div style="width: 100%;display:none" :style="cOutBoxStyle">
+          <div style="width: 100%;" >
+            <div :style="cAvatarBoxStyle">
+              <div class="Useravatar-icon"></div>
+            </div>
+            <div style="color: #fff;" :style="cNameBoxStyle">{{data.headName}}</div><br />
+            <div style="color: #fff;" :style="cNameBoxStyle">{{data.headInfo}}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="diy-component-edit" v-if="shopinfoData.isCked">
+      <el-form label-width="100px" @submit.native.prevent>
+        <el-form-item label="昵称" style="display:none">
+          <el-input type="text" v-model="data.headName" size="small" style="margin-right: 25px;">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="介绍" style="display:none">
+          <el-input type="text" v-model="data.headInfo" size="small" style="margin-right: 25px;">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="背景图片" >
+          <div class="zk_pic_box" @click="choicImg=true" flex="main:center cross:center"
+            :style="{backgroundImage:'url(' + getIconLink(data.backgroundPicUrl) + ')'}">
+            <i v-if="data.backgroundPicUrl==''" class="el-icon-picture-outline"></i>
+            <el-button type="danger" v-if="data.backgroundPicUrl!=''" class="image-delete" size="mini"
+              icon="el-icon-close" @click.stop="data.backgroundPicUrl=''" circle></el-button>
+          </div>
+        </el-form-item>
+
+        <el-form-item label="背景颜色" style="display:none">
+          <el-color-picker v-model="data.backgroundColor"></el-color-picker>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 选择图片文件 -->
+    <el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
+      <ChooseImg @SelectId="SelectId"></ChooseImg>
+    </el-dialog>
+  </div>
+</template>
+<script>
+  import ChooseImg from "@/components/global/ChooseImg.vue";
+  export default {
+    props: ["shopinfoData", "index", "dataLeng"],
+    components: {
+      ChooseImg
+    },
+    data() {
+      return {
+        choicImg: false,
+        data: this.shopinfoData.data,
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      //向父组件传值 并调用排序
+      resetSord(IsUp) {
+        this.$emit('getSord', this.index, IsUp);
+      },
+      //点击触发父组件删除
+      delPlugin() {
+        this.$emit('comDelPlugin', this.index);
+      },
+      //选择图片
+      SelectId(msg) {
+        this.data.backgroundPicUrl = this.getIconLink(msg.url);
+        this.choicImg = false;
+      },
+    },
+    computed: {
+      cFlexDir() {
+        let style = '';
+        if (this.data.style === 1) {
+          style += 'dir:left box:first cross:center';
+        }
+        if (this.data.style === 2) {
+          style += 'dir:top main:center';
+        }
+        if (this.data.style === 3) {
+          style += 'dir:left box:first cross:center';
+        }
+        return style;
+      },
+      cOutBoxStyle() {
+        let style = '';
+        if (this.data.style === 3) {
+          style += `padding: 30px 20px;border-radius: 10px; background-color: ${this.data.backgroundColor};`;
+        }
+        return style;
+      },
+      cAvatarBoxStyle() {
+        let style = '';
+        if (this.data.style === 1 || this.data.style === 3) {
+          style += 'padding: 0 20px;';
+        }
+        if (this.data.style === 2) {
+          style += 'text-align: center;';
+        }
+        return style;
+      },
+      cNameBoxStyle() {
+        let style = '';
+        if (this.data.style === 2) {
+          style += 'text-align: center;';
+        }
+        if (this.data.style === 3) {
+          style += 'color: #333333;';
+        }
+        return style;
+      },
+    },
+    mounted() {
+
+    }
+  };
+
+</script>

src/components/sallCenter/templateEdit.vue

@@ -280,6 +280,8 @@
                   @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></imageText>
                 <topic v-if="item.Id=='topic'" :topicData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
                   :index="index" :dataLeng="dataList.length"></topic>
+                <shopinfo v-if="item.Id=='shop-info'" :shopinfoData="item" @getSord="getSord" @comDelPlugin="comDelPlugin"
+                  :index="index" :dataLeng="dataList.length"></shopinfo>
               </div>
             </div>
           </div>
@@ -386,6 +388,7 @@
   import quickNav from "../sallCenter/plugin/quick-nav.vue"
   import imageText from "../sallCenter/plugin/image-text.vue"
   import topic from "../sallCenter/plugin/topic.vue"
+  import shopinfo from "../sallCenter/plugin/shopinfo.vue"
 
   import ChooseImg from "@/components/global/ChooseImg.vue";
   export default {
@@ -453,12 +456,13 @@
       quickNav,
       imageText,
       topic,
+      shopinfo,
       ChooseImg
     },
     methods: {
       //选择图片
       SelectId(msg) {
-        this.bgMsg.data.backgroundPicUrl =this.getIconLink(msg.url);
+        this.bgMsg.data.backgroundPicUrl = this.getIconLink(msg.url);
         this.choicImg = false;
       },
       choose(num, position) {
@@ -469,7 +473,7 @@
       SetBgInfo() {
         var isExists = false;
         var existsIndex = 0;
-        this.dataList.forEach((item,index) => {
+        this.dataList.forEach((item, index) => {
           if (item.Id == "background") {
             isExists = true;
             existsIndex = index;
@@ -518,7 +522,6 @@
         this.apipost("/api/Tenant/GetPlugInList", {}, res => {
           if (res.data.resultCode == 1) {
             this.allComponents = res.data.data;
-
           } else {
             this.Info(res.data.message);
           }
@@ -1235,6 +1238,21 @@
             }
             this.dataList.push(quickObj);
             break;
+            //门店用户信息
+          case 'shop-info':
+            let shopInfoObj = {
+              Id: 'shop-info',
+              isCked: false,
+              data: {
+                headImg: "", //头像
+                headName: "赞羊小店", //用户信息
+                headInfo: "赞美生活,样样满意", //用户介绍
+                backgroundPicUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/shopinfo.jpg', //背景图片
+                backgroundColor: '#ffffff', //背景颜色         
+              }
+            };
+            this.dataList.push(shopInfoObj);
+            break;
         }
       },
       //给子组件调用 重新排序上移下移