feat(order): 更新API配置和订单支付功能

- 修改开发和生产环境配置文件中的API和WebSocket地址 - 添加updateOrderPay API方法用于更新订单支付信息 - 在订单信息组件中添加日期选择器用于修改开始和过期时间 - 实现订单过期天数计算逻辑的改进 - 添加数据保存成功提示消息 - 更新头像文件存储地址配置
2026-01-10 00:31:15 +08:00
parent 5146d52e46
commit 72194db479
7 changed files with 2990 additions and 2914 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,6 @@
 VITE_APP_NAME=后台管理系统
 #VITE_API_URL=http://localhost:9090/api
-VITE_API_URL=http://yxw.wsdns.cn/api
+VITE_API_URL=https://yxw-api.websoft.top/api
 #VITE_SOCKET_URL=ws://localhost:9190
 #VITE_API_URL=http://127.0.0.1:9090/api
-#VITE_API_URL=https://server.gxwebsoft.com/api
-VITE_SOCKET_URL=wss://server.gxwebsoft.com
+VITE_SOCKET_URL=wss://server.websoft.top
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,3 @@
 VITE_APP_NAME=后台管理系统
-#VITE_API_URL=https://server.jimeigroup.cn/api
-#VITE_API_URL=https://server.gxwebsoft.com/api
-VITE_API_URL=http://yxw.wsdns.cn/api
-#VITE_API_URL=http://1.14.132.108:10032/api
-VITE_SOCKET_URL=wss://server.gxwebsoft.com
+VITE_API_URL=https://yxw-api.websoft.top/api
+VITE_SOCKET_URL=wss://server.websoft.top
--- a/src/api/order/index.ts
+++ b/src/api/order/index.ts
@@ -67,6 +67,14 @@ export async function addOrderPay(data: OrderPay) {
  return Promise.reject(new Error(res.data.message));
 }

