添加：豆豆和积分持有信息

添加：平台抽成信息添加订单商品信息

src/views/marketing/platformCommission/commissionRecord/index.vue

@@ -20,8 +20,8 @@
       </div>
       <!--列表内容-->
       <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
-        <el-table-column prop="id" label="ID" min-width="60" align="center"/>
+        <el-table-column prop="id" label="ID" min-width="50" align="center"/>
-        <el-table-column label="用户信息" prop="nickname" min-width="260" align="center">
+        <el-table-column label="用户信息" prop="nickname" min-width="230" align="center">
           <template slot-scope="scope">
             <div class="user-content">
               <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
@@ -37,7 +37,7 @@
         <el-table-column label="抽成商户" prop="mer_name" min-width="260" align="center">
           <template slot-scope="scope">
             <div class="user-content">
-              <div class="user-avatar" v-if="scope.row.avatar" >
+              <div class="user-avatar" v-if="scope.row.mer_avatar" >
                 <img :src="scope.row.mer_avatar" />
               </div>
               <div class="user-info">
@@ -47,61 +47,72 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="订单号" prop="mer_name" min-width="200" align="center">
+        <el-table-column label="订单商品信息" prop="mer_name" min-width="300" align="center">
-          <template slot-scope="scope">{{ scope.row.storeOrder.order_sn }}</template>
-        </el-table-column>
-        <el-table-column label="平台抽成" prop="mer_name" min-width="110" align="center">
           <template slot-scope="scope">
-            <el-tag type="success" effect="plain">金额：{{ scope.row.platform_commission_money || '0.00' }}</el-tag>
+            <div class="user-content" v-if="scope.row.storeOrderProduct">
-            <br />
+              <div class="user-avatar" v-if="scope.row.storeOrderProduct.image" >
-            <el-tag effect="plain" class="rate-num">比例：{{ scope.row.platform_commission_rate || '0' }}%</el-tag>
+                <img :src="scope.row.storeOrderProduct.image" />
+              </div>
+              <div class="user-info">
+                <div class="nickname">{{ scope.row.storeOrderProduct.store_name || '' }}</div>
+                <div class="user-id">订单号：{{ scope.row.storeOrder.order_sn || 0 }}</div>
+                <div class="user-id">商品ID：{{ scope.row.storeOrderProduct.product_id || 0 }}</div>
+              </div>
+            </div>
           </template>
         </el-table-column>
-        <el-table-column label="平台分佣" prop="mer_name" min-width="110" align="center">
+        <el-table-column label="平台抽成" prop="mer_name" min-width="85" align="center">
           <template slot-scope="scope">
-            <el-tag type="success" effect="plain">金额：{{ scope.row.commission_platform_money || '0.00' }}</el-tag>
+            <el-tag type="success" effect="plain" size="small">{{ scope.row.platform_commission_money || '0.00' }}元</el-tag>
             <br />
-            <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_platform_rate || '0' }}%</el-tag>
+            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.platform_commission_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="合伙人分佣" prop="mer_name" min-width="110" align="center">
+        <el-table-column label="平台分佣" prop="mer_name" min-width="85" align="center">
           <template slot-scope="scope">
-            <el-tag type="success" effect="plain">金额：{{ scope.row.commission_partner_money || '0.00' }}</el-tag>
+            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_platform_money || '0.00' }}元</el-tag>
             <br />
-            <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_partner_rate || '0' }}%</el-tag>
+            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_platform_rate || '0' }}%</el-tag>
-            <br />
-            <el-tag v-if="scope.row.commission_partner_status == 0" type="info" effect="dark" class="rate-num">待结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_partner_status == 1" type="success"  effect="dark" class="rate-num">已结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_partner_status == 2" type="danger"  effect="dark" class="rate-num">无合伙人</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="招商员分佣" prop="mer_name" min-width="110" align="center">
+        <el-table-column label="合伙人分佣" prop="mer_name" min-width="85" align="center">
           <template slot-scope="scope">
-            <el-tag type="success" effect="plain">金额：{{ scope.row.commission_merchants_money || '0.00' }}</el-tag>
+            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_partner_money || '0.00' }}元</el-tag>
             <br />
-            <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_merchants_rate || '0' }}%</el-tag>
+            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_partner_rate || '0' }}%</el-tag>
             <br />
-            <el-tag v-if="scope.row.commission_merchants_status == 0" type="info" effect="dark" class="rate-num">待结算</el-tag>
+            <el-tag v-if="scope.row.commission_partner_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_merchants_status == 1" type="success"  effect="dark" class="rate-num">已结算</el-tag>
+            <el-tag v-else-if="scope.row.commission_partner_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_merchants_status == 2" type="danger"  effect="dark" class="rate-num">无招商员</el-tag>
+            <el-tag v-else-if="scope.row.commission_partner_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无合伙人</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="推广员分佣" prop="mer_name" min-width="110" align="center">
+        <el-table-column label="招商员分佣" prop="mer_name" min-width="85" align="center">
           <template slot-scope="scope">
-            <el-tag type="success" effect="plain">金额：{{ scope.row.commission_promoter_money || '0.00' }}</el-tag>
+            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_merchants_money || '0.00' }}元</el-tag>
             <br />
