feat(shop): 添加订单状态字段和展示功能

- 在资金模型中新增订单状态字段(orderStatus)及注释说明
- 实现订单状态标签展示组件，支持8种不同状态的可视化显示
- 添加订单状态表格列，设置固定宽度便于查看
- 更新开发环境配置中的API地址设置

.env.development

@@ -1,5 +1,5 @@
 VITE_APP_NAME=后台管理(开发环境)
-#VITE_API_URL=http://127.0.0.1:9200/api
+VITE_API_URL=http://127.0.0.1:9200/api
 #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 

.env.glt

@@ -0,0 +1,11 @@
+# 租户配置(必填)
+VITE_TENANT_ID=10584
+
+# API 配置(必填)
+VITE_API_URL=https://glt-api.websoft.top/api
+
+# WebSoftAdmin 授权码 (必填-请联系官方获取)
+VITE_LICENSE_CODE=dk9mcwJyetRWQlxWRiojIzJCLi8mcQ5Wa4ojI0NWZqJWd6ICZpJCL0kjNvdjbE5WQ2AjIvl2cyVmdiwiIiETMuEjI6IibQf0NW==
+
+# 服务端 API 配置(可选)
+VITE_SERVER_API_URL=https://glt-server.websoft.top/api

.env.ws

@@ -0,0 +1,11 @@
+# 租户配置(必填)
+VITE_TENANT_ID=10584
+
+# API 配置(必填)
+VITE_API_URL=https://mp-api.websoft.top/api
+
+# WebSoftAdmin 授权码 (必填-请联系官方获取)
+VITE_LICENSE_CODE=dk9mcwJyetRWQlxWRiojIzJCLi8mcQ5Wa4ojI0NWZqJWd6ICZpJCL0kjNvdjbE5WQ2AjIvl2cyVmdiwiIiETMuEjI6IibQf0NW==
+
+# 服务端 API 配置(可选)
+VITE_SERVER_API_URL=https://server.websoft.top/api

src/api/glt/gltTicketTemplate/model/index.ts

