佣金列表详情

pages/comdetail/index.vue

@@ -2,72 +2,63 @@
   <view class="actdetail-ward">
     <view class="actdetail-ward-tbg">
       <view class="actdetail-ward-top">
-        <!-- <view class="info fl_b">
-          <view class="title">{{ detailInfo.name }}</view>
-          <view class="act-status" v-if="detailInfo.status == 1">进行中</view>
-          <view class="act-status grey" v-else>已结束</view>
+        <view class="money">{{ detailInfo.cash }}</view>
+        <view class="u-border-right pd">佣金金额</view>
+        <view class="op8">
+          {{ ["冻结", "正常", "退款"][detailInfo.cashStatus - 1] }}
         </view>
-        <view class="time"
-          >{{ detailInfo.startTime | formate("yyyy-mm-dd hh:mm") }} 到
-          {{ detailInfo.endTime | formate("yyyy-mm-dd hh:mm") }}</view
-        > -->
-        <text class="money">1200.00</text>
-        <text class="op8">佣金金额</text>
-        <!-- <text style="padding: 0 20rpx">|</text> -->
-        <text class="op8">冻结</text>
       </view>
     </view>
     <view class="actdetail-ward-main">
-      <view class="actdetail-ward-goods detail-box">
-        <view class="title">商品及佣金</view>
-        <view class="goods-list">
-          <view
-            class="goods-list-item"
-            v-for="item in detailInfo.goodsList"
-            :key="item.id"
-          >
-            <view class="fl lebel">
-              <view>商品名称:</view>
-              <view>{{ item.goodsName }}</view>
-            </view>
-            <view class="fl lebel">
-              <view>商品价格:</view>
-              <view>{{ item.goodsPrice }}元</view>
-            </view>
-            <view class="fl lebel">
-              <view>分佣方式:</view>
-              <view>{{ ["百分比", "固定金额"][item.profitType - 1] }}</view>
-            </view>
-            <view class="fl lebel">
-              <view>数值:</view>
-              <view
-                >{{ item.profitMax }}{{ item.profitType == 1 ? "%" : "" }}</view
-              >
-            </view>
-            <view class="fl lebel">
-              <view>一级佣金:</view>
-              <view>{{ item.profitOne }}</view>
-            </view>
-            <view class="fl lebel">
-              <view>二级佣金:</view>
-              <view>{{ item.profitTwo }}</view>
-            </view>
-            <view class="fl lebel">
-              <view>三级级佣金:</view>
-              <view>{{ item.profitThree }}</view>
-            </view>
-          </view>
+      <view class="detail-box">
+        <view class="title">活动详情</view>
+
+        <view class="fl lebel">
+          <view>所属订单</view>
+          <view>{{ detailInfo.orderSn }}</view>
+        </view>
+        <view class="fl lebel">
+          <view>所属活动</view>
+          <view>{{ detailInfo.distributionName }}</view>
+        </view>
+        <view class="fl lebel">
+          <view>下单人</view>
+          <view>{{ detailInfo.orderUserName }}</view>
+        </view>
+        <view class="u-border-bottom" style="margin: 12rpx 0 32rpx"></view>
+        <view class="fl lebel">
+          <view>订单时间</view>
+          <view>{{ detailInfo.orderTime | formate("yyyy-mm-dd hh:mm") }}</view>
+        </view>
+        <view class="fl lebel">
+          <view>订单金额</view>
+          <view>{{ detailInfo.orderPrice }}元</view>
         </view>
       </view>
-      <view class="actdetail-ward-bom detail-box">
-        <view class="title">活动详情</view>
-        <view class="fl_b time u-border-bottom">
-          <text>佣金冻结期</text>
-          <text>{{ detailInfo.freezingPeriod }}天</text>
+      <view class="detail-box">
+        <view class="title">佣金信息</view>
+
+        <view class="fl lebel">
+          <view>分成方式</view>
+          <view>{{ ["百分比", "固定金额"][detailInfo.cashType - 1] }}</view>
         </view>
-        <view class="desc">
-          <view class="desc-title">描述</view>
-          <text>{{ detailInfo.remark }}</text>
+        <view class="fl lebel">
+          <view>数值</view>
+          <view>
+            {{ detailInfo.cashRatio }}{{ detailInfo.cashType == 1 ? "%" : "" }}
+          </view>
+        </view>
+        <view class="fl lebel">
+          <view>佣金金额</view>
+          <view>{{ detailInfo.cash }}元</view>
+        </view>
+        <view class="fl lebel">
+          <view>结算时间</view>
+          <view>{{ detailInfo.cashTime | formate("yyyy-mm-dd hh:mm") }}</view>
+        </view>
+        <view class="fl lebel">
+          <view>佣金状态</view>
+          <view>{{ ["冻结", "正常", "退款"][detailInfo.cashStatus - 1] }}</view>
         </view>
       </view>
     </view>
@@ -75,38 +66,22 @@
 </template>
 
 <script>
