.

.idea/workspace.xml

@@ -55,11 +55,6 @@
       <workItem from="1654653264438" duration="30604000" />
       <workItem from="1654739102819" duration="11048000" />
       <workItem from="1654756255993" duration="16970000" />
-<<<<<<< HEAD
-      <workItem from="1654774566674" duration="839000" />
-      <workItem from="1654827336655" duration="1043000" />
-=======
->>>>>>> master
     </task>
     <servers />
   </component>

project/src/components/customOperate/sideTool/index.vue

@@ -0,0 +1,32 @@
+<template>
+  <div>
+    <div class="topTagBox flex">
+      <div class="left flex-align-center">
+        <div :class="['tagItem',type=='userPortrait'?'tagItem_active':'']" @click="changeType('userPortrait');">客户画像</div>
+        <div :class="['tagItem',type=='quickWord'?'tagItem_active':'']" @click="changeType('quickWord');">快捷话术</div>
+      </div>
+    </div>
+    <keep-alive>
+      <component v-bind:is="type" class="tab"></component>
+    </keep-alive>
+  </div>
+</template>
+<script>
+import userPortrait from './userPortrait.vue'
+import quickWord from './quickWord.vue'
+export default {
+  components: { userPortrait, quickWord },
+  data () {
+    return {
+      type: 'userPortrait'
+    }
+  },
+  methods: {
+    changeType (type) {
+      this.type = type
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>

project/src/components/customOperate/sideTool/quickWord.vue

@@ -0,0 +1,5 @@
+<template>
+  <div>
+    2222
+  </div>
+</template>

project/src/components/dataBoard/wxAccount/accountReportConf.vue

@@ -10,6 +10,10 @@
         <div class="name"><em>*</em>关联企微:</div>
         <self-channel title="" width="250px" type='corpIdList' :afferent_value='corpid' @channelDefine="(val)=>{corpid = val;}"></self-channel>
       </div>
+      <div class="itemBox">
+        <div class="name">渠道编号:</div>
+        <el-input placeholder="请输入渠道编号" style="width:250px" v-model.trim="channel" size="small" clearable></el-input>
+      </div>
     </div>
     <div slot="footer" class="dialog-footer">
       <el-button size="mini" @click="$emit('returnReportRule')">取 消</el-button>
@@ -30,13 +34,15 @@ export default {
       user_id: '',
       time: [],
       loading: false,
-      user_action_set_id: ''
+      user_action_set_id: '',
+      channel: ''
     }
   },
   created () {
     if (this.editData && this.editData.wechat_account_id) {
       this.corpid = this.editData.corp_id ? this.editData.corp_id : '';
       this.user_action_set_id = this.editData.user_action_set_id ? this.editData.user_action_set_id : '';
+      this.channel = this.editData.channel ? this.editData.channel : '';
     }
   },
   methods: {
@@ -61,6 +67,7 @@ export default {
         user_action_set_id: this.user_action_set_id,
         corpid: this.corpid,
         app_id: this.editData.wechat_account_id,
+        channel: this.channel
       }
       this.$axios.post(this.URL.BASEURL + axios_api, params).then((res) => {
         var res = res.data

project/src/components/dataBoard/wxAccount/list.vue

@@ -12,7 +12,7 @@
             <el-button type="primary" plain size="mini" @click="clearSelect">清空选中</el-button>
           </div>
         </div>
-        <div class="c-FF604D f14 lMar28">重要提示：公众号完成后请及时编辑数据源ID与企微主体</div>
+        <div class="c-FF604D f14 lMar28">重要提示：公众号完成后请及时编辑渠道编号、数据源ID与企微主体</div>
       </div>
       <div class="flex">
         <el-popover placement="bottom" width="600" trigger="click">
@@ -35,6 +35,7 @@
     <el-table ref="multipleTable" :height="height" :data="gzhData" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
       <el-table-column type="selection" :selectable="checkSelectable" width="55" align="center"></el-table-column>
       <el-table-column prop="account_name" min-width="160" label="公众号" show-overflow-tooltip align="center" fixed="left"></el-table-column>
+      <el-table-column prop="channel" min-width="140" label="渠道编号" show-overflow-tooltip align="center"></el-table-column>
       <el-table-column prop="user_action_set_id" min-width="160" label="数据源ID" show-overflow-tooltip align="center"></el-table-column>
       <el-table-column prop="created_at" min-width="180" label="授权时间" show-overflow-tooltip align="center"></el-table-column>
       <el-table-column prop="corp_name" min-width="160" label="关联企微" show-overflow-tooltip align="center"></el-table-column>

project/src/router/allRouter.js

@@ -5,7 +5,7 @@ const homeData = () => import('@/components/HomeData.vue')
 const customManage = () => import(/* webpackChunkName: 'customManage' */ '@/components/customManage/manage.vue')
 const employee_bulk_messaging_log = () => import(/* webpackChunkName: 'employee_bulk_messaging_log' */ '@/components/customOperate/employee_bulk_messaging_log.vue')
 const customerFriendsCircle = () => import(/* webpackChunkName: 'customerFriendsCircle' */ '@/components/customOperate/friendsCircle/index.vue')
-// const createFriendsCircle = () => import(/* webpackChunkName: 'createFriendsCircle' */ '@/components/customOperate/createFriendsCircle.vue')
+const sideTool = () => import(/* webpackChunkName: 'sideTool' */ '@/components/customOperate/sideTool/index.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')
@@ -41,7 +41,7 @@ const importRecordDetial = () => import(/* webpackChunkName: 'importRecordDetial
 const codeIndex = () => import(/* webpackChunkName: 'codeIndex' */ '@/components/channelCode/codeIndex.vue')
 const code_dataAnalyse = () => import(/* webpackChunkName: 'dataAnalyse' */ '@/components/channelCode/dataAnalyse.vue')
 const createChannelCode = () => import(/* webpackChunkName: 'createChannelCode' */ '@/components/channelCode/createChannelCode.vue')
-const h5test= () => import(/* webpackChunkName: 'h5test' */ '@/components/h5test.vue')
+const h5test = () => import(/* webpackChunkName: 'h5test' */ '@/components/h5test.vue')
 
 // name与菜单配置的页面路由一致
 // meta下isData:true为数据看板,否则为助手
@@ -213,16 +213,16 @@ export var allRouter = [
           title: '客户朋友圈'
         }
       },
-      // {
-      //   path: 'createFriendsCircle',
-      //   name: 'customerFriendsCircle',
-      //   component: createFriendsCircle,
-      //   meta: {
-      //     keepAlive: false,
-      //     isLogin: true,
-      //     title: '创建朋友圈'
-      //   }
-      // },
+      {
+        path: 'sideTool',
+        name: 'sideTool',
+        component: sideTool,
+        meta: {
+          keepAlive: false,
+          isLogin: true,
+          title: '侧边栏工具'
+        }
+      },
       {
         path: 'employee_bulk_messaging_log',
         name: 'employee_bulk_messaging_log',

qwh5/config/index.js

@@ -0,0 +1,18 @@
+module.exports = {
+  mock: {
+    baseURL: '/dev-api',
+    mockURL: 'https://mock.xwhx.top'
+  },
+  local: {
+    baseURL: '/dev-api',
+    mockURL: 'http://0.0.0.0:7001'
+  },
+  development: {
+    baseURL: '/dev-api',
+    mockURL: 'https://api.xwhx.top'
+  },
+  production: {
+    baseURL: 'https://api.xwhx.top',
+    mockURL: 'https://api.xwhx.top'
+  }
+}

qwh5/dist/js/about.f1949232.js

@@ -1,2 +1 @@
-"use strict";(self["webpackChunkqwh5"]=self["webpackChunkqwh5"]||[]).push([[443],{4335:function(n,u,t){t.r(u),t.d(u,{default:function(){return f}});var a=t(3396);const e={class:"about"},r=(0,a._)("h1",null,"This is an about page",-1),s=[r];function c(n,u){return(0,a.wg)(),(0,a.iD)("div",e,s)}var i=t(89);const h={},o=(0,i.Z)(h,[["render",c]]);var f=o}}]);
-//# sourceMappingURL=about.f1949232.js.map
+"use strict";(self["webpackChunkqwh5"]=self["webpackChunkqwh5"]||[]).push([[443],{4335:function(n,u,t){t.r(u),t.d(u,{default:function(){return f}});var a=t(3396);const e={class:"about"},r=(0,a._)("h1",null,"This is an about page",-1),s=[r];function c(n,u){return(0,a.wg)(),(0,a.iD)("div",e,s)}var i=t(89);const h={},o=(0,i.Z)(h,[["render",c]]);var f=o}}]);

qwh5/src/main.ts

@@ -4,5 +4,6 @@ import router from './router'
 import store from './store'
 import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
+import './styles/index.scss'
 
 createApp(App).use(ElementPlus).use(store).use(router).mount('#app')

qwh5/src/router/index.ts

@@ -14,6 +14,11 @@ const routes: Array<RouteRecordRaw> = [
     // this generates a separate chunk (about.[hash].js) for this route
     // which is lazy-loaded when the route is visited.
     component: () => import(/* webpackChunkName: "about" */ '../views/AboutView.vue')
+  },
+  {
+    path: '/userPortrait',
+    name: 'userPortrait',
+    component: () => import(/*webpackChunkName:"userPortrait" */ '@/views/userPortrait.vue')
   }
 ]
 

qwh5/src/styles/index.scss

@@ -0,0 +1,6 @@
+@import './reset.scss';
+@import './normalize.scss';
+
+html {
+  touch-action: manipulation;
+}

qwh5/src/styles/normalize.scss

@@ -0,0 +1,351 @@
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+   ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+ html {
+  line-height: 1.15; /* 1 */
+  -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+     ========================================================================== */
+
+/**
+   * Remove the margin in all browsers.
+   */
+
+body {
+  margin: 0;
+}
+
+/**
+   * Render the `main` element consistently in IE.
+   */
+
+main {
+  display: block;
+}
+
+/**
+   * Correct the font size and margin on `h1` elements within `section` and
+   * `article` contexts in Chrome, Firefox, and Safari.
+   */
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+/* Grouping content
+     ========================================================================== */
+
+/**
+   * 1. Add the correct box sizing in Firefox.
+   * 2. Show the overflow in Edge and IE.
+   */
+
+hr {
+  box-sizing: content-box; /* 1 */
+  height: 0; /* 1 */
+  overflow: visible; /* 2 */
+}
+
+/**
+   * 1. Correct the inheritance and scaling of font size in all browsers.
+   * 2. Correct the odd `em` font sizing in all browsers.
+   */
+
+pre {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+     ========================================================================== */
+
+/**
+   * Remove the gray background on active links in IE 10.
+   */
+
+a {
+  background-color: transparent;
+}
+
+/**
+   * 1. Remove the bottom border in Chrome 57-
+   * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+   */
+
+abbr[title] {
+  border-bottom: none; /* 1 */
+  text-decoration: underline; /* 2 */
+  text-decoration: underline dotted; /* 2 */
+}
+
+/**
+   * Add the correct font weight in Chrome, Edge, and Safari.
+   */
+
+b,
+strong {
+  font-weight: bolder;
+}
+
+/**
+   * 1. Correct the inheritance and scaling of font size in all browsers.
+   * 2. Correct the odd `em` font sizing in all browsers.
+   */
+
+code,
+kbd,
+samp {
+  font-family: monospace, monospace; /* 1 */
+  font-size: 1em; /* 2 */
+}
+
+/**
+   * Add the correct font size in all browsers.
+   */
+
+small {
+  font-size: 80%;
+}
+
+/**
+   * Prevent `sub` and `sup` elements from affecting the line height in
+   * all browsers.
+   */
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+sup {
+  top: -0.5em;
+}
+
+/* Embedded content
+     ========================================================================== */
+
+/**
+   * Remove the border on images inside links in IE 10.
+   */
+
+img {
+  border-style: none;
+}
+
+/* Forms
+     ========================================================================== */
+
+/**
+   * 1. Change the font styles in all browsers.
+   * 2. Remove the margin in Firefox and Safari.
+   */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  font-family: inherit; /* 1 */
+  font-size: 100%; /* 1 */
+  line-height: 1.15; /* 1 */
+  margin: 0; /* 2 */
+}
+
+/**
+   * Show the overflow in IE.
+   * 1. Show the overflow in Edge.
+   */
+
+button,
+input {
+  /* 1 */
+  overflow: visible;
+}
+
+/**
+   * Remove the inheritance of text transform in Edge, Firefox, and IE.
+   * 1. Remove the inheritance of text transform in Firefox.
+   */
+
+button,
+select {
+  /* 1 */
+  text-transform: none;
+}
+
+/**
+   * Correct the inability to style clickable types in iOS and Safari.
+   */
+
+button,
+[type='button'],
+[type='reset'],
+[type='submit'] {
+  -webkit-appearance: button;
+}
+
+/**
+   * Remove the inner border and padding in Firefox.
+   */
+
+button::-moz-focus-inner,
+[type='button']::-moz-focus-inner,
+[type='reset']::-moz-focus-inner,
+[type='submit']::-moz-focus-inner {
+  border-style: none;
+  padding: 0;
+}
+
+/**
+   * Restore the focus styles unset by the previous rule.
+   */
+
+button:-moz-focusring,
+[type='button']:-moz-focusring,
+[type='reset']:-moz-focusring,
+[type='submit']:-moz-focusring {
+  outline: 1px dotted ButtonText;
+}
+
+/**
+   * Correct the padding in Firefox.
+   */
+
+fieldset {
+  padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+   * 1. Correct the text wrapping in Edge and IE.
+   * 2. Correct the color inheritance from `fieldset` elements in IE.
+   * 3. Remove the padding so developers are not caught out when they zero out
+   *    `fieldset` elements in all browsers.
+   */
+
+legend {
+  box-sizing: border-box; /* 1 */
+  color: inherit; /* 2 */
+  display: table; /* 1 */
+  max-width: 100%; /* 1 */
+  padding: 0; /* 3 */
+  white-space: normal; /* 1 */
+}
+
+/**
+   * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+   */
+
+progress {
+  vertical-align: baseline;
+}
+
+/**
+   * Remove the default vertical scrollbar in IE 10+.
+   */
+
+textarea {
+  overflow: auto;
+}
+
+/**
+   * 1. Add the correct box sizing in IE 10.
+   * 2. Remove the padding in IE 10.
+   */
+
+[type='checkbox'],
+[type='radio'] {
+  box-sizing: border-box; /* 1 */
+  padding: 0; /* 2 */
+}
+
+/**
+   * Correct the cursor style of increment and decrement buttons in Chrome.
+   */
+
+[type='number']::-webkit-inner-spin-button,
+[type='number']::-webkit-outer-spin-button {
+  height: auto;
+}
+
+/**
+   * 1. Correct the odd appearance in Chrome and Safari.
+   * 2. Correct the outline style in Safari.
+   */
+
+[type='search'] {
+  -webkit-appearance: textfield; /* 1 */
+  outline-offset: -2px; /* 2 */
+}
+
+/**
+   * Remove the inner padding in Chrome and Safari on macOS.
+   */
+
+[type='search']::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+/**
+   * 1. Correct the inability to style clickable types in iOS and Safari.
+   * 2. Change font properties to `inherit` in Safari.
+   */
+
+::-webkit-file-upload-button {
+  -webkit-appearance: button; /* 1 */
+  font: inherit; /* 2 */
+}
+
+/* Interactive
+     ========================================================================== */
+
+/*
+   * Add the correct display in Edge, IE 10+, and Firefox.
+   */
+
+details {
+  display: block;
+}
+
+/*
+   * Add the correct display in all browsers.
+   */
+
+summary {
+  display: list-item;
+}
+
+/* Misc
+     ========================================================================== */
+
+/**
+   * Add the correct display in IE 10+.
+   */
+
+template {
+  display: none;
+}
+
+/**
+   * Add the correct display in IE 10.
+   */
+
+[hidden] {
+  display: none;
+}

qwh5/src/styles/reset.scss

@@ -0,0 +1,124 @@
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+menu,
+nav,
+section {
+  display: block;
+}
+body {
+  line-height: 1.15;
+}
+ol,
+ul {
+  list-style: none;
+}
+blockquote,
+q {
+  quotes: none;
+}
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+  content: "";
+  content: none;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}

qwh5/src/utils/axios.ts

@@ -0,0 +1,49 @@
+import axios, { AxiosInstance } from 'axios'
+// eslint-disable-next-line
+// import { getToken, getCsrfToken } from '@/utils/auth'
+// import store from '@/store'
+
+// eslint-disable-next-line
+const config = require('../../config')
+console.log('process.env.NODE_ENV', process.env.NODE_ENV);
+
+const { baseURL } = config[process.env.NODE_ENV]
+
+// 创建axios实例
+const service: AxiosInstance = axios.create({
+  baseURL,
+  timeout: 5000
+  // withCredentials: true
+})
+
+// 请求拦截器
+service.interceptors.request.use(
+  config => {
+    // if (store.state.user.token) {
+    //   config.headers.Authorization = `Bearer ${getToken()}`
+    // }
+    // config.headers['x-csrf-token'] = getCsrfToken()
+    return config
+  },
+  error => {
+    console.log(error)
+    return Promise.reject(error)
+  }
+)
+
+// 响应拦截器
+service.interceptors.response.use(
+  response => {
+    const res = response.data
+    if (res.code !== 200) {
+      return Promise.reject(res)
+    } else {
+      return response
+    }
+  },
+  error => {
+    return Promise.reject(error)
+  }
+)
+
+export default service

qwh5/src/utils/request.ts

@@ -0,0 +1,42 @@
+import { AxiosRequestConfig } from 'axios'
+// import { Toast, Dialog } from 'vant'
+// import store from '@/store'
+import service from './axios'
+
+interface BaseResponse<T> {
+  code: number
+  status: boolean
+  data: T
+  message?: string
+}
+
+const request = <T>(config: AxiosRequestConfig): Promise<BaseResponse<T>> => {
+  return new Promise((resolve, reject) => {
+    service.request<BaseResponse<T>>(config).then(
+      res => {
+        resolve(res.data)
+      },
+      err => {
+        switch (err?.code) {
+          case 401:
+            // token失效
+            // Dialog.alert({
+            //   title: '提示',
+            //   message: '您还未登录或登录已过期，请重新登录'
+            // }).then(() => {
+            //   store.dispatch('user/signOut').then(() => {
+            //     location.reload()
+            //   })
+            // })
+            break
+          default:
+            // Toast(err.message)
+            break
+        }
+        reject(err)
+      }
+    )
+  })
+}
+
+export default request

qwh5/vue.config.js

@@ -15,4 +15,5 @@ module.exports = defineConfig({
   lintOnSave: false,
   publicPath: process.env.NODE_ENV === 'production' ? './' : '/',
   outputDir: 'dist',
+  productionSourceMap: false,//打包不到.map文件
 })