@@ -28,6 +28,8 @@ export interface GltTicketTemplate {
   releasePeriods?: number;
   // 首期释放时机：0=支付成功当刻；1=下个月同日
   firstReleaseMode?: number;
+  // 步长
+  step?: number;
   // 用户ID
   userId?: number;
   // 排序(数字越小越靠前)

src/api/shop/shopDealerCapital/model/index.ts

@@ -14,6 +14,8 @@ export interface ShopDealerCapital {
   orderId?: number;
   // 订单编号
   orderNo?: string;
+  // 订单状态 (1已完成 4退款申请中 6已退款)
+  orderStatus?: number;
   // 资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入)
   flowType?: number;
   // 金额

src/views/glt/gltTicketOrder/components/gltTicketOrderEdit.vue

@@ -19,40 +19,44 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
-      <a-form-item label="用户水票ID" name="userTicketId">
+<!--      <a-form-item label="用户水票ID" name="userTicketId">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入用户水票ID"
+<!--          placeholder="请输入用户水票ID"-->
-          v-model:value="form.userTicketId"
+<!--          v-model:value="form.userTicketId"-->
-        />
+<!--        />-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item label="门店ID" name="storeId">
+<!--      <a-form-item label="门店ID" name="storeId">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入门店ID"
+<!--          placeholder="请输入门店ID"-->
-          v-model:value="form.storeId"
+<!--          v-model:value="form.storeId"-->
-        />
+<!--        />-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item label="配送员" name="riderId">
+<!--      <a-form-item label="配送员" name="riderId">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入配送员"
+<!--          placeholder="请输入配送员"-->
-          v-model:value="form.riderId"
+<!--          v-model:value="form.riderId"-->
-        />
+<!--        />-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item label="仓库ID" name="warehouseId">
+<!--      <a-form-item label="仓库ID" name="warehouseId">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入仓库ID"
+<!--          placeholder="请输入仓库ID"-->
-          v-model:value="form.warehouseId"
+<!--          v-model:value="form.warehouseId"-->
-        />
+<!--        />-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item label="关联收货地址" name="addressId">
+<!--      <a-form-item label="关联收货地址" name="addressId">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入关联收货地址"
+<!--          placeholder="请输入关联收货地址"-->
-          v-model:value="form.addressId"
+<!--          v-model:value="form.addressId"-->
-        />
+<!--        />-->
+<!--      </a-form-item>-->
+
+      <a-form-item label="订单编号" name="orderNo">
+        {{ form.orderNo }}
       </a-form-item>
       <a-form-item label="收货地址" name="address">
         <a-input
@@ -62,54 +66,48 @@
         />
       </a-form-item>
       <a-form-item label="买家留言" name="buyerRemarks">
-        <a-input
+        <a-textarea
-          allow-clear
+          :rows="4"
+          :maxlength="200"
           placeholder="请输入买家留言"
           v-model:value="form.buyerRemarks"
         />
       </a-form-item>
-      <a-form-item label="用于统计" name="price">
+<!--      <a-form-item label="用于统计" name="price">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入用于统计"
+<!--          placeholder="请输入用于统计"-->
-          v-model:value="form.price"
+<!--          v-model:value="form.price"-->
-        />
+<!--        />-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item label="购买数量" name="totalNum">
+<!--      <a-form-item label="购买数量" name="totalNum">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入购买数量"
+<!--          placeholder="请输入购买数量"-->
-          v-model:value="form.totalNum"
+<!--          v-model:value="form.totalNum"-->
-        />
+<!--        />-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item label="用户ID" name="userId">
+<!--      <a-form-item label="用户ID" name="userId">-->
-        <a-input
+<!--        <a-input-->
-          allow-clear
+<!--          allow-clear-->
-          placeholder="请输入用户ID"
+<!--          placeholder="请输入用户ID"-->
-          v-model:value="form.userId"
+<!--          v-model:value="form.userId"-->
-        />
+<!--        />-->
-      </a-form-item>
+<!--      </a-form-item>-->
-      <a-form-item label="订单编号" name="orderNo">
+<!--      <a-form-item label="备注" name="comments">-->
-        <a-input
+<!--        <a-textarea-->
-          allow-clear
+<!--          :rows="4"-->
-          placeholder="请输入订单编号"
+<!--          :maxlength="200"-->
-          v-model:value="form.orderNo"
+<!--          placeholder="请输入描述"-->
-        />
+<!--          v-model:value="form.comments"-->
-      </a-form-item>
+<!--        />-->
-      <a-form-item label="备注" name="comments">
+<!--      </a-form-item>-->
-        <a-textarea
+<!--      <a-form-item label="状态" name="status">-->
-          :rows="4"
+<!--        <a-radio-group v-model:value="form.status">-->
-          :maxlength="200"
+<!--          <a-radio :value="0">显示</a-radio>-->
-          placeholder="请输入描述"
+<!--          <a-radio :value="1">隐藏</a-radio>-->
-          v-model:value="form.comments"
+<!--        </a-radio-group>-->
-        />
+<!--      </a-form-item>-->
-      </a-form-item>
-      <a-form-item label="状态" name="status">
-        <a-radio-group v-model:value="form.status">
-          <a-radio :value="0">显示</a-radio>
-          <a-radio :value="1">隐藏</a-radio>
-        </a-radio-group>
-      </a-form-item>
     </a-form>
   </ele-modal>
 </template>

src/views/glt/gltTicketOrder/index.vue

@@ -117,8 +117,8 @@
             </template>
             <template v-if="column.key === 'action'">
               <a-space>
-<!--                <a @click="openEdit(record)">修改</a>-->
+                <a @click="openEdit(record)">修改</a>
-<!--                <a-divider type="vertical" />-->
+                <a-divider type="vertical" />
                 <a-popconfirm
                   v-if="record.orderStatus == 6"
                   title="确定要删除此记录吗？"

src/views/glt/gltTicketTemplate/components/gltTicketTemplateEdit.vue

@@ -187,6 +187,18 @@
           </a-form-item>
         </a-col>
 
+        <a-col :span="12">
+          <a-form-item label="步长" name="step">
+            <a-input-number
+              :min="1"
+              :max="99"
+              class="ele-fluid"
+              placeholder="步长"
+              v-model:value="form.step"
+            />
+          </a-form-item>
+        </a-col>
+
         <a-col :span="12">
           <a-form-item label="排序" name="sortNumber">
             <a-input-number
@@ -268,6 +280,7 @@
 	    monthlyReleaseQty: 10,
 	    releasePeriods: 0,
 	    firstReleaseMode: 0,
+      step: 1,
     userId: undefined,
     sortNumber: 100,
     comments: '',

src/views/shop/shopDealerCapital/index.vue

@@ -26,9 +26,30 @@
           <template v-if="column.key === 'userId'">
             <div>{{ record.nickName }}({{ record.userId }})</div>
           </template>
-          <template v-if="column.key === 'status'">
+          <template v-if="column.key === 'orderStatus'">
-            <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+            <a-space :size="6" wrap>
-            <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
+              <!-- 订单状态 -->
+              <a-tag v-if="record.orderStatus === 0">未完成</a-tag>
+              <a-tag v-if="record.orderStatus === 1" color="green"
+              >已完成</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 2">已关闭</a-tag>
+              <a-tag v-if="record.orderStatus === 3" color="red"
+              >关闭中</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 4" color="red"
+              >退款申请中</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 5" color="red"
+              >退款被拒绝</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 6" color="orange"
+              >已退款</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 7" color="pink"
+              >客户端申请退款</a-tag
+              >
+            </a-space>
           </template>
           <template v-if="column.key === 'action'">
             <a-space>
@@ -198,6 +219,13 @@
       key: 'createTime',
       align: 'center',
       sorter: true
+    },
+    {
+      title: '订单状态',
+      dataIndex: 'orderStatus',
+      key: 'orderStatus',
+      align: 'center',
+      width: 90
     }
     // {
     //   title: '操作',

src/views/shop/shopDealerOrder/index.vue

@@ -103,6 +103,32 @@
             </div>
           </template>
 
+          <template v-if="column.key === 'orderStatus'">
+            <a-space :size="6" wrap>
+              <!-- 订单状态 -->
+              <a-tag v-if="record.orderStatus === 0">未完成</a-tag>
+              <a-tag v-if="record.orderStatus === 1" color="green"
+              >已完成</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 2">已关闭</a-tag>
+              <a-tag v-if="record.orderStatus === 3" color="red"
+              >关闭中</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 4" color="red"
+              >退款申请中</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 5" color="red"
+              >退款被拒绝</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 6" color="orange"
+              >已退款</a-tag
+              >
+              <a-tag v-if="record.orderStatus === 7" color="pink"
+              >客户端申请退款</a-tag
+              >
+            </a-space>
+          </template>
+
           <template v-if="column.key === 'createTime'">
             <div class="flex flex-col">
               <a-tooltip title="创建时间">
@@ -282,7 +308,13 @@
       key: 'createTime',
       align: 'center',
       width: 180
-    }
+    },
+    {
+      title: '订单状态',
+      dataIndex: 'orderStatus',
+      key: 'orderStatus',
+      align: 'center'
+    },
     // {
     //   title: '操作',
     //   key: 'action',