-            <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_promoter_rate || '0' }}%</el-tag>
+            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_merchants_rate || '0' }}%</el-tag>
             <br />
-            <el-tag v-if="scope.row.commission_promoter_status == 0" type="info" effect="dark" class="rate-num">待结算</el-tag>
+            <el-tag v-if="scope.row.commission_merchants_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_promoter_status == 1" type="success"  effect="dark" class="rate-num">已结算</el-tag>
+            <el-tag v-else-if="scope.row.commission_merchants_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
-            <el-tag v-else-if="scope.row.commission_promoter_status == 2" type="danger"  effect="dark" class="rate-num">无推广员</el-tag>
+            <el-tag v-else-if="scope.row.commission_merchants_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无招商员</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="积分释放" prop="mer_name" min-width="110" align="center">
+        <el-table-column label="推广员分佣" prop="mer_name" min-width="85" align="center">
           <template slot-scope="scope">
-            <el-tag type="success" effect="plain">金额：{{ scope.row.commission_integral_release_money || '0.00' }}</el-tag>
+            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_promoter_money || '0.00' }}元</el-tag>
             <br />
-            <el-tag effect="plain" class="rate-num">比例：{{ scope.row.commission_integral_release_rate || '0' }}%</el-tag>
+            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_promoter_rate || '0' }}%</el-tag>
+            <br />
+            <el-tag v-if="scope.row.commission_promoter_status == 0" type="info" effect="dark" class="rate-num" size="small">待结算</el-tag>
+            <el-tag v-else-if="scope.row.commission_promoter_status == 1" type="success"  effect="dark" class="rate-num" size="small">已结算</el-tag>
+            <el-tag v-else-if="scope.row.commission_promoter_status == 2" type="danger"  effect="dark" class="rate-num" size="small">无推广员</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="积分释放" prop="mer_name" min-width="85" align="center">
+          <template slot-scope="scope">
+            <el-tag type="success" effect="plain" size="small">{{ scope.row.commission_integral_release_money || '0.00' }}元</el-tag>
+            <br />
+            <el-tag effect="plain" class="rate-num" size="small">{{ scope.row.commission_integral_release_rate || '0' }}%</el-tag>
           </template>
         </el-table-column>
       </el-table>

src/views/marketing/platformCommission/legumes/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="divBox">
     <el-card class="box-card">
-      <!--顶部搜索栏-->
+      <!--顶部统计栏-->
       <div slot="header" class="clearfix">
         <div class="container">
           <cards-data :card-lists="cardLists" />
@@ -35,7 +35,7 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
-        <el-tab-pane label="豆豆分配明细" name="list">
+        <el-tab-pane label="分配明细" name="list">
           <!--顶部搜索栏-->
           <div class="clearfix">
             <div class="container">
@@ -87,6 +87,56 @@
             </el-table-column>
           </el-table>
         </el-tab-pane>
+        <el-tab-pane label="持有明细" name="hold_list">
+          <el-alert
+            title="由于获取积分不能超过订单实际支付金额 + 抵扣积分；因此当前豆豆价格 * 持有的豆豆 ≠ 已获取积分！"
+            type="warning"
+            :closable="false"
+            style="margin-bottom: 10px!important;"
+            show-icon
+            center
+          ></el-alert>
+          <!--顶部搜索栏-->
+          <div class="clearfix">
+            <div class="container">
+              <el-form inline size="small" label-width="80px">
+                <el-form-item label="搜索：">
+                  <el-input v-model="tableFrom.uid" placeholder="请输入用户ID" class="selWidth" clearable>
+                    <el-button slot="append" icon="el-icon-search" class="el-button-solt" @click="clickSearch" />
+                  </el-input>
+                </el-form-item>
+                <el-form-item class="width100">
+                  <!--<el-button size="small" type="primary" @click="exports">导出</el-button>-->
+                </el-form-item>
+              </el-form>
+            </div>
+          </div>
+          <!--表单列表-->
+          <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
+            <el-table-column label="用户信息" prop="nickname" min-width="280" align="center">
+              <template slot-scope="scope">
+                <div class="user-content">
+                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
+                    <img :src="scope.row.avatar" />
+                  </div>
+                  <div class="user-info">
+                    <div class="nickname">{{ scope.row.nickname }}</div>
+                    <div class="user-id">ID：{{ scope.row.uid }}</div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="total_get_legumes" label="持有豆豆" min-width="150" align="center"/>
+            <el-table-column label="已获取积分 / 积分上限" min-width="200" align="center">
+              <template slot-scope="scope">
+                <el-tag type="success" effect="dark">{{ scope.row.total_get_integral }} / {{ scope.row.total_order_money }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="total_freeze_integral" label="冻结中积分" min-width="150" align="center"/>
+            <el-table-column prop="total_use_integral" label="已使用积分" min-width="150" align="center"/>
+            <el-table-column prop="surplus_use_integral" label="剩余可用积分" min-width="150" align="center"/>
+          </el-table>
+        </el-tab-pane>
       </el-tabs>
       <div class="block">
         <el-pagination