jmash-core-mp 0.1.10 → 0.1.11

package/lib/api/auth/index.d.ts

@@ -1,4 +1,4 @@
-import { ResponseData } from "../../types/core";
+import { ResponseData } from "../../api/types";
 import type { LoginReq, LoginRes, RolesPerms, WebLoginReq, TokenModel, PhoneRegisterReq, PhoneReplaceReq, UpdateUserReq, UserInfoReq, UserInfo } from "./types";
 declare class AuthApi {
     mpLogin(data: LoginReq): Promise<ResponseData<LoginRes>>;

package/lib/api/cms/index.d.ts

@@ -1,12 +1,20 @@
-import { CmsSiteList, CmsChannelReq, CmsChannelList, CmsInfoReq, CmsInfoPage, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel } from "./types";
-import { ResponseData } from "../../types/core";
+import { CmsSiteKey, CmsSiteList, CmsSiteModel, CmsChannelReq, CmsChannelList, CmsInfoReq, CmsInfoPage, CmsInfoKey, CmsInfoModel, CmsInfoContentReq, CmsInfoContentList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoFileReq, CmsInfoFileList, FrontInteractKey, FrontInteractModel, FrontLikeKey, FrontLikeModel, FrontLikeCreateReq, FrontBrowseRecordCreateReq, FrontBrowseRecordModel, CmsChannelKey, CmsChannelModel } from "./types";
+import { ResponseData } from "../../api/types";
 declare class CmsApiImpl {
     findCmsSiteList(tenant: string): Promise<ResponseData<CmsSiteList>>;
+    findCmsSite(data: CmsSiteKey): Promise<ResponseData<CmsSiteModel>>;
     findCmsChannelList(data: CmsChannelReq): Promise<ResponseData<CmsChannelList>>;
+    findCmsChannelById(data: CmsChannelKey): Promise<ResponseData<CmsChannelModel>>;
+    findCmsContentInfo(data: CmsContentInfoReq): Promise<ResponseData<CmsContentInfoModel>>;
+    findCmsSingleInfo(data: CmsChannelKey): Promise<ResponseData<CmsInfoModel>>;
     findCmsInfoPage(data: CmsInfoReq): Promise<ResponseData<CmsInfoPage>>;
-    findCmsInfo(data: CmsInfoKey): Promise<ResponseData<CmsInfoModel>>;
+    findCmsInfoById(data: CmsInfoKey): Promise<ResponseData<CmsInfoModel>>;
     findCmsInfoContent(data: CmsInfoContentReq): Promise<ResponseData<CmsInfoContentList>>;
-    findCmsContentInfo(data: CmsContentInfoReq): Promise<ResponseData<CmsContentInfoModel>>;
+    cmsInfoFile(data: CmsInfoFileReq): Promise<ResponseData<CmsInfoFileList>>;
+    cmsInfoInteractId(data: FrontInteractKey): Promise<ResponseData<FrontInteractModel>>;
+    isLike(data: FrontLikeKey): Promise<ResponseData<string>>;
+    frontLike(data: FrontLikeCreateReq): Promise<ResponseData<FrontLikeModel>>;
+    createfrontBrowseRecord(data: FrontBrowseRecordCreateReq): Promise<ResponseData<FrontBrowseRecordModel>>;
 }
 declare const cmsApi: CmsApiImpl;
 export { cmsApi };

package/lib/api/cms/index.js

@@ -10,6 +10,17 @@ class CmsApiImpl {
             method: "GET",
         });
     }
+    // 查询网站站点
+    findCmsSite(data) {
+        const tenant = data.tenant ? data.tenant : data.organTenant;
+        return mpx.xfetch.fetch({
+            url: "/v1/front/cms/cms_site/id/" + tenant + "/" + data.siteId,
+            method: "GET",
+            header: {
+                "Grpc-Metadata-Tenant": tenant,
+            },
+        });
+    }
     // 查询列表信息网站栏目  (没有传递别名就是将所有的栏目信息查询出来,给了栏目别名查询传递别名的栏目信息)
     findCmsChannelList(data) {
         grpc.clearEmpty(data);
@@ -23,6 +34,39 @@ class CmsApiImpl {
             data,
         });
     }
