.

project/src/assets/config/interface_api.js

@@ -30,6 +30,7 @@ var api = {
   moveCustomerToBlackList: "/api/customer/moveCustomerToBlackList",
   blackList: "/api/customer/blackList",
   removeCustomerFromBlackList: "/api/customer/removeCustomerFromBlackList",
+  welcomeMsg_lists: "/api/welcomeMsg/lists",
 };
 
 export { api };

project/src/components/Home.vue

@@ -1,8 +1,8 @@
 <template>
-  <div style="min-height:calc(100vh - 70px);margin-top:10px">
+  <div style="min-height:calc(100vh - 70px);margin-top:10px" class="bg-ffffff">
     <div class="topCon">
       <span>WELCOME！</span>
-      <p>欢迎访问酷炫直播运营系统</p>
+      <p>欢迎访问企微助手</p>
     </div>
     <img src="@/assets/img/homeBigImg.png" class="homeBigImg" alt="">
   </div>
@@ -13,17 +13,16 @@
   padding-top: 50px;
   position: relative;
   span {
-    font-size: 80px;
+    font-size: 100px;
     line-height: 124px;
-    color: rgba(255, 255, 255, 0.11);
+    color: rgba(0, 179, 138, 0.08);
     font-weight: bold;
     letter-spacing: 0.1em;
   }
   p {
-    color: #ffffff;
-    font-size: 50px;
+    color: #313333;
+    font-size: 70px;
     line-height: 69px;
-    font-weight: bold;
     position: absolute;
     bottom: -10px;
     left: 0;
@@ -36,6 +35,6 @@
   width: 600px;
   margin: auto;
   margin-top: 40px;
-  opacity: 0.74;
+  opacity: 0.9;
 }
 </style>

project/src/components/assembly/screen/customerService.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="common-screen-item">
-    <label class="common-screen-label">{{title}}</label>
+    <label class="common-screen-label" v-if="title&&title!=''">{{title}}</label>
     <el-popover placement="bottom" trigger="click" v-model="visible" @show="visibleShow">
-      <div :class="['common-screen-self-box','common-input-select',final_result&&final_result.length!=0&&clearable?'common-input-select-hover':'']" slot="reference">
+      <div :style="width?'width:'+width:''" :class="['common-screen-self-box','common-input-select',final_result&&final_result.length!=0&&clearable?'common-input-select-hover':'']" slot="reference">
         <div :class="['common-screen-self-con',!final_result||final_result.length==0?'common-screen-self-placeholder':'']">
           <span v-if="!final_result||final_result.length==0">请选择</span>
           <template v-else>