src/views/shop/shopOrder/index.vue

@@ -120,6 +120,11 @@
                 <a-tag v-if="record.orderStatus === 7" color="pink"
                   >客户端申请退款</a-tag
                 >
+                <!-- 结算状态 -->
+<!--                <a-tag v-if="record.isSettled === 0">未结算</a-tag>-->
+<!--                <a-tag v-if="record.isSettled === 1" color="green"-->
+<!--                  >已结算</a-tag-->
+<!--                >-->
               </a-space>
             </div>
           </template>
@@ -156,6 +161,22 @@
             <a-tag v-if="record.status === 0" color="green">显示</a-tag>
             <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
           </template>
+          <template v-if="column.key === 'createTime'">
+            <div class="flex flex-col">
+              <a-tooltip title="创建时间">
+                <span class="text-gray-400">{{ record.createTime }}</span>
+              </a-tooltip>
+              <a-tooltip title="支付时间">
+                <span class="text-blue-400">{{ record.payTime }}</span>
+              </a-tooltip>
+              <a-tooltip title="发货时间">
+                <span class="text-green-400">{{ record.deliveryTime }}</span>
+              </a-tooltip>
+              <a-tooltip title="退款时间">
+                <span class="text-orange-400">{{ record.refundTime }}</span>
+              </a-tooltip>
+            </div>
+          </template>
           <template v-if="column.key === 'action'">
             <a-space>
               <!-- 查看详情 - 所有状态都可以查看 -->
@@ -176,6 +197,7 @@
                 v-if="
                 record.payStatus &&
                 record.deliveryStatus === 10 &&
+                record.orderStatus === 0 &&
                 !isCancelledStatus(record.orderStatus) &&
                 !isRefundStatus(record.orderStatus)
               "
@@ -349,6 +371,7 @@
       title: '订单编号',
       dataIndex: 'orderNo',
       key: 'orderNo',
+      width: 200,
       align: 'center'
     },
     {
@@ -388,19 +411,11 @@
     //   key: 'comments',
     //   align: 'center',
     // },
-    // {
-    //   title: '支付时间',
-    //   dataIndex: 'payTime',
-    //   key: 'payTime',
-    //   align: 'center',
-    //   width: 180,
-    //   sorter: true,
-    //   ellipsis: true
-    // },
     {
-      title: '下单时间',
+      title: '创建时间',
       dataIndex: 'createTime',
       key: 'createTime',
+      width: 180,
       align: 'center',
       sorter: true,
       customRender: ({ text }) => toDateString(text)