From 9bacdaf2fcd88ed25ccf04297e8db881bb752abb Mon Sep 17 00:00:00 2001
From: 1748153932 <1748153932@qq.com>
Date: Fri, 29 Dec 2023 15:49:40 +0800
Subject: [PATCH] 651651

---
 src/views/dashboard/components/baseInfo.vue | 164 ++++++++++----------
 src/views/user/list/index.vue               |  97 ++++++------
 2 files changed, 130 insertions(+), 131 deletions(-)

diff --git a/src/views/dashboard/components/baseInfo.vue b/src/views/dashboard/components/baseInfo.vue
index 7963195..0c7e36a 100644
--- a/src/views/dashboard/components/baseInfo.vue
+++ b/src/views/dashboard/components/baseInfo.vue
@@ -14,18 +14,18 @@
                     :duration="3000"
                     class="card-panel-num"
                     />
-                    <div class="card-panel-compared"> 
+                    <div class="card-panel-compared">
                         周环比：
                         <i :class="Number(statisticsData.lastWeekRate.userNum)>=0?'up':'down'">
                             {{ statisticsData.lastWeekRate.userNum ? (statisticsData.lastWeekRate.userNum*100*1000/1000).toFixed(2) : 0.00 }}%</i>
                         <i :class="Number(statisticsData.lastWeekRate.userNum)>=0?'el-icon-caret-top':'el-icon-caret-bottom'" />
-                    </div>  
+                    </div>
                     <div class="card-panel-date">
                         <span class="date_text">昨日数据</span>
-                        <span class="date_num">{{ statisticsData.yesterday.userNum }}</span>              
+                        <span class="date_num">{{ statisticsData.yesterday.userNum }}</span>
                     </div>
                 </div>
-            </div>      
+            </div>
         </el-col>
         <el-col :span="6" class="content">
             <div class="card-panel">
@@ -40,15 +40,15 @@
                     :duration="3000"
                     class="card-panel-num"
                     />
-                    <div class="card-panel-compared"> 
+                    <div class="card-panel-compared">
                     周环比：
                         <i :class="Number(statisticsData.lastWeekRate.visitNum)>=0?'up':'down'">{{ statisticsData.lastWeekRate.visitNum ? (statisticsData.lastWeekRate.visitNum*100*1000/1000).toFixed(2) : 0.00 }}%</i>
                         <i :class="Number(statisticsData.lastWeekRate.visitNum)>=0?'el-icon-caret-top':'el-icon-caret-bottom'" />
-                     </div> 
+                     </div>
                     <div class="card-panel-date">
                         <span class="date_text">昨日数据</span>
-                        <span class="date_num">{{ statisticsData.yesterday.visitNum }}</span>              
-                    </div> 
+                        <span class="date_num">{{ statisticsData.yesterday.visitNum }}</span>
+                    </div>
                 </div>
             </div>
         </el-col>
@@ -65,7 +65,7 @@
                     :duration="3000"
                     class="card-panel-num"
                     />
-                    <div class="card-panel-compared"> 
+                    <div class="card-panel-compared">
                         周环比：
                         <i :class="Number(statisticsData.lastWeekRate.visitUserNum)>=0?'up':'down'">
                             {{ statisticsData.lastWeekRate.visitUserNum ? (statisticsData.lastWeekRate.visitUserNum*100*1000/1000).toFixed(2) : 0.00 }}%</i>
@@ -73,8 +73,8 @@
                     </div>
                     <div class="card-panel-date">
                         <span class="date_text">昨日数据</span>
-                        <span class="date_num">{{ statisticsData.yesterday.visitUserNum }}</span>              
-                    </div>  
+                        <span class="date_num">{{ statisticsData.yesterday.visitUserNum }}</span>
+                    </div>
                 </div>
             </div>
         </el-col>
@@ -91,7 +91,7 @@
                     :duration="3000"
                     class="card-panel-num"
                     />
