Merge branch 'master' of http://47.109.59.107:3000/fycode_ZF_Client/backed-web-vue

backmanage/src/api/module/recharge_order.ts

@@ -29,6 +29,8 @@ export interface IRechargeOrder {
   giveGold: number; // 赠送金币
   ifNewRecharge: number; // 是否新充值（1:新用户，2老用户）
   usePayChannelType: number; // 使用支付类型
+  campaignId: string; // 广告ID
+  campaignName: string; // 广告名称
 }
 
 export interface IRechargeOrderCount {
@@ -41,6 +43,17 @@ export interface IRechargeOrderCount {
   rechargeSuccessRelMoney: number; //真实成功金额
   successRate: number; //成功率
   countName: string; //统计名称
+  rechargeSuccessPeople: number; //成功充值人数
+  rechargeNumNew: number; //订单拉起数-新
+  rechargeSuccessNumNew: number; //充值成功数-新
+  rechargeSuccessMoneyNew: number; //充值成功金额-新
+  rechargeSuccessPeopleNew: number; //成功充值人数-新
+  successRateNew: number; //成功率-新
+  rechargeNumOld: number; //订单拉起数-旧
+  rechargeSuccessNumOld: number; //充值成功数-旧
+  rechargeSuccessMoneyOld: number; //充值成功金额-旧
+  rechargeSuccessPeopleOld: number; //成功充值人数-旧
+  successRateOld: number; //成功率-旧
 }
 
 // 分页支付订单列表

backmanage/src/views/rechargeOrder/index.vue

@@ -39,27 +39,78 @@
       </template>
       <template #info_tips>
         <el-table :data="countData" :border="true">
-          <el-table-column align="center" prop="countName" label="日期" />
-          <el-table-column align="center" prop="rechargeNum" label="唤起充值笔数" />
-          <el-table-column align="center" label="充值成功率">
+          <el-table-column align="center" prop="countName" label="日期" width="180" />
+          <el-table-column align="center" prop="rechargeNum" label="唤起总数" width="100" />
+          <el-table-column align="center" label="成功率">
             <template #default="item">
               <span>{{ item.row.successRate }}%</span>
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="rechargeSuccessNum" label="成功充值数" />
-          <el-table-column align="center" prop="rechargeSuccessMoney" label="成功充值金额" />
-          <el-table-column align="center" label="真实充值笔数">
+          <el-table-column align="center" prop="rechargeSuccessNum" label="成功笔数" width="100" />
+          <el-table-column align="center" prop="rechargeSuccessMoney" label="成功金额" width="100" />
+          <el-table-column align="center" label="新唤起数" width="100">
+            <template #default="item">
+              <span class="importent-type-blue">{{ item.row.rechargeNumNew }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="新成功率" width="100">
+            <template #default="item">
+              <span class="importent-type-blue">{{ item.row.successRateNew }}%</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="新成功笔数" width="100">
+            <template #default="item">
+              <span class="importent-type-blue">{{ item.row.rechargeSuccessNumNew }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="新成功人数" width="100">
+            <template #default="item">
+              <span class="importent-type-blue">{{ item.row.rechargeSuccessPeopleNew }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="新成功金额" width="100">
+            <template #default="item">
+              <span class="importent-type-blue">{{ item.row.rechargeSuccessMoneyNew }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="旧唤起数" width="100">
+            <template #default="item">
+              <span class="importent-type-grey">{{ item.row.rechargeNumOld }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="旧成功率" width="100">
+            <template #default="item">
+              <span class="importent-type-grey">{{ item.row.successRateOld }}%</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="旧成功笔数" width="100">
+            <template #default="item">
+              <span class="importent-type-grey">{{ item.row.rechargeSuccessNumOld }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="旧成功人数" width="100">
+            <template #default="item">
+              <span class="importent-type-grey">{{ item.row.rechargeSuccessPeopleOld }}</span>
+              </template>
+          </el-table-column>
+          <el-table-column align="center" label="旧成功金额" width="100">
+            <template #default="item">
+              <span class="importent-type-grey">{{ item.row.rechargeSuccessMoneyOld }}</span>
+              </template>
+          </el-table-column>
+
+          <el-table-column align="center" label="真实笔数" width="100">
             <template #default="item">
               <span class="importent-type">{{ item.row.rechargeSuccessRelNum }}</span>
               </template>
           </el-table-column>
-          <el-table-column align="center" label="真实充值金额">
+          <el-table-column align="center" label="真实金额" width="100">
             <template #default="item">
               <span class="importent-type">{{ item.row.rechargeSuccessRelMoney }}</span>
               </template>
           </el-table-column>
-          <el-table-column align="center" prop="rechargeSuccessDoNum" label="手动充值笔数" />
-          <el-table-column align="center" prop="rechargeSuccessDoMoney" label="手动充值金额" />
+          <el-table-column align="center" prop="rechargeSuccessDoNum" label="手动笔数" width="100" />
+          <el-table-column align="center" prop="rechargeSuccessDoMoney" label="手动金额" width="100" />
         </el-table>
       </template>
       <template #operation_column="{ row }">
@@ -306,6 +357,18 @@ const columns: TableColumnType<IRechargeOrder>[] = [
     prop: "urlPay",
     width:"100",
   },
+  {
+    label: "广告ID",
+    uniqueKey: "campaignId",
+    prop: "campaignId",
+    width:"100",
+  },
+  {
+    label: "广告名称",
+    uniqueKey: "campaignName",
+    prop: "campaignName",
+    width:"100",
+  },
   {
     label: "是否新用户",
     uniqueKey: "ifNewRecharge",
@@ -386,8 +449,12 @@ const handleDelRow = (id: number) => {
 </script>
 
 <style scoped>
-.importent-type {
+/* .importent-type-blue {
   color: #4090ec;
   font-weight: bold;
 }
+.importent-type-grey {
+  color: #a4a6a8;
+  font-weight: bold;
+} */
 </style>