From b2635bb0de07f25888b20b8b6e6ed76a4ad32d66 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Wed, 12 Jun 2024 17:04:53 +0800
Subject: [PATCH] 1

---
 src/views/dashboard/components/baseInfo.vue   | 24 +++-----
 .../merchant/list/handle/merEditForm.vue      |  4 +-
 src/views/merchant/list/index.vue             |  8 +--
 src/views/user/list/index.vue                 | 56 +++++++++----------
 src/views/user/list/userDetails.vue           | 12 ++--
 5 files changed, 47 insertions(+), 57 deletions(-)

diff --git a/src/views/dashboard/components/baseInfo.vue b/src/views/dashboard/components/baseInfo.vue
index ca88d01..6a0ce03 100644
--- a/src/views/dashboard/components/baseInfo.vue
+++ b/src/views/dashboard/components/baseInfo.vue
@@ -1,7 +1,7 @@
 <template>
 <div class="box-card statistics">
     <el-row :gutter="14" v-if="statisticsData" class="panel-group">
-        <el-col :span="6" class="content">
+        <el-col :span="8" class="content">
             <div class="card-panel">
                 <div class="card-panel-description">
                     <div class="card-panel-text">
@@ -27,7 +27,7 @@
                 </div>
             </div>      
         </el-col>
-        <el-col :span="6" class="content">
+        <el-col :span="8" class="content">
             <div class="card-panel">
                 <div class="card-panel-description">
                     <div class="card-panel-text">
@@ -53,7 +53,7 @@
                 </div>
             </div>
         </el-col>
-        <el-col :span="6" class="content" style="border:none">
+        <el-col :span="8" class="content" style="border:none">
             <div class="card-panel">
                 <div class="card-panel-description">
                     <div class="card-panel-text">
@@ -79,7 +79,7 @@
                 </div>    
             </div>
         </el-col>
-        <el-col :span="6" class="content">
+        <!-- <el-col :span="6" class="content">
             <div class="card-panel">
                 <div class="card-panel-description">
                     <div class="card-panel-text">
@@ -97,21 +97,11 @@
                         <span>{{ item.u }}</span>
                     </div>
                     </div>
-
-                    <!-- <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 class="card-panel-date">
-                        <span class="date_text">昨日数据</span>
-                        <span class="date_num">{{ statisticsData.yesterday.visitNum }}</span>              
-                    </div>  -->
                 </div>
             </div>
-        </el-col>
+        </el-col> -->
     </el-row>
-    <el-row :gutter="14" class="panel-group-count">
+    <!-- <el-row :gutter="14" class="panel-group-count">
       <el-col :span="3" class="card-panel-item">
         <router-link :to=" { path:`${roterPre}` + '/product/examine' } ">
           <div class="card-panel-count">
@@ -176,7 +166,7 @@
           </div>
         </router-link>
       </el-col>
-    </el-row>
+    </el-row> -->
 </div>
 </template>
 
diff --git a/src/views/merchant/list/handle/merEditForm.vue b/src/views/merchant/list/handle/merEditForm.vue
index f9c0d21..b297e35 100644
--- a/src/views/merchant/list/handle/merEditForm.vue
+++ b/src/views/merchant/list/handle/merEditForm.vue
@@ -124,7 +124,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <!-- <el-row>
             <el-col :span="12">
               <el-form-item label="是否店长店：" prop="is_store_mgr">
                 <el-switch
@@ -137,7 +137,7 @@
                 />
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
           <el-row>
             <el-col :span="12">
               <el-form-item label="排序：" prop="sort">
diff --git a/src/views/merchant/list/index.vue b/src/views/merchant/list/index.vue
index 72b440e..f243dbd 100644
--- a/src/views/merchant/list/index.vue
+++ b/src/views/merchant/list/index.vue
@@ -130,7 +130,7 @@
             clearable
           />
         </el-form-item>
-        <el-form-item label="是否店长店：" prop="is_store_mgr">
+        <!-- <el-form-item label="是否店长店：" prop="is_store_mgr">
           <el-select
             v-model="tableFrom.is_store_mgr"
             clearable
@@ -141,7 +141,7 @@
             <el-option key="1" label="是" value="1" />
             <el-option key="0" label="否" value="0" />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="是否新商户：" prop="is_new">
           <el-select
             v-model="tableFrom.is_new"
