From 69e8792b9100f8e5264bef942458041dec782b9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=8F?= <1978476055@qq.com>
Date: Mon, 4 Nov 2024 18:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BD=A3=E9=87=91,=E6=83=A0?=
 =?UTF-8?q?=E7=BE=8E=E4=B9=A1=E6=9D=91=E4=BA=A7=E5=93=81,=E5=A5=96?=
 =?UTF-8?q?=E5=8A=B1=E9=87=91=E5=AF=BC=E5=87=BA,=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/api/marketing.js                          |  6 +++
 .../marketing/assist/assist_goods/info.vue    | 14 +++----
 .../combination/combination_goods/info.vue    | 14 +++----
 .../platformCoupon/couponRecord/index.vue     |  2 +-
 src/views/marketing/preSale/info.vue          | 14 +++----
 .../marketing/seckill/seckillGoods/info.vue   | 14 +++----
 src/views/order/list/index.vue                | 28 +++++++++++++
 src/views/product/productExamine/editAttr.vue |  8 ++--
 src/views/product/productExamine/index.vue    | 40 +++++++++++++------
 src/views/product/productExamine/info.vue     | 28 ++++++++-----
 .../product/productExamine/proDetails.vue     | 14 +++++--
 src/views/promoter/bonusLog/index.vue         | 10 ++---
 src/views/promoter/config/index.vue           | 24 +++++------
 src/views/promoter/membershipLevel/index.vue  | 24 +++++------
 src/views/promoter/user/index.vue             |  8 ++--
 src/views/user/list/userDetails.vue           | 18 +++++++++
 17 files changed, 175 insertions(+), 93 deletions(-)

diff --git a/.env.development b/.env.development
index b1bd2dd..79f835e 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,7 @@ ENV = 'development'
 # http://mer.crmeb.net/admin
 # base api
 # www.shop.xyz
-VUE_APP_BASE_API = 'http://testg.tropjoin.com/'
+VUE_APP_BASE_API = 'http://testg.tropjoin.com'
 # VUE_APP_BASE_API = 'http://test.tropjoin.com'
 # VUE_APP_BASE_API = 'https://api.tropjoin.com'
 
