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

src/components/Ftemplate.vue

+<style>
+  .Fsetting {
+    height: 100%;
+    display: flex;
+    -webkit-box-orient: horizontal;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    -webkit-box-flex: 1;
+    -ms-flex: 1;
+    flex: 1;
+    -ms-flex-preferred-size: auto;
+    flex-basis: auto;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    min-width: 0;
+    font-size: 14px;
+  }
+
+  .Fsetting .mainLeftMenu {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    color: #fff;
+  }
+
+  .Fsetting .leftMenu1 {
+    background: #444444;
+    cursor: pointer;
+    width: 200px;
+    height: 100%;
+    overflow-y: auto;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+  }
+
+  .Fsetting .asideInner {
+    background: rgba(0, 0, 0, 0.15);
+    padding: 6px 6px;
+    width: 100%;
+    border-radius: 3px;
+    font-weight: bold;
+  }
+
+  .Fsetting .F_Logo {
+    height: 60px;
+    background: #464d54;
+    color: #f2f2f2;
+    cursor: pointer;
+    font-weight: bold;
+    text-align: center;
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+  }
+
+  .Fsetting .mainRightContent {
+    width: 100%;
+    height: 100%;
+    background-color: #f3f3f3;
+  }
+
+  .Fsetting .mainRightTop {
+    width: 100%;
+    height: 60px;
+    background: #fff;
+    display: flex;
+    justify-content: space-between;
+    color: #909399;
+  }
+
+  .Fsetting .mainRightLeft {
+    width: 110px;
+    height: 60px;
+    line-height: 62px;
+    text-align: center;
+    margin-left: 30px;
+    cursor: pointer;
+    position: relative;
+    top: -2px;
+  }
+
+  .Fsetting .marinRightList {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 300px;
+    float: right;
+  }
+
+  .Fsetting .marinRightList ul {
+    display: flex;
+    width: 100%;
+    justify-content: space-around;
+  }
+
+  .Fsetting .marinRightList ul li {
+    display: block;
+    list-style-type: none;
+    cursor: pointer;
+    color: #909399;
+    outline: none;
+    border: none;
+  }
+
+  .Fsetting .main_routerPage {
+    padding: 20px;
+    overflow-y: scroll;
+  }
+  .Fsetting .FsettingUU{
+    position: fixed;
+    width: 200px;
+    height: 100%;
+    position: fixed;
+    top: 60px;
+    left: 0;
+    overflow: auto;
+    z-index: 5;
+    background-color: rgb(84, 92, 100);
+}
+.Fsetting .FsettingUU .menu_item{
+    font-size: 14px;
+    color: #303133;
+    padding: 0 20px;
+    cursor: pointer;
+    -webkit-transition: border-color .3s,background-color .3s,color .3s;
+    transition: border-color .3s,background-color .3s,color .3s;
+    box-sizing: border-box;
+    height:56px;
+    line-height: 56px;
+    list-style: none;
+    white-space: nowrap;
+    color:#fff;
+    display: flex;
+    align-items: center;
+}
+.Fsetting .FsettingUU .menu_item i {
+    margin-right: 5px;
+    width: 24px;
+    text-align: center;
+    font-size: 18px;
+    vertical-align: middle;
+    color:#909399;
+}
+.Fsetting .menu_item:hover{
+    background-color: rgba(67,74,80);
+}
+.Fsetting .F_Logo:hover{
+    background-color: #30353a;
+    color:#fff;
+}
+.Fsetting .Fchecked{
+    color:rgb(255, 208, 75)!important;
+}
+.Fsetting .Fchecked i{
+    color:rgb(255, 208, 75)!important;
+}
+</style>
+<template>
+  <div class="Fsetting">
+    <div class="mainLeftMenu">
+      <div class="leftMenu1">
+        <div class="F_Logo">
+          <div class="asideInner" @click="CommonJump('zanIndex')">{{currentUser.MallName}}
+          </div>
+        </div>
+        <ul class="FsettingUU">
+          <li class="menu_item" :class="{'Fchecked':isChecked==1}"  @click="isChecked=1,CommonJump('wexinappconfig')">
+              <i class="el-icon-menu"></i><span>模板管理</span>
+          </li>
+          <li class="menu_item" :class="{'Fchecked':isChecked==2}" @click="isChecked=2,CommonJump('wexinappmsg')">
+              <i class="el-icon-menu"></i><span>模板市场</span>
+          </li>
+          <li class="menu_item" :class="{'Fchecked':isChecked==3}" @click="isChecked=3">
+              <i class="el-icon-menu"></i><span>自定义页面</span>
+          </li>
+          <li class="menu_item" :class="{'Fchecked':isChecked==4}" @click="isChecked=4">
+              <i class="el-icon-menu"></i><span>授权页面</span>
+          </li>
+          <li class="menu_item" :class="{'Fchecked':isChecked==5}" @click="isChecked=5">
+              <i class="el-icon-menu"></i><span>表单提交信息</span>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="mainRightContent">
+      <div class="mainRightTop">
+        <div class="mainRightLeft">微信小程序</div>
+        <div class="marinRightList">
+          <ul>
+            <li>缓存</li>
+            <li title="教程管理">
+              <el-dropdown trigger="click">
+                <span class="el-dropdown-link">
+                  教程管理<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item>操作教程</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </li>
+            <li :title="currentUser.MallName">
+              <el-dropdown trigger="click">
+                <span class="el-dropdown-link">
+                  {{currentUser.MallName}}<i class="el-icon-arrow-down el-icon--right"></i>
+                </span>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item disabled>{{currentUser.MallName}}</el-dropdown-item>
+                  <el-dropdown-item disabled>{{currentUser.Account}}({{currentUser.MobilePhone}})</el-dropdown-item>
+                  <el-dropdown-item @click.native="CommonJump('index')">返回系统</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </li>
+          </ul>
+        </div>
+      </div>
+      <div class="main_routerPage" :style="{height: Height+'px'}">
+        <router-view />
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        currentUser: {},
+        isChecked:1,
+        Height:0
+      };
+    },
+    created() {
+      this.currentUser = this.getLocalStorage();
+    },
+    methods: {
+    },
+    mounted() {
+      this.CommonJump('templateManage');
+      this.Height = document.documentElement.clientHeight - 60;
+      //监听浏览器窗口变化　
+      window.onresize = () => {
+        this.Height = document.documentElement.clientHeight - 60
+      }
+    }
+  };
+
+</script>

