ts-glitter 20.6.8 → 20.7.0

package/lowcode/glitter-base/route/shopping.js

@@ -383,6 +383,8 @@ export class ApiShop {
                     json.minPrice && par.push(`min_price=${json.minPrice}`);
                     json.status && par.push(`status=${json.status}`);
                     json.channel && par.push(`channel=${json.channel}`);
+                    json.general_tag && par.push(`general_tag=${json.general_tag}`);
+                    json.manager_tag && par.push(`manager_tag=${json.manager_tag}`);
                     json.whereStore && par.push(`whereStore=${json.whereStore}`);
                     if (json.schedule === true || json.schedule === false) {
                         par.push(`schedule=${json.schedule}`);
@@ -479,6 +481,12 @@ export class ApiShop {
             if (obj.payment_select && obj.payment_select.length > 0) {
                 list.push(`payment_select=${obj.payment_select.join(',')}`);
             }
+            if (obj.manager_tag && obj.manager_tag.length > 0) {
+                list.push(`manager_tag=${obj.manager_tag.join(',')}`);
+            }
+            if (obj.member_levels && obj.member_levels.length > 0) {
+                list.push(`member_levels=${obj.member_levels.join(',')}`);
+            }
         }
         return list;
     }
@@ -1059,38 +1067,6 @@ export class ApiShop {
             { title: '已退款', value: '-2' },
         ];
     }
