页面调整

src/components/cards/redPoint.vue

@@ -58,34 +58,34 @@ export default {
   methods: {
     pushToPage(index) {
       console.log('000000')
-      if (index === 0) {
-        this.$router.push({
-          path: roterPre + '/user/list/',
-          query: { user_group: 4, is_show: ''}
-        })
-      }
+      // if (index === 0) {
+      //   this.$router.push({
+      //     path: roterPre + '/user/list/',
+      //     query: { user_group: 4, is_show: ''}
+      //   })
+      // }
     },
 
 
     subPushToPage(index) {
       console.log('0000000----')
 
-      if (index === 0) {
-        this.$router.push({
-          path: roterPre + '/user/list/',
-          query: { user_group: 4, is_show: '2' }
-        })
-      } else if (index === 1) {
-        this.$router.push({
-          path: roterPre + '/user/list/',
-          query: { user_group: 4, is_show: '1' }
-        })
-      } else if (index === 2) {
-        this.$router.push({
-          path: roterPre + '/user/list/',
-          query: { user_group: 4, is_show: '3' }
-        })
-      }
+      // if (index === 0) {
+      //   this.$router.push({
+      //     path: roterPre + '/user/list/',
+      //     query: { user_group: 4, is_show: '2' }
+      //   })
+      // } else if (index === 1) {
+      //   this.$router.push({
+      //     path: roterPre + '/user/list/',
+      //     query: { user_group: 4, is_show: '1' }
+      //   })
+      // } else if (index === 2) {
+      //   this.$router.push({
+      //     path: roterPre + '/user/list/',
+      //     query: { user_group: 4, is_show: '3' }
+      //   })
+      // }
 
     },
 

src/components/cards/tongjiCard.vue

@@ -35,7 +35,7 @@ export default {
 
     isBlue(index) {
       let isBlue = false
-      if (index === 0 || index === 1 || index === 2 || index === 5 || index === 7) {
+      if (index === 0 || index === 1 || index === 2 || index === 5 || index === 7 || index === 8 || index === 9 || index === 10 || index === 11 || index === 12) {
         isBlue = true
       }
       return isBlue
@@ -72,6 +72,45 @@ export default {
           // query: { order_sn: orderIds }
         })
       }
+
+      if (index === 8) {
+        this.$router.push({
+          path: roterPre + '/accounts/count/contribute'
+          // query: { order_sn: orderIds }
+        })
+      }
+
+
+      if (index === 9) {
+        this.$router.push({
+          path: roterPre + '/accounts/count/jingdou'
+          // query: { order_sn: orderIds }
+        })
+      }
+
+
+      if (index === 10) {
+        this.$router.push({
+          path: roterPre + '/accounts/count/hongbao'
+          // query: { order_sn: orderIds }
+        })
+      }
+
+      if (index === 11) {
+        this.$router.push({
+          path: roterPre + '/accounts/count/fugou'
+          // query: { order_sn: orderIds }
+        })
+      }
+
+      if (index === 12) {
+        this.$router.push({
+          path: roterPre + '/accounts/count/vr'
+          // query: { order_sn: orderIds }
+        })
+      }
+
+
     }
 
   }

src/layout/components/Navbar.vue

@@ -74,8 +74,8 @@ export default {
                 }).then(() => {
                   console.log('环信登录 success')
                   const option = {
-                    nickname: '一壶茶',
-                    avatarurl: 'https://cdn.bjtdba.com/chuxubao/images/2024-04-18/c9edc202404181057405802.png',
+                    nickname: '幸福保',
+                    avatarurl: 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                     mail: '',
                     phone: '',
                     gender: '',

src/settings.js

@@ -2,7 +2,7 @@ module.exports = {
   // 路由前缀
   roterPre: '/admin',
   // 路由标题
-  title: '一壶茶',
+  title: '幸福保',
   /**
    * @type {boolean} true | false
    * @description Whether show the settings right-panel

src/views/accounts/caiwuOperate/merchantTiXian/index.vue

@@ -83,7 +83,7 @@
 <!--        综合服务费、实际到账金额          综合服务费=申请金额*6%            实际到账金额=申请金额-综合服务费-->
 <!--        <el-table-column label="支出商户" min-width="200" >-->
 <!--          <template slot-scope="scope">-->
-<!--            <span v-for="(item,i) in scope.row.list">{{item.type==1?'河北省一壶茶电子商务有限公司':'北京天地博爱科技有限公司'}}<br v-if="i<1" /> </span>-->
+<!--            <span v-for="(item,i) in scope.row.list">{{item.type==1?'河北省幸福保电子商务有限公司':'北京天地博爱科技有限公司'}}<br v-if="i<1" /> </span>-->
 <!--            <span v-if="scope.row.list.length<1">北京天地博爱科技有限公司</span>-->
 <!--          </template>-->
 <!--        </el-table-column>-->

src/views/accounts/caiwutongji/contribute/index.vue

@@ -88,7 +88,7 @@
                 <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="说明" prop="mark"  min-width="130" /> -->
+            <el-table-column label="说明" prop="mark"  min-width="130" />
         </el-table>
         <div class="block">
           <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"

src/views/accounts/caiwutongji/fugou/index.vue

@@ -89,7 +89,7 @@
                 <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="说明" prop="mark"  min-width="130" /> -->
+            <el-table-column label="说明" prop="mark"  min-width="130" />
         </el-table>
         <div class="block">
           <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"

src/views/accounts/caiwutongji/hongbao/index.vue

@@ -88,7 +88,7 @@
                 <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="说明" prop="mark"  min-width="130" /> -->
+            <el-table-column label="说明" prop="mark"  min-width="130" />
         </el-table>
         <div class="block">
           <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
@@ -324,7 +324,7 @@ export default {
                   { info: '', name: '已结算红包', count: res.data.statistics.clear },
                   { info: '', name: '未结算红包', count: res.data.statistics.nclear },
                   { info: '', name: '已提现红包', count: res.data.statistics.tixian },
-                  { info: '', name: '转VR红包', count: res.data.statistics.zhuan_vr },
+                  { info: '', name: '红包转VR', count: res.data.statistics.zhuan_vr },
                   // {info: '', name: '红包扣减总数', count: res.data.statistics.deduct},
                   // {info: '', name: '剩余红包总数', count: res.data.statistics.all_mp1}
                 ]

src/views/accounts/caiwutongji/jingdou/index.vue

@@ -89,7 +89,7 @@
                 <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="说明" prop="mark"  min-width="130" /> -->
+            <el-table-column label="说明" prop="mark"  min-width="130" />
         </el-table>
         <div class="block">
           <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"

src/views/accounts/caiwutongji/pension/index.vue

@@ -97,12 +97,12 @@
                 <el-table-column label="当前身份" min-width="130" prop="user_group" >
                   <template slot-scope="scope">
                       <span v-if="scope.row.user_group == 1"> 消费者 </span>
-                      <span v-if="scope.row.user_group == 2"> V客 </span>
-                      <span v-if="scope.row.user_group == 3"> 大V </span>
-                      <span v-if="scope.row.user_group == 4"> 创客 </span>
-                      <span v-if="scope.row.user_group == 5"> 区县代理 </span>
-                      <span v-if="scope.row.user_group == 6"> 省级代理 </span>
-
+                      <span v-if="scope.row.user_group == 2"> 业务员 </span>
+                      <span v-if="scope.row.user_group == 3"> 业务经理 </span>
+                      <span v-if="scope.row.user_group == 4"> 初级合伙人 </span>
+                      <span v-if="scope.row.user_group == 5"> 中级合伙人 </span>
+                      <span v-if="scope.row.user_group == 6"> 高级合伙人 </span>
+                      <span v-if="scope.row.user_group == 7"> 董事 </span>
                   </template>
                 </el-table-column>
                 <el-table-column label="养老金(元)" min-width="100" prop="number"/>
@@ -121,6 +121,7 @@
                       <span v-if="scope.row.status == -1"> 已失效 </span>
                   </template>
                 </el-table-column>
+                <el-table-column label="说明" prop="mark"  min-width="130" />
             </el-table>
             <div class="block">
                 <el-pagination :current-page="tableFrom.page" :page-size="tableFrom.limit"

src/views/accounts/caiwutongji/point/index.vue

@@ -89,7 +89,7 @@
                 <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column label="说明" prop="mark"  min-width="130" /> -->
+            <el-table-column label="说明" prop="mark"  min-width="130" />
         </el-table>
         <div class="block">
           <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"

src/views/accounts/caiwutongji/vr/index.vue

@@ -81,12 +81,12 @@
                 <span v-if="scope.row.pm == 2">扣减</span>
               </template>
             </el-table-column> -->
-            <el-table-column label="关联订单" prop="order_sn"  min-width="130">
+            <!-- <el-table-column label="关联订单" prop="order_sn"  min-width="130">
               <template slot-scope="scope">
                 <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
               </template>
-            </el-table-column>
-            <!-- <el-table-column label="说明" prop="mark"  min-width="130" /> -->
+            </el-table-column> -->
+            <el-table-column label="说明" prop="mark"  min-width="130" />
         </el-table>
         <div class="block">
           <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"

src/views/accounts/extract/index.vue

@@ -109,7 +109,7 @@
         </el-table-column>
 <!--        <el-table-column label="支出商户" min-width="200" >-->
 <!--          <template slot-scope="scope">-->
-<!--            <span v-for="(item,i) in scope.row.list">{{item.type==1?'河北省一壶茶电子商务有限公司':'北京天地博爱科技有限公司'}}<br v-if="i<1" /> </span>-->
+<!--            <span v-for="(item,i) in scope.row.list">{{item.type==1?'河北省幸福保电子商务有限公司':'北京天地博爱科技有限公司'}}<br v-if="i<1" /> </span>-->
 <!--            <span v-if="scope.row.list.length<1">北京天地博爱科技有限公司</span>-->
 <!--          </template>-->
 <!--        </el-table-column>-->
@@ -235,7 +235,7 @@ export default {
       merSelect: [{
         'mer_id':0,'mer_name':'平台'
       },{
-        'mer_id':496,'mer_name':'河北省一壶茶电子商务有限公司'
+        'mer_id':496,'mer_name':'河北省幸福保电子商务有限公司'
       }],
       fromList: fromList,
       cardLists: [{ 'className': 'el-icon-s-goods', 'count': '21.00', 'field': '元', 'name': '总支付金额' }, { 'className': 'el-icon-s-goods', 'count': '0.00', 'field': '元', 'name': '服务商返利' }, { 'className': 'el-icon-s-order', 'count': '3.24', 'field': '元', 'name': '养老金' }]

src/views/dacang/addadmin/index.vue

@@ -200,7 +200,7 @@
           </el-col>
           <el-col v-bind="grid">
             <el-form-item
-              label="一壶茶账号："
+              label="幸福保账号："
               prop="account"
               label-for="account"
             >
@@ -335,7 +335,7 @@ export default {
           { required: true, message: "请输入投诉邮箱", trigger: "change" },
         ],
         account: [
-          { required: true, message: "请输入一壶茶账号", trigger: "change" },
+          { required: true, message: "请输入幸福保账号", trigger: "change" },
         ],
         introduce: [
           { required: true, message: "请输入介绍", trigger: "change" },

src/views/login/index.vue

@@ -297,8 +297,8 @@ export default {
                 }).then(() => {
                   console.log('环信登录 success')
                   const option = {
-                    nickname: '一壶茶',
-                    avatarurl: 'https://cdn.bjtdba.com/chuxubao/images/2024-04-18/c9edc202404181057405802.png',
+                    nickname: '幸福保',
+                    avatarurl: 'https://cdn.bjtdba.com/vod/image/2025-01-21/20250121180855764.png',
                     mail: '',
                     phone: '',
                     gender: '',

src/views/user/list/index.vue

@@ -63,11 +63,12 @@
                       <el-select v-model="userFrom.user_group" placeholder="请选择" class="selWidth" clearable @change="changeuserGroup">
                         <el-option value="" label="全部" />
                         <el-option value="1" label="消费者" />
-                        <el-option value="2" label="V客" />
-                        <el-option value="3" label="大V经理" />
-                        <el-option value="4" label="创客" />
-                        <el-option value="5" label="区县代理" />
-                        <el-option value="6" label="省级代理" />
+                        <el-option value="2" label="业务员" />
+                        <el-option value="3" label="业务经理" />
+                        <el-option value="4" label="初级合伙人" />
+                        <el-option value="5" label="中级合伙人" />
+                        <el-option value="6" label="高级合伙人" />
+                        <el-option value="7" label="董事" />
                       </el-select>
                     </el-form-item>
                   </el-col>
@@ -84,7 +85,7 @@
                   </el-col>
                 </el-col>
 
-                <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18">
+                <!-- <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18">
                   <el-col v-bind="grid">
                     <el-form-item label="访问情况：">
                       <el-select v-model="userFrom.user_time_type" placeholder="请选择" class="selWidth">
@@ -95,7 +96,8 @@
                     </el-form-item>
                   </el-col>
 
-                </el-col>
+                </el-col> -->
+
                 <el-col :xs="24" :sm="24" :md="24" :lg="18" :xl="18">
                   <el-col v-bind="grid">
                     <el-form-item label="时间选择：" class="timeBox">
@@ -221,16 +223,16 @@
           </template>
         </el-table-column> -->
         <!-- <el-table-column label="公司名称" min-width="100">
-            <span v-if="userFrom.company == 1">一壶茶</span>
+            <span v-if="userFrom.company == 1">幸福保</span>
             <span v-if="userFrom.company == 2">国盛</span>
         </el-table-column> -->
         <el-table-column label="推荐人" min-width="100">
           <template slot-scope="{ row }">
-            <span>{{ !row.spread ? "平台" : row.spread.account }}(一壶茶)</span><br/>
+            <span>{{ !row.spread ? "平台" : row.spread.account }}</span><br/>
             <span v-for="it in row.enterprise_user">
               <span v-if="it.puid < 1">平台</span>
               <span v-if="it.puid >0"> {{ it.p_phone }}</span>
-              <span v-if="it.mer_id == 496">(一壶茶)</span>
+              <span v-if="it.mer_id == 496">(幸福保)</span>
             </span>
           </template>
         </el-table-column>
@@ -244,11 +246,12 @@
           <template slot-scope="{ row }">
 
             <span v-if="row.user_group === '1'">消费者</span>
-            <span v-if="row.user_group === '2'">V客</span>
-            <span v-if="row.user_group === '3'">大V经理</span>
-            <span v-if="row.user_group === '4'">创客</span>
-            <span v-if="row.user_group === '5'">区县代理</span>
-            <span v-if="row.user_group === '6'">省级代理</span>
+            <span v-if="row.user_group === '2'">业务员</span>
+            <span v-if="row.user_group === '3'">业务经理</span>
+            <span v-if="row.user_group === '4'">初级合伙人</span>
+            <span v-if="row.user_group === '5'">中级合伙人</span>
+            <span v-if="row.user_group === '6'">高级合伙人</span>
+            <span v-if="row.user_group === '7'">董事</span>
           </template>
         </el-table-column>
 
@@ -833,7 +836,7 @@ export default {
       }],
       companyLists:[
         { value: '', label: '全部' },
-        { value: '0', label: '一壶茶' },
+        { value: '0', label: '幸福保' },
         { value: '1', label: '国盛' }], // 公司名称