7.1(优化

2024-07-01 19:07:20 +08:00
parent 041be74421
commit fa41ed1d92
7 changed files with 77 additions and 13 deletions
--- a/.env.development
+++ b/.env.development
@@ -8,7 +8,7 @@ ENV = 'development'
 # 花花
 # VUE_APP_BASE_API = 'http://192.168.31.16:8080/car_admin_api'
 # 薛磊
- VUE_APP_BASE_API = 'http://192.168.31.226:8080/car_admin_api'
+ VUE_APP_BASE_API = 'http://192.168.0.118:8080/car_admin_api'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().
--- a/src/api/divide.js
+++ b/src/api/divide.js
@@ -235,3 +235,13 @@ export function exportUserError(params) {
  });
 }

+
+//提交修改分佣金额 admin/platform/comm/plat/order/return/update
+export function orderUpdate(data) {
+  return request({
+    url: '/admin/platform/comm/plat/order/return/update',
+    method: 'post',
+    data
+  });
+}
+
--- a/src/views/carousel/carouselList/creatLevel.vue
+++ b/src/views/carousel/carouselList/creatLevel.vue
@@ -23,6 +23,8 @@
          <el-option label="用户端福利页轮播图" :value="4" />
          <el-option label="用户端邀请页广告位" :value="5" />
          <el-option label="用户端发现广场轮播图" :value="6" />
+          <el-option label="展厅" :value="7" />
+          <el-option label="流水返佣轮播图" :value="8" />
        </el-select>
      </el-form-item>

--- a/src/views/carousel/carouselList/index.vue
+++ b/src/views/carousel/carouselList/index.vue
@@ -15,6 +15,8 @@
                <el-option label="用户端福利页轮播图" :value="4" />
                <el-option label="用户端邀请页广告位" :value="5" />
                <el-option label="用户端发现广场轮播图" :value="6" />
+                <el-option label="展厅" :value="7" />
+                <el-option label="流水返佣轮播图" :value="8" />
              </el-select>
            </el-form-item>
            <el-form-item>