diff --git a/src/api/marketing.js b/src/api/marketing.js
index 3709ded..6e5fdc6 100644
--- a/src/api/marketing.js
+++ b/src/api/marketing.js
@@ -397,6 +397,12 @@ export function signLogExport(data) {
 export function brokerageLogExport(data) {
   return request.get(`user/brokerage/excel`, data)
 }
+/**
+ * @description 奖励金 -- 导出
+ */
+export function bonusExport(data) {
+  return request.get(`user/brokerage/bonus/excel`, data)
+}
 /**
  * @description 签到配置 -- 列表
  */
diff --git a/src/views/marketing/assist/assist_goods/info.vue b/src/views/marketing/assist/assist_goods/info.vue
index 38a8514..fe9e83f 100644
--- a/src/views/marketing/assist/assist_goods/info.vue
+++ b/src/views/marketing/assist/assist_goods/info.vue
@@ -58,7 +58,7 @@
       </el-tab-pane>
       <el-tab-pane label="商品规格" name="fourth">
         <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
-        <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span>
+        <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
         <span class="sp100">
           <span class="mb15" style="display: block">商品规格:</span>
           <template v-if="projectData.spec_type === 0">
@@ -78,20 +78,20 @@
                   <span class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="120">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_one" />
-                    <!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="二级返佣(元)" min-width="120">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_two" />
-                    <!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
           <template v-if="projectData.spec_type === 1">
@@ -115,7 +115,7 @@
                   <span class="priceBox">{{ scope.row[iii] }}</span>
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="120">
                   <template slot-scope="scope">
                     <span class="priceBox">{{ scope.row.extension_one }}</span>
@@ -126,7 +126,7 @@
                     <span class="priceBox">{{ scope.row.extension_two }}</span>
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
         </span>
diff --git a/src/views/marketing/combination/combination_goods/info.vue b/src/views/marketing/combination/combination_goods/info.vue
index 5cce4de..83bb8a0 100644
--- a/src/views/marketing/combination/combination_goods/info.vue
+++ b/src/views/marketing/combination/combination_goods/info.vue
@@ -65,7 +65,7 @@
       </el-tab-pane>
       <el-tab-pane label="商品规格" name="fourth">
         <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
-        <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span>
+        <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
         <span class="sp100">
           <span class="mb15" style="display: block">商品规格:</span>
           <template v-if="projectData.spec_type === 0">
@@ -85,20 +85,20 @@
                   <span class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="90">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_one" />
-                    <!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="二级返佣(元)" min-width="90">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_two" />
-                    <!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
           <template v-if="projectData.spec_type === 1">
@@ -122,7 +122,7 @@
                   <span class="priceBox">{{ scope.row[iii] }}</span>
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="90">
                   <template slot-scope="scope">
                     <span class="priceBox">{{ scope.row.extension_one }}</span>
@@ -133,7 +133,7 @@
                     <span class="priceBox">{{ scope.row.extension_two }}</span>
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
         </span>
diff --git a/src/views/marketing/platformCoupon/couponRecord/index.vue b/src/views/marketing/platformCoupon/couponRecord/index.vue
index c8aa756..76b8962 100644
--- a/src/views/marketing/platformCoupon/couponRecord/index.vue
+++ b/src/views/marketing/platformCoupon/couponRecord/index.vue
@@ -124,7 +124,7 @@
         </el-table-column>
         <el-table-column label="订单号" min-width="170">
           <template slot-scope="scope">
-            <span>{{ scope.row.grouporder.group_order_sn }}</span>
+            <span>{{ scope.row.grouporder&&scope.row.grouporder.group_order_sn }}</span>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/marketing/preSale/info.vue b/src/views/marketing/preSale/info.vue
index 8c157b3..bd031ac 100644
--- a/src/views/marketing/preSale/info.vue
+++ b/src/views/marketing/preSale/info.vue
@@ -65,7 +65,7 @@
       </el-tab-pane>
       <el-tab-pane label="商品规格" name="fourth">
         <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
-        <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span>
+        <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
         <span class="sp100">
           <span class="mb15" style="display: block">商品规格:</span>
           <template v-if="projectData.spec_type === 0">
@@ -85,20 +85,20 @@
                   <span class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="100">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_one" />
-                    <!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="二级返佣(元)" min-width="100">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_two" />
-                    <!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
           <template v-if="projectData.spec_type === 1">
@@ -122,7 +122,7 @@
                   <span class="priceBox">{{ scope.row[iii] }}</span>
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="100">
                   <template slot-scope="scope">
                     <span class="priceBox">{{ scope.row.extension_one }}</span>
@@ -133,7 +133,7 @@
                     <span class="priceBox">{{ scope.row.extension_two }}</span>
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
         </span>
diff --git a/src/views/marketing/seckill/seckillGoods/info.vue b/src/views/marketing/seckill/seckillGoods/info.vue
index 369dd49..b5baaeb 100644
--- a/src/views/marketing/seckill/seckillGoods/info.vue
+++ b/src/views/marketing/seckill/seckillGoods/info.vue
@@ -65,7 +65,7 @@
       </el-tab-pane>
       <el-tab-pane label="商品规格" name="fourth">
         <span class="sp">商品规格：{{ projectData.spec_type === 0 ? '单规格' : '多规格' }}</span>
-        <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span>
+        <!-- <span class="sp">佣金设置：{{ projectData.extension_type === 0 ? '默认设置' : '单独设置' }}</span> -->
         <span class="sp100">
           <span class="mb15" style="display: block">商品规格:</span>
           <template v-if="projectData.spec_type === 0">
@@ -85,20 +85,20 @@
                   <span class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="90">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_one" />
-                    <!--<el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="二级返佣(元)" min-width="90">
                   <template slot-scope="scope">
                     <span class="priceBox" v-text="scope.row.extension_two" />
-                    <!--<el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />-->
+                    <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
           <template v-if="projectData.spec_type === 1">
@@ -115,7 +115,7 @@
                   <span class="priceBox">{{ scope.row[iii] }}</span>
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column align="center" label="一级返佣(元)" min-width="90">
                   <template slot-scope="scope">
                     <span class="priceBox">{{ scope.row.extension_one }}</span>
@@ -126,7 +126,7 @@
                     <span class="priceBox">{{ scope.row.extension_two }}</span>
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
         </span>
diff --git a/src/views/order/list/index.vue b/src/views/order/list/index.vue
index 3751ea6..6fc88f1 100644
--- a/src/views/order/list/index.vue
+++ b/src/views/order/list/index.vue
@@ -270,6 +270,34 @@
             <el-option label="否" value="0" />
           </el-select>
         </el-form-item>
+        <el-form-item label="活动订单：" prop="is_activities">
+          <el-select
+            v-model="tableFrom.is_activities"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="是" value="1" />
+            <el-option label="否" value="0" />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="惠美乡村产品："
+          prop="is_huimei"
+          label-width="110px"
+        >
+          <el-select
+            v-model="tableFrom.is_huimei"
+            clearable
+            placeholder="请选择"
+            class="selWidth"
+            @change="getList(1)"
+          >
+            <el-option label="是" value="1" />
+            <el-option label="否" value="0" />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" size="small" @click="getList(1)"
             >搜索</el-button
diff --git a/src/views/product/productExamine/editAttr.vue b/src/views/product/productExamine/editAttr.vue
index 8077ff6..e950ee6 100644
--- a/src/views/product/productExamine/editAttr.vue
+++ b/src/views/product/productExamine/editAttr.vue
@@ -269,7 +269,7 @@
                     <el-input v-model="scope.row.basis_url" type="text" />
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.extension_type === 1">
+                <!-- <template v-if="formValidate.extension_type === 1">
                   <el-table-column
                     align="center"
                     label="一级返佣(元)"
@@ -298,7 +298,7 @@
                       />
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
               </el-table>
             </el-form-item>
             <el-form-item
@@ -409,7 +409,7 @@
                     <el-input v-model="scope.row.basis_url" type="text" />
                   </template>
                 </el-table-column>
-                <template v-if="formValidate.extension_type === 1">
+                <!-- <template v-if="formValidate.extension_type === 1">
                   <el-table-column
                     align="center"
                     label="一级返佣(元)"
@@ -438,7 +438,7 @@
                       />
                     </template>
                   </el-table-column>
-                </template>
+                </template> -->
               </el-table>
             </el-form-item>
             <!-- <el-table
diff --git a/src/views/product/productExamine/index.vue b/src/views/product/productExamine/index.vue
index 3df0510..23bd7c8 100644
--- a/src/views/product/productExamine/index.vue
+++ b/src/views/product/productExamine/index.vue
@@ -186,7 +186,7 @@
             clearable
           />
         </el-form-item>
-        <!-- <el-form-item label="是否惠美乡村：" prop="is_huimei">
+        <el-form-item label="惠美乡村产品：" prop="is_huimei">
           <el-select
             v-model="tableFrom.is_huimei"
             placeholder="请选择"
@@ -197,7 +197,7 @@
             <el-option label="是" value="1" />
             <el-option label="否" value="0" />
           </el-select>
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item label="审核状态：" prop="is_audited">
           <el-select
             v-model="tableFrom.is_audited"
@@ -414,12 +414,18 @@
             }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="惠美乡村产品" min-width="80">