+export async function updateOrderPay(data: OrderPay) {
+  const res = await request.put<ApiResult<unknown>>('/shop/order-pay', data);
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
 /**
 * 根据id查询订单
 */
--- a/src/views/oa/task/components/task-info.vue
+++ b/src/views/oa/task/components/task-info.vue
@@ -119,7 +119,7 @@
        <a-page-header
          :title="item.nickname"
          :sub-title="`${item.createTime}`"
-          :avatar="{ src: item.avatar ? item.avatar : 'https://file.gxwebsoft.com/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
+          :avatar="{ src: item.avatar ? item.avatar : 'https://file.wsdns.cn/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
        >
          <template #extra>
            <a-button key="2" href="#bottom" @click="onReply(item)">回复</a-button>
@@ -147,7 +147,7 @@
                <a-page-header
                  :title="item.nickname"
                  :sub-title="`${item.createTime}`"
-                  :avatar="{ src: item.avatar ? item.avatar : 'https://file.gxwebsoft.com/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
+                  :avatar="{ src: item.avatar ? item.avatar : 'https://file.wsdns.cn/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
                >
                  <template #extra>
                    <template v-for="(role,index) in loginUser.roles" :key="index">
--- a/src/views/user/task/components/task-info.vue
+++ b/src/views/user/task/components/task-info.vue
@@ -115,7 +115,7 @@
        <a-page-header
          :title="item.nickname"
          :sub-title="`${item.createTime}`"
-          :avatar="{ src: item.avatar ? item.avatar : 'https://file.gxwebsoft.com/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
+          :avatar="{ src: item.avatar ? item.avatar : 'https://file.wsdns.cn/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
        >
          <template #extra>
            <a-button key="2" href="#bottom" @click="onReply(item)">回复</a-button>
@@ -143,7 +143,7 @@
                <a-page-header
                  :title="item.nickname"
                  :sub-title="`${item.createTime}`"
-                  :avatar="{ src: item.avatar ? item.avatar : 'https://file.gxwebsoft.com/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
+                  :avatar="{ src: item.avatar ? item.avatar : 'https://file.wsdns.cn/20230217/c8a5c699b3174866a36dd6d378a09bb9.jpg' }"
                >
                  <template #extra>
                    <template v-for="(role,index) in loginUser.roles" :key="index">
--- a/src/views/yunxinwei/order/components/order-info.vue
+++ b/src/views/yunxinwei/order/components/order-info.vue
@@ -283,7 +283,7 @@
          ref="tableRef2"
          :pagination="true"
        >
-          <template #bodyCell="{ column, record }">
+          <template #bodyCell="{ column, record, index }">
            <template v-if="column.key === 'orderNo'">
              <span
                :class="[record.isAdminRenew === 1 ? 'ele-text-primary' : '']"
@@ -300,17 +300,33 @@
              </div>
            </template>
            <template v-if="column.key === 'expirationTime'">
-              <div>{{ record.startTime }}</div>
-              <div>{{ record.expirationTime }}</div>
+              <div>
+                <a-date-picker
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  @change="changeData(record, 'startTime')"
+                  class="ele-fluid"
+                  placeholder="请选择时间"
+                  v-model:value="record.startTime"
+                />
+              </div>
+              <div>
+                <a-date-picker
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  @change="changeData(record, 'expirationTime')"
+                  class="ele-fluid"
+                  placeholder="请选择时间"
+                  v-model:value="record.expirationTime"
+                />
+              </div>
            </template>
            <template v-if="column.key === 'expirationDay'">
              <span
                class="ele-text-danger"
-                v-if="expirationDay(record).includes('逾期')"
-                >{{ expirationDay(record) }}</span
+                v-if="expirationDay(record, index).includes('逾期')"
+                >{{ expirationDay(record, index) }}</span
              >
              <span class="ele-text-success" v-else>{{
-                expirationDay(record)
+                expirationDay(record, index)
              }}</span>
            </template>

@@ -444,13 +460,13 @@

 <script lang="ts" setup>
  import { ref, reactive, watch } from 'vue';
-  import { Form } from 'ant-design-vue';
+  import { Form, message } from 'ant-design-vue';
  import { assignObject, EleProTable, timeAgo } from 'ele-admin-pro';
  import { useThemeStore } from '@/store/modules/theme';
  import { formatNumber } from 'ele-admin-pro/es';
  import { storeToRefs } from 'pinia';
  import { copyText } from '@/utils/common';
-  import { Order } from '@/api/order/model';
+  import { Order, OrderPay } from '@/api/order/model';
  import OrderXufei from '../components/order-xufei.vue';
  import { listEquipmentOrderGoods } from '@/api/apps/equipment/order/goods';
  import { EquipmentOrderGoods } from '@/api/apps/equipment/order/goods/model';
@@ -460,7 +476,7 @@
    ColumnItem,
    DatasourceFunction
  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import { listOrder, listOrderPay } from '@/api/order';
+  import { listOrder, listOrderPay, updateOrderPay } from '@/api/order';
  import { CopyOutlined } from '@ant-design/icons-vue';
  import { EquipmentRecord } from '@/api/apps/equipment/record/model';
  import dayjs from 'dayjs';
@@ -795,7 +811,8 @@
  const getEquipmentRecordList = () => {
    EquipmentRecordApi.pageEquipmentRecord({
      orderId: order.orderId,
-      userId: order.userId
+      userId: order.userId,
+      limit: 100
    }).then((data) => {
      EquipmentRecordList.value = data.list;
    });
@@ -818,13 +835,18 @@
  //     });
  //   };

-  const expirationDay = (order) => {
+  const expirationDay = (order, index) => {
    if (dayjs(order.expirationTime).isBefore(dayjs())) {
-      const useDay = dayjs(order.expirationTime).diff(
-        dayjs(props?.data?.payTime),
-        'd'
-      );
-      return `使用${useDay}天`;
+      if (index === 0) {
+        const useDay = dayjs().diff(dayjs(order.expirationTime), 'd');
+        return `逾期${useDay}天`;
+      } else {
+        const useDay = dayjs(order.expirationTime).diff(
+          dayjs(props?.data?.payTime),
+          'd'
+        );
+        return `使用${useDay}天`;
+      }
    } else {
      const day = dayjs(order.expirationTime).diff(dayjs(order.payTime), 'd');
      if (day < 0) {
@@ -865,6 +887,11 @@
    }
  };

+  const changeData = async (data: OrderPay) => {
+    await updateOrderPay(data);
+    message.success('保存成功');
+  };
+
  /* 保存编辑 */
  const save = () => {};

@@ -884,6 +911,7 @@
        }
      } else {
        resetFields();
+        emit('done')
      }
    }
  );
--- a/yarn.lock
+++ b/yarn.lock