-                    <div class="card-panel-compared"> 
+                    <div class="card-panel-compared">
                         周环比：
                         <i :class="Number(statisticsData.lastWeekRate.storeNum)>=0?'up':'down'">
                         {{ statisticsData.lastWeekRate.storeNum ? (statisticsData.lastWeekRate.storeNum*100*1000/1000).toFixed(2) : 0.00 }}%</i>
@@ -99,78 +99,78 @@
                     </div>
                     <div class="card-panel-date">
                         <span class="date_text">昨日数据</span>
-                        <span class="date_num">{{ statisticsData.yesterday.storeNum }}</span>              
-                     </div>  
-                </div>    
+                        <span class="date_num">{{ statisticsData.yesterday.storeNum }}</span>
+                     </div>
+                </div>
             </div>
         </el-col>
     </el-row>
-    <el-row :gutter="18" class="panel-group-count">
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/product/examine' } ">
-          <div class="card-panel-count">
-            <span class="iconfont icon-shangpinguanli" style="color: #5CC7C1;"></span>
-            <span class="panel-text">商品管理</span>
-          </div>
-        </router-link>           
-      </el-col>
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/user/list' } ">
-          <div class="card-panel-count">
-            <span class="iconfont icon-yonghuguanli" style="color: #69C0FD;"></span>
-            <span class="panel-text">用户管理</span>
-          </div>
-        </router-link>  
-      </el-col>
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/order/list' } "> 
-          <div class="card-panel-count">
-            <span class="iconfont icon-dingdanguanli" style="color: #EF9B6F;"></span>
-            <span class="panel-text">订单管理</span>
-          </div>
-        </router-link>
-      </el-col>
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/promoter/user' } ">
-          <div class="card-panel-count">
-            <span class="iconfont icon-fenxiaoguanli" style="color: #B27FEB;"></span>
-            <span class="panel-text">分销管理</span>
-          </div>
-        </router-link>
-      </el-col>
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/setting/sms/sms_config/index' } ">
-          <div class="card-panel-count">
-            <span class="iconfont icon-duanxinpeizhi" style="color: #F0AA0B;"></span>
-            <span class="panel-text">一号通</span>
-          </div>
-        </router-link>
-      </el-col>
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/cms/article' } ">
-          <div class="card-panel-count">
-            <span class="iconfont icon-wenzhangguanli" style="color: #5CC7C1;"></span>
-            <span class="panel-text">文章管理</span>
-          </div>
-        </router-link>
-      </el-col>
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/marketing/coupon/list' } ">
-          <div class="card-panel-count">
-            <span class="iconfont icon-youhuiquan" style="color: #EF9B6F;"></span>
-            <span class="panel-text">优惠券</span>
-          </div>
-        </router-link>
-      </el-col>
-      <el-col :span="3" class="card-panel-item">
-        <router-link :to=" { path:`${roterPre}` + '/systemForm/Basics/system_tabs' } ">
-          <div class="card-panel-count">
-            <span class="iconfont icon-xitongshezhi" style="color: #F0AA0B;"></span>
-            <span class="panel-text">系统设置</span>
-          </div>
-        </router-link>
-      </el-col>
-    </el-row>
+<!--    <el-row :gutter="18" class="panel-group-count">-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/product/examine' } ">-->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-shangpinguanli" style="color: #5CC7C1;"></span>-->
+<!--            <span class="panel-text">商品管理</span>-->
+<!--          </div>-->
+<!--        </router-link>           -->
+<!--      </el-col>-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/user/list' } ">-->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-yonghuguanli" style="color: #69C0FD;"></span>-->
+<!--            <span class="panel-text">用户管理</span>-->
+<!--          </div>-->
+<!--        </router-link>  -->
+<!--      </el-col>-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/order/list' } "> -->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-dingdanguanli" style="color: #EF9B6F;"></span>-->
+<!--            <span class="panel-text">订单管理</span>-->
+<!--          </div>-->
+<!--        </router-link>-->
+<!--      </el-col>-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/promoter/user' } ">-->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-fenxiaoguanli" style="color: #B27FEB;"></span>-->
+<!--            <span class="panel-text">分销管理</span>-->
+<!--          </div>-->
+<!--        </router-link>-->
+<!--      </el-col>-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/setting/sms/sms_config/index' } ">-->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-duanxinpeizhi" style="color: #F0AA0B;"></span>-->
+<!--            <span class="panel-text">一号通</span>-->
+<!--          </div>-->
+<!--        </router-link>-->
+<!--      </el-col>-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/cms/article' } ">-->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-wenzhangguanli" style="color: #5CC7C1;"></span>-->
+<!--            <span class="panel-text">文章管理</span>-->
+<!--          </div>-->
+<!--        </router-link>-->
+<!--      </el-col>-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/marketing/coupon/list' } ">-->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-youhuiquan" style="color: #EF9B6F;"></span>-->
+<!--            <span class="panel-text">优惠券</span>-->
+<!--          </div>-->
+<!--        </router-link>-->
+<!--      </el-col>-->
+<!--      <el-col :span="3" class="card-panel-item">-->
+<!--        <router-link :to=" { path:`${roterPre}` + '/systemForm/Basics/system_tabs' } ">-->
+<!--          <div class="card-panel-count">-->
+<!--            <span class="iconfont icon-xitongshezhi" style="color: #F0AA0B;"></span>-->
+<!--            <span class="panel-text">系统设置</span>-->
+<!--          </div>-->
+<!--        </router-link>-->
+<!--      </el-col>-->
+<!--    </el-row>-->
 </div>
 </template>
 