+          <template slot-scope="scope">
+            <span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="is_audited" label="待审核类型" min-width="90">
           <template slot-scope="scope">
             {{ auditedList[scope.row.is_audited] }}
           </template>
         </el-table-column>
         <el-table-column prop="price" label="商品售价" min-width="80" />
+        <el-table-column prop="hot_type" label="商品推荐" min-width="80" />
         <el-table-column prop="refusal" label="拒绝/锁定原因" min-width="110" />
         <el-table-column prop="operator" label="操作人" min-width="110" />
         <el-table-column
@@ -438,8 +444,8 @@
           <template slot-scope="scope">
             <span>{{ scope.row.merchant.is_huimei ? "是" : "否" }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="是否惠美乡村产品" min-width="80">
+        </el-table-column> -->
+        <!-- <el-table-column label="是否惠美乡村产品" min-width="80">
           <template slot-scope="scope">
             <span>{{ scope.row.is_huimei ? "是" : "否" }}</span>
           </template>
@@ -903,14 +909,18 @@ const proOptions = [
     name: "特惠专区",
     value: "is_benefit",
   },
-  {
-    name: "精品推荐",
-    value: "is_best",
-  },
+  // {
+  //   name: "精品推荐",
+  //   value: "is_best",
+  // },
   {
     name: "首发新品",
     value: "is_new",
   },
+  {
+    name: "活动专区",
+    value: "is_activities",
+  },
 ];
 export default {
   name: "ProductExamine1",
@@ -969,18 +979,22 @@ export default {
           name: "特惠专区",
           value: "good",
         },
-        {
-          name: "精品推荐",
-          value: "best",
-        },
+        // {
+        //   name: "精品推荐",
+        //   value: "best",
+        // },
         {
           name: "首发新品",
           value: "new",
         },
+        {
+          name: "活动专区",
+          value: "is_activities",
+        },
       ],
       formValidate: {
         is_hot: 0,
-        is_huimei:0,
+        is_huimei: 0,
         is_customize: 0,
         is_best: 0,
         is_new: 0,
diff --git a/src/views/product/productExamine/info.vue b/src/views/product/productExamine/info.vue
index a86f975..f16485d 100644
--- a/src/views/product/productExamine/info.vue
+++ b/src/views/product/productExamine/info.vue
@@ -72,9 +72,9 @@
       </span>
       <span class="sp">商品简介：{{ projectData.store_info }}</span>
       <span class="sp">商品备注：{{ projectData.remark }}</span>
-      <!-- <span class="sp"
-        >是否惠美乡村：{{ projectData.is_huimei ? "是" : "否" }}</span
-      > -->
+      <span class="sp"
+        >惠美乡村产品：{{ projectData.is_huimei ? "是" : "否" }}</span
+      >
       <span class="sp100">
         商品封面图：
         <div class="demo-image__preview">
@@ -471,11 +471,11 @@
             projectData.spec_type === 0 ? "单规格" : "多规格"
           }}</span
         >
