From a858cfab21ad468b0c6fe834e29a332226d22042 Mon Sep 17 00:00:00 2001
From: 1748153932 <1748153932@qq.com>
Date: Fri, 15 Dec 2023 12:32:34 +0800
Subject: [PATCH] 21 31

---
 src/libs/settingMer.js                     |  2 +-
 src/views/product/productExamine/index.vue | 11 +++----
 src/views/user/list/index.vue              | 34 +++++++++++++++-------
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/src/libs/settingMer.js b/src/libs/settingMer.js
index 9e9197a..7dafe5e 100644
--- a/src/libs/settingMer.js
+++ b/src/libs/settingMer.js
@@ -9,7 +9,7 @@
 // +----------------------------------------------------------------------
 import Cookies from "js-cookie";
 // 请求接口地址 如果没有配置自动获取当前网址路径
-const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`
+const VUE_APP_API_URL = 'https://b2b2c.njrenzhou.cn'
 const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || (location.protocol === 'https:' ? 'wss' : 'ws') + ':' + location.hostname
 const login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : ''
 const SettingMer = {
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 3417005..195e0ff 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -30,12 +30,12 @@
               <el-form-item label="推荐级别：">
                 <el-select v-model="tableFrom.star" placeholder="请选择" class="filter-item selWidth" clearable @change="getList(1)">
                   <el-option v-for="item in recommendedLevelStatus" :key="item.value" :label="item.label" :value="item.value" />
-                </el-select>               
+                </el-select>
               </el-form-item>
               <el-form-item label="标签：">
                 <el-select v-model="tableFrom.sys_labels" placeholder="请选择" class="filter-item selWidth" clearable filterable @change="getList(1)">
                   <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>               
+                </el-select>
               </el-form-item>
               <el-form-item label="会员价设置：">
               <el-select v-model="tableFrom.svip_price_type" placeholder="请选择" class="selWidth" clearable @change="getList(1)">
@@ -47,7 +47,7 @@
               <el-form-item label="商品推荐：">
                 <el-select v-model="tableFrom.hot_type" placeholder="请选择" class="filter-item selWidth" clearable filterable @change="getList(1)">
                   <el-option v-for="item in recommendList" :key="item.value" :label="item.name" :value="item.value" />
-                </el-select>               
+                </el-select>
               </el-form-item>
               <el-form-item label="商品搜索：">
                 <el-input v-model="tableFrom.keyword" @keyup.enter.native="getList(1)" placeholder="请输入商品名称，关键字，产品编号" class="selWidth">
@@ -170,7 +170,7 @@
             <el-button v-if="tableFrom.type === '6' || tableFrom.type === '1'" type="text" size="small" @click="toVirtualSales(scope.row.product_id)">已售数量</el-button>
             <el-button v-if="tableFrom.type === '6'" type="text" size="small" @click="toExamine(scope.row.product_id)">审核</el-button>
             <el-button v-if="Number(tableFrom.type) < 3" type="text" size="small" @click="toOff([scope.row.product_id])">强制下架</el-button>
-            
+
           </template>
         </el-table-column>
       </el-table>
@@ -221,7 +221,8 @@
     >
       <el-form ref="labelForm" :model="labelForm" @submit.native.prevent>
         <el-form-item>
-          <el-select v-model="labelForm.sys_labels" clearable filterable multiple placeholder="请选择" class="selWidth">
+<!--          <el-select v-model="labelForm.sys_labels" clearable filterable multiple placeholder="请选择" class="selWidth">-->
+          <el-select v-model="labelForm.sys_labels" clearable filterable placeholder="请选择" class="selWidth">
             <el-option
                 v-for="item in labelList"
                 :key="item.id"
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
index 5c416ff..49ee8d5 100644
--- a/src/views/user/list/index.vue
+++ b/src/views/user/list/index.vue
@@ -127,7 +127,7 @@
                 </el-form>
             </div>
             <div class="mb15">
-                <el-button class="mr10" size="mini" @click="createUser">创建用户</el-button>             
+                <el-button class="mr10" size="mini" @click="createUser">创建用户</el-button>
                 <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>
@@ -156,6 +156,20 @@
                         <el-form-item label="真实姓名：">
                             <span>{{ props.row.real_name }}</span>
                         </el-form-item>
+
+<!--                      <el-form-item label="社区贡献值：">-->
+<!--                        <span>{{ props.row.community_value }}</span>-->
+<!--                      </el-form-item>-->
+
+<!--                      <el-form-item label="角色贡献值：">-->
+<!--                        <span>{{ props.row.role_value }}</span>-->
+<!--                      </el-form-item>-->
+
+<!--                      <el-form-item label="品宣贡献值：">-->
+<!--                        <span>{{ props.row.brand_value }}</span>-->
+<!--                      </el-form-item>-->
+
+
                         <el-form-item label="标签：">
                             <span v-for="(item, index) in props.row.label" :key="index" v-text="item" />
                         </el-form-item>
@@ -241,7 +255,7 @@
                             更多<i class="el-icon-arrow-down el-icon--right" />
                         </span>
                         <el-dropdown-menu slot="dropdown">
-                            <el-dropdown-item @click.native="onDetails(scope.row.uid)">用户详情</el-dropdown-item>                            
+                            <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>
@@ -270,7 +284,7 @@
     </el-dialog>
     <!-- 选择优惠券 -->
      <el-dialog v-if="visibleCoupon" title="优惠券列表" :visible.sync="visibleCoupon" width="1000px">
-      <coupon-List v-if="visibleCoupon" ref="couponList" :couponForm="couponForm" :checkedIds="checkedIds" :allCheck="allCheck" :userFrom="userFrom" @sendSuccess="sendSuccess" />        
+      <coupon-List v-if="visibleCoupon" ref="couponList" :couponForm="couponForm" :checkedIds="checkedIds" :allCheck="allCheck" :userFrom="userFrom" @sendSuccess="sendSuccess" />
     </el-dialog>
 </div>
 </template>
@@ -484,7 +498,7 @@ export default {
           } else if (index > -1) {
             this.checkedPage.splice(index, 1)
           }
-          
+
           this.syncCheckedId()
         },
         syncCheckedId() {
@@ -513,7 +527,7 @@ export default {
               }
             })
           }
-     
+
         },
         // 分开选择
         changeOne(v, user) {
@@ -552,7 +566,7 @@ export default {
             let label_id = this.userFrom.label_id == '' ? '' : this.getLabelValue(),
             user_type = this.findKey(this.userFrom.user_type,{'':'','微信用户':'wechat','小程序用户':'routine','H5用户':'h5'}),
             sex = this.findKey(this.userFrom.sex,{'男':'1','女':'2','保密':'0','':''}),
-            pay_count = this.findKey(this.userFrom.sex,{'0次':'-1','1次以上':'0','2次以上':'1','3次以上':'2','4次以上':'3','5次以上':'4','': ''}),          
+            pay_count = this.findKey(this.userFrom.sex,{'0次':'-1','1次以上':'0','2次以上':'1','3次以上':'2','4次以上':'3','5次以上':'4','': ''}),
             is_promoter = this.findKey(this.userFrom.is_promoter,{'推广员':'1','普通用户':'0','':''}),
             user_time_type = this.userFrom.user_time_type == 'visit' ? '最后访问' : this.userFrom.user_time_type == 'add_time' ? '首次访问' : ''
             this.couponForm =  {
@@ -637,7 +651,7 @@ export default {
             if (this.checkedIds.length === 0 && this.allCheck == false) return this.$message.warning('请先选择用户')
             this.visible = true
             this.wechatIds = this.getWechatUsers(this.tableData.data, this.checkedIds)
-            
+
         },
         handleClose() {
             this.visible = false
@@ -650,7 +664,7 @@ export default {
                     if(arr1[i]['wechat_user_id']){
                         newArr.push(arr1[i]['wechat_user_id']);
                     }
-                } 
+                }
             }else{
                 for (let i = 0; i < arr1.length; i++) {
                     for (let j = 0; j < arr2.length; j++) {
@@ -700,7 +714,7 @@ export default {
             this.$modalForm(changeMemberApi(row.uid)).then(() => this.getList(''))
         },
         // 赠送付费会员
-        giveMember(row) {  
+        giveMember(row) {
             this.$modalForm(giveMemberApi(row.uid)).then(() => this.getList(''))
         },
         // 修改推荐人
@@ -718,7 +732,7 @@ export default {
             this.$modalForm(changeNowMoneyApi(row.uid)).then(() => this.getList(''))
         },
         // 修改积分余额
-        changeIntegral(row){            
+        changeIntegral(row){
             this.$modalForm(changeNowIntegralApi(row.uid)).then(() => this.getList(''))
         },
         // 列表