+    // 查询网站栏目
+    findCmsChannelById(data) {
+        return mpx.xfetch.fetch({
+            url: `/v1/cms/cms_channel/id/${data.tenant}/${data.channelId}`,
+            method: "GET",
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
+        });
+    }
+    // 根据栏目别名查询翻页信息信息主表-单页栏目内容
+    findCmsContentInfo(data) {
+        data.tenant = data.tenant || config.tenant;
+        grpc.clearEmpty(data);
+        return mpx.xfetch.fetch({
+            url: `/v1/front/cms/cms_info/alias/${data.tenant}/${data.siteId}/${data.channelAlias}`,
+            method: "GET",
+        });
+    }
+    // 根据栏目id查询单页模型的信息主表-单页栏目内容
+    findCmsSingleInfo(data) {
+        grpc.clearEmpty(data);
+        return mpx.xfetch.fetch({
+            url: "/v1/front/cms/cms_info/single_page_info/" +
+                data.tenant +
+                "/" +
+                data.channelId,
+            method: "GET",
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
+        });
+    }
     // 查询翻页信息信息列表
     findCmsInfoPage(data) {
         if (data) {
@@ -36,8 +80,8 @@ class CmsApiImpl {
             data,
         });
     }
-    // 查询信息主表
-    findCmsInfo(data) {
+    // 查询翻页信息信息列表
+    findCmsInfoById(data) {
         grpc.clearEmpty(data);
         return mpx.xfetch.fetch({
             url: "/v1/front/cms/cms_info/id/" + data.tenant + "/" + data.infoId,
@@ -51,15 +95,65 @@ class CmsApiImpl {
             url: "/v1/front/cms/cms_info_content/list/" + data.tenant,
             method: "GET",
             data,
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
         });
     }
-    // 根据栏目别名查询翻页信息信息主表-单页栏目内容
-    findCmsContentInfo(data) {
-        data.tenant = data.tenant || config.tenant;
-        grpc.clearEmpty(data);
+    // 查询列表信息信息附件表
+    cmsInfoFile(data) {
         return mpx.xfetch.fetch({
-            url: `/v1/front/cms/cms_info/alias/${data.tenant}/${data.siteId}/${data.channelAlias}`,
+            url: "/v1/front/cms/cms_info_file/list/" + data.tenant,
+            method: "GET",
+            data,
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
+        });
+    }
+    // 查询信息互动表
+    cmsInfoInteractId(data) {
+        return mpx.xfetch.fetch({
+            url: "/v1/front/front/front_info_interact/id/" +
+                data.tenant +
+                "/" +
+                data.interactId,
+            method: "GET",
+        });
+    }
+    // 查看是否点赞
+    isLike(data) {
+        return mpx.xfetch.fetch({
+            url: "/v1/front/front/front_like/is_like/" +
+                data.tenant +
+                "/" +
+                data.relationId,
             method: "GET",
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
+        });
+    }
+    // 点赞/取消点赞
+    frontLike(data) {
+        return mpx.xfetch.fetch({
+            url: "/v1/front/front/front_like",
+            method: "POST",
+            data,
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
+        });
+    }
+    // 浏览
+    createfrontBrowseRecord(data) {
+        return mpx.xfetch.fetch({
+            url: "/v1/front/front/front_browse_record",
+            method: "POST",
+            data,
+            header: {
+                "Grpc-Metadata-Tenant": data.tenant,
+            },
         });
     }
 }

package/lib/api/cms/types.d.ts

@@ -1,9 +1,31 @@
 export interface CmsSiteList {
     results: Array<CmsSiteModel>;
 }
+export interface CmsSiteKey {
+    tenant?: string;
+    organTenant?: string;
+    siteId: string;
+}
 export interface CmsSiteModel {
     siteId?: string;
     siteName?: string;
+    siteLogo?: string;
+    keyword?: string;
+    description?: string;
+    contactPerson?: string;
+    contactPhone?: string;
+    dueTime?: string;
+    status?: string;
+    siteType?: string;
+    isComment?: boolean;
+    isCommentReview?: boolean;
+    mobileProductPath?: string;
+    pcProductPath?: string;
+    channelList?: Array<CmsChannelModel>;
+    address?: string;
+    geoLongitude: number;
+    geoLatitude: number;
+    email: string;
 }
 export interface CmsChannelReq {
     tenant?: string;
@@ -34,6 +56,22 @@ export interface CmsChannelModel {
     url: string;
     type?: string;
 }
+export interface CmsChannelKey {
+    tenant?: string;
+    channelId: string;
+}
+export interface CmsInfoPage {
+    results: Array<CmsInfoModel>;
+    curPage?: number;
+    pageSize?: number;
+    totalSize?: number;
+    subTotalDto?: CmsInfoModelTotal;
+    totalDto?: CmsInfoModelTotal;
+    pageCount?: number;
+}
+export interface CmsInfoModelTotal {
+    totalSize?: number;
+}
 export interface CmsInfoReq {
     tenant?: string;
     curPage?: number;
@@ -48,17 +86,9 @@ export interface CmsInfoReq {
     hasIsImg?: boolean;
     isImg?: boolean;
 }
-export interface CmsInfoPage {
-    results?: Array<CmsInfoModel>;
-    curPage?: number;
-    pageSize?: number;
-    totalSize?: number;
-    subTotalDto?: CmsInfoModelTotal;
-    totalDto?: CmsInfoModelTotal;
-    pageCount?: number;
-}
-export interface CmsInfoModelTotal {
-    totalSize?: number;
+export interface CmsInfoKey {
+    tenant?: string;
+    infoId?: string;
 }
 export interface CmsInfoModel {
     infoId?: string;
@@ -75,9 +105,34 @@ export interface CmsInfoModel {
     sourceName?: string;
     siteId: string;
 }
+export interface CmsInfoContentReq {
+    tenant?: string;
+    infoId?: string;
+}
+export interface CmsInfoContentModel {
+    imagePath?: Array<string>;
+    videoPath?: Array<string>;
+    contentId?: string;
+    infoId?: string;
+    infoContent?: string;
+    infoType?: string;
+    orderBy?: number;
+}
+export interface CmsInfoContentList {
+    results: Array<CmsInfoContentModel>;
+}
+export interface CmsContentInfoReq {
+    tenant?: string;
+    siteId?: string;
+    channelAlias: string;
+}
+export interface CmsContentInfoModel {
+    cmsInfo?: CmsInfoModel;
+    infoContentResults?: Array<CmsInfoContentModel>;
+}
 export interface CmsInfoKey {
     tenant?: string;
-    infoId: string;
+    infoId?: string;
 }
 export interface CmsInfoContentReq {
     tenant?: string;
@@ -98,12 +153,55 @@ export interface CmsInfoContentModel {
         path: string;
     }[];
 }
-export interface CmsContentInfoReq {
+export interface CmsInfoFileReq {
     tenant?: string;
-    siteId?: string;
-    channelAlias: string;
+    infoId?: string;
 }
-export interface CmsContentInfoModel {
-    cmsInfo?: CmsInfoModel;
-    infoContentResults?: Array<CmsInfoContentModel>;
+export interface CmsInfoFileModel {
+    fileId?: string;
+    infoId?: string;
+    fileName?: string;
+    fileType?: string;
+    filePath?: string;
+    fileSize?: string;
+    fileExt?: string;
+    fileWidth?: number;
+    fileHeight?: number;
+    videoTime?: number;
+    intro?: string;
+}
+export interface CmsInfoFileList {
+    results: Array<CmsInfoFileModel>;
+}
+export interface FrontInteractKey {
+    tenant?: string;
+    interactId?: string;
+}
+export interface FrontInteractModel {
+    interactId?: string;
+    likeCount: number;
+    browseCount: number;
+}
+export interface FrontLikeKey {
+    tenant: string;
+    relationId: string;
+}
+export interface FrontLikeCreateReq {
+    tenant: string;
+    requestId?: string;
+    likeType?: string;
+    relationId?: string;
+    action?: boolean;
+}
+export interface FrontLikeModel {
+    likeId?: string;
+}
+export interface FrontBrowseRecordCreateReq {
+    tenant?: string;
+    requestId?: string;
+    type?: string;
+    relationId?: string;
+}
+export interface FrontBrowseRecordModel {
+    browseId?: string;
 }

package/lib/api/dict/index.d.ts

@@ -1,4 +1,4 @@
-import { ResponseData } from "../../types/core";
+import { ResponseData } from "../../api/types";
 import { EnumRes, DictEntryReq, DictEntryList } from "./types";
 declare class DictApiImpl {
     /**

package/lib/api/files/index.d.ts

@@ -1,5 +1,5 @@
 import { FileInfo, FileBase64Req, FileDownInfo, FileWebReq } from "./types";
-import { ResponseData } from "../../types/core";
+import { ResponseData } from "../../api/types";
 declare class FileApi {
     baseApiUrl(): string;
     uploadUrl(): string;

package/lib/api/region/index.d.ts

@@ -1,5 +1,5 @@
 import { DictRegionList, DictRegionReq } from "./types";
-import { ResponseData } from "../../types/core";
+import { ResponseData } from "../../api/types";
 declare class RegionApiImpl {
     findList(query?: DictRegionReq): Promise<ResponseData<DictRegionList>>;
 }

package/lib/api/storage/index.d.ts

@@ -0,0 +1,10 @@
+import { ResponseData } from "../../api/types";
+import { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel } from "./types";
+declare class StorageApiImpl {
+    findMyOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
+    findStorageBrowserOrganList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
+    findStorageOrganInfoList(data: StorageOrganInfoReq): Promise<ResponseData<StorageOrganInfoList>>;
+    updateStorageOrganBrowser(data: StorageOrganBrowserUpdateReq): Promise<ResponseData<StorageOrganBrowserModel>>;
+}
+declare const storageApi: StorageApiImpl;
+export { storageApi };

package/lib/api/storage/index.js

@@ -0,0 +1,40 @@
+import mpx from "@mpxjs/core";
+import { grpc } from "../../utils/grpc";
+import { config } from "../../utils/config";
+class StorageApiImpl {
+    // 查询我的组织列表
+    findMyOrganList(data) {
+        grpc.clearEmpty(data);
+        return mpx.xfetch.fetch({
+            url: `/v1/storage/storage_organ/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
+            method: "GET",
+        });
+    }
+    // 查询列表信息店铺用户浏览信息
+    findStorageBrowserOrganList(data) {
+        return mpx.xfetch.fetch({
+            url: `/v1/front/storage/storage_organ_browser/my_list/${config.tenant}?&serviceType[]=${data.serviceType}`,
+            method: "GET",
+        });
+    }
+    // 查询列表信息店铺用户浏览信息
+    findStorageOrganInfoList(data) {
+        return mpx.xfetch.fetch({
+            url: `/v1/storage/storage_organ_info/list/${config.tenant}?&serviceType[]=${data.serviceType}`,
+            method: "GET",
+            data: data,
+        });
+    }
+    // 修改组织浏览信息
+    updateStorageOrganBrowser(data) {
+        data.tenant = config.tenant;
+        grpc.clearEmpty(data);
+        return mpx.xfetch.fetch({
+            url: "/v1/front/storage/storage_organ_browser/browse",
+            method: "PATCH",
+            data: data,
+        });
+    }
+}
+const storageApi = new StorageApiImpl();
+export { storageApi };

package/lib/api/storage/types.d.ts

@@ -0,0 +1,28 @@
+export interface StorageOrganInfoReq {
+    serviceType: string;
+    likeOrganName?: string;
+}
+export interface StorageOrganInfoList {
+    results: StorageOrganInfoModel[];
+}
+export interface StorageOrganInfoModel {
+    organName?: string;
+    logoUrl?: string;
+    createTime?: string;
+    remark?: string;
+    organTenant?: string;
+}
+export interface ShopBrowserUserList {
+    results: ShopBrowserUserModel[];
+}
+export interface ShopBrowserUserModel {
+    shopName?: string;
+    picUrl?: string;
+}
+export interface StorageOrganBrowserUpdateReq {
+    tenant?: string;
+    requestId: string;
+    storageId: string;
+}
+export interface StorageOrganBrowserModel {
+}

package/lib/api/storage/types.js

@@ -0,0 +1 @@
+export {};

package/lib/api/types.d.ts

@@ -1,3 +1,24 @@
+/// <reference types="miniprogram-api-typings" />
+/// <reference types="miniprogram-api-typings" />
+export type ResponseData<T extends string | WechatMiniprogram.IAnyObject | ArrayBuffer = string | WechatMiniprogram.IAnyObject | ArrayBuffer> = WechatMiniprogram.RequestSuccessCallbackResult<T>;
+export interface AppConfig {
+    tenant: string;
+    name: string;
+    baseUrl: string;
+    resourceUrl: string;
+    appId: string;
+    componentAppid: string;
+    wechatComponentAppId: string;
+    wechatAppId: string;
+    wechatBiz: string;
+    siteId: string;
+    dev: boolean;
+    testNewUser: boolean;
+}
+export interface ValidateData {
+    validate: boolean;
+    message: string;
+}
 export interface EventBase {
     changedTouches?: any;
     currentTarget: EventTarget;
@@ -12,3 +33,9 @@ export interface EventTarget {
     offsetLeft?: number;
     offsetTop?: number;
 }
+export interface CanvasResponse {
+    width?: number;
+    height?: number;
+    nodeCanvasType?: string;
+    node: any;
+}

package/lib/components/cms/jmash-cms-acticle-list.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/components/cms/jmash-cms-article.mpx.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/index.d.ts

@@ -1,6 +1,11 @@
-export type { AppConfig, ResponseData, ValidateData, EventBase, EventTarget, CanvasResponse, } from "./types/core";
+export type { AppConfig, ResponseData, ValidateData, EventBase, EventTarget, CanvasResponse, } from "./api/types";
+export type { LoginReq, LoginRes, RolesPerms, WebLoginReq, TokenModel, PhoneRegisterReq, PhoneReplaceReq, UpdateUserReq, UserInfoReq, UserInfo, } from "./api/auth/types";
+export type { CmsSiteList, CmsChannelReq, CmsChannelList, CmsContentInfoReq, CmsContentInfoModel, CmsInfoModel, CmsInfoContentModel, } from "./api/cms/types";
 export type { Entry, DictEntryModel } from "./api/dict/types";
 export { EntryDict, EnumDict } from "./api/dicts";
+export type { FileInfo, FileBase64Req, FileDownInfo, FileWebReq, } from "./api/files/types";
+export type { DictRegionList, DictRegionReq, DictRegionModel, } from "./api/region/types";
+export type { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel, } from "./api/storage/types";
 export { mpxFetch } from "./utils/request";
 export { config } from "./utils/config";
 export { grpc } from "./utils/grpc";
@@ -8,8 +13,9 @@ export { db } from "./utils/db";
 export { useUserStore } from "./store/user";
 export { authApi } from "./api/auth";
 export { cmsApi } from "./api/cms";
-export type { CmsInfoModel, CmsInfoContentModel } from "./api/cms/types";
 export { dictApi } from "./api/dict";
 export { fileApi } from "./api/files";
+export { regionApi } from "./api/region";
+export { storageApi } from "./api/storage";
 export { net } from "./utils/net";
 export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";

package/lib/index.js

@@ -8,5 +8,7 @@ export { authApi } from "./api/auth";
 export { cmsApi } from "./api/cms";
 export { dictApi } from "./api/dict";
 export { fileApi } from "./api/files";
+export { regionApi } from "./api/region";
+export { storageApi } from "./api/storage";
 export { net } from "./utils/net";
 export { getHeight, formatDateTime, validateRules, validateRequired, } from "./utils/common";

package/lib/store/user.d.ts

@@ -1,5 +1,5 @@
 import { LoginRes, RolesPerms, TokenModel, UserInfo } from "../api/auth/types";
-import { ResponseData } from "../types/core";
+import { ResponseData } from "../api/types";
 interface UserState {
     userInfo: UserInfo;
     roleCodes: string[];

package/lib/utils/config.d.ts

@@ -1,3 +1,3 @@
-import { AppConfig } from "../types/core";
+import { AppConfig } from "../api/types";
 declare const config: AppConfig;
 export { config };

package/lib/utils/config.js

@@ -1,7 +1,7 @@
 const config = {
     name: "Jmash Core MPX",
     dev: true,
-    testNewUser: true,
+    testNewUser: false,
     tenant: "xyvcard",
     baseUrl: "https://mm.sooyie.cn",
     resourceUrl: "https://mm.sooyie.cn/v1/file/path/wxapp",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/api/auth/index.ts

@@ -1,4 +1,4 @@
-import { ResponseData } from "../../types/core";
+import { ResponseData } from "../../api/types";
 import { OpensType } from "./types";
 import type {
   LoginReq,