Merge branch 'dev' into test

2024-09-03 22:22:13 +08:00
parent c97f3c655f 0fe04dd0c3
commit 6756f80cd6
13 changed files with 4867 additions and 1659 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,62 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="Remove" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="100" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>
--- a/.idea/git_toolbox_blame.xml
+++ b/.idea/git_toolbox_blame.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxBlameSettings">
+    <option name="version" value="2" />
+  </component>
+</project>
--- a/.idea/jdt-mer.iml
+++ b/.idea/jdt-mer.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/jdt-mer.iml" filepath="$PROJECT_DIR$/.idea/jdt-mer.iml" />
+    </modules>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/layout/components/header/components/MessageNotification.vue
+++ b/src/layout/components/header/components/MessageNotification.vue
@@ -68,7 +68,7 @@ const tabs = [
 const count = ref(tabs.map((item) => item.messages).flat().length)

 watch(activeTab, (v) => {
-  if (count === 0) return
+  if (count.value === 0) return
  const tabIndex = tabs.findIndex((item) => item.name === v)
  count.value -= tabs[tabIndex].messages.length
  if (count.value < 0) count.value = 0
--- a/src/views/goods/add/index.vue
+++ b/src/views/goods/add/index.vue
@@ -32,12 +32,12 @@
          <!--              ]"-->
          <!--            />-->
          <!--          </n-form-item-gi>-->
-          <n-form-item-gi :span="12" label="现金价格:" path="number">
+          <n-form-item-gi :span="12" label="商品价格:" path="number">
            <n-input-number v-model:value="model.number" :min="0" placeholder="输入现金价格" />
          </n-form-item-gi>
-          <n-form-item-gi :span="12" label="积分价格:" path="exchange">
-            <n-input-number v-model:value="model.exchange" :min="0" placeholder="输入积分价格" />
-          </n-form-item-gi>
+          <!--          <n-form-item-gi :span="12" label="积分价格:" path="exchange">-->
+          <!--            <n-input-number v-model:value="model.exchange" :min="0" placeholder="输入积分价格" />-->
+          <!--          </n-form-item-gi>-->
          <n-form-item-gi :span="12" label="商品库存:" path="stock">
            <n-input-number v-model:value="model.stock" :min="0" placeholder="输入商品库存" />
          </n-form-item-gi>
@@ -118,12 +118,12 @@ const rules = {
    message: '请输入商品价格',
    trigger: 'blur',
  },
-  exchange: {
-    required: true,
-    type: 'number',
-    message: '请输入市场价格',
-    trigger: 'blur',
-  },
+  // exchange: {
+  //   required: true,
+  //   type: 'number',
+  //   message: '请输入市场价格',
+  //   trigger: 'blur',
+  // },
  stock: {
    required: true,
    type: 'number',
@@ -150,7 +150,7 @@ const getClassList = async () => {
  classList.value = res.data.data.filter((item) => item.status !== 2)

  if (row && type.value === 'edit') {
-    console.log(row)
+    // console.log(row)
    type.value = 'edit'
    model.value = {
      ...row,
--- a/src/views/order/index1/index.vue
+++ b/src/views/order/index1/index.vue
@@ -236,16 +236,22 @@ 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: '支付方式',
    align: 'center',
    slot: 'pay_type',
-    render: (row) => h('span', row.pay_type === 1 ? '微信' : '积分'),
+    render: (row) => h('span', row.pay_type === 1 ? '微信' : '平台抵扣'),
  },
  {
    title: '订单状态',
--- a/src/views/settlement/route.js
+++ b/src/views/settlement/route.js
@@ -26,7 +26,7 @@ export default {
      path: 'tx_list',
      component: () => import('./tx_list/index.vue'),
      meta: {
-        title: '积分提现',
+        title: '余额提现',
        icon: 'mdi:account-multiple',
        order: 10,
      },
--- a/src/views/settlement/tx_list/index.vue
+++ b/src/views/settlement/tx_list/index.vue
@@ -1,24 +1,24 @@
 <template>
  <!-- <div> -->
  <CommonPage show-footer :title="$route.title">
-    <div w-1200 flex items-center justify-between>
-      <n-card class="w-300">
-        <n-statistic label="可提现积分">
-          <n-number-animation
-            ref="numberAnimationInstRef"
-            :precision="2"
-            :from="0"
-            :to="userInfo.integral"
-          />
-        </n-statistic>
-      </n-card>
-      <div w-100 text-center text-25>/</div>
-      <n-card class="w-300">
-        <n-statistic label="兑换比例">
-          <n-number-animation ref="numberAnimationInstRef" :precision="2" :from="0" :to="100" />
-        </n-statistic>
-      </n-card>
-      <div w-100 text-center text-25>=</div>
+    <div w-1200 flex items-center>
+      <!--      <n-card class="w-300">-->
+      <!--        <n-statistic label="可提现积分">-->
+      <!--          <n-number-animation-->
+      <!--            ref="numberAnimationInstRef"-->
+      <!--            :precision="2"-->
+      <!--            :from="0"-->
+      <!--            :to="userInfo.integral"-->
+      <!--          />-->
+      <!--        </n-statistic>-->
+      <!--      </n-card>-->
+      <!--      <div w-100 text-center text-25>/</div>-->
+      <!--      <n-card class="w-300">-->
+      <!--        <n-statistic label="兑换比例">-->
+      <!--          <n-number-animation ref="numberAnimationInstRef" :precision="2" :from="0" :to="100" />-->
+      <!--        </n-statistic>-->
+      <!--      </n-card>-->
+      <!--      <div w-100 text-center text-25>=</div>-->
      <n-card class="w-300">
        <n-statistic label="CNY">
          <n-number-animation
@@ -30,7 +30,12 @@
        </n-statistic>
      </n-card>
      <div ml-10 w-300 flex flex-col items-center justify-center>
-        <n-input-number v-model:value="formData.integral" clearable placeholder="请输入提现积分" />
+        <n-input-number
+          v-model:value="formData.integral"
+          clearable
+          w-full
+          placeholder="请输入提现余额"
+        />
        <n-button mt-10 w-full type="primary" @click="ok">立即提现</n-button>
      </div>
    </div>
@@ -66,7 +71,7 @@ const columns = ref([
    align: 'center',
  },
  {
-    title: '上次留存积分',
+    title: '上次留存余额',
    key: 'balance',
    align: 'center',
  },