ud

statement-pc/config/dev.env.js

@@ -2,5 +2,5 @@ module.exports = {
 	NODE_ENV: '"development"',
 	ENV_CONFIG: '"dev"',
 	// BASE_API: '"http://tstatementapi.d5ct.com"'
-	BASE_API: '"http://statementapi.d5c360.com"'
+	BASE_API: '"http://statementapi.hiwavo.com"'
 }

statement-pc/config/test.env.js

@@ -5,5 +5,5 @@ const devEnv = require('./dev.env')
 module.exports = merge(devEnv, {
   NODE_ENV: '"testing"',
   // API_URI: '"http://tstatementapi.d5ct.com"'
-  API_URI: '"http://statementapi.d5c360.com"'
+  API_URI: '"http://statementapi.hiwavo.com"'
 })

statement-pc/index.html

@@ -5,7 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 		<meta name="renderer" content="webkit">
 		<!-- <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> -->
-		<title>第五创数据报表系统</title>
+		<title>FOHOW数据报表系统</title>
 		<script type="text/javascript">
 			console.log(window.location.href)
 			var url = window.location.href

statement-pc/src/components/HeaderContainer/index.vue

@@ -5,7 +5,7 @@
         <i class="el-icon-arrow-up"></i>
         <img :src="d5c_logo" alt="logo" title="logo" />
         <div class="d5cA-logo__info">
-          <h3>第五创</h3>
+          <h3>FOHOW</h3>
           <p>数据统计平台</p>
         </div>
       </div>
@@ -28,7 +28,7 @@
         <router-link to="/fanscount">
           <img :src="d5c_logo" alt="logo" title="logo" />
           <div class="d5cA-logo__info">
-            <h3>第五创</h3>
+            <h3>FOHOW</h3>
             <p>数据统计平台</p>
           </div>
         </router-link>
@@ -55,7 +55,7 @@
           <p>数据截至{{dateBottom}}</p>
         </div>
 
-        
+
       </div>
     </div>
   </header>

statement-pc/src/components/LeftNav/index.vue

@@ -86,7 +86,7 @@
           <el-menu-item index="/rabbit/exchange">萝卜产生</el-menu-item>
           <el-menu-item index="/rabbit/radish">萝卜消耗</el-menu-item>
           <el-menu-item index="/rabbit/r-goods">商城销售</el-menu-item>
-          <el-menu-item index="/rabbit/d5c-accounts">第五创商家结算</el-menu-item>
+          <el-menu-item index="/rabbit/d5c-accounts">FOHOW商家结算</el-menu-item>
         </el-menu-item-group>
       </el-submenu> -->
       <!-- <el-menu-item index="/aftermelting">
