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

src/components/Index.vue

@@ -734,11 +734,13 @@
       },
       //修改版权
       TestMiniApp() {
-        this.apipost("/api/Mall/GetHome", {
-      
-        }, res => {
-          console.log("Test",res.data);
-        })
+        var cmdStr = "";
+        //cmdStr = "/api/test/get";
+        cmdStr="/api/Mall/GetHome";
+        // this.apipost(cmdStr, {
+        // }, res => {
+        //   console.log("Test", res.data);
+        // })
       },
     },
     mounted() {

src/components/pintuan/pintuanMsg.vue

+<style>
+  .weixinappmsg{
+      position: relative;
+  }
+  .weixinappmsg .mimitBody {
+    padding: 20px;
+    background-color: #fff;
+    margin: 10px 0 20px 0;
+    display: table;
+    width: 100%;
+  }
+
+  .weixinappmsg .mimitList {
+    margin-bottom: 15px;
+    display: flex;
+    flex-direction: row;
+  }
+
+  .weixinappmsg .mimitBody .el-tag {
+    min-width: 120px;
+    padding-right: 50px;
+  }
+
+  .weixinappmsg .el-button--small {
+    padding: 9px 15px;
+  }
+  .wexin_Header{
+    padding: 0 20px;
+    height: 56px;
+    line-height: 56px;
+    background-color: #fff;
+    margin-bottom: 10px;
+  }
+  .weixinTopBtn{
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    z-index: 2;
+  }
+  .weixin_warmTips{
+    margin: 0px 20px 20px;
+    background-color: rgb(244, 244, 245);
+    padding: 10px 15px;
+    color: rgb(144, 147, 153);
+    display: inline-block;
+    font-size: 15px;
+  }
+</style>
+<template>
+  <div class="weixinappmsg">
+    <!--<el-button class="weixinTopBtn" type="primary" size="small">一键添加订阅信息</el-button>-->
+    <div class="wexin_Header">
+        <el-tabs v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="微信小程序" name="1"></el-tab-pane>
+        </el-tabs>
+    </div>
+    <template v-if="checkIndex==1">
+      <div class="mimitBody">
+        <div class="el-col el-col-24">
+          <div class="weixin_warmTips">温馨提示：获取前请先确认您已获得订阅消息的使用权限，并且订阅消息中没有任何数据。获取后请不要到小程序后台 删除相应的订阅消息，否则会影响订阅消息正常使用。</div>
+          <el-form label-width="300px">
+            <el-form-item label="拼团成功通知(类目: 服装/鞋/箱包 )">
+              <el-input type="text" style="width:30%" size="small" maxlength="200" v-model="wechatMsg.sucMsg">
+              </el-input>
+              <el-button plain size="small">查看订阅消息示例</el-button>
+            </el-form-item>
+            <el-form-item label="拼团失败通知(类目: 服装/鞋/箱包 )">
+              <el-input type="text" style="width:30%" size="small" maxlength="200" v-model="wechatMsg.falMsg">
+              </el-input>
+              <el-button plain size="small">查看订阅消息示例</el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+      </div>
+      <el-button size="small" type="primary" @click="saveMsg()">保 存</el-button>
+      <el-button size="small" type="primary">生成测试二维码</el-button>
+    </template>
+  </div>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        //商城订阅消息
+        activeName:'1',
+        checkIndex:1,
+        wechatMsg:{
+            sucMsg:'',
+            falMsg:''
+        },
+      };
+    },
+    created() {
+
+    },
+    methods: {
+      //切换
+      handleClick(tab){
+        this.checkIndex = tab.name;
+      },
+      //保存信息
+      saveMsg(){
+
+      }
+    },
+    mounted() {
+    }
+  };
+
+</script>

src/components/pintuanMain.vue