src/components/StoreDesign/customPoster.vue

@@ -540,7 +540,7 @@
                     <div class="custom_rightCheck" style="padding:30px 0 50px;">
                         <el-form label-width="100px">
                             <el-form-item label="海报样式">
-                                <el-radio-group v-model="postersMsg.PosterStyle" style="min-width:500px;">
+                                <el-radio-group v-model="postersMsg.PosterStyle" style="width:345px;">
                                     <div class="poster-style-box" @click="postersMsg.PosterStyle=1">
                                         <el-radio :label="1">样式一</el-radio>
                                         <img src="../../assets/img/storeDesign/check1.png" alt="">   
@@ -676,7 +676,7 @@
           //商品海报msg
           postersMsg:{
             PosterStyle:1,
-            pictureNum:5
+            pictureNum:1
           }
       };
     },

src/components/StoreDesign/thematicPosters.vue

+<style>
+
+</style>
 <template>
-    <div>
-        123
+    <div class="custom_Main">
+        <div class="custom_mobile_box">
+            <div class="custom_bg_box">
+
+            </div>
+        </div>
+        <div class="custom_formBody">
+            <div class="customShareBtn">
+                <el-button size="small" type="primary">保存</el-button>
+            </div>
+        </div>
     </div>
-</template>
+</template>
\ No newline at end of file
+<script>
+  export default {
+    data() {
+      return {
+
+      };
+    },
+    created() {
+
+    },
+    methods: {
+    },
+    mounted() {
+
+    }
+  };
+
+</script>

src/components/sallCenter/pluginCenter.vue

