gxwebsoft/mp-10550
Template
1
1
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

master #1

Open
gxwebsoft wants to merge 108 commits from developer/template-10584:master into master
pull from: developer/template-10584:master
merge into: gxwebsoft:master
Conversation 0 Commits 108 Files Changed 154 +2 -2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a2e34466d5 - Show all commits

4
src/utils/payment.ts
View File

@@ -191,7 +191,7 @@ export class PaymentHandler {
// 后端字段可能叫 dealerId 或 storeId，这里都带上，服务端忽略未知字段即可。 // 后端字段可能叫 dealerId 或 storeId，这里都带上，服务端忽略未知字段即可。
// 这里做一次路径兼容（camel vs kebab），避免接口路径不一致导致整单失败。 // 这里做一次路径兼容（camel vs kebab），避免接口路径不一致导致整单失败。
const list = await this.listByCompatEndpoint<ShopStoreRider>( const list = await this.listByCompatEndpoint<ShopStoreRider>(
['/shop/shopStoreRider', '/shop/shop-store-rider'], ['/shop/shop-store-rider', '/shop/shop-store-rider'],
{ {
dealerId: storeId, dealerId: storeId,
storeId: storeId, storeId: storeId,
@@ -224,7 +224,7 @@ export class PaymentHandler {
private static async getWarehouses(): Promise<ShopWarehouse[]> { private static async getWarehouses(): Promise<ShopWarehouse[]> {
if (this.warehousesCache) return this.warehousesCache; if (this.warehousesCache) return this.warehousesCache;
const list = await this.listByCompatEndpoint<ShopWarehouse>( const list = await this.listByCompatEndpoint<ShopWarehouse>(
['/shop/shopWarehouse', '/shop/shop-warehouse'], ['/shop/shop-warehouse', '/shop/shop-warehouse'],
{} {}
); );
const usable = (list || []).filter(w => w?.isDelete !== 1 && (w.status === undefined || w.status === 1)); const usable = (list || []).filter(w => w?.isDelete !== 1 && (w.status === undefined || w.status === 1));