-        <span class="sp"
+        <!-- <span class="sp"
           >佣金设置：{{
             projectData.extension_type === 0 ? "默认设置" : "单独设置"
           }}</span
-        >
+        > -->
         <span class="sp100">
           <span class="mb15" style="display: block">商品规格:</span>
           <template v-if="projectData.spec_type === 0">
@@ -508,7 +508,7 @@
                   <span v-else class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column
                   align="center"
                   label="一级返佣(元)"
@@ -527,7 +527,7 @@
                     <span class="priceBox" v-text="scope.row.extension_two" />
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
           <template v-if="projectData.spec_type === 1">
@@ -575,7 +575,7 @@
                   <span v-else class="priceBox" v-text="scope.row[iii]" />
                 </template>
               </el-table-column>
-              <template v-if="projectData.extension_type === 1">
+              <!-- <template v-if="projectData.extension_type === 1">
                 <el-table-column
                   align="center"
                   label="一级返佣(元)"
@@ -594,7 +594,7 @@
                     <span class="priceBox">{{ scope.row.extension_two }}</span>
                   </template>
                 </el-table-column>
-              </template>
+              </template> -->
             </el-table>
           </template>
         </span>
@@ -617,6 +617,16 @@
           >
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="惠美乡村产品" prop="is_huimei" label-width="90px">
+        <el-radio-group v-model="projectData.is_huimei">
+          <el-radio :disabled="projectData.is_huimei == 1" :label="0"
+            >否</el-radio
+          >
+          <el-radio :disabled="projectData.is_huimei == 0" :label="1"
+            >是</el-radio
+          >
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
         :label="projectData.status == 15 ? '解锁状态' : '审核状态'"
         prop="status"
diff --git a/src/views/product/productExamine/proDetails.vue b/src/views/product/productExamine/proDetails.vue
index b55a2e0..530028f 100644
--- a/src/views/product/productExamine/proDetails.vue
+++ b/src/views/product/productExamine/proDetails.vue
@@ -209,6 +209,12 @@
                     {{ productData.is_customize ? "是" : "否" }}
                   </div>
                 </li>
+                <li class="item">
+                  <div class="item-title">惠美乡村产品：</div>
+                  <div class="value">
+                    {{ productData.is_huimei ? "是" : "否" }}
+                  </div>
+                </li>
               </ul>
               <ul v-if="productData.video_link" class="list">
                 <li class="item item100">
@@ -315,7 +321,7 @@
                         <span v-else class="priceBox" v-text="scope.row[iii]" />
                       </template>
                     </el-table-column>
-                    <template v-if="productData.extension_type === 1">
+                    <!-- <template v-if="productData.extension_type === 1">
                       <el-table-column
                         align="center"
                         label="一级返佣(元)"
@@ -340,7 +346,7 @@
                           />
                         </template>
                       </el-table-column>
-                    </template>
+                    </template> -->
                   </el-table>
                 </template>
                 <template v-if="productData.spec_type === 1">
@@ -391,7 +397,7 @@
                         }}</span>
                       </template>
                     </el-table-column>