@@ -118,7 +118,7 @@ export default {
   },
   created() {
     if (getToken()) {
-      this.getPermisson()
+      // this.getPermisson()
     }
     New.$on('getisshow', data => {
       this.navlist = data.navlist
@@ -202,7 +202,7 @@ export default {
       left: 0;
     }
     .el-menu {
-      border-right-color: #223040; 
+      border-right-color: #223040;
     }
   }
 }

statement-pc/src/views/auditData/index.vue

@@ -68,7 +68,7 @@
                             <td>新/老店</td>
                             <td>行业</td>
                             <td>所在地</td>
-                            <td>项目总额(元)</td>
+                            <td>订单总额(元)</td>
                             <td>单股本金(元)</td>
                             <td>众筹占比</td>
                             <td>认购份数(股)</td>
@@ -320,7 +320,7 @@ export default {
     tbody {
       width: 100%;
       height: 48px;
-      
+
       tr {
         height: 48px;
         border-bottom: 1px solid #223040;

statement-pc/src/views/cow/pointdraw.vue

@@ -12,7 +12,7 @@
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
               <div class="d5cA-pointdraw__panes">
-                <h3>第五创积分抽奖统计</h3>
+                <h3>FOHOW积分抽奖统计</h3>
               </div>
             </el-col>
 
@@ -307,4 +307,4 @@ export default {
     }
   }
 }
-</style>
+</style>

statement-pc/src/views/dashboard/components/InvestChart.vue

@@ -50,7 +50,7 @@ export default {
           trigger: 'axis'
         },
         legend: {
-          data: ['项目融资', '实际融资', '充值'],
+          data: ['项目融资', '充值金额', '充值'],
           selected: {
             '项目融资': false,
             '充值': false
@@ -105,7 +105,7 @@ export default {
           data: this.investData.month_project_money
         },
         {
-          name: '实际融资',
+          name: '充值金额',
           type: 'bar',
           data: this.investData.month_invest_money
         },
@@ -132,4 +132,4 @@ export default {
 
 <!-- <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
- -->
+ -->

statement-pc/src/views/dashboard/components/MonthChart.vue

@@ -84,12 +84,12 @@ export default {
           }
         },
         legend: {
-          data: ['新增粉丝', '净增粉丝', '新增注册', '新增好友数', '实际融资', '积分训练营'],
+          data: ['新增粉丝', '净增粉丝', '新增注册', '新增好友数', '充值金额', '积分训练营'],
           left: '9%',
           selected: {
             '新增粉丝': false,
             '净增粉丝': false,
-            '实际融资': false,
+            '充值金额': false,
             '积分训练营': false
           },
           textStyle: {
@@ -153,7 +153,7 @@ export default {
           data: this.userData.time_new_phone_friends
         },
         {
-          name: '实际融资',
+          name: '充值金额',
           type: 'line',
           data: this.userData.time_invest_money
         },

statement-pc/src/views/dashboard/components/UserChart.vue

@@ -28,7 +28,7 @@ export default {
   methods: {
     getUserGrowth() {
       request({
-        url: '/v1/user_grouth',
+        url: '/v1/fohow_user_grouth',
         methods: 'get'
       }).then(response => {
         this.userData = response.data
@@ -40,18 +40,18 @@ export default {
       this.userchart = echarts.init(this.$refs.userChart)
       this.userchart.setOption({
         title: {
-          text: '用户及投资人',
+          text: '',
           textStyle: {
             fontSize: 16,
             color: '#fff'
           }
         },
-        color: ['#d7ff39', '#16d6ff'],
+        color: ['#d7ff39', '#16d6ff', '#f00', '#4caf50'],
         tooltip: {
           trigger: 'axis'
         },
         legend: {
-          data: ['注册用户', '新投资人'],
+          data: ['新粉丝', '新群主', '新店长', '新订单'],
           selected: {
             '新投资人': false
           },
@@ -100,7 +100,7 @@ export default {
           }
         ],
         series: [{
-          name: '注册用户',
+          name: '新粉丝',
           type: 'bar',
           data: this.userData.month_users
           // markLine: {
@@ -110,7 +110,7 @@ export default {
           // }
         },
         {
-          name: '新投资人',
+          name: '新群主',
           type: 'bar',
           data: this.userData.month_invest_users
           // markLine: {
@@ -118,7 +118,27 @@ export default {
           //     { type: 'average', name: '平均值' }
           //   ]
           // }
-        }]
+        },
+          {
+            name: '新店长',
+            type: 'bar',
+            data: this.userData.month_shop_users
+            // markLine: {
+            //   data: [
+            //     { type: 'average', name: '平均值' }
+            //   ]
+            // }
+          },
+          {
+            name: '新订单',
+            type: 'bar',
+            data: this.userData.month_total_orders
+            // markLine: {
+            //   data: [
+            //     { type: 'average', name: '平均值' }
+            //   ]
+            // }
+          }]
       })
     }
   },
@@ -137,4 +157,4 @@ export default {
 
 <!-- <style rel="stylesheet/scss" lang="scss" scoped>
 </style>
- -->
+ -->

statement-pc/src/views/dashboard/components/YearChart.vue

@@ -84,7 +84,7 @@ export default {
           }
         },
         legend: {
-          data: ['新增粉丝', '净增粉丝', '新增注册', '新增好友数', '新手训练营', '积分训练营', '阅读人数', '积分赠送', '积分消耗', '实际融资', '一元投资'],
+          data: ['新增粉丝', '净增粉丝', '新增注册', '新增好友数', '新手训练营', '积分训练营', '阅读人数', '积分赠送', '积分消耗', '充值金额', '一元投资'],
           left: '9%',
           selected: {
             '新增粉丝': false,
@@ -180,7 +180,7 @@ export default {
           data: this.userData.time_consume_pm_balances
         },
         {
-          name: '实际融资',
+          name: '充值金额',
           type: 'bar',
           data: this.userData.time_invest_money
         },

statement-pc/src/views/dashboard/index-d5c.vue

@@ -0,0 +1,214 @@
+<template>
+  <div class="dashboard-container">
+    <header-container></header-container>
+
+    <div class="d5cA-table">
+      <el-row :gutter="10">
+        <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="6">
+          <div class="d5cA-table__pane">
+            <p class="d5cA-table__title">充值金额(元)</p>
+            <h2 class="d5cA-table__totalPrice">
+              <count-to :startVal="0" :endVal="homeData.total_invest" :duration="3000" :decimals="2"></count-to>
+            </h2>
+            <p class="d5cA-table__projectPrice">
+              订单总额
+              <span>
+                <count-to :startVal="0" :endVal="homeData.total_project" :duration="3000" :decimals="2"></count-to>
+              </span>
+              元
+            </p>
+            <div class="d5cA-table__people">
+              <div class="wid borderRight">
+                <p>小程序粉丝总数(人)</p>
+                <h3><count-to :startVal="0" :endVal="homeData.platform_total_fans" :duration="2000"></count-to></h3>
+              </div>
+              <div class="wid">
+                <p>注册总数(人)</p>
+                <h3><count-to :startVal="0" :endVal="homeData.total_register" :duration="2000"></count-to></h3>
+              </div>
+            </div>
+          </div>
+          <div class="d5cA-table__pane">
+            <fanmap-chart></fanmap-chart>
+          </div>
+        </el-col>
+
+        <el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="18">
+          <div>
+            <el-row :gutter="0">
+              <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                <div class="d5cA-table__pane">
+                  <user-chart></user-chart>
+                </div>
+              </el-col>
+              <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                <div class="d5cA-table__pane">
+                  <fans-chart :fansData="fansChart"></fans-chart>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+
+          <div>
+            <el-row :gutter="0">
+              <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                <div class="d5cA-table__pane">
+                  <invest-chart></invest-chart>
+                </div>
+              </el-col>
+              <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
+                <div class="d5cA-table__pane">
+                  <growth-chart :fansData="fansChart"></growth-chart>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+
+        </el-col>
+      </el-row>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import UserChart from './components/UserChart'
+import FansChart from './components/FansChart'
+import GrowthChart from './components/GrowthChart'
+import InvestChart from './components/InvestChart'
+import FanmapChart from './components/FanmapChart'
+import request from '@/utils/request'
+import CountTo from 'vue-count-to'
+import Screenfull from '@/components/Screenfull'
+import HeaderContainer from '@/components/HeaderContainer'
+import { mapGetters } from 'vuex'
+export default {
+  name: 'dashboard',
+  components: {
+    UserChart,
+    FansChart,
+    GrowthChart,
+    InvestChart,
+    FanmapChart,
+    Screenfull,
+    CountTo,
+    HeaderContainer
+  },
+  data() {
+    return {
+      homeData: {},
+      fansChart: {}
+    }
+  },
+  computed: {
+    ...mapGetters(['user'])
+  },
+  methods: {
+    getFansGrowth() {
+      request({
+        url: '/v1/fans_month_grouth',
+        methods: 'get'
+      }).then(response => {
+        this.fansChart = response.data
+      }).catch(error => {
+        console.log(error)
+      })
+    },
+    getHomeTotal() {
+      request({
+        url: '/v1/home_left_top_data',
+        methods: 'get'
+      }).then(response => {
+        this.homeData = response.data
+      }).catch(error => {
+        console.log(error)
+      })
+    }
+  },
+  mounted() {
+    // this.investChart()
+  },
+  created() {
+    this.$store.dispatch('GetUserInfo')
+    this.getHomeTotal()
+    this.getFansGrowth()
+  },
+  watch: {
+    'user': function(val) {
+      if (val) {
+        console.log(val)
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.dashboard-container {
+  position: relative;
+  background-color: #334051;
+  min-height: 100%;
+}
+.d5cA {
+  &-table {
+    width: 94%;
+    margin: 0 auto;
+  }
+  &-table__pane {
+    width: 100%;
+    background-color: #37475b;
+    padding: 18px 20px;
+    margin-top: 10px;
+  }
+  &-table__title {
+    text-align: center;
+    font-size: 16px;
+    color: #808fa1;
+    margin-top: 18px;
+  }
+  &-table__totalPrice {
+    font-size: 42px;
+    color: #fff;
+    text-align: center;
+    font-weight: bold;
+    margin-top: 36px;
+  }
+  &-table__people {
+    width: 100%;
+    height: 150px;
+    background-color: #344355;
+    padding: 18px;
+    box-sizing: border-box;
+    margin-top: 40px;
+    .wid {
+      float: left;
+      width: 50%;
+      height: 114px;
+      text-align: center;
+      font-size: 16px;
+      color: #808fa1;
+      box-sizing: border-box;
+      p {
+        margin-top: 10px;
+      }
+      h3 {
+        font-size: 24px;
+        color: #fff;
+        font-weight: bold;
+        margin-top: 54px;
+      }
+    }
+    .borderRight {
+      border-right: 1px solid #223040;
+    }
+  }
+  &-table__projectPrice {
+    font-size: 16px;
+    color: #808fa1;
+    text-align: center;
+    margin-top: 36px;
+    span {
+      color: #fff;
+    }
+  }
+}
+</style>

statement-pc/src/views/dashboard/index.vue

@@ -6,12 +6,12 @@
       <el-row :gutter="10">
         <el-col :xs="24" :sm="24" :md="24" :lg="8" :xl="6">
           <div class="d5cA-table__pane">
-            <p class="d5cA-table__title">实际融资(元)</p>
+            <p class="d5cA-table__title">充值金额(元)</p>
             <h2 class="d5cA-table__totalPrice">
               <count-to :startVal="0" :endVal="homeData.total_invest" :duration="3000" :decimals="2"></count-to>
             </h2>
             <p class="d5cA-table__projectPrice">
-              项目总额
+              订单总额
               <span>
                 <count-to :startVal="0" :endVal="homeData.total_project" :duration="3000" :decimals="2"></count-to>
               </span>
@@ -19,18 +19,23 @@
             </p>
             <div class="d5cA-table__people">
               <div class="wid borderRight">
-                <p>服务号粉丝总数(人)</p>
-                <h3><count-to :startVal="0" :endVal="homeData.platform_total_fans" :duration="2000"></count-to></h3>
+                <p>总群主数量(人)</p>
+                <h3><count-to :startVal="0" :endVal="homeData.total_load1" :duration="2000"></count-to></h3>
+              </div>
+              <div class="wid borderRight">
+                <p>总店长数量(人)</p>
+                <h3><count-to :startVal="0" :endVal="homeData.total_load2" :duration="2000"></count-to></h3>
               </div>
               <div class="wid">
-                <p>注册总数(人)</p>
-                <h3><count-to :startVal="0" :endVal="homeData.total_register" :duration="2000"></count-to></h3>
+                <p>总提现金额(元)</p>
+                <h3><count-to :startVal="0" :endVal="homeData.total_take_cash" :duration="2000"></count-to></h3>
               </div>
+
             </div>
           </div>
-          <div class="d5cA-table__pane">
-            <fanmap-chart></fanmap-chart>
-          </div>
+          <!--<div class="d5cA-table__pane">-->
+            <!--<fanmap-chart></fanmap-chart>-->
+          <!--</div>-->
         </el-col>
 
         <el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="18">
@@ -49,20 +54,20 @@
             </el-row>
           </div>
 
-          <div>
-            <el-row :gutter="0">
-              <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <div class="d5cA-table__pane">
-                  <invest-chart></invest-chart>
-                </div>
-              </el-col>
-              <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">
-                <div class="d5cA-table__pane">
-                  <growth-chart :fansData="fansChart"></growth-chart>
-                </div>
-              </el-col>
-            </el-row>
-          </div>
+          <!--<div>-->
+            <!--<el-row :gutter="0">-->
+              <!--<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">-->
+                <!--<div class="d5cA-table__pane">-->
+                  <!--<invest-chart></invest-chart>-->
+                <!--</div>-->
+              <!--</el-col>-->
+              <!--<el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12">-->
+                <!--<div class="d5cA-table__pane">-->
+                  <!--<growth-chart :fansData="fansChart"></growth-chart>-->
+                <!--</div>-->
+              <!--</el-col>-->
+            <!--</el-row>-->
+          <!--</div>-->
 
         </el-col>
       </el-row>
@@ -106,7 +111,7 @@ export default {
   methods: {
     getFansGrowth() {
       request({
-        url: '/v1/fans_month_grouth',
+        url: '/v1/fohow_fans_month_grouth',
         methods: 'get'
       }).then(response => {
         this.fansChart = response.data
@@ -116,7 +121,7 @@ export default {
     },
     getHomeTotal() {
       request({
-        url: '/v1/home_left_top_data',
+        url: '/v1/fohow_home_left_top_data',
         methods: 'get'
       }).then(response => {
         this.homeData = response.data
@@ -181,7 +186,7 @@ export default {
     margin-top: 40px;
     .wid {
       float: left;
-      width: 50%;
+      width: 33.33%;
       height: 114px;
       text-align: center;
       font-size: 16px;
@@ -191,7 +196,7 @@ export default {
         margin-top: 10px;
       }
       h3 {
-        font-size: 24px;
+        font-size: 20px;
         color: #fff;
         font-weight: bold;
         margin-top: 54px;

statement-pc/src/views/integral/ten.vue

@@ -77,14 +77,14 @@
             </table>
           </div>
         </el-col>
-        
+
         <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="12" style="position: relative;" v-if="this.ashow">
           <ten-circle-chart :circleChart="circllist"></ten-circle-chart>
-          <div class="r-sum">真实投资项目总额：{{this.paied_price_format}}</div>
+          <div class="r-sum">真实投资订单总额：{{this.paied_price_format}}</div>
           <div class="r-count">真实投资项目总数：{{this.project_count_format}}</div>
         </el-col>
       </el-row>
-      
+
 
     </div>
   </div>
@@ -359,7 +359,7 @@ export default {
       background-color: #344355;
       .active {
         background: #303e4f;
-        border-left: 3px solid #00a8ff; 
+        border-left: 3px solid #00a8ff;
         box-sizing: border-box;
       }
       tr {

statement-pc/src/views/login/index.vue

@@ -2,7 +2,7 @@
   <div class="login-container">
     <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left">
       <div class="title-container">
-        <h3 class="title">第五创数据报表系统</h3>
+        <h3 class="title">FOHOW数据报表系统</h3>
       </div>
       <el-form-item prop="username">
         <span class="svg-container svg-container_login">
@@ -72,8 +72,10 @@ export default {
       }
     },
     getPermisson() {
+      let thatuser = global.JSON.parse(global.localStorage.getItem('auth.user'));
       request({
-        url: '/v1/user/getPermission',
+        // url: '/v1/user/getPermission',
+        url: '/v1/user/'+thatuser.id,
         methods: 'get',
         params: {
         }
@@ -86,6 +88,7 @@ export default {
         this.url = response.data.first_page
         this.$router.push({ path: this.url })
       }).catch(error => {
+        console.log('onnnnnerror?')
         console.log(error)
       })
     },