+<style>
+.pluginCenter{
+    padding:20px 0;
+}
+.plugin_ListTitle{
+    font-weight: 400;
+    font-size: 18px;
+    margin-bottom:24px;
+}
+.plugin-list{
+    margin:0 0 0 -20px;
+}
+.plugin-item {
+    border: 1px solid #ebebeb;
+    background: #fff;
+    padding: 20px;
+    margin: 0 0 20px 20px;
+    transition: 250ms;
+    position: relative;
+    height: 97px;
+}
+.plugin-item .display-name {
+    margin-bottom: 10px;
+    transition: 250ms;
+}
+.plugin-item:hover{
+    border-color: #bfddff;
+    cursor: pointer;
+}
+.plugin-item:hover .display-name {
+    color: #409EFF;
+}
+</style>
+<template>
+    <div class="pluginCenter">
+        <div flex="cross:center">
+            <h3 class="plugin_ListTitle">已安装</h3>
+        </div>
+        <div class="plugin-list el-row">
+            <div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4">
+                <div flex="dir:left box:first" class="plugin-item">
+                    <div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/icon.png" style="width: 50px; height: 50px; display: block;"></div> 
+                        <div>
+                            <div class="display-name">微信小程序</div> 
+                            <div flex="box:last"><div class="name">wxapp</div> 
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="el-col el-col-24 el-col-xs-24 el-col-sm-12 el-col-md-8 el-col-lg-6 el-col-xl-4" @click="goDiyCenter">
+                <div flex="dir:left box:first" class="plugin-item">
+                    <div style="padding-right: 12px;"><img src="../../assets/img/sallCenter/Diy.png" style="width: 50px; height: 50px; display: block;"></div> 
+                        <div>
+                            <div class="display-name">DIY装修</div> 
+                            <div flex="box:last"><div class="name">diy</div> 
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        currentUser: {},
+        isChecked:1,
+        Height:0
+      };
+    },
+    created() {
+      this.currentUser = this.getLocalStorage();
+    },
+    methods: {
+      //跳转微信小程序
+      goDiyCenter(){
+        let routeData = this.$router.resolve({
+          name: 'Fsetting',
+          query: {}
+        });
+        window.open(routeData.href, "_blank");
+      }
+    },
+    mounted() {
+      this.Height = document.documentElement.clientHeight - 60;
+      //监听浏览器窗口变化　
+      window.onresize = () => {
+        this.Height = document.documentElement.clientHeight - 60
+      }
+    }
+  };
+
+</script>

src/components/sallCenter/templateEdit.vue

+<template>
+    <div>
+        123
+    </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+
+      };
+    },
+    created() {
+
+    },
+    methods: {
+    },
+    mounted() {
+        
+    }
+  };
+
+</script>

src/components/sallCenter/templateManage.vue

+<style>
+    .templateManage .template_comheader{
+        padding: 13px 20px;
+        border-bottom: 1px solid #EBEEF5;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        background: #fff;
+    }
+    .templateManage .template_comheader>div{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        flex-direction: row;
+    }
+    .templateManage .temp_content{
+        margin-top:10px;
+        background: #fff;
+        padding:20px;
+    }
+    .templateManage .temp_imgStyle{
+        display:inline-block;
+        margin-right:10px;
+    }
+</style>
+<template>
+    <div class="templateManage">
+        <div class="template_comheader">
+            <div>
+                <span>模板管理</span>
+                <el-button type="primary" size="small" @click="CommonJump('templateEdit')">添加模板</el-button>
+            </div>
+        </div>
+        <div class="temp_content">
+            <el-table :data="tableData" border style="width: 100%">
+                <el-table-column prop="ID" label="ID"></el-table-column>
+                <el-table-column prop="name" label="模板名称"></el-table-column>
+                <el-table-column prop="date" label="创建时间"></el-table-column>
+                <el-table-column label="操作">
+                    <template slot-scope="scope">
+                        <el-tooltip class="item" effect="dark" content="编辑" placement="top" >
+                            <img src="../../assets/img/setup/edit.png" alt="" class="temp_imgStyle" @click="edit(scope.row)">
+                        </el-tooltip>
+                        <el-tooltip class="item" effect="dark" content="删除" placement="top" >
+                            <img src="../../assets/img/setup/del.png" alt="" class="temp_imgStyle" @click="delRow(scope.row)">
+                        </el-tooltip>
+                    </template>
+                </el-table-column>
+            </el-table>            
+        </div>
+    </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        tableData: [{
+          ID: '3542',
+          name: '微途测试',
+          date: '2020-04-27 19:20:08',
+        }]
+      };
+    },
+    created() {
+
+    },
+    methods: {
+        
+    },
+    mounted() {
+
+    }
+  };
+
+</script>

src/router/index.js

@@ -62,6 +62,20 @@ export default new Router({
         }
       ]
     },
+    {
+      path:'/Ftemplate', //DIY装修
+      name: 'Ftemplate',
+      component: resolve => require(['@/components/Ftemplate'], resolve),
+      children:[{ //模板管理
+        path:'/templateManage',
+        name:'templateManage',
+        component: resolve => require(['@/components/sallCenter/templateManage'], resolve),
+      },{ //添加 修改模板
+        path:'/templateEdit',
+        name: 'templateEdit',
+        component: resolve => require(['@/components/sallCenter/templateEdit'], resolve),
+      }]
+    },
     {
       path: '/mall',
       name: 'mall',
@@ -222,6 +236,12 @@ export default new Router({
           path: '/customPoster',
           name: 'customPoster',
           component: resolve => require(['@/components/StoreDesign/customPoster'], resolve),
+        },
+        //营销中心 插件中心
+        {
+          path: '/pluginCenter',
+          name: 'pluginCenter',
+          component: resolve => require(['@/components/sallCenter/pluginCenter'], resolve),
         }
       ]
     },