-import { getActDetail, getLinkCode } from "@/utils/act";
+import { getComDetail } from "@/utils/commission";
 export default {
-  name: "SaasManagerIndex",
-
   data() {
     return {
       detailInfo: {},
     };
   },
   onLoad(options) {
-    this.getActDetail(options.id);
+    this.getComDetail(options.id);
   },
   methods: {
-    getActDetail(id) {
-      getActDetail(id).then((res) => {
+    getComDetail(id) {
+      getComDetail(id).then((res) => {
         this.detailInfo = res;
       });
     },
-    getLinkCode() {
-      let { distributionId } = this.detailInfo;
-      getLinkCode({ distributionId }).then(({ linkCode, shareCode }) => {
-        uni.navigateTo({
-          url:
-            "/pages/bill/index?distributionId=" +
-            distributionId +
-            "&linkCode=" +
-            linkCode +
-            "&shareCode=" +
-            shareCode,
-        });
-      });
-    },
   },
 };
 </script>
@@ -121,22 +96,23 @@ page {
     height: 429rpx;
     top: 80rpx;
     background: linear-gradient(180deg, #3f8dfd 49%, rgba(0, 105, 255, 0) 100%);
-    padding: 44rpx 24rpx 0;
+    padding: 80rpx 24rpx 0;
     box-sizing: border-box;
 
     .actdetail-ward-top {
-      color: #ffffff;
+      color: #eee;
       font-size: 28rpx;
-      .money {
-        font-size: 72rpx;
+      view {
+        display: inline-block;
         margin-right: 16rpx;
       }
-      text {
+      .money {
+        font-size: 72rpx;
+        color: #ffffff;
       }
-      .op8 {
-        line-height: 16rpx;
-        border-right: 2rpx solid #ccc;
-        opacity: 0.8;
+      .pd {
+        line-height: 28rpx;
+        padding-right: 16rpx;
       }
     }
   }
@@ -147,7 +123,6 @@ page {
     width: 100%;
     box-sizing: border-box;
     .actdetail-ward-goods {
-      margin-bottom: 24rpx;
       .goods-list {
         .goods-list-item {
           background: #fafafa;
@@ -172,17 +147,11 @@ page {
         }
       }
     }
-    .actdetail-ward-bom {
-      .time {
-        color: #484848;
-        font-size: 32rpx;
-        padding-bottom: 32rpx;
-      }
-    }
     .detail-box {
       background: #ffffff;
       border-radius: 16rpx;
-      padding: 32rpx 24rpx 1rpx;
+      padding: 32rpx 24rpx 10rpx;
+      margin-bottom: 24rpx;
       .title {
         font-weight: bold;
         color: #24263d;
@@ -200,16 +169,22 @@ page {
           opacity: 0.7;
         }
       }
+      .lebel {
+        color: #484848;
+        font-size: 28rpx;
+        width: 100%;
+        view {
+          margin-bottom: 20rpx;
+          &:nth-of-type(1) {
+            width: 188rpx;
+          }
+          &:nth-of-type(2) {
+            flex: 1;
+            line-height: 40rpx;
+          }
+        }
+      }
     }
   }
-  .actdetail-btn {
-    width: 100%;
-    background: #ffffff;
-    height: 144rpx;
-    padding: 24rpx;
-    position: fixed;
-    bottom: 0;
-    box-sizing: border-box;
-  }
 }
 </style>

pages/commission/index.vue

@@ -13,7 +13,12 @@
           <view class="money">+{{ item.cash }}</view>
         </view>
         <view class="com-ward-list-item-status">
-          {{ item.orderTime | formate("yyyy-mm-dd hh:mm") }}
+          <view class="fl com-ward-list-item-status">
+            <view class="u-border-right">{{
+              ["冻结", "正常", "退款"][item.cashStatus - 1]
+            }}</view>
+            <view>{{ item.orderTime | formate("yyyy-mm-dd hh:mm") }}</view>
+          </view>
         </view>
       </view>
     </view>
@@ -50,7 +55,7 @@ export default {
   methods: {
     toDetail(data) {
       uni.navigateTo({
-        url: "/pages/comdetail/index?id=" + 28,
+        url: "/pages/comdetail/index?id=" + data.id,
       });
     },
     reset() {
@@ -104,7 +109,12 @@ page {
         margin: 24rpx 0 40rpx;
         color: #7e7d83;
         font-size: 28rpx;
-        padding-left: 44rpx;
+
+        view {
+          line-height: 28rpx;
+          padding-right: 24rpx;
+          margin-right: 24rpx;
+        }
       }
     }
   }

utils/commission.js

@@ -4,6 +4,13 @@ export function getCashList(data) {
   return myRequest({
     url: "/distribution/seller/cash/list",
     method: "get",
-    data
+    data,
+  });
+}
+
+export function getComDetail(id) {
+  return myRequest({
+    url: "/distribution/seller/cash/detail/" + id,
+    method: "get",
   });
 }