-    static getProgressArray(shipment_number) {
-        return [
-            {
-                title: '出貨狀態',
-                value: '',
-            },
-            {
-                title: '已出貨',
-                value: 'shipping',
-            },
-            {
-                title: '待預購',
-                value: 'pre_order',
-            },
-            {
-                title: shipment_number ? `備貨中` : '未出貨',
-                value: 'wait',
-            },
-            {
-                title: '已取貨',
-                value: 'finish',
-            },
-            {
-                title: '已退貨',
-                value: 'returns',
-            },
-            {
-                title: '已到貨',
-                value: 'arrived',
-            },
-        ];
-    }
     static getVariants(json) {
         return BaseApi.create({
             url: getBaseUrl() +

package/lowcode/glitter-base/route/shopping.ts

@@ -410,6 +410,8 @@ export class ApiShop {
     minPrice?: string;
     status?: string;
     channel?: string;
+    general_tag?: string;
+    manager_tag?: string;
     whereStore?: string;
     schedule?: boolean;
     orderBy?: string;
@@ -438,6 +440,8 @@ export class ApiShop {
           json.minPrice && par.push(`min_price=${json.minPrice}`);
           json.status && par.push(`status=${json.status}`);
           json.channel && par.push(`channel=${json.channel}`);
+          json.general_tag && par.push(`general_tag=${json.general_tag}`);
+          json.manager_tag && par.push(`manager_tag=${json.manager_tag}`);
           json.whereStore && par.push(`whereStore=${json.whereStore}`);
           if (json.schedule === true || json.schedule === false) {
             par.push(`schedule=${json.schedule}`);
@@ -552,6 +556,12 @@ export class ApiShop {
       if (obj.payment_select && obj.payment_select.length > 0) {
         list.push(`payment_select=${obj.payment_select.join(',')}`);
       }
+      if (obj.manager_tag && obj.manager_tag.length > 0) {
+        list.push(`manager_tag=${obj.manager_tag.join(',')}`);
+      }
+      if (obj.member_levels && obj.member_levels.length > 0) {
+        list.push(`member_levels=${obj.member_levels.join(',')}`);
+      }
     }
 
     return list;
@@ -1359,39 +1369,6 @@ export class ApiShop {
     ];
   }
 
-  static getProgressArray(shipment_number: any) {
-    return [
-      {
-        title: '出貨狀態',
-        value: '',
-      },
-      {
-        title: '已出貨',
-        value: 'shipping',
-      },
-      {
-        title: '待預購',
-        value: 'pre_order',
-      },
-      {
-        title: shipment_number ? `備貨中` : '未出貨',
-        value: 'wait',
-      },
-      {
-        title: '已取貨',
-        value: 'finish',
-      },
-      {
-        title: '已退貨',
-        value: 'returns',
-      },
-      {
-        title: '已到貨',
-        value: 'arrived',
-      },
-    ];
-  }
-
   static getVariants(json: {
     limit: number;
     page: number;

package/lowcode/glitter-base/route/stock.ts

@@ -4,6 +4,7 @@ export type StockHistoryType = 'restocking' | 'transfer' | 'checking';
 
 export type ContentProduct = {
     variant_id: number;
+    product_id:number;
     cost: number;
     note: string;
     transfer_count: number; // 預計進貨數, 預計調入數

package/lowcode/glitter-base/route/user.js

@@ -220,11 +220,11 @@ export class ApiUser {
                 data: JSON.stringify({
                     phone_number: phone_number,
                 }),
-            }).then((res) => {
+            }).then(res => {
                 if (res.response.out_limit) {
                     const dialog = new ShareDialog(window.glitter);
                     dialog.errorMessage({
-                        text: '連續驗證失敗超過三次，請聯絡客服進行修改'
+                        text: '連續驗證失敗超過三次，請聯絡客服進行修改',
                     });
                 }
                 else {
@@ -318,6 +318,7 @@ export class ApiUser {
                     let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
                     json.search && par.push(`search=${json.search}`);
                     json.search_type && par.push(`searchType=${json.search_type}`);
+                    json.only_id && par.push(`only_id=${json.only_id}`);
                     json.id && par.push(`id=${json.id}`);
                     return par.join('&');
                 })()}`,
@@ -799,6 +800,14 @@ export class ApiUser {
         });
     }
 }
+ApiUser.normalMember = {
+    id: '',
+    duration: { type: 'noLimit', value: 0 },
+    tag_name: '一般會員',
+    condition: { type: 'total', value: 0 },
+    dead_line: { type: 'noLimit' },
+    create_date: '2024-01-01T00:00:00.000Z',
+};
 ApiUser.getting_config = [];
 function getConfig() {
     const saasConfig = window.parent.saasConfig;

package/lowcode/glitter-base/route/user.ts

@@ -220,7 +220,7 @@ export class ApiUser {
   }
 
   public static phoneVerify(phone_number: string) {
-    return new Promise<{result:boolean,response:any}>((resolve, reject) => {
+    return new Promise<{ result: boolean; response: any }>((resolve, reject) => {
       BaseApi.create({
         url: getBaseUrl() + `/api-public/v1/user/phone-verify`,
         type: 'POST',
@@ -231,17 +231,17 @@ export class ApiUser {
         data: JSON.stringify({
           phone_number: phone_number,
         }),
-      }).then((res)=>{
-        if(res.response.out_limit){
-         const dialog=new ShareDialog((window as any).glitter);
-         dialog.errorMessage({
-           text:'連續驗證失敗超過三次，請聯絡客服進行修改'
-         })
-        }else{
-          resolve(res)
+      }).then(res => {
+        if (res.response.out_limit) {
+          const dialog = new ShareDialog((window as any).glitter);
+          dialog.errorMessage({
+            text: '連續驗證失敗超過三次，請聯絡客服進行修改',
+          });
+        } else {
+          resolve(res);
         }
-      })
-    })
+      });
+    });
   }
 
   public static registerFCM(userID: string, deviceToken: string, app_name?: string) {
@@ -336,7 +336,7 @@ export class ApiUser {
     search?: string;
     id?: string;
     search_type?: string;
-    only_id?: string;
+    only_id?: boolean;
   }) {
     return BaseApi.create({
       url:
@@ -345,7 +345,9 @@ export class ApiUser {
           let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
           json.search && par.push(`search=${json.search}`);
           json.search_type && par.push(`searchType=${json.search_type}`);
+          json.only_id && par.push(`only_id=${json.only_id}`);
           json.id && par.push(`id=${json.id}`);
+          
           return par.join('&');
         })()}`,
       type: 'GET',
@@ -402,6 +404,15 @@ export class ApiUser {
     return list;
   }
 
+  public static normalMember = {
+    id: '',
+    duration: { type: 'noLimit', value: 0 },
+    tag_name: '一般會員',
+    condition: { type: 'total', value: 0 },
+    dead_line: { type: 'noLimit' },
+    create_date: '2024-01-01T00:00:00.000Z',
+  };
+
   public static async getUserListOrders(json: {
     limit: number;
     page: number;

package/lowcode/jspage/function-page/setting_editor.js

@@ -1508,6 +1508,15 @@ Setting_editor.menuItems = () => {
             groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
             moduleName: '訂閱裝置管理',
         },
+        {
+            icon: '',
+            page: 'auto_fcm_history',
+            group: '品牌APP',
+            title: 'APP推播紀錄',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
+            moduleName: '訂閱裝置管理',
+        },
         {
             icon: '',
             page: 'shop_list',

package/lowcode/jspage/function-page/setting_editor.ts

@@ -737,6 +737,15 @@ export class Setting_editor {
                 groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
                 moduleName: '訂閱裝置管理',
             },
+            {
+                icon: '',
+                page: 'auto_fcm_history',
+                group: '品牌APP',
+                title: 'APP推播紀錄',
+                appName: 'cms_system',
+                groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
+                moduleName: '訂閱裝置管理',
+            },
             // {
             //     icon: '',
             //     page: 'auto_fcm_template',