+<style>
+  .pintuanMain {
+    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;
+  }
+
+  .pintuanMain .mainLeftMenu {
+    position: relative;
+    display: flex;
+    flex-direction: row;
+    color: #fff;
+  }
+
+  .pintuanMain .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;
+  }
+
+  .pintuanMain .asideInner {
+    background: rgba(0, 0, 0, 0.15);
+    padding: 6px 6px;
+    width: 100%;
+    border-radius: 3px;
+    font-weight: bold;
+  }
+
+  .pintuanMain .F_Logo {
+    height: 60px;
+    background: #464d54;
+    color: #f2f2f2;
+    cursor: pointer;
+    font-weight: bold;
+    text-align: center;
+    padding: 0 15px;
+    display: flex;
+    align-items: center;
+  }
+
+  .pintuanMain .mainRightContent {
+    width: 100%;
+    height: 100%;
+    background-color: #f3f3f3;
+  }
+
+  .pintuanMain .mainRightTop {
+    width: 100%;
+    height: 60px;
+    background: #fff;
+    display: flex;
+    justify-content: space-between;
+    color: #909399;
+  }
+
+  .pintuanMain .mainRightLeft {
+    width: 110px;
+    height: 60px;
+    line-height: 62px;
+    text-align: center;
+    margin-left: 30px;
+    cursor: pointer;
+    position: relative;
+    top: -2px;
+  }
+
+  .pintuanMain .marinRightList {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    width: 300px;
+    float: right;
+  }
+
+  .pintuanMain .marinRightList ul {
+    display: flex;
+    width: 100%;
+    justify-content: space-around;
+  }
+
+  .pintuanMain .marinRightList ul li {
+    display: block;
+    list-style-type: none;
+    cursor: pointer;
+    color: #909399;
+    outline: none;
+    border: none;
+  }
+
+  .pintuanMain .main_routerPage {
+    padding: 20px;
+    overflow-y: scroll;
+  }
+  .pintuanMain .pintuanSetUU{
+    position: fixed;
+    width: 200px;
+    height: 100%;
+    position: fixed;
+    top: 60px;
+    left: 0;
+    overflow: auto;
+    z-index: 5;
+    background-color: rgb(84, 92, 100);
+}
+.pintuanMain .pintuanSetUU .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;
+}
+.pintuanMain .pintuanSetUU .menu_item i {
+    margin-right: 5px;
+    width: 24px;
+    text-align: center;
+    font-size: 18px;
+    vertical-align: middle;
+    color:#909399;
+}
+.pintuanMain .menu_item:hover{
+    background-color: rgba(67,74,80);
+}
+.pintuanMain .F_Logo:hover{
+    background-color: #30353a;
+    color:#fff;
+}
+.pintuanMain .Fchecked{
+    color:rgb(255, 208, 75)!important;
+}
+.pintuanMain .Fchecked i{
+    color:rgb(255, 208, 75)!important;
+}
+</style>
+<template>
+  <div class="pintuanMain">
+    <div class="mainLeftMenu">
+      <div class="leftMenu1">
+        <div class="F_Logo">
+          <div class="asideInner" @click="CommonJump('mallIndex')">{{currentUser.MallName}}
+          </div>
+        </div>
+        <ul class="pintuanSetUU">
+          <li class="menu_item" :class="{'Fchecked':isChecked=='/pintuanSet'}"  @click="isChecked='/pintuanSet',CommonJump('pintuanSet')">
+              <i class="el-icon-menu"></i><span>拼团设置</span>
+          </li>
+          <li class="menu_item" :class="{'Fchecked':isChecked=='/pintuanMsg'}" @click="isChecked='/pintuanMsg',CommonJump('pintuanMsg')">
+              <i class="el-icon-menu"></i><span>消息通知</span>
+          </li>
+          <li class="menu_item" :class="{'Fchecked':isChecked=='/AppletPublishing'}" @click="isChecked='/AppletPublishing',CommonJump('AppletPublishing')">
+              <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>
+        </ul>
+      </div>
+    </div>
+    <div class="mainRightContent">
+      <div class="mainRightTop">
+        <div class="mainRightLeft">微信小程序</div>
+        <div class="marinRightList">
+          <ul>
+            <li style="display:none">缓存</li>
+            <li style="display:none"> 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:'',
+        Height:0
+      };
+    },
+    created() {
+      this.currentUser = this.getLocalStorage();
+      this.isChecked=this.$route.path;
+      if(this.$route.query.FIndex){
+        this.CommonJump('pintuanSet');
+        this.isChecked='/pintuanSet'
+      }
+    },
+    methods: {
+    },
+    mounted() {
+      this.Height = document.documentElement.clientHeight - 60;
+      //监听浏览器窗口变化　
+      window.onresize = () => {
+        this.Height = document.documentElement.clientHeight - 60
+      }
+    }
+  };
+
+</script>

src/components/sallCenter/pluginCenter.vue

@@ -30,6 +30,30 @@
 .plugin-item:hover .display-name {
     color: #409EFF;
 }
+.plugin-icon-bg{
+    background: rgb(250, 163, 34);
+    border-radius: 10px;
+    font-size: 0;
+    display: inline-block;
+}
+.plugin-icon{
+    width:50px;
+    height:50px;
+}
+.plugin-name{
+    font-size: 14px;
+    margin-bottom: 4px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.plugin-desc{
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    color: #999999;
+    font-size: 12px;
+}
 </style>
 <template>
     <div class="pluginCenter">
@@ -68,6 +92,24 @@
                 </div>
             </div>
         </div>
+        <div flex="cross:center" style="margin-top:20px;">
+            <h3 class="plugin_ListTitle">营销工具</h3>
+        </div>
+        <div flex="dir:left" 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" @click="goDiyCenter('pintuanMain')">
+                <div flex="dir:left box:first" class="plugin-item">
+                    <div style="padding-right: 12px;">
+                        <div class="plugin-icon-bg">
+                            <img src="../../assets/img/sallCenter/pintuan.png" style="width: 50px; height: 50px; display: block;"></div> 
+                        </div>
+                        <div>
+                            <div class="plugin-name">拼团</div> 
+                            <div flex="box:last"><div class="plugin-desc">邀请朋友一起拼团购买</div> 
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </template>
 <script>

src/router/index.js

@@ -790,6 +790,25 @@ export default new Router({
 
       ]
     },
+    {
+      path: '/pintuanMain',
+      name: 'pintuanMain',
+      component: resolve => require(['@/components/pintuanMain'], resolve),
+      children: [
+        //拼团 拼团设置
+        {
+          path: '/pintuanSet',
+          name: 'pintuanSet',
+          component: resolve => require(['@/components/pintuan/pintuanSet'], resolve),
+        },
+        //拼团 消息通知
+        {
+          path: '/pintuanMsg',
+          name: 'pintuanMsg',
+          component: resolve => require(['@/components/pintuan/pintuanMsg'], resolve),
+        }
+      ]
+    }
 
   ]
 })