修复：图形验证码大写不识别

修复：按商户ID查询订单、商品、分类等

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

@@ -78,6 +78,7 @@ export interface Merchant {
 export interface MerchantParam extends PageParam {
   merchantId?: number;
   merchantIds?: string;
+  phone?: string;
   merchantCodes?: string;
   keywords?: string;
 }

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

@@ -115,5 +115,11 @@ export interface Order {
  */
 export interface OrderParam extends PageParam {
   orderId?: number;
+  type?: number;
+  payStatus?: string;
+  week?: number;
+  payType?: string;
+  isInvoice?: string;
+  orderStatus?: string;
   keywords?: string;
 }

src/api/user/index.ts

@@ -1,12 +1,16 @@
 import request from '@/utils/request';
 import type { ApiResult } from '@/api';
 import type { User } from './model';
+import { SERVER_API_URL } from '@/config/setting';
 
 /**
  * 修改当前登录用户信息
  */
 export async function authUser(data: User) {
-  const res = await request.put<ApiResult<unknown>>('/auth/user', data);
+  const res = await request.put<ApiResult<unknown>>(
+    SERVER_API_URL + '/auth/user',
+    data
+  );
   if (res.data.code === 0) {
     return res.data.message;
   }

src/api/user/model/index.ts

@@ -34,6 +34,10 @@ export interface User {
   sexName?: string;
   // 机构名称
   organizationName?: string;
+  // 商户ID
+  merchantId?: number;
+  // 商户名称
+  merchantName?: string;
   // 创建时间
   createTime?: string;
 }