-                    <template v-if="productData.extension_type === 1">
+                    <!-- <template v-if="productData.extension_type === 1">
                       <el-table-column
                         align="center"
                         label="一级返佣(元)"
@@ -414,7 +420,7 @@
                           }}</span>
                         </template>
                       </el-table-column>
-                    </template>
+                    </template> -->
                   </el-table>
                 </template>
               </div>
diff --git a/src/views/promoter/bonusLog/index.vue b/src/views/promoter/bonusLog/index.vue
index 691cc93..2d6b425 100644
--- a/src/views/promoter/bonusLog/index.vue
+++ b/src/views/promoter/bonusLog/index.vue
@@ -57,9 +57,9 @@
     </div>
     <!-- <cards-data v-if="cardLists.length > 0" :card-lists="cardLists" /> -->
     <el-card>
-      <!-- <div class="mb20">
+      <div class="mb20">
         <el-button size="small" type="primary" @click="exports">导出</el-button>
-      </div> -->
+      </div>
       <el-table v-loading="listLoading" :data="tableData.data" size="small">
         <el-table-column prop="bill_id" label="ID" min-width="50" />
         <el-table-column label="用户昵称" prop="nickname" min-width="150" />
@@ -107,7 +107,7 @@
 import {
   integralLogTitle,
   bonusLogLst,
-  brokerageLogExport,
+  bonusExport,
 } from "@/api/marketing";
 import fileList from "@/components/exportFile/fileList";
 import cardsData from "@/components/cards/index";
