bugfix

src/api/salesman/commission.js

@@ -1,9 +1,10 @@
 import request from "@/utils/request";
 //登录短信
-export function getCashList() {
+export function getCashList(query) {
   return request({
-    url: "/distribution/cash/log/fromOrderCashList",
+    url: "/distribution/seller/cash/list",
     method: "get",
+    params: query
   });
 }
 

src/utils/request.js

@@ -7,8 +7,8 @@ import methods from '@/utils/methodsTool';
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-// export const baseURL = process.env.VUE_APP_BASE_API
-export const baseURL = 'http://192.168.1.24:5030/'
+export const baseURL = process.env.VUE_APP_BASE_API
+// export const baseURL = 'http://192.168.1.7:5030/'
 export const BASE_IMG_URL = process.env.VUE_APP_IMG_API
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分

src/views/salesman/commission/index.vue

@@ -63,7 +63,7 @@ export default {
     return {
       loading: false, //当前表单加载是否加载动画
       navText: {
-        title: "活动列表",
+        title: "佣金列表",
         index: 0,
         ch: "条",
         num: false,
@@ -81,75 +81,81 @@ export default {
           placeholder: "请输入活动名称",
         },
       ],
-      formData: {
-        status: "0,1",
-        pageSize: 10,
-        pageNum: 1,
-      },
+      formData: {},
       // 表单
       tableSet: [
         {
           label: "佣金ID",
-          prop: "studentCode",
+          prop: "orderId",
           hidden: true,
         },
         {
           label: "所属订单",
-          prop: "relatedSn",
+          prop: "orderSn",
           hidden: true,
         },
         {
           label: "所属活动",
-          prop: "sex",
+          prop: "distributionName",
           hidden: true,
-          scope: "sex",
         },
         {
           label: "下单人",
-          prop: "nickname",
+          prop: "orderUserName",
           hidden: true,
         },
         {
           label: "订单时间",
-          prop: "payWay",
+          prop: "orderTime",
           hidden: true,
+          scope: "aTimeList",
         },
         {
-          label: "订单金额",
-          prop: "payWay",
+          label: "订单金额（元）",
+          prop: "orderPrice",
           hidden: true,
         },
         {
           label: "佣金分成方式",
-          prop: "profitType",
+          prop: "cashType",
           hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "百分比",
+              value: 1,
+            },
+            {
+              label: "固定",
+              value: 2,
+            },
+          ],
         },
         {
-          label: "佣金等级",
-          prop: "payWay",
+          label: "佣金比例",
+          prop: "cashRatio",
           hidden: true,
         },
         {
-          label: "佣金金额",
-          prop: "payWay",
+          label: "佣金金额（元）",
+          prop: "cash",
           hidden: true,
         },
         {
           label: "佣金结算时间",
-          prop: "freezingPeriod",
+          prop: "cashTime",
           hidden: true,
+          scope: "aTimeList",
         },
       ],
       tableData: [], //表单数据
       total: 0, //一共多少条
-      pageSize: 10, //每页多少条数据
-      currentPage: 1, //当前页码
       dialogVisible: false,
       userInfo: {},
     };
   },
   mounted() {
-    this.search();
+    this.search(2);
     this.getSellerInfo();
   },
   methods: {
@@ -290,13 +296,13 @@ export default {
     margin: 5px 0px;
   }
 }
-.withd-box{
+.withd-box {
   display: flex;
   position: absolute;
   top: 122px;
   left: 200px;
   z-index: 10;
-  div{
+  div {
     margin-right: 20px;
   }
 }

src/views/salesman/withdrawal/record.vue

@@ -46,7 +46,7 @@ export default {
     return {
       loading: false, //当前表单加载是否加载动画
       navText: {
-        title: "活动列表",
+        title: "提现记录",
         index: 0,
         ch: "条",
         num: false,