@@ -153,6 +155,8 @@ export default {
      if (type == 4) return '用户端福利页轮播图';
      if (type == 5) return '用户端邀请页广告位';
      if (type == 6) return '用户端发现广场轮播图';
+      if (type == 7) return '展厅';
+      if (type == 8) return '流水返佣轮播图';
    },
    showLinkType(type) {
      if (type == 0) return '内部链接';
--- a/src/views/coupon/goods.vue
+++ b/src/views/coupon/goods.vue
@@ -320,6 +320,7 @@ export default {
      });
    },
    getCarList() {
+      console.log(this.carForm);
      cardList(this.carForm).then((res) => {
        this.carList = res.list;
        this.total1 = res.total;
@@ -542,11 +543,11 @@ export default {
      this.getList();
    },
    pageChange1(page) {
-      this.queryForm.page = page;
+      this.carForm.page = page;
      this.getCarList();
    },
    handleSizeChange1(val) {
-      this.queryForm.limit = val;
+      this.carForm.limit = val;
      this.getCarList();
    },
  },
--- a/src/views/divide/commission_order/index.vue
+++ b/src/views/divide/commission_order/index.vue
@@ -63,12 +63,15 @@
        </el-table-column>
        <el-table-column prop="status" label="城市" show-overflow-tooltip>
          <template slot-scope="scope">
-           {{ scope.row.cityOrder }}
+            {{ scope.row.cityOrder }}
          </template>
        </el-table-column>
-        <el-table-column prop="createTime" label="参与时间" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="payTime" label="支付时间" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createTime" label="返佣时间" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip></el-table-column>
        <el-table-column label="操作" min-width="110" fixed="right" align="center">
          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="unpRebateAmount(scope.row)" class="mr10">修改分佣金额</el-button>
            <el-button type="text" size="small" @click="onInfo(scope.row.id)" class="mr10">详情</el-button>
          </template>
        </el-table-column>
@@ -125,7 +128,7 @@
          <el-descriptions-item label="平台id">{{ formData.platformId }}</el-descriptions-item>
          <el-descriptions-item label="平台sn">{{ formData.platformSn }}</el-descriptions-item>
          <el-descriptions-item label="平台名称">{{ formData.platformName }}</el-descriptions-item>
-          <el-descriptions-item label="分佣城市">  {{ formData.cityOrder }}</el-descriptions-item>
+          <el-descriptions-item label="分佣城市"> {{ formData.cityOrder }}</el-descriptions-item>
          <el-descriptions-item label="滴友id">{{ formData.driverKey }}</el-descriptions-item>
          <el-descriptions-item label="司机编码">{{ formData.driverSn }}</el-descriptions-item>
          <el-descriptions-item label="用户头像">
@@ -142,23 +145,44 @@
          <el-descriptions-item label="订单编号">{{ formData.orderSn }}</el-descriptions-item>
          <el-descriptions-item label="订单金额">{{ formData.actualAmount }}</el-descriptions-item>
          <el-descriptions-item label="分佣金额">{{ formData.rebateAmount }}</el-descriptions-item>
-          <!-- <el-descriptions-item label="平台名称">{{ formData.platformName }}</el-descriptions-item> -->
-          
          <el-descriptions-item label="汇总编号">{{ formData.summarySn }}</el-descriptions-item>
-          <el-descriptions-item label="创建时间">{{ formData.createTime }}</el-descriptions-item>
-          
+          <el-descriptions-item label="支付时间">{{ formData.payTime }}</el-descriptions-item>
+          <el-descriptions-item label="返佣时间">{{ formData.createTime }}</el-descriptions-item>
+          <el-descriptions-item label="备注">{{ formData.remark }}</el-descriptions-item>
        </el-descriptions>
      </div>
    </el-drawer>
+
+    <!-- 修改返佣金额 -->
+    <el-dialog title="修改返佣金额" :visible.sync="unpRebateAmountShow" destroy-on-close>
+      <el-form :model="form">
+        <el-form-item label="分佣金额" :label-width="formLabelWidth">
+          <el-input-number type="text" :precision="2"  v-model="unpRebateAmountData.rebateAmount" :min="0" :max="999999999"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注" :label-width="formLabelWidth">
+          <el-input v-model="unpRebateAmountData.remark" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="unpRebateAmountShow = false">取 消</el-button>
+        <el-button type="primary" @click="submitAmountFn">确 定</el-button>
+      </div>
+    </el-dialog>
+
  </div>
 </template>
 <script>
-import { platformPageListApi, revenueListApi, excelImportOrder, getImportOrderRate, orderExportError, orderReturnDetail } from "@/api/divide.js"
+import { platformPageListApi, revenueListApi, excelImportOrder, getImportOrderRate, orderExportError, orderReturnDetail, orderUpdate } from "@/api/divide.js"
 export default {
  name: 'carBrand',
  components: {},
  data() {
    return {
+      formLabelWidth: '120px',
+      //修改返佣弹出层
+      unpRebateAmountShow: false,
+      unpRebateAmountData: {},
      formData: {},
      loadingFrom: false,
      //参与时间
@@ -199,6 +223,18 @@ export default {

  },
  methods: {
+    //提交修改金额
+    submitAmountFn() {
+      console.log(this.unpRebateAmountData);
+      let obj = {
+        id: this.unpRebateAmountData.id,
+        remark: this.unpRebateAmountData.remark,
+        rebateAmount: this.unpRebateAmountData.rebateAmount
+      }
+      orderUpdate(obj).then(res => {
+        this.unpRebateAmountShow = false
+      })
+    },
    //时间
    timeChange(e) {
      console.log(e);
@@ -265,6 +301,11 @@ export default {
      this.$refs.creatMerchants.dialogVisible = true
      this.onInfo(row.id)
    },
+    //修改返佣金额
+    unpRebateAmount(row) {
+      this.unpRebateAmountShow = true
+      this.unpRebateAmountData = row
+    },
    // 详情
    onInfo(id) {
      this.loadingFrom = true;
--- a/src/views/divide/divide_user_list/index.vue
+++ b/src/views/divide/divide_user_list/index.vue
@@ -29,15 +29,17 @@
              </el-button>
            </el-form-item>
            <el-form-item>
+              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="exportListFn">导出
+              </el-button>
              <el-button type="warning" plain icon="el-icon-download" size="mini" @click="carExportFn">导出司机编号
              </el-button>
              <el-button type="primary" plain icon="el-icon-plus" size="mini"
                @click="carExpListOpen = true; expType = 1">导入司机编号</el-button>
-              <el-button type="warning" plain icon="el-icon-download" size="mini"
+              <!-- <el-button type="warning" plain icon="el-icon-download" size="mini"
                @click="carExportUnregisteredFn">导出第三方注册
              </el-button>
              <el-button type="primary" plain icon="el-icon-plus" size="mini"
-                @click="carExpListOpen = true; expType = 2">导入第三方注册</el-button>
+                @click="carExpListOpen = true; expType = 2">导入第三方注册</el-button> -->
            </el-form-item>
          </el-form>
        </div>
@@ -343,6 +345,10 @@ export default {
        return 0;
      }
      return total <= 0 ? 0 : Math.floor(Math.round((num / total) * 10000) / 100.0);
+    },
+    //d导出列表
+    exportListFn(){
+      
    },
    //导出失败文件
    carExportErrorFn() {