Merge remote-tracking branch 'origin/master'

src/api/product.js

@@ -19,6 +19,12 @@ import request from './request'
   return request.post('store/product/edit_price/'+id,data)
 }
 /**
+ * @description 供应链商品 -- 删除
+ */
+export function Posteditdelete(id) {
+  return request.post('store/product/delete_xp/'+id)
+}
+/**
  * @description 供应链商品 -- 上下架
  */
  export function postchangeshow(data) {

src/api/setting.js

@@ -111,8 +111,8 @@ export function storeUpdateApi(data) {
  * @description 获取商户分润比例
  * @param {Object} param params {Object} 传值参数
  */
-export function getMerchantProfitApi() {
-  return request.get(`getConfig/shop_bonus_setting`)
+export function getMerchantProfitApi() {  
+  return request.get(`getConfig/base_commission`)
 }
 
 /**

src/router/modules/selection.js

@@ -6,7 +6,7 @@ const selectionRouter =
   name: 'selection',
   meta: {
     icon: 'dashboard',
-    title: '一壶茶供应链'
+    title: '幸福保供应链'
   },
   alwaysShow: true,
   component: Layout,

src/settings.js

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

src/views/login/index.vue

@@ -210,7 +210,7 @@ export default {
   methods: {
     getInfo() {
       loginConfigApi().then(({ data }) => {
-        data.login_banner[0].pic = 'https://cdn.bjtdba.com/vod/image/2024-04-13/20240413005952459.jpg'
+        data.login_banner[0].pic = 'https://cdn.bjtdba.com/vod/image/2025-02-02/20250202135218800.jpg'
         this.swiperList = data.login_banner
         this.loginLogo = data.login_logo
         

src/views/product/addProduct/index.vue

@@ -186,23 +186,23 @@
             </el-form-item> -->
             <!-- 编辑进来的 -->
             <div v-if="formValidate.volunteer == false && merInfo.mer_id != 496">
-              <el-form-item label="商品类型：">
+              <!-- <el-form-item label="商品类型："> -->
                 <!-- sadasdasd -->
-                <el-radio-group v-model="radio" @change="Typeshang">
-                  <el-radio label="1">普通商品</el-radio>
+                <!-- <el-radio-group v-model="radio" @change="Typeshang">
+                  <el-radio label="1">普通商品</el-radio> -->
                   <!-- <el-radio :label="2">事业一部</el-radio> -->
                   <!-- <el-radio :label="5" v-if="this.merchant_type == 3">大仓商品</el-radio> -->
-                  <el-radio v-if="specialMerchant == 'beishengtang'" label="7">积分商品</el-radio>
+                  <!-- <el-radio v-if="specialMerchant == 'beishengtang'" label="7">积分商品</el-radio> -->
 
-                  <el-radio v-if="merInfo.mer_type == '1'" label="8">会员商品</el-radio>
+                  <!-- <el-radio v-if="merInfo.mer_type == '1'" label="8">会员商品</el-radio>
                   <el-radio v-if="merInfo.mer_type == '1'" label="10">高级会员商品</el-radio>
                   <el-radio v-if="merInfo.mer_type == '1'" label="14">合伙人商品</el-radio>
                   <el-radio v-if="merInfo.mer_type == '1'" label="15">股权商品</el-radio>
                   <el-radio v-if="merInfo.mer_type == '1'" label="16">合伙人+股权商品</el-radio>
-                  <el-radio v-if="merInfo.mer_type == '2'" label="17">合伙人商品</el-radio>
+                  <el-radio v-if="merInfo.mer_type == '2'" label="17">合伙人商品</el-radio> -->
                   <!-- <el-radio :label="3">消费积分商品</el-radio> -->
-                </el-radio-group>
-              </el-form-item>
+                <!-- </el-radio-group>
+              </el-form-item> -->
 
               <!-- <el-form-item label="佣金：" prop="commission1" v-show="type == 2">
                 <div style="display: flex;">
@@ -239,7 +239,7 @@
               </el-radio-group>
             </el-form-item>
 
-            <el-form-item v-if="extensionStatus>0 && merInfo.mer_id != 496" label="佣金设置：" props="extension_type">
+            <el-form-item v-if="extensionStatus>0 && merInfo.mer_id != 496" label="分润设置：" props="extension_type">
               <el-radio-group v-model="formValidate.extension_type" @change="onChangetype(formValidate.extension_type)">
                 <el-radio label="1" class="radio">单独设置</el-radio>
                 <el-radio label="0" :disabled="formValidate.volunteer == 1?true:false">默认设置</el-radio>
@@ -324,7 +324,7 @@
           </el-col>
           <!-- 批量设置-->
           <el-col v-if="formValidate.spec_type == 1 && formValidate.attr.length>0" :span="24" class="noForm">
-            <el-form-item label="批量设置：" class="labeltop">
+            <!-- <el-form-item label="批量设置：" class="labeltop">
               <el-table :data="oneFormBatch" border class="tabNumWidth" size="mini">
                 <el-table-column align="center" label="图片" min-width="80">
                   <template slot-scope="scope">
@@ -336,19 +336,6 @@
                     </div>
                   </template>
                 </el-table-column>
-                <!-- 多规格大仓价格 -->
-                <!-- <template v-if="this.type == 5">
-                  <el-table-column align="center" label="大仓价格" min-width="120">
-                    <template slot-scope="scope">
-                      <el-input v-model="scope.row.dacang_price" type="number" :min="0" class="priceBox" />
-                    </template>
-                  </el-table-column>
-                </template> -->
-                <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
-                  <template slot-scope="scope">
-                    <el-input v-model="scope.row[iii]" :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" placeholder="请输入" />
-                  </template>
-                </el-table-column>
 
                 <template v-if="merInfo.mer_id == 496">
                   <template v-if="formValidate.share_is == 1">
@@ -386,28 +373,46 @@
                 </template>
                 <template v-else>
                   <template v-if="formValidate.extension_type == 1">
-                    <el-table-column align="center" label="返佣(%)" min-width="120">
+                    <el-table-column align="center" label="分润比例(%)" min-width="120">
                       <template slot-scope="scope">
                         <el-input v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" />
                       </template>
-                    </el-table-column>
+                    </el-table-column> -->
                     <!-- <el-table-column align="center" label="二级返佣(元)" min-width="120">
                           <template slot-scope="scope">
                             <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
                           </template>
                         </el-table-column> -->
+                  <!-- </template>
+                </template> -->
+
+                <!-- 多规格大仓价格 -->
+                <!-- <template v-if="this.type == 5">
+                  <el-table-column align="center" label="大仓价格" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input v-model="scope.row.dacang_price" type="number" :min="0" class="priceBox" />
+                    </template>
+                  </el-table-column>
+                </template> -->
+                <!-- <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                  <template slot-scope="scope">
+                    <el-input  @input="handleInput(scope.row,scope.formThead[iii].title)" :disabled="formThead[iii].title==='销售价格'?'text':disabled" v-model="scope.row[iii]"  :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" placeholder="请输入" />
                   </template>
-                </template>
+                </el-table-column> -->
 
+           
+<!-- 
                 <el-table-column align="center" label="操作" min-width="80">
                   <template>
                     <el-button type="text" class="submission" @click="batchAdd">批量添加</el-button>
                   </template>
                 </el-table-column>
               </el-table>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
           <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+
+
             <!-- 单规格表格-->
             <el-form-item v-if="formValidate.spec_type == 0">
               <el-table :data="OneattrValue" border class="tabNumWidth" size="mini">
@@ -430,22 +435,6 @@
                   </el-table-column>
                 </template> -->
 
-                <template v-if="this.Spu_id==null||this.Spu_id==''||this.Spu_id==undefined">
-                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
-                    <template slot-scope="scope">
-                      <el-input v-model="scope.row[iii]" :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" placeholder="请输入" />
-                    </template>
-                  </el-table-column>
-                </template>
-
-                <template v-else>
-                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
-                    <template slot-scope="scope">
-                      <el-input v-model="scope.row[iii]" :disabled="formThead[iii].title==='成本价'?'text':disabled" :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" placeholder="请输入" />
-                    </template>
-                  </el-table-column>
-                </template>
-
                 <template v-if="merInfo.mer_id == 496">
                   <template v-if="formValidate.share_is == 1">
                     <el-table-column align="center" label="分享奖(%)" min-width="120">
@@ -479,27 +468,45 @@
 
                 </template>
                 <template v-else>
-
                   <template v-if="formValidate.extension_type == 1">
-                    <el-table-column align="center" label="返利比例" min-width="120">
-                      <template slot-scope="scope">
-                        <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">
-                        <el-input v-model="scope.row.dacang_price" type="number" :min="0" class="priceBox" />
-                      </template>
-                    </el-table-column> -->
-                    <!-- <el-table-column align="center" label="二级返佣(元)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
-                      </template>
-                    </el-table-column> -->
+                  <el-table-column align="center" label="分润比例" min-width="125">
+                    <template slot-scope="scope">
+                      <div style="display: flex;">
+                        <div style="width: 80px;flex: 1;"><el-input @input="handleInput(scope.row, '分润比例')"  v-model="scope.row.extension_one" type="number" :min="0" class="priceBox" /></div>
+                        <div style="width: 10px;margin-top: 10px;"><b>%</b></div>
+                      </div>
+                    </template>
+                  </el-table-column>
                   </template>
                 </template>
+
+                <template v-if="this.Spu_id==null||this.Spu_id==''||this.Spu_id==undefined">
+                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input @input="handleInput(scope.row,formThead[iii].title)" v-model="scope.row[iii]" :disabled="formThead[iii].title==='销售价格'?'text':disabled" :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" placeholder="请输入" />
+                    </template>
+                  </el-table-column>
+                </template>
+
+                <template v-else>
+                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input v-model="scope.row[iii]" :disabled="formThead[iii].title==='成本价'?'text':disabled" :type="formThead[iii].title==='商品编号'?'text':'number'" :min="0" class="priceBox" placeholder="请输入" />
+                    </template>
+                  </el-table-column>
+                </template>
+
               </el-table>
             </el-form-item>
+
+
+
+
+
+
+
+
+
             <!-- 多规格表格-->
             <el-form-item v-if="formValidate.spec_type == 1 && formValidate.attr.length>0" class="labeltop" label="规格列表：">
               <el-table :data="ManyAttrValue" border class="tabNumWidth" size="mini">
@@ -535,70 +542,71 @@
                   </el-table-column>
                 </template> -->
 
-                <template v-if="this.Spu_ids==null || this.Spu_ids=='' || this.Spu_ids==undefined">
-                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                <template v-if="merInfo.mer_id == 496">
+
+                <template v-if="formValidate.share_is == 1">
+                  <el-table-column align="center" label="分享奖(%)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input v-model="scope.row[iii]" :type="formThead[iii].title==='商品编号'?'text':'number'" class="priceBox" placeholder="请输入" />
+                      <el-input v-model="scope.row.share_num" placeholder="请输入" type="number" :min="0" :max="100" class="priceBox" @input="handleChangeShare" />
                     </template>
                   </el-table-column>
                 </template>
-                <template v-else>
-                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+
+                <template v-if="formValidate.pension_is == 1">
+                  <el-table-column align="center" label="养老金(%)" min-width="120">
                     <template slot-scope="scope">
-                      <el-input v-model="scope.row[iii]" :disabled="formThead[iii].title==='成本价'?'text':disabled" :type="formThead[iii].title==='商品编号'?'text':'number'" class="priceBox" placeholder="请输入" />
+                      <el-input v-model="scope.row.pension_num" placeholder="请输入" type="number" :min="0" :max="100" class="priceBox" @input="handleChangePension" />
                     </template>
                   </el-table-column>
-                </template>
-
-                <template v-if="merInfo.mer_id == 496">
 
-                  <template v-if="formValidate.share_is == 1">
-                    <el-table-column align="center" label="分享奖(%)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.share_num" placeholder="请输入" type="number" :min="0" :max="100" class="priceBox" @input="handleChangeShare" />
-                      </template>
-                    </el-table-column>
-                  </template>
+                </template>
 
-                  <template v-if="formValidate.pension_is == 1">
-                    <el-table-column align="center" label="养老金(%)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.pension_num" placeholder="请输入" type="number" :min="0" :max="100" class="priceBox" @input="handleChangePension" />
-                      </template>
-                    </el-table-column>
+                <template>
+                  <el-table-column align="center" label="分红股权(%)" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input v-model="scope.row.stock_num" placeholder="请输入" type="number" :min="0" :max="100" class="priceBox" />
+                    </template>
+                  </el-table-column>
+                  <el-table-column align="center" label="股票数量" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input v-model="scope.row.shares_num" placeholder="请输入" type="number" :min="0" class="priceBox" />
+                    </template>
+                  </el-table-column>
 
-                  </template>
+                </template>
+                </template>
+                <template v-else>
 
-                  <template>
-                    <el-table-column align="center" label="分红股权(%)" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.stock_num" placeholder="请输入" type="number" :min="0" :max="100" class="priceBox" />
-                      </template>
-                    </el-table-column>
-                    <el-table-column align="center" label="股票数量" min-width="120">
-                      <template slot-scope="scope">
-                        <el-input v-model="scope.row.shares_num" placeholder="请输入" type="number" :min="0" class="priceBox" />
-                      </template>
-                    </el-table-column>
+                <template v-if="formValidate.extension_type == 1">
+                  <el-table-column align="center" label="分润比例(%)" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input @input="handleInput(scope.row, '分润比例')" 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">
+                                      <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
+                                    </template>
+                                  </el-table-column> -->
+                </template>
+                </template>
 
-                  </template>
+                <template v-if="this.Spu_ids==null || this.Spu_ids=='' || this.Spu_ids==undefined">
+                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input v-model="scope.row[iii]" @input="handleInput(scope.row,formThead[iii].title)" :disabled="formThead[iii].title==='销售价格'?'text':disabled" :type="formThead[iii].title==='商品编号'?'text':'number'" class="priceBox" placeholder="请输入" />
+                    </template> 
+                  </el-table-column>
                 </template>
                 <template v-else>
-
-                  <template v-if="formValidate.extension_type == 1">
-                    <el-table-column align="center" label="一级返佣(%)" min-width="120">
-                      <template slot-scope="scope">
-                        <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">
-                                        <el-input v-model="scope.row.extension_two" type="number" :min="0" class="priceBox" />
-                                      </template>
-                                    </el-table-column> -->
-                  </template>
+                  <el-table-column v-for="(item,iii) in attrValue" :key="iii" :label="formThead[iii].title" align="center" min-width="120">
+                    <template slot-scope="scope">
+                      <el-input v-model="scope.row[iii]" :disabled="formThead[iii].title==='成本价'?'text':disabled" :type="formThead[iii].title==='商品编号'?'text':'number'" class="priceBox" placeholder="请输入" />
+                    </template>
+                  </el-table-column>
                 </template>
 
+
               </el-table>
             </el-form-item>
           </el-col>
@@ -617,6 +625,8 @@ import ueditorFrom from '@/components/ueditorFrom'
 import { shippingListApi, templateLsitApi, productCreateApi, productDetailApi, categorySelectApi, categoryListApi, categoryBrandListApi, productUpdateApi, productConfigApi } from '@/api/product'
 import { getBaseInfo } from '@/api/user'
 import { roterPre } from '@/settings'
+import { getMerchantProfitApi } from '@/api/setting.js'
+import { B } from 'af-table-column'
 const defaultObj = {
   dacang_price: '',
   image: '',
@@ -633,8 +643,8 @@ const defaultObj = {
   temp_id: '',
   attrValue: [{
     image: '',
-    price: null,
     cost: null,
+    price: null,
     ot_price: null,
     stock: null,
     bar_code: '',
@@ -662,13 +672,13 @@ const defaultObj = {
 
 }
 const objTitle = {
-  price: {
-    title: '售价'
-  },
   // no_dacang_cost_price
   // dacang_cost_price
   cost: {
-    title: '成本价'
+    title: '成本价格'
+  },
+  price: {
+    title: '销售价格'
   },
   ot_price: {
     title: '原价'
@@ -692,6 +702,7 @@ export default {
   components: { ueditorFrom },
   data() {
     return {
+      base_commission: '',
       merchant_type: '',
       optionsCate: {
         value: 'store_category_id',
@@ -832,6 +843,7 @@ export default {
     }
   },
   created() {
+    this.getMerchantProfit()
     this.merchant_type = localStorage.getItem('merchant_type')
     console.log(this.merchant_type)
     this.tempRoute = Object.assign({}, this.$route)
@@ -865,7 +877,29 @@ export default {
     this.productCon()
   },
   methods: {
-
+    handleInput(value, title) {
+      if(title == '成本价格' || title == '分润比例'){
+        console.log('输入的内容:', value);
+        var bili = value.extension_one / 100;//比例
+        var gong_mer_profit = value.cost * bili//利润
+        var gong_market_price = Number(value.cost) + Number(gong_mer_profit)//加入利润后的价格
+        var plate_mer_profit = gong_mer_profit;
+        value.price = gong_market_price
+        value.gong_mer_profit = gong_mer_profit
+        value.gong_market_price = gong_market_price
+        value.plate_mer_profit = plate_mer_profit
+        console.log('计算的内容:', value);
+      }
+      // 这里可以执行其他逻辑，如发送数据到服务器等
+    },
+    // 获取商户分润比例
+    getMerchantProfit() {
+      getMerchantProfitApi().then(res => {
+        this.base_commission = res.message;
+      }).catch(err => {
+        this.$message.error(err.message)
+      })
+    },
     // 监测输入框的值是否变化
     handleChangeShare(value) {
       console.log('输入的', value)
@@ -1051,6 +1085,7 @@ export default {
           this.formValidate.attr = item.template_value
         }
       })
+      this.onChangetype(this.formValidate.extension_type)
     },
     // 商户分类；
     getCategorySelect() {
@@ -1149,18 +1184,18 @@ export default {
       console.log(item, 'itemsss')
       if (item == 1) {
         this.OneattrValue.map(item => {
-          this.$set(item, 'extension_one', null)
+          this.$set(item, 'extension_one', this.base_commission)
           this.$set(item, 'extension_two', null)
         })
         this.ManyAttrValue.map(item => {
-          this.$set(item, 'extension_one', null)
+          this.$set(item, 'extension_one', this.base_commission)
           this.$set(item, 'extension_two', null)
         })
       } else {
         this.OneattrValue.map(item => {
           delete item.extension_one
           delete item.extension_two
-          this.$set(item, 'extension_one', null)
+          this.$set(item, 'extension_one', this.base_commission)
           this.$set(item, 'extension_two', null)
         })
         this.ManyAttrValue.map(item => {

src/views/product/dxzwyhList/index.vue

@@ -149,6 +149,16 @@
 
             <el-button
               type="text"
+              size="small"
+              class="mr10"
+            >
+              <div @click="deleteXp(scope.row.product_id)">
+                删除
+              </div>
+            </el-button>
+
+            <el-button
+              type="text"
               @click=""
               size="small"
               class="mr10"
@@ -245,6 +255,7 @@
 import {
   postchangeshow,
   Posteditprice,
+  Posteditdelete,
   statusApi,
   Getproductgdx,
   getgonglstfilter,
@@ -356,6 +367,23 @@ export default {
 
 
     },
+    deleteXp(en) {
+        const _this = this
+        Posteditdelete(en).then(
+          (res) => {
+            if (res.status == 200) {
+              this.getList();
+              this.getLstFilterApi();
+              this.$message.success(res.message);
+            } else {
+              this.$message.error(res.message);
+            }
+          },
+          (fail) => {
+             this.$message.error(fail.message);
+          }
+        );
+    },
     // toggleSelection(rows) {
     //   if (rows) {
     //     rows.forEach((row) => {

src/views/setting/fenrunbili.vue

@@ -2,7 +2,8 @@
   <div class="divBox">
     <el-form size="small" label-width="120px">
       <el-form-item label="商户分润比例：">
-        <el-select v-model="userFrom.scole" placeholder="请选择" class="filter-item" @change="scoleChange">
+        <el-input v-model="userFrom.value" placeholder="请输入" element-id="value" style="width: 20%" /> %
+        <!-- <el-select v-model="userFrom.scole" placeholder="请选择" class="filter-item" @change="scoleChange">
           <el-option value="30" label="30%" />
           <el-option value="35" label="35%" />
           <el-option value="40" label="40%" />
@@ -18,11 +19,11 @@
           <el-option value="90" label="90%" />
           <el-option value="95" label="95%" />
           <el-option value="100" label="100%" />
-        </el-select>
+        </el-select> -->
       </el-form-item>
-      <el-form-item label="积分比例：">
+      <!-- <el-form-item label="积分比例：">
         {{ userFrom.pension }}
-      </el-form-item>
+      </el-form-item> -->
       <el-button class="ResetSearch mr10" size="small" type="primary" @click="config()">确定</el-button>
     </el-form>
 
@@ -37,15 +38,17 @@ export default {
   data() {
     return {
       userFrom: {
-        scole: '30%',
-        pension: '5%'
+        value:0
+        // scole: '30%',
+        // pension: '5%'
       },
       params: {
-        name: 'shop_bonus_setting',
-        value: {
-          yanglao_rate: '5%',
-          shop_bonus_rate: '30%'
-        }
+        // name: 'shop_bonus_setting',
+        // value: 0
+        // value: {
+        //   yanglao_rate: '5%',
+        //   shop_bonus_rate: '30%'
+        // }
       }
     }
   },
@@ -60,28 +63,33 @@ export default {
     // 获取商户分润比例
     getMerchantProfit() {
       getMerchantProfitApi().then(res => {
-        this.userFrom.scole = res.data.shop_bonus_rate + '%'
-        this.userFrom.pension = res.data.yanglao_rate + '%'
+        this.userFrom.value = res.message
+        // this.userFrom.scole = res.data.shop_bonus_rate + '%'
+        // this.userFrom.pension = res.data.yanglao_rate + '%'
       }).catch(err => {
         this.$message.error(err.message)
       })
     },
     // 修改商户分润比例
     config() {
+      this.params = {
+        name: 'base_commission',
+        value: this.userFrom.value
+      };
       this.setMerchantProfit(this.params)
     },
     scoleChange(value) {
-      console.log(value, '<---  v  ')
-      console.log(value / 5, '<---  v % 5 ')
-      const pension = value / 5 - 1
-      this.userFrom.pension = pension + '%'
+      // console.log(value, '<---  v  ')
+      // console.log(value / 5, '<---  v % 5 ')
+      // const pension = value / 5 - 1
+      // this.userFrom.pension = pension + '%'
       // const params = {
       //   name: 'shop_bonus_setting',
       //   value: { yanglao_rate: pension,
       //     shop_bonus_rate: value }
       // }
-      this.params.value.yanglao_rate = pension
-      this.params.value.shop_bonus_rate = value
+      // this.params.value.yanglao_rate = pension
+      // this.params.value.shop_bonus_rate = value
     },
     // 修改商户分润比例
     setMerchantProfit(params) {

src/views/user/list/index.vue

@@ -798,7 +798,7 @@ export default {
       }],
       companyLists: [
         { value: '13', label: '全部' },
-        { value: '13', label: '一壶茶' },
+        { value: '13', label: '幸福保' },
         { value: '13', label: '国盛' }], // 公司名称
       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': '养老金' }],
       performanceList: [],