@@ -89,7 +89,10 @@ export default {
     reset: {
       type: Boolean,
       default: false
-    }
+    },
+    width: {
+      type: String
+    },
   },
   watch: {
     reset () {

project/src/components/customOperate/create.scss

@@ -0,0 +1,76 @@
+.backBox {
+  background: #ffffff;
+  padding: 15px;
+  margin-bottom: 10px;
+  .back {
+    font-size: 16px;
+    font-weight: bold;
+    color: #333333;
+    cursor: pointer;
+    display: inline-block;
+  }
+}
+.createMassMsg{
+  width: 100%;
+  min-height: 400px;
+  .bigTitle {
+    color: #333333;
+    font-size: 16px;
+    line-height: 22px;
+    font-weight: bold;
+  }
+  .line {
+    width: 730px;
+    height: 1px;
+    background: #e9e9e9;
+    margin: 40px 0 20px;
+  }
+  .regulations {
+    display: flex;
+    align-items: flex-start;
+    margin-top: 28px;
+    label {
+      width: 100px;
+      color: #333333;
+      font-size: 14px;
+      line-height: 28px;
+      em {
+        color: #ff0000;
+      }
+    }
+  }
+}
+
+// .switch_self{
+//   display: flex;
+//   align-items: center;
+//   height: 30px;
+//   font-size: 13px;
+//   .switch_self_button{
+//     color: #333333;
+//     padding: 0 8px;
+//     border: 1px solid #e9e9e9;
+//     height: 100%;
+//     line-height: 28px;
+//     border-right: none;
+//     cursor: pointer;
+//     &:last-of-type{
+//       border-top-right-radius: 4px;
+//       border-bottom-right-radius: 4px;
+//       border-right: 1px solid #e9e9e9;
+//     }
+//     &:first-of-type{
+//       border-top-left-radius: 4px;
+//       border-bottom-left-radius: 4px;
+//     }
+//     &.switch_self_button_active{
+//       background: #43B083;
+//       border-color: #43B083;
+//       color: #ffffff;
+//     }
+//   }
+// }
+// <div class="switch_self">
+// <div class="switch_self_button switch_self_button_active">全部员工</div>
+// <div class="switch_self_button">部分员工</div>
+// </div>

project/src/components/customOperate/createMassMsg.vue

@@ -314,37 +314,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import "./create.scss";
 .reversalAnimation {
   transform: rotate(180deg);
 }
 .createMassMsg {
-  width: 100%;
-  min-height: 400px;
-  .bigTitle {
-    color: #333333;
-    font-size: 16px;
-    line-height: 22px;
-    font-weight: bold;
-  }
-  .line {
-    width: 730px;
-    height: 1px;
-    background: #e9e9e9;
-    margin: 40px 0 20px;
-  }
   .regulations {
-    display: flex;
-    align-items: flex-start;
-    margin-top: 28px;
-    label {
-      width: 100px;
-      color: #333333;
-      font-size: 14px;
-      line-height: 20px;
-      em {
-        color: #ff0000;
-      }
-    }
     .regulations-account {
       width: 365px;
       height: 40px;
@@ -455,16 +430,4 @@ export default {
   border: none;
   margin: 40px 70px;
 }
-.backBox {
-  background: #ffffff;
-  padding: 15px;
-  margin-bottom: 10px;
-  .back {
-    font-size: 16px;
-    font-weight: bold;
-    color: #333333;
-    cursor: pointer;
-    display: inline-block;
-  }
-}
 </style>

project/src/components/customOperate/welcom_message.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="createMassMsg" v-loading="loading">
+    <div class="backBox" @click="$router.go(-1)">
+      <div class="back">
+        <i class="el-icon-back"></i>
+        <span>返回</span>
+      </div>
+    </div>
+    <div v-if="!loading" class="bg-ffffff" style="padding: 15px;">
+      <h3 class="bigTitle">基础信息</h3>
+      <div class="self-hint" style="margin-top:10px;width:730px">
+        <i class="el-icon-message-solid"></i>
+        <div>
+          <p>1、在渠道码处设置的欢迎语会被优先推送，如果成员在渠道码处设置了欢迎语，在此设置的欢迎语不会生效</p>
+          <p>2、一个成员如果被设置了多个欢迎语，将会使用最新设置或修改的欢迎语。</p>
+        </div>
+      </div>
+      <div class="regulations">
+        <label><em>*</em>使用成员:</label>
+        <div>
+          <div style="display:flex">
+            <el-radio v-model="is_for_all" :disabled="!editFlag" :label="0">全部员工</el-radio>
+            <el-radio v-model="is_for_all" :disabled="!editFlag" :label="1">部分员工</el-radio>
+          </div>
+          <self-customerservice title='' width="300px" @customerDefine="(val)=>{user_id_list=val;}"></self-customerservice>
+        </div>
+      </div>
+      <div class="line" style="margin-top:20px"></div>
+    </div>
+  </div>
+</template>
+<script>
+import selfCustomerservice from '@/components/assembly/screen/customerService.vue'
+export default {
+  components: { selfCustomerservice },
+  data () {
+    return {
+      loading: false,
+      user_id_list: [],
+      is_for_all: 1,
+      editFlag: true
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import "./create.scss";
+</style>

project/src/components/customOperate/welcomeMsg.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <div class="tableInfo">
+      <div>
+        <div class="flex">
+          <div class="totalCustom">共有<span>{{total}}</span>条欢迎语</div>
+        </div>
+      </div>
+      <div class="flex">
+        <el-button type="primary" size="small" @click="createWelcom">新建欢迎语</el-button>
+      </div>
+    </div>
+    <el-table ref="multipleTable" :data="tableData" tooltip-effect="dark" style="width: 100%">
+      <el-table-column prop="name" label="欢迎语标题" show-overflow-tooltip align="center"></el-table-column>
+      <el-table-column label="创建人" align="center">
+        <template slot-scope="scope">
+          <div class="customerServiceTagBox">
+            <div class="customerServiceTag"><i class="el-icon-user-solid"></i> {{ scope.row.creator }}</div>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="使用成员" align="center">
+        <template slot-scope="scope">
+          <div v-if="scope.row.is_for_all==1">全部员工</div>
+          <template v-else>
+            <div class="customerServiceTagBox biaoqian">
+              <div class="customerServiceTag" v-for="(item) in scope.row.user_list" :key="item">
+                <i class="el-icon-s-custom"></i>
+                {{item}}
+              </div>
+            </div>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updated_at" label="更新时间" show-overflow-tooltip align="center"></el-table-column>
+      <el-table-column prop="created_at" label="创建时间" show-overflow-tooltip align="center"></el-table-column>
+      <el-table-column label="是否可用" show-overflow-tooltip align="center">
+        <template slot-scope="scope">
+          <div>{{scope.row.enable==0?'否':'是'}}</div>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <div class="flex" style="justify-content:center">
+            <div class="c-00B38A pointer" style="margin:0 6px" @click="goDetail(scope.row.rule_id)">删除</div>
+            <div class="c-00B38A pointer" style="margin:0 6px" @click="removeCustomer(scope.row)">编辑</div>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination" v-show="total>0">
+      <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pages)'>
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      loading: false,
+      page: 1,
+      pages: 0,
+      total: 0,
+      page_size: 20,
+      tableData: []
+    }
+  },
+  created () {
+    this.init(1)
+  },
+  methods: {
+    createWelcom () {
+      this.$router.push({ path: '/welcom_message_create' })
+    },
+    init (page) {
+      this.page = page ? page : this.page;
+      this.loading = true
+      this.$axios.get(this.URL.BASEURL + this.URL.welcomeMsg_lists, {
+        params: {
+          page: this.page,
+          page_size: this.page_size
+        }
+      }).then((res) => {
+        var res = res.data
+        this.loading = false
+        if (res && res.errno == 0) {
+          this.tableData = res.rst.data;
+          this.total = res.rst.pageInfo.total;
+          this.pages = res.rst.pageInfo.pages;
+        } else if (res.errno != 4002) {
+          this.$message({
+            message: res.err,
+            type: "warning"
+          })
+        }
+      }).catch((err) => {
+        this.loading = false
+      });
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import "@/style/list.scss";
+.tableInfo {
+  height: 50px;
+}
+</style>

project/src/router/allRouter.js

@@ -5,6 +5,8 @@ const customManage = () => import(/* webpackChunkName: 'customManage' */ '@/comp
 const employee_bulk_messaging_log = () => import(/* webpackChunkName: 'employee_bulk_messaging_log' */ '@/components/customOperate/employee_bulk_messaging_log.vue')
 const createMassMsg = () => import(/* webpackChunkName: 'createMassMsg' */ '@/components/customOperate/createMassMsg.vue')
 const blackList = () => import(/* webpackChunkName: 'blackList' */ '@/components/customManage/blackList.vue')
+const welcomeMsg = () => import(/* webpackChunkName: 'welcomeMsg' */ '@/components/customOperate/welcomeMsg.vue')
+const welcom_message = () => import(/* webpackChunkName: 'welcom_message' */ '@/components/customOperate/welcom_message.vue')
 
 
 export var allRouter = [
@@ -54,6 +56,26 @@ export var allRouter = [
         }
       },
       {
+        path: 'welcomeMsg',
+        name: 'welcomeMsg',
+        component: welcomeMsg,
+        meta: {
+          keepAlive: false,
+          isLogin: true,
+          title: '客户欢迎语'
+        }
+      },
+      {
+        path: 'welcom_message_create',
+        name: 'welcom_message',
+        component: welcom_message,
+        meta: {
+          keepAlive: false,
+          isLogin: true,
+          title: '创建欢迎语'
+        }
+      },
+      {
         path: 'createMassMsg',
         name: 'createMassMsg',
         component: createMassMsg,

project/src/router/navList.js

@@ -44,7 +44,7 @@ var navList = [
     small_menu: [
       {
         viewName: '客户欢迎语',
-        path: 'liveNotice',
+        path: 'welcomeMsg',
       },
       {
         viewName: '客户群发',