@@ -185,14 +185,14 @@ export default {
     /**列表 */
     downData(excelData) {
       return new Promise((resolve, reject) => {
-        brokerageLogExport(excelData).then((res) => {
+        bonusExport(excelData).then((res) => {
           return resolve(res.data);
         });
       });
     },
     // 导出
     exportRecord() {
-      brokerageLogExport(this.tableFrom)
+      bonusExport(this.tableFrom)
         .then((res) => {
           const h = this.$createElement;
           this.$msgbox({
diff --git a/src/views/promoter/config/index.vue b/src/views/promoter/config/index.vue
index f14e881..6394ed2 100644
--- a/src/views/promoter/config/index.vue
+++ b/src/views/promoter/config/index.vue
@@ -25,7 +25,7 @@
             <el-radio :label="0">关闭</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item prop="extension_one_rate">
+        <!-- <el-form-item prop="extension_one_rate">
           <span slot="label">
             <span>一级返佣比例：</span>
             <el-tooltip
@@ -45,8 +45,8 @@
             class="selWidth"
           ></el-input-number>
           <span>%</span>
-        </el-form-item>
-        <el-form-item prop="extension_two_rate">
+        </el-form-item> -->
+        <!-- <el-form-item prop="extension_two_rate">
           <span slot="label">
             <span>二级返佣比例：</span>
             <el-tooltip
@@ -66,8 +66,8 @@
             class="selWidth"
           ></el-input-number>
           <span>%</span>
-        </el-form-item>
-        <el-form-item prop="extension_self" required>
+        </el-form-item> -->
+        <!-- <el-form-item prop="extension_self" required>
           <span slot="label">
             <span>服务内购：</span>
           </span>
@@ -80,7 +80,7 @@
             >开启服务内购，服务员自己购买商品，享受一级返佣，上级享受二级返佣；
             <span class="title">关闭：</span>服务员自己购买商品没有返佣
           </div>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item prop="extension_limit" required>
           <span slot="label">
             <span>服务限时开关：</span>
@@ -152,12 +152,12 @@ export default {
         extension_status: [
           { required: true, message: "请选择是否启用服务", trigger: "change" },
         ],
-        extension_one_rate: [
-          { required: true, message: "请输入一级返佣比例", trigger: "blur" },
-        ],
-        extension_two_rate: [
-          { required: true, message: "请输入二级返佣比例", trigger: "blur" },
-        ],
+        // extension_one_rate: [
+        //   { required: true, message: "请输入一级返佣比例", trigger: "blur" },
+        // ],
+        // extension_two_rate: [
+        //   { required: true, message: "请输入二级返佣比例", trigger: "blur" },
+        // ],
         extension_self: [
           {
             required: true,
diff --git a/src/views/promoter/membershipLevel/index.vue b/src/views/promoter/membershipLevel/index.vue
index a884374..2ccd07c 100644
--- a/src/views/promoter/membershipLevel/index.vue
+++ b/src/views/promoter/membershipLevel/index.vue
@@ -77,7 +77,7 @@
           </template>
         </el-table-column>
         <el-table-column label="服务员人数" min-width="100" prop="user_num" />
-        <el-table-column
+        <!-- <el-table-column
           prop="extension_one"
           label="一级返佣上浮比例(%)"
           min-width="120"
@@ -86,7 +86,7 @@
           prop="extension_two"
           label="二级返佣上浮比例(%)"
           min-width="120"
-        />
+        /> -->
         <el-table-column label="操作" min-width="120" fixed="right">
           <template slot-scope="scope">
             <el-button
@@ -273,7 +273,7 @@
           ></el-input>
         </el-form-item>
 
-        <el-form-item prop="extension_one">
+        <!-- <el-form-item prop="extension_one">
           <span slot="label">
             <span>一级返佣(上浮比例)：</span>
             <el-tooltip
@@ -316,7 +316,7 @@
             class="selWidth"
           ></el-input-number>
           <span>%</span>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item>
           <el-button
             type="primary"
@@ -401,14 +401,14 @@
                 :src="formValidate.brokerage_icon"
               />
             </div>
-            <div class="list sp100">
+            <!-- <div class="list sp100">
               <label class="name">一级返佣(上浮比例)：</label
               >{{ formValidate.extension_one }}%
             </div>
             <div class="list sp100">
               <label class="name">二级返佣(上浮比例)：</label
               >{{ formValidate.extension_two }}%
-            </div>
+            </div> -->
           </div>
         </div>
       </div>
@@ -477,12 +477,12 @@ export default {
         brokerage_icon: [
           { required: true, message: "请上传图标", trigger: "change" },
         ],
-        extension_one: [
-          { required: true, message: "请输入一级返佣比例", trigger: "change" },
-        ],
-        extension_two: [
-          { required: true, message: "请输入二级返佣比例", trigger: "change" },
-        ],
+        // extension_one: [
+        //   { required: true, message: "请输入一级返佣比例", trigger: "change" },
+        // ],
+        // extension_two: [
+        //   { required: true, message: "请输入二级返佣比例", trigger: "change" },
+        // ],
       },
     };
   },
diff --git a/src/views/promoter/user/index.vue b/src/views/promoter/user/index.vue
index 87c87b2..5c60ad2 100644
--- a/src/views/promoter/user/index.vue
+++ b/src/views/promoter/user/index.vue
@@ -111,10 +111,10 @@
           sortable
           :sort-method="
             (a, b) => {
-              return a.total_brokerage_price - b.total_brokerage_price;
+              return a.total_bonus_price - b.total_bonus_price;
             }
           "
-          prop="total_brokerage_price"
+          prop="total_bonus_price"
         />
         <el-table-column
           label="已提现金额"
@@ -138,10 +138,10 @@
           sortable
           :sort-method="
             (a, b) => {
-              return a.brokerage_price - b.brokerage_price;
+              return a.bonus_price - b.bonus_price;
             }
           "
-          prop="brokerage_price"
+          prop="bonus_price"
         />
         <el-table-column
           prop="spread.nickname"
diff --git a/src/views/user/list/userDetails.vue b/src/views/user/list/userDetails.vue
index 97e143d..5155773 100644
--- a/src/views/user/list/userDetails.vue
+++ b/src/views/user/list/userDetails.vue
@@ -206,6 +206,10 @@
                     <div>用户ID：</div>
                     <div class="value">{{ psInfo.spread.uid }}</div>
                   </li>
+                  <li class="item">
+                    <div>ID号：</div>
+                    <div class="value">{{ psInfo.spread.number }}</div>
+                  </li>
                   <li class="item">
                     <div>用户姓名：</div>
                     <div class="value">{{ psInfo.spread.real_name }}</div>
@@ -218,6 +222,20 @@
                     <div>用户电话：</div>
                     <div class="value">{{ psInfo.spread.phone }}</div>
                   </li>
+                  <li class="item">
+                    <div>绑定状态：</div>
+                    <div class="value">
+                      {{ psInfo.activation_promoter_name }}
+                    </div>
+                  </li>
+                  <li class="item">
+                    <div>绑定时间：</div>
+                    <div class="value">{{ psInfo.spread.activation_time }}</div>
+                  </li>
+                  <li class="item">
+                    <div>邀请时间：</div>
+                    <div class="value">{{ psInfo.spread_time }}</div>
+                  </li>
                 </ul>
               </div>
               <div class="section">