@@ -276,7 +276,7 @@ export default {
     padding: 0 20px;
     margin-top: 19px;
     .card-panel-text {
-        line-height: 18px;     
+        line-height: 18px;
         margin-bottom: 12px;
         font-weight: normal;
         align-items: center;
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
index 5997790..0c77764 100644
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@@ -4,11 +4,11 @@
       <div slot="header" class="clearfix">
         <el-tabs v-model="user_type" @tab-click="getList(1)">
           <el-tab-pane label="全部用户" name=""/>
-          <el-tab-pane label="微信用户" name="wechat"/>
-          <el-tab-pane label="小程序用户" name="routine"/>
-          <el-tab-pane label="H5用户" name="h5"/>
-          <el-tab-pane label="APP" name="app"/>
-          <el-tab-pane label="PC" name="pc"/>
+<!--          <el-tab-pane label="微信用户" name="wechat"/>-->
+<!--          <el-tab-pane label="小程序用户" name="routine"/>-->
+<!--          <el-tab-pane label="H5用户" name="h5"/>-->
+<!--          <el-tab-pane label="APP" name="app"/>-->
+<!--          <el-tab-pane label="PC" name="pc"/>-->
         </el-tabs>
         <div class="container">
           <el-form inline size="small" :label-position="labelPosition" label-width="100px">
@@ -143,10 +143,10 @@
           <el-button v-show="user_type === 'wechat'" size="mini" class="mr10" @click="sendNews">发送图文消息</el-button>
           <el-button v-show="checkedIds.length != 0" size="mini" class="mr10" @click="batchGroup">批量设置分组</el-button>
           <el-button v-show="checkedIds.length != 0" size="mini" @click="batchlabel">批量设置标签</el-button>
-          <el-button type="primary" icon="ios-search" label="default" class="mr15" size="mini" @click="sendCoupon"
-                     style="margin-bottom: 20px;"
-          >发送优惠券
-          </el-button>
+<!--          <el-button type="primary" icon="ios-search" label="default" class="mr15" size="mini" @click="sendCoupon"-->
+<!--                     style="margin-bottom: 20px;"-->
+<!--          >发送优惠券-->
+<!--          </el-button>-->
 
         </div>
         <el-alert v-if="checkedIds.length>0 || allCheck"
@@ -253,38 +253,37 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="is_svip" label="付费会员" min-width="120">
-          <template slot-scope="{row}">
-            <span>{{ row.is_svip > 0 ? '是' : '否' }}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="hp_value" label="生命值" min-width="120"/>
+        <el-table-column prop="brand_integral" label="品宣积分" min-width="120"/>
+        <el-table-column prop="all_value" label="总贡献值" min-width="120"/>
+
         <el-table-column prop="phone" label="手机号" min-width="120"/>
-        <el-table-column label="等级" min-width="100">
-          <template slot-scope="{row}">
-            <span>{{ row.member ? row.member.brokerage_name : '-' }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="分组" min-width="100">
-          <template slot-scope="{row}">
-            <span>{{ row.group ? row.group.group_name : '无' }}</span>
-          </template>
-        </el-table-column>
+<!--        <el-table-column label="等级" min-width="100">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ row.member ? row.member.brokerage_name : '-' }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column label="分组" min-width="100">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ row.group ? row.group.group_name : '无' }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column label="推荐人" min-width="140">
           <template slot-scope="{row}">
             <span>{{ row.spread ? row.spread.nickname + ' / ' + row.spread.uid : '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="用户类型" min-width="100">
-          <template slot-scope="{row}">
-            <span>{{
-                row.user_type === 'routine' ? '小程序' : row.user_type === 'wechat' ? '公众号' : row.user_type === 'app' || row.user_type === 'App' ? 'App' : row.user_type === 'pc' ? 'PC' : 'H5'
-              }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="now_money" label="余额" sortable min-width="100"
-                         :sort-method="(a,b)=>{return a.now_money - b.now_money}"
-        />
-        <el-table-column prop="integral" label="当前可用积分" min-width="100"/>
+<!--        <el-table-column label="用户类型" min-width="100">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{-->
+<!--                row.user_type === 'routine' ? '小程序' : row.user_type === 'wechat' ? '公众号' : row.user_type === 'app' || row.user_type === 'App' ? 'App' : row.user_type === 'pc' ? 'PC' : 'H5'-->
+<!--              }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column prop="now_money" label="余额" sortable min-width="100"-->
+<!--                         :sort-method="(a,b)=>{return a.now_money - b.now_money}"-->
+<!--        />-->
+
         <el-table-column label="操作" min-width="130" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="!scope.row.cancel_time" type="text" size="small" class="mr10"
@@ -297,25 +296,25 @@
                         </span>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="onDetails(scope.row.uid)">用户详情</el-dropdown-item>
-                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMoney(scope.row)">设置余额
-                </el-dropdown-item>
-                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="changeIntegral(scope.row)">设置积分
-                </el-dropdown-item>
-                <el-dropdown-item v-if="scope.row.vip_name && !scope.row.cancel_time">清除等级</el-dropdown-item>
-                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setGroup(scope.row)">设置分组
-                </el-dropdown-item>
-                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setLabel(scope.row)">设置标签
-                </el-dropdown-item>
+<!--                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMoney(scope.row)">设置余额-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="changeIntegral(scope.row)">设置积分-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item v-if="scope.row.vip_name && !scope.row.cancel_time">清除等级</el-dropdown-item>-->
+<!--                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setGroup(scope.row)">设置分组-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setLabel(scope.row)">设置标签-->
+<!--                </el-dropdown-item>-->
                 <el-dropdown-item @click.native="wmc(scope.row)">设置用户合作方角色
                 </el-dropdown-item>
                 <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setModify(scope.row)">修改推荐人
                 </el-dropdown-item>
                 <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setPassword(scope.row)">修改密码
                 </el-dropdown-item>
-                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMember(scope.row)">编辑会员等级
-                </el-dropdown-item>
-                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="giveMember(scope.row)">付费会员设置
-                </el-dropdown-item>
+<!--                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setMember(scope.row)">编辑会员等级-->
+<!--                </el-dropdown-item>-->
+<!--                <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="giveMember(scope.row)">付费会员设置-->
+<!--                </el-dropdown-item>-->
               </el-dropdown-menu>
             </el-dropdown>
           </template>
@@ -829,7 +828,7 @@ export default {
     },
     wmc(value) {
       this.dialogVisible = true
-      this.uid2 = value.uid
+      this.uid2 = val
       userLstApi11(value.uid).then(res => {
         this.ulist = res.data.option
         this.sel = res.data.partner_id