Merge branch 'develop' into test

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2021-11-29 11:14:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-08-08 11:10:32
+ * @LastEditTime: 2022-09-08 16:17:40
  * @FilePath: \TelpoUserManageAdmin\README.md
  * @description:
 -->
@@ -66,3 +66,9 @@ fix
 `2022.8.8`
 feat
 - 增加 收单系统，众筹拼单系统，消息管理和系统管理路由配置
+
+
+## v1.0.1
+`2022.9.8`
+feat
+- 增加 流量统计功能

src/layout/components/Sidebar/Logo.vue

@@ -31,7 +31,7 @@ export default {
   },
   data() {
     return {
-      title: '用户运营管理系统',
+      title: '用户运营管理平台',
       logo: require('@/assets/telpo.png')
     }
   }

src/router/index.js

@@ -72,6 +72,7 @@ export const constantRoutes = [{
     component: Layout,
     redirect: '/collection-order-list',
     name: 'collection-order-system',
+    hidden: true,
     meta: {
       title: '收单系统',
       icon: 'el-icon-s-help'
@@ -89,6 +90,29 @@ export const constantRoutes = [{
     ]
   },
 
+  // 流量统计 todo
+  {
+    path: '/traffic-statistics',
+    component: Layout,
+    redirect: '/ssjl-statistics',
+    name: 'traffic-statistics',
+    hidden: false,
+    meta: {
+      title: '流量统计',
+      icon: 'el-icon-data-line'
+    },
+    children: [
+      {
+        path: '/ssjl-statistics',
+        name: 'ssjl-statistics',
+        component: () => import('@/views/traffic-statistics/main/ssjl-statistics/index'),
+        meta: {
+          title: '家长端流量统计', //收单列表
+          icon: 'el-icon-office-building'
+        }
+      },
+    ]
+  },
   // 众筹拼单系统
   {
     path: 'crowd-funding-otrder-system',
@@ -168,7 +192,7 @@ export const constantRoutes = [{
     redirect: '/wechat-fans',
     name: 'message-manage',
     meta: {
-      title: '消息管理',
+      title: '消息发送系统',
       icon: 'el-icon-message-solid'
     },
     children: [

src/settings.js

@@ -7,7 +7,7 @@
  */
 module.exports = {
 
-  title: '用户运营管理系统',
+  title: '用户运营管理平台',
 
   /**
    * @type {boolean} true | false

src/styles/index.scss

@@ -66,7 +66,7 @@ div:focus {
   height: 600px;
   position: relative;
   margin: 60px 20px 0 20px;
-  padding: 10px 0;
+  padding: 10px 10px;
   border: 1px solid #d8dce5;
   box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
   .top-container {

src/utils/get-page-title.js

@@ -7,7 +7,7 @@
  */
 import defaultSettings from '@/settings'
 
-const title = defaultSettings.title || '用户运营管理系统'
+const title = defaultSettings.title || '用户运营管理平台'
 
 export default function getPageTitle(pageTitle) {
   if (pageTitle) {

src/utils/model.js

@@ -1,8 +1,8 @@
 /*
  * @Date: 2021-11-30 15:09:25
  * @LastEditors: JinxChen
- * @LastEditTime: 2022-08-08 11:10:59
+ * @LastEditTime: 2022-09-08 16:18:13
  * @FilePath: \TelpoUserManageAdmin\src\utils\model.js
  * @description: 版本号
  */
-export const VersionModel = '1.0.0';
+export const VersionModel = '1.0.1';

src/views/dashboard/index.vue

@@ -7,7 +7,7 @@
 -->
 <template>
   <div class="dashboard-container">
-    <div class="dashboard-text">欢迎来到用户运营管理系统</div>
+    <div class="dashboard-text">欢迎来到用户运营管理平台</div>
   </div>
 </template>
 

src/views/traffic-statistics/main/index.vue

@@ -0,0 +1,31 @@
+<!--
+ * @Date: 2022-08-08 10:14:16
+ * @LastEditors: JinxChen
+ * @LastEditTime: 2022-09-08 15:54:08
+ * @FilePath: \TelpoUserManageAdmin\src\views\traffic-statistics\main\index.vue
+ * @description: 家长端流量统计
+-->
+
+<template>
+  <div style="padding:30px;">
+    <el-alert :closable="false" title="menu 1">
+      <router-view />
+    </el-alert>
+  </div>
+</template>
+
+
+<script>
+export default {
+  name:'',
+  data(){
+   return {
+
+   }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/traffic-statistics/main/ssjl-statistics/index.vue

@@ -0,0 +1,43 @@
+<!--
+ * @Date: 2022-09-08 15:55:10
+ * @LastEditors: JinxChen
+ * @LastEditTime: 2022-09-08 16:11:22
+ * @FilePath: \TelpoUserManageAdmin\src\views\traffic-statistics\main\ssjl-statistics\index.vue
+ * @description:
+-->
+<template>
+  <div class="app-container">
+    <div class="home-container">
+      <p>账号: <el-input v-model="account" ></el-input></p>
+      <p>密码: <el-input v-model="password" ></el-input></p>
+      <el-button type="success" icon="el-icon-paperclip" @click="onJumpBaidu">点击跳转百度统计平台</el-button>
+     </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ssjl-statistics',
+  data(){
+   return {
+     hrefUrl: 'https://tongji.baidu.com/web5/welcome/login',
+     account: 'ssjlai',
+     password: 'Ssjlai_123456'
+   }
+  },
+  methods: {
+    onJumpBaidu() {
+      window.open(this.hrefUrl);
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+  .home-container {
+    .el-input {
+      width: 200px;
+    }
+  }
+
+</style>

vue.config.js

@@ -6,7 +6,7 @@ function resolve(dir) {
   return path.join(__dirname, dir)
 }
 
-const name = defaultSettings.title || '用户运营管理系统' // page title
+const name = defaultSettings.title || '用户运营管理平台' // page title
 
 // If your port is set to 80,
 // use administrator privileges to execute the command line.