@@ -233,11 +233,11 @@
             <span>{{ scope.row.is_new == 1 ? "是" : "否" }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="is_store_mgr" label="是否店长店" min-width="90">
+        <!-- <el-table-column prop="is_store_mgr" label="是否店长店" min-width="90">
           <template slot-scope="scope">
             <span>{{ scope.row.is_store_mgr == 1 ? "是" : "否" }}</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="is_sign" label="是否签署" min-width="90">
           <template slot-scope="scope">
             <span>{{ scope.row.is_sign == 1 ? "是" : "否" }}</span>
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
index 49fe0e6..b1ddc20 100644
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@@ -13,11 +13,11 @@
                             </el-select>
                         </el-input>  
                     </el-form-item>
-                    <el-form-item label="用户分组：" prop="group_id">
+                    <!-- <el-form-item label="用户分组：" prop="group_id">
                         <el-select v-model="userFrom.group_id" placeholder="请选择" class="selWidth" clearable filterable @change="changeSearch(1)">
                             <el-option v-for="(item, index) in groupList" :key="index" :value="item.group_id" :label="item.group_name" />
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="身份证号码：" prop="card_id" label-width="100px">
                        <el-input placeholder="请输入身份证号码" v-model="userFrom.card_id" clearable></el-input>
                     </el-form-item>
@@ -47,23 +47,23 @@
                             </el-select>
                         </el-input>  
                     </el-form-item>
-                    <el-form-item label="用户分组：" prop="group_id">
+                    <!-- <el-form-item label="用户分组：" prop="group_id">
                         <el-select v-model="userFrom.group_id" placeholder="请选择" class="selWidth" clearable filterable @change="changeSearch(1)">
                             <el-option v-for="(item, index) in groupList" :key="index" :value="item.group_id" :label="item.group_name" />
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="用户标签：" prop="label_id">
                         <el-select v-model="userFrom.label_id" placeholder="请选择" class="selWidth" clearable filterable @change="changeSearch(1)">
                             <el-option v-for="(item, index) in labelLists" :key="index" :value="item.label_id" :label="item.label_name" />
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="用户类型：" prop="is_svip">
+                    <!-- <el-form-item label="用户类型：" prop="is_svip">
                         <el-select v-model="userFrom.is_svip" placeholder="请选择" class="selWidth" clearable filterable @change="changeSearch(1)">
                             <el-option value="0" label="普通用户">普通用户</el-option>
                             <el-option value="1" label="付费会员">付费会员</el-option>
                         </el-select>
-                    </el-form-item>
-                    <el-form-item label="用户等级：" prop="member_level">
+                    </el-form-item> -->
+                    <!-- <el-form-item label="用户等级：" prop="member_level">
                         <el-select
                         v-model="userFrom.member_level"
                         placeholder="请选择"
@@ -76,7 +76,7 @@
                                 :value="item.value"
                             />
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="消费情况：" prop="pay_count">
                         <el-select v-model="userFrom.pay_count" placeholder="请选择" class="selWidth" clearable @change="changeSearch(1)">
                             <el-option value="-1" label="0次"></el-option>
@@ -104,22 +104,22 @@
                             <el-option value="0" label="保密">保密</el-option>
                         </el-select>
                     </el-form-item>
-                    <el-form-item label="身份：" prop="is_promoter">
+                    <!-- <el-form-item label="身份：" prop="is_promoter">
                         <el-select v-model="userFrom.is_promoter" placeholder="请选择" class="selWidth" clearable filterable @change="changeSearch(1)">
                             <el-option value="1" label="推广员">推广员</el-option>
                             <el-option value="0" label="普通会员">普通会员</el-option>
                         </el-select>
-                    </el-form-item>
+                    </el-form-item> -->
                     <el-form-item label="生日：">
                         <el-date-picker v-model="timeVal2" value-format="yyyy/MM/dd" align="right" unlink-panels format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" :picker-options="pickerOptions" @change="onchangeTime2" />
                     </el-form-item>
-                    <el-form-item label="信息补充：">
+                    <!-- <el-form-item label="信息补充：">
                         <el-input placeholder="请输入内容" v-model="userFrom.fields_value" class="input-with-select selWidth" clearable @keyup.enter.native="changeSearch(1)">
                             <el-select v-model="userFrom.fields_type" slot="prepend" clearable placeholder="请选择">
                                 <el-option v-for="(item,index) in selectList" :label="item.label" :value="item.value" :key="index"></el-option>
                             </el-select>
                         </el-input>  
-                    </el-form-item>
+                    </el-form-item> -->
                 </div>
                 
                 <el-form-item class="search-form-sub">
@@ -147,9 +147,9 @@
                 <el-button type="primary" size="small" @click="createUser">创建用户</el-button>             
                 <el-button type="primary" size="small" @click="GetverifyCode">验证码查询</el-button>             
                 <el-button v-show="user_type === 'wechat'" size="small" @click="sendNews">发送图文消息</el-button>
-                <el-button :disabled="checkedIds.length == 0" size="small" @click="batchGroup">批量设置分组</el-button>
+                <!-- <el-button :disabled="checkedIds.length == 0" size="small" @click="batchGroup">批量设置分组</el-button> -->
                 <el-button :disabled="checkedIds.length == 0" size="small" @click="batchlabel">批量设置标签</el-button>
-                <el-button :disabled="checkedIds.length == 0" size="small" @click="setDistributor">批量设置分销员</el-button>
+                <!-- <el-button :disabled="checkedIds.length == 0" size="small" @click="setDistributor">批量设置分销员</el-button> -->
                 <el-button :disabled="checkedIds.length == 0" label="default" size="small" @click="sendCoupon">发送优惠券</el-button>
                 <el-button size="small" @click="exportList">导出列表</el-button>
             </div>
@@ -220,36 +220,36 @@
                     </div>
                 </template>
             </el-table-column>
-            <el-table-column prop="is_svip" label="付费会员" min-width="120">
+            <!-- <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> -->
             <el-table-column prop="phone" label="手机号" min-width="120" />
             <el-table-column prop="real_name" label="真实姓名" min-width="120" />
             <el-table-column prop="card_id" label="身份证号码" min-width="120" />
-            <el-table-column label="等级" min-width="100">
+            <!-- <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">
+            </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">
+            </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> -->
             <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 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="150" fixed="right">
                 <template slot-scope="scope">
                     <el-button v-if="!scope.row.cancel_time" type="text" size="small" @click="onDetails(scope.row.uid)">详情</el-button>
@@ -262,9 +262,9 @@
                         <el-dropdown-menu slot="dropdown">
                             <!-- <el-dropdown-item @click.native="onEdit(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.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="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="setModify(scope.row)">修改推荐人</el-dropdown-item> -->
                             <el-dropdown-item v-if="!scope.row.cancel_time" @click.native="setPassword(scope.row)">修改密码</el-dropdown-item>
@@ -531,7 +531,7 @@ export default {
                 用户标签: '',
                 用户类型: '',
                 性别: '',
-                身份: '',
+                // 身份: '',
                 消费情况: '',
                 访问情况: '',
                 访问时间: '',
@@ -732,7 +732,7 @@ export default {
                 用户类型: user_type,
                 性别: sex,
                 消费情况: pay_count,
-                身份: is_promoter,
+                // 身份: is_promoter,
                 访问情况: user_time_type,
                 访问时间: this.userFrom.user_time,
                 昵称: this.userFrom.nickname
diff --git a/src/views/user/list/userDetails.vue b/src/views/user/list/userDetails.vue
index a9941af..669662f 100644
--- a/src/views/user/list/userDetails.vue
+++ b/src/views/user/list/userDetails.vue
@@ -46,7 +46,7 @@
             <el-dropdown @command="handleCommand" class="ml10">
               <el-button icon="el-icon-more" size="small"></el-button>
               <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="integral">设置铸源星</el-dropdown-item>
+                <!-- <el-dropdown-item command="integral">设置铸源星</el-dropdown-item> -->
                 <el-dropdown-item command="balance">设置余额</el-dropdown-item>
                 <el-dropdown-item command="group">设置分组</el-dropdown-item> 
                 <el-dropdown-item command="label">设置标签</el-dropdown-item> 
@@ -74,10 +74,10 @@
               <div class="title">总消费金额</div>
               <div>{{psInfo.pay_price}}元</div>
             </li>
-            <li class="item">
+            <!-- <li class="item">
               <div class="title">铸源星余额</div>
               <div>{{psInfo.integral}}</div>
-            </li>
+            </li> -->
             <!-- <li class="item">
               <div class="title">用户成长值</div>
               <div>{{psInfo.member_value}}</div>
@@ -464,7 +464,7 @@
               </div>
             </template>
           </el-tab-pane>
-          <el-tab-pane label="铸源星明细" name="detailed">
+          <!-- <el-tab-pane label="铸源星明细" name="detailed">
             <template v-if="activeName == 'detailed'">
               <el-table :data="tableData.data" size="small">
                 <el-table-column
@@ -500,7 +500,7 @@
                 />
              </div>
             </template>
-          </el-tab-pane>
+          </el-tab-pane> -->
           <el-tab-pane label="签到记录" name="signRecord">
             <template v-if="activeName == 'signRecord'">
               <el-table :data="tableData.data" size="small">
@@ -547,7 +547,7 @@
               </div>
             </template>
           </el-tab-pane>
-          <el-tab-pane label="余额变更" name="balance" size="small">
+          <el-tab-pane label="抵扣券变更" name="balance" size="small">
             <template v-if="activeName == 'balance'">
               <el-table :data="tableData.data" size="small">
                 <el-table-column