feat(custom): \!

src/views/commodity/hot_list/index.vue

@@ -173,6 +173,17 @@
                 :min="0"
               />
             </n-form-item-gi>
+            <n-form-item-gi :span="20" label="商品折扣比例" path="discount">
+              <n-input-number
+                v-model:value="nowRow.discount"
+                clearable
+                placeholder="请输入折扣比例...."
+                :min="0"
+                :precision="0"
+              >
+                <template #suffix>%</template>
+              </n-input-number>
+            </n-form-item-gi>
             <n-form-item-gi :span="20" label="豆子过期时间" path="expiration">
               <n-input-number
                 v-model:value="nowRow.expiration"
@@ -323,6 +334,12 @@ const rules = {
     message: '请输入分佣比例',
     trigger: 'blur',
   },
+  discount: {
+    required: true,
+    type: 'number',
+    message: '请输入折扣比例',
+    trigger: 'blur',
+  },
 }
 
 const nowRow = ref({})
@@ -426,6 +443,34 @@ const columns = ref([
     key: 'number',
     align: 'center',
   },
+  {
+    title: '积分抵扣',
+    slot: 'exchange',
+    align: 'center',
+    render: (row) => {
+      return h(
+        'span',
+        {},
+        {
+          default: () => (row.exchange ? `${(row.exchange / 100).toFixed(2)}元` : '无'),
+        }
+      )
+    },
+  },
+  {
+    title: '折扣比例(%)',
+    slot: 'discount',
+    align: 'center',
+    render: (row) => {
+      return h(
+        'span',
+        {},
+        {
+          default: () => `${row.discount}%`,
+        }
+      )
+    },
+  },
   {
     title: '商品库存',
     key: 'stock',

src/views/finance/api.js

@@ -7,4 +7,6 @@ export default {
 
   getYdata: (data) => request.post('/store/amount/withdraw', data),
   ydataEdit: (data) => request.post('/store/amount/withdraw/edit', data),
+  // 溯源统计
+  suyuanData: (data) => request.post('/pulse/count', data),
 }

src/views/finance/index.vue

@@ -205,7 +205,7 @@ const columns = ref([
     align: 'center',
   },
   {
-    title: '上次留存积分',
+    title: '上次留存余额',
     key: 'balance',
     align: 'center',
   },

src/views/finance/suyuan.vue

@@ -0,0 +1,64 @@
+<template>
+  <CommonPage show-footer :title="$route.title">
+    <n-data-table
+      class="mt-10"
+      :loading="loading"
+      :columns="columns"
+      :data="data"
+      :pagination="pagination"
+      :bordered="false"
+      remote
+    />
+  </CommonPage>
+</template>
+
+<script setup>
+import api from './api'
+
+// const queryData = ref({})
+
+const loading = ref(false)
+
+const columns = ref([])
+
+const data = ref([])
+
+const pagination = ref({
+  page: 1,
+  pageSize: 10,
+  itemCount: 0,
+  onChange: (page) => {
+    pagination.value.page = page
+    getList()
+  },
+})
+
+onMounted(() => {
+  getList()
+})
+
+const getList = async () => {
+  loading.value = true
+  // const query_data = {
+  //   Status: queryData.value.status || '',
+  //   Phone: queryData.value.word || '',
+  //   StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
+  //   EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
+  // }
+  const res = await api.suyuanData({
+    pageNum: pagination.value.page,
+    pageSize: pagination.value.pageSize,
+    // ...query_data,
+  })
+
+  data.value = res.data.data || []
+  pagination.value.itemCount = res.data.total
+  // cardData.value.total = res.data.all
+  // cardData.value.service = res.data.audit_number
+  // cardData.value.commission = res.data.audit_commission
+  // cardData.value.count = res.data.success_amount
+  loading.value = false
+}
+</script>
+
+<style lang="scss" scoped></style>

src/views/order/index/index.vue

@@ -45,11 +45,11 @@
             <n-radio-button
               v-for="song in [
                 {
-                  label: '微信',
+                  label: '微信支付',
                   value: 1,
                 },
                 {
-                  label: '积分',
+                  label: '平台积分',
                   value: 2,
                 },
                 {
@@ -105,7 +105,7 @@
       :data="data"
       :pagination="pagination"
       :bordered="false"
-      :scroll-x="1800"
+      :scroll-x="2000"
       remote
     />
   </CommonPage>
@@ -245,10 +245,16 @@ const columns = ref([
     key: 'count',
   },
   {
-    title: '订单总价',
+    title: '订单金额',
     align: 'center',
     slot: 'number',
-    render: (row) => h('span', row.pay_type === 1 ? `${row.price}元` : `${row.exchange}积分`),
+    render: (row) => h('span', `${row.price}元`),
+  },
+  {
+    title: '积分抵扣',
+    align: 'center',
+    slot: 'discount_price',
+    render: (row) => h('span', `${row.discount_price}`),
   },
   {
     title: '支付方式',