同步代码20240818

src/api/member/user/index.ts

@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import ExpressForm from '@/views/mall/trade/delivery/express/ExpressForm.vue'
 
 export interface UserVO {
   id: number
@@ -73,3 +74,7 @@ export const updateUserBalance = async (data: any) => {
   return await request.put({ url: `/member/user/update-balance`, data })
 }
 
+// 根据用户名查询用户列表（模糊查询）
+export const getUserListByUsername = async (params) => {
+  return await request.get({ url: `/member/user/getUsersByUserName`, params })
+}

src/api/system/distri/consumption/index.ts

@@ -0,0 +1,55 @@
+import request from '@/config/axios'
+
+// 平台消费分充值记录 VO
+export interface ConsumptionTopUpLogVO {
+  // 充值编号
+  id: number
+  // 用户ID
+  userId: number
+  // 转账凭证附件
+  attachment: string
+  // 消费分
+  consumptionPoints: number
+  // 实际消费分
+  practicalConsumptionPoints: number
+  // 用户名
+  userName: string
+}
+
+// 平台消费分充值记录 API
+export const ConsumptionTopUpLogApi = {
+  // 查询平台消费分充值记录分页
+  getConsumptionTopUpLogPage: async (params: any) => {
+    return await request.get({ url: `/distri/consumption-top-up-log/page`, params })
+  },
+
+  // 查询平台消费分充值记录详情
+  getConsumptionTopUpLog: async (id: number) => {
+    return await request.get({ url: `/distri/consumption-top-up-log/get?id=` + id })
+  },
+
+  // 新增平台消费分充值记录
+  createConsumptionTopUpLog: async (data: ConsumptionTopUpLogVO) => {
+    return await request.post({ url: `/distri/consumption-top-up-log/create`, data })
+  },
+
+  // 修改平台消费分充值记录
+  updateConsumptionTopUpLog: async (data: ConsumptionTopUpLogVO) => {
+    return await request.put({ url: `/distri/consumption-top-up-log/update`, data })
+  },
+
+  // 删除平台消费分充值记录
+  deleteConsumptionTopUpLog: async (id: number) => {
+    return await request.delete({ url: `/distri/consumption-top-up-log/delete?id=` + id })
+  },
+
+  // 导出平台消费分充值记录 Excel
+  exportConsumptionTopUpLog: async (params) => {
+    return await request.download({ url: `/distri/consumption-top-up-log/export-excel`, params })
+  },
+
+  // 查询用户是否第一次充值消费分
+  isUserFirstRecharge: async (params: any) => {
+    return await request.get({ url: `/distri/consumption-top-up-log/isFirstConsumption`, params })
+  }
+}

src/locales/en.ts

@@ -298,7 +298,8 @@ export default {
     typeUpdate: 'Dict Type Eidt',
     dataCreate: 'Dict Data Create',
     dataUpdate: 'Dict Data Eidt',
-    fileUpload: 'File Upload'
+    fileUpload: 'File Upload',
+    ConsumptionCreate: 'Consumption Sub Recharge',
   },
   dialog: {
     dialog: 'Dialog',

src/locales/zh-CN.ts

@@ -298,7 +298,8 @@ export default {
 		typeCreate: '字典类型新增',
 		typeUpdate: '字典类型编辑',
 		dataCreate: '字典数据新增',
-		dataUpdate: '字典数据编辑'
+		dataUpdate: '字典数据编辑',
+		ConsumptionCreate: '消费分充值',
 	},
 	dialog: {
 		dialog: '弹窗',

src/utils/formatTime.ts

@@ -222,6 +222,7 @@ export const dateFormatter2 = (row, column, cellValue) => {
   return formatDate(cellValue, 'YYYY-MM-DD')
 }
 
+
 /**
  * 设置起始日期，时间为00:00:00
  * @param param 传入日期

src/utils/index.ts

@@ -308,6 +308,22 @@ export const pointsToPoint = (points: string | number): string => {
 export const pointsToYuan = (points: string | number): string => {
   return formatToFourFraction(points)
 }
+
+
+/**
+ * element plus 的时间 Formatter 实现，使用 YYYY-MM-DD 格式
+ *
+ * @param row 行数据
+ * @param column 字段
+ * @param cellValue 字段值
+ */
+// @ts-ignore
+export const pointsFormatter = (row, column, cellValue) => {
+  if (!cellValue) {
+    return
+  }
+  return formatToFourFraction(cellValue)
+}
 /**
  * 计算环比
  *

src/views/system/distri/consumption/ConsumptionTopUpLogForm.vue

@@ -0,0 +1,256 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="转账凭证附件" prop="attachment">
+        <!-- <el-input v-model="formData.attachment" placeholder="请输入转账凭证附件" /> -->
+        <UploadImg v-model="formData.attachment" :limit="1">
+          <!-- <template #tip>建议宽度 750px</template> -->
+        </UploadImg>
+      </el-form-item>
+      <el-form-item label="用户" prop="userId">
+        <el-select
+          v-model="formData.userId"
+          clearable
+          filterable
+          remote
+          reserve-keyword
+          placeholder="请输入用户名称"
+          :remote-method="debouncedRemoteMethod"
+          :loading="UserSearchLoading"
+          style="width: 240px"
+        >
+          <el-option
+            v-for="item in UserSearchOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+            <div class="flex items-center">
+              <el-avatar :size="28" :src="item.avatar" />
+              <span class="m-l-2">{{ item.username }}（{{ item.mobile }}）</span>
+            </div>
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="充值金额" prop="consumptionPoints">
+        <el-input v-model.number="formData.consumptionPoints"  placeholder="请输入充值金额" :disabled="!formData.userId" @input="(val) => formData.consumptionPoints = val.replace(/[^\d]/g, '')" :maxlength='9'>
+          <template #suffix> 
+            <template v-if="!state.hide">
+              <span class="text-red-500" v-if="state.isFirstConsumption">该用户第一次充值至少需要{{state.minimumConsumptionPoints}}</span>
+              <span class="text-red-500" v-else>单次充值不低于{{state.minimumConsumptionPoints}}</span>
+            </template>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="消费分" prop="">
+        {{consumptionPoints}}
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+        <el-input v-model="formData.smsCodeUseReqDTO.mobile" placeholder="请输入手机号" :disabled="true">
+          <template #append>
+            <span
+              v-if="mobileCodeTimer <= 0"
+              class="getMobileCode"
+              style="cursor: pointer"
+              @click="getSmsCode"
+            >
+              {{ t('login.getSmsCode') }}
+            </span>
+            <span v-if="mobileCodeTimer > 0" class="getMobileCode" style="cursor: pointer">
+              {{ mobileCodeTimer }}秒后可重新获取
+            </span>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="验证码" prop="smsCodeUseReqDTO.code">
+        <el-input v-model.number="formData.smsCodeUseReqDTO.code" placeholder="请输入验证码" max="4"/>
+      </el-form-item>
+
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确定</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ConsumptionTopUpLogApi, ConsumptionTopUpLogVO } from '@/api/system/distri/consumption'
+import * as UserApi from '@/api/member/user'
+import { getUserProfile } from '@/api/system/user/profile'
+import { debounce } from 'lodash-es'
+import { sendSmsCode } from '@/api/login'
+
+/** 平台消费分充值记录 表单 */
+defineOptions({ name: 'ConsumptionTopUpLogForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const UserSearchLoading = ref(false)
+const UserSearchList = ref([])
+const UserSearchOptions = ref([])
+const UserSearchValue = ref([])
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = reactive({
+  id: undefined,
+  userId: undefined,
+  attachment: undefined,
+  consumptionPoints: undefined,
+  practicalConsumptionPoints: undefined,
+  userName: undefined,
+  smsCodeUseReqDTO: {
+    mobile: '',
+    scene: '10',
+    code: '',
+  }
+})
+// 初始化或重置表单数据的函数
+const resetFormData = () => {
+  formData.id = undefined;
+  // formData.userId = undefined;
+  formData.attachment = undefined;
+  formData.consumptionPoints = undefined;
+  formData.practicalConsumptionPoints = undefined;
+  formData.userName = undefined;
+  formData.smsCodeUseReqDTO = {
+    mobile: '',
+    scene: '10', // 默认值
+    code: '',
+  }
+}
+const formRules = reactive({
+  consumptionPoints: [{ required: true, message: '消费分不能为空', trigger: 'blur' }],
+  userId: [{ required: true, message: '用户不能为空', trigger: 'blur' }],
+  attachment: [{ required: true, message: '转账凭证附件不能为空', trigger: 'blur' }],
+  "smsCodeUseReqDTO.code": [{ required: true, message: '验证码不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetFormData()
+  await getUserInfo()
+  
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  console.log(formData)
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    await ConsumptionTopUpLogApi.createConsumptionTopUpLog(formData)
+    message.success(t('common.createSuccess'))
+   
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+// 实际请求方法
+const remoteMethod = async (query: string) => {
+  if (query) {
+    UserSearchLoading.value = true
+    try {
+      const response = await UserApi.getUserListByUsername({ username: query })
+      // console.log(response)
+      UserSearchOptions.value = response.map((item: any) => ({
+        value: item.id,
+        label: item.username,
+        mobile: item.mobile,
+        avatar: item.avatar,
+        username: item.username
+      }))
+    } catch (error) {
+      console.error('Error fetching data:', error)
+    } finally {
+      UserSearchLoading.value = false
+    }
+  } else {
+  }
+}
+// 使用 lodash 防抖，延迟 200ms 触发请求
+const debouncedRemoteMethod = debounce(remoteMethod, 200)
+
+const state = reactive({
+  hide: true,
+  isFirstConsumption:false,
+  minimumConsumptionPoints:0,
+  consumptionMagnification:''
+})
+// 根据 value 查找 username
+const findUsernameByValue = (value) => {
+  const user = UserSearchOptions.value.find(item => item.value === value);
+  return user ? user.username : null;
+};
+async function isUserFirstRecharge(userId: number) {
+  state.hide = false
+  const data = await ConsumptionTopUpLogApi.isUserFirstRecharge({ userId })
+  state.isFirstConsumption = data.isFirstConsumption
+  state.minimumConsumptionPoints = data.minimumConsumptionPoints
+  state.consumptionMagnification = data.consumptionMagnification
+}
+// 监听 el-select 选项值的变化
+watch(
+  () => formData.userId,
+  (newValue) => {
+    isUserFirstRecharge(newValue);
+    formData.userName = findUsernameByValue(newValue);
+  }
+)
+const consumptionPoints = computed(() => {
+  if(!formData.consumptionPoints){
+    return 0
+  }
+  const point = formData.consumptionPoints * parseFloat(state.consumptionMagnification)
+  console.log(formData.consumptionPoints,state.consumptionMagnification,point)
+  return point.toFixed(2)
+})
+
+const smsVO = reactive({
+  smsCode: {
+    mobile: '',
+    scene: 10
+  }
+})
+const mobileCodeTimer = ref(0)
+const getSmsCode = async () => {
+  smsVO.smsCode.mobile = formData.smsCodeUseReqDTO.mobile
+  await sendSmsCode(smsVO.smsCode).then(async () => {
+    message.success(t('login.SmsSendMsg'))
+    // 设置倒计时
+    mobileCodeTimer.value = 60
+    let msgTimer = setInterval(() => {
+      mobileCodeTimer.value = mobileCodeTimer.value - 1
+      if (mobileCodeTimer.value <= 0) {
+        clearInterval(msgTimer)
+      }
+    }, 1000)
+  })
+}
+
+// 获取当前登录用户的手机号并且回填
+const getUserInfo = async () => {
+  const users = await getUserProfile()
+  formData.smsCodeUseReqDTO.mobile = users.mobile
+}
+</script>

src/views/system/distri/consumption/index.vue

@@ -0,0 +1,268 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <!-- <el-form-item label="用户ID" prop="userId">
+        <el-input
+          v-model="queryParams.userId"
+          placeholder="请输入用户ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="转账凭证附件" prop="attachment">
+        <el-input
+          v-model="queryParams.attachment"
+          placeholder="请输入转账凭证附件"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="消费分" prop="consumptionPoints">
+        <el-input
+          v-model="queryParams.consumptionPoints"
+          placeholder="请输入消费分"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="实际消费分" prop="practicalConsumptionPoints">
+        <el-input
+          v-model="queryParams.practicalConsumptionPoints"
+          placeholder="请输入实际消费分"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item> -->
+
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
+
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('ConsumptionCreate')"
+          v-hasPermi="['distri:consumption-top-up-log:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <!-- <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['distri:consumption-top-up-log:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="用户名" align="center" prop="userName" />
+      <el-table-column
+        label="充值金额"
+        align="center"
+        prop="consumptionPoints"
+        :formatter="pointsFormatter"
+      />
+      <el-table-column
+        label="消费分"
+        align="center"
+        prop="practicalConsumptionPoints"
+        :formatter="pointsFormatter"
+      />
+      <el-table-column label="转账凭证附件" align="center" prop="attachment">
+        <template #default="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.attachment"
+            @click="openViewer(scope.row.attachment)"
+          />
+          
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+
+      <!-- <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['distri:consumption-top-up-log:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['distri:consumption-top-up-log:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column> -->
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </ContentWrap>
+  <el-image-viewer
+      v-if="showViewer"
+      :url-list="urlList"
+      :z-index="9999"
+      :initial-index="currentIndex"
+      @close="closeViewer"
+    />
+  <!-- 表单弹窗：添加/修改 -->
+  <ConsumptionTopUpLogForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { pointsFormatter } from '@/utils'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ConsumptionTopUpLogApi, ConsumptionTopUpLogVO } from '@/api/system/distri/consumption'
+import ConsumptionTopUpLogForm from './ConsumptionTopUpLogForm.vue'
+
+/** 平台消费分充值记录 列表 */
+defineOptions({ name: 'ConsumptionTopUpLog' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ConsumptionTopUpLogVO[]>([]) // 列表的数据
+// 列表的总页数
+const total = ref(0)
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  userId: undefined,
+  attachment: undefined,
+  consumptionPoints: undefined,
+  practicalConsumptionPoints: undefined,
+  createTime: [],
+  userName: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ConsumptionTopUpLogApi.getConsumptionTopUpLogPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+// 控制图片预览器的状态
+const showViewer = ref(false);
+const urlList = ref<string[]>([]); // 存储所有图片URL的列表
+const currentIndex = ref(0); // 当前显示的图片索引
+
+// 打开图片预览
+const openViewer = (imageUrl: string) => {
+  console.log(imageUrl)
+  urlList.value = list.value.map(item => item.attachment); // 提取所有图片URL
+  currentIndex.value = urlList.value.indexOf(imageUrl); // 根据点击的图片找到对应的索引
+  showViewer.value = true; // 显示图片预览器
+};
+// 关闭图片预览
+const closeViewer = () => {
+  showViewer.value = false;
+};
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ConsumptionTopUpLogApi.deleteConsumptionTopUpLog(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ConsumptionTopUpLogApi.exportConsumptionTopUpLog(queryParams)
+    download.excel(data, '平台消费分充值记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

src/views/system/distri/orderpercentage/OrderPercentageForm.vue

@@ -48,7 +48,7 @@
           </el-input>
         </el-form-item>
       </template>
-      <template v-else>
+      <template v-else-if="formType == 'update2'">
         <el-form-item label="购物自得" prop="orderUserSocialStatus">
           <el-input v-model="formData.orderUserSocialStatus" placeholder="请输入购物自得" />
         </el-form-item>
@@ -71,6 +71,20 @@
           <el-input v-model="formData.signInSocialStatusMax" placeholder="请输入签到获得" />
         </el-form-item>
       </template>
+      <template v-else>
+        <el-form-item label="充值倍率" prop="consumptionMagnification">
+          <el-input v-model="formData.consumptionMagnification" placeholder="请输入充值倍率" >
+            <template #append>%</template>
+          </el-input> 
+        </el-form-item>
+        <el-form-item label="首次最低充值金额" prop="firstTopUpConsumption">
+          <el-input v-model="formData.firstTopUpConsumption" placeholder="请输入首次最低充值金额" />
+        </el-form-item>
+        <el-form-item label="后续单次最低充值金额" prop="followUpConsumption">
+          <el-input v-model="formData.followUpConsumption" placeholder="请输入后续单次最低充值金额" />
+        </el-form-item>
+       
+      </template>
     </el-form>
 
     <template #footer>
@@ -107,7 +121,10 @@ const formData = ref({
   collectSocialStatus: undefined,
   signInSocialStatus:undefined,
   signInSocialStatusMax:undefined,
-})
+  consumptionMagnification: undefined,
+  firstTopUpConsumption: undefined,
+  followUpConsumption: undefined,
+}) // 表单数据
 
 const totalPercentage = computed(() => {
   return Number(formData.value.grossProfitUserQuotaPerc) +
@@ -152,7 +169,8 @@ const percKeys = [
   "grossProfitAncestorQuotaPerc",
   "grossProfitBonusQuotaPerc",
   "grossProfitPlatformQuotaPerc",
-  "divideIntoPerc"
+  "divideIntoPerc",
+  "consumptionMagnification"
 ];
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调

src/views/system/distri/orderpercentage/index.vue

@@ -185,8 +185,6 @@
       </el-table-column>
       <el-table-column label="签到获得" align="center" prop="signInSocialStatus" />
       <el-table-column label="签到可获得的最大身价值" align="center" prop="signInSocialStatusMax" />
-
-
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
@@ -201,6 +199,40 @@
       </el-table-column>
     </el-table>
   </ContentWrap>
+  <h3 class="m-y-1">消费分</h3>
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="充值倍率" align="center" prop="consumptionMagnification" >
+        <template #default="scope">
+          <span>{{ scope.row.consumptionMagnification*100 }}%</span>
+        </template>
+
+      </el-table-column>
+      <el-table-column label="首次最低充值金额" align="center" prop="firstTopUpConsumption" >
+        <template #default="scope">
+          <span>{{ scope.row.firstTopUpConsumption  }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="后续单次最低充值金额" align="center" prop="followUpConsumption" >
+        <template #default="scope">
+          <span>{{ scope.row.followUpConsumption}}</span>
+        </template>
+      </el-table-column>
+    
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('consumption', scope.row.id)"
+            v-hasPermi="['distri:order-percentage:update']"
+          >
+            编辑
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
   <!-- 表单弹窗：添加/修改 -->
   <OrderPercentageForm ref="formRef" @success="getList" />
 </template>