jmash-core-mp 0.1.73 → 0.1.74

package/lib/packages/pages/share/scan.mpx.d.ts

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

package/lib/utils/share.d.ts

@@ -1,6 +1,7 @@
 declare class ShareUtil {
     getCurrentPage(): string;
     getCurrentQuery(): string;
+    shareLoad(options: Record<string, string>): Promise<boolean>;
     shareUserPath(pagePath: string, query: string): string;
     shareUserQuery(query: string): string;
     shareUserLoad(options: Record<string, string>): Promise<boolean>;

package/lib/utils/share.js

@@ -29,6 +29,47 @@ class ShareUtil {
             .map((key) => `${key}=${options[key]}`)
             .join("&");
     }
+    // 分享加载
+    shareLoad(options) {
+        //推荐人
+        const userStore = useUserStore();
+        console.log("推荐人:", options.referee);
+        if (options.referee) {
+            userStore.setReferee(options.referee);
+        }
+        const shopStore = useShopStore();
+        //门店ID
+        if (options.branchId && options.organTenant) {
+            console.log("门店ID", options.branchId, options.organTenant);
+            return shopApi
+                .findShopBranchById(options.organTenant, options.branchId)
+                .then((res) => {
+                return shopStore.switchBranch(res.data).then(() => {
+                    return userStore.loginOnlyAC();
+                });
+            });
+        }
+        else if (options.shopId) {
+            //商城ID
+            console.log("商城ID", options.shopId);
+            return shopApi.findShopInfoById(options.shopId).then((res) => {
+                return shopStore.switchShop(res.data).then(() => {
+                    return userStore.loginOnlyAC();
+                });
+            });
+        }
+        else if (options.organTenant) {
+            //组织Token
+            const organStore = useOrganStore();
+            console.log("组织Token", options.organTenant);
+            return organStore.setOrganTenant(options.organTenant).then(() => {
+                //静默登录
+                return userStore.loginOnlyAC();
+            });
+        }
+        //静默登录
+        return userStore.loginOnlyAC();
+    }
     // 分享用户页给好友
     shareUserPath(pagePath, query) {
         const userStore = useUserStore();
@@ -45,6 +86,7 @@ class ShareUtil {
     shareUserLoad(options) {
         //推荐人
         const userStore = useUserStore();
+        console.log("推荐人:", options.referee);
         if (options.referee) {
             userStore.setReferee(options.referee);
         }

package/package.json

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

package/src/packages/index.mpx

@@ -11,6 +11,7 @@
         "./pages/cms/cms-location",
         "./pages/cms/cms-activity-list",
         "./pages/cms/cms-product-list",
+        "./pages/share/scan",
     ]
 }
 </script>

package/src/packages/pages/share/scan.mpx

@@ -0,0 +1,104 @@
+<template>
+    <!-- 分享公共页面 -->
+    <image wx:if="{{ resourceUrl }}" class="img" src="{{ resourceUrl + '/images/mall/img-1.png' }}" mode="widthFix" />
+</template>
+
+<script lang="ts">
+import mpx, { createPage, onLoad } from "@mpxjs/core";
+import { useUserStore } from "../../../store/user";
+import { share } from "../../../utils/share";
+
+createPage({
+    setup() {
+        const config = getApp().globalData.config;
+        // 资源路径
+        let resourceUrl = config.resourceUrl;
+        // 用户状态管理
+        const userStore = useUserStore();
+        /**
+         * 生命周期函数--监听页面加载
+         */
+        onLoad(async (options) => {
+            // 判断是否登录-静默登录
+            userStore.loginOnlyAC().then(() => {
+                // 处理页面参数
+                if (options.q) {
+                    const q = decodeURIComponent(options.q);
+                    if (q.includes("share?")) {
+                        const params = _URIParams(q);
+                        onRedirectTo(params, _ReturnParams(params));
+                    }
+                } else {
+                    onRedirectTo(options, _ReturnParams(options));
+                }
+            });
+        });
+
+        // 跳转页面
+        function onRedirectTo(options: any, query: string) {
+            console.log("action--->页面路径 ==> ", options.action, options.tab);
+            console.log("query--->页面参数 ==> ", query);
+            // mpx.reLaunch({ url: `${options.action}${query}` });
+            if (options.action && options.tab) {
+                share.shareLoad(options).then(() => {
+                    console.log("TabBar ", options.action);
+                    mpx.switchTab({ url: options.action });
+                });
+            } else {
+                mpx.navigateTo({ url: `${options.action}${query}` });
+            }
+        };
+
+        // 拼接参数
+        function _ReturnParams(options: any): string {
+            let query = Object.keys(options)
+                .filter((key) => key !== "action")
+                .filter((key) => key !== "tab")
+                .map((key) => key + "=" + options[key])
+                .join("&");
+            return query ? `?${query}` : "";
+        };
+
+        // 提取地址参数
+        function _URIParams(q: string): object {
+            const obj: { [key: string]: string } = {};
+            q.substring(q.indexOf("?") + 1, q.length)
+                .split("&")
+                .forEach((item) => {
+                    obj[item.split("=")[0]] = item.split("=")[1];
+                });
+            return obj;
+        };
+
+        return {
+            resourceUrl,
+            userStore,
+            onRedirectTo,
+            _ReturnParams,
+            _URIParams,
+        }
+    },
+})
+</script>
+
+<style lang="scss">
+page {
+    background-image: linear-gradient(to bottom, #ffdbdb, #fffbfb, #fff7f7);
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    align-items: center;
+    height: 100%;
+
+    .img {
+        width: 291px;
+    }
+}
+</style>
+
+<script type="application/json">
+{
+    "usingComponents": {},
+    "navigationStyle": "custom"
+}
+</script>

package/src/pages/tabbar/home.mpx

@@ -31,6 +31,21 @@ createPage({
           {
             key: 'cms-article-list', title: '文章列表', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/cms/cms-article-list'
           },
+          {
+            key: 'share-scan', title: '扫码Tab首页', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/share/scan?action=/pages/tabbar/home&tab=1'
+          },
+          {
+            key: 'share-scan', title: '扫码Tab组织', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/share/scan?action=/pages/tabbar/organ&tab=1&organTenant=a904d3a75b21499b8c62c95c6c2ea664@e97'
+          },
+          {
+            key: 'share-scan', title: '扫码Tab电商', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/share/scan?action=/pages/tabbar/mall&tab=1&shopId=f78f767c-f52d-4bf1-964d-5a11f4c81c75'
+          },
+          {
+            key: 'share-scan', title: '扫码Tab门店', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/share/scan?action=/pages/tabbar/mall&tab=1&organTenant=092c3844a7b2445888ed7e63338d98c7@e97&branchId=267703a8-f960-4125-9319-693ddfb1ea7a'
+          },
+          {
+            key: 'share-scan', title: '扫码首页', icon: '📝', iconBg: '#409eff', path: '/jmash/pages/share/scan?action=/pages/index'
+          },
         ]
       }
     ]

package/src/utils/share.ts

@@ -30,6 +30,45 @@ class ShareUtil {
       .map((key) => `${key}=${options[key]}`)
       .join("&");
   }
+  // 分享加载
+  shareLoad(options: Record<string, string>): Promise<boolean> {
+    //推荐人
+    const userStore = useUserStore();
+    console.log("推荐人:", options.referee);
+    if (options.referee) {
+      userStore.setReferee(options.referee);
+    }
+    const shopStore = useShopStore();
+    //门店ID
+    if (options.branchId && options.organTenant) {
+      console.log("门店ID", options.branchId, options.organTenant);
+      return shopApi
+        .findShopBranchById(options.organTenant, options.branchId)
+        .then((res) => {
+          return shopStore.switchBranch(res.data).then(() => {
+            return userStore.loginOnlyAC();
+          });
+        });
+    } else if (options.shopId) {
+      //商城ID
+      console.log("商城ID", options.shopId);
+      return shopApi.findShopInfoById(options.shopId).then((res) => {
+        return shopStore.switchShop(res.data).then(() => {
+          return userStore.loginOnlyAC();
+        });
+      });
+    } else if (options.organTenant) {
+      //组织Token
+      const organStore = useOrganStore();
+      console.log("组织Token", options.organTenant);
+      return organStore.setOrganTenant(options.organTenant).then(() => {
+        //静默登录
+        return userStore.loginOnlyAC();
+      });
+    }
+    //静默登录
+    return userStore.loginOnlyAC();
+  }
 
   // 分享用户页给好友
   shareUserPath(pagePath: string, query: string): string {

package/static/wx/project.config.json

@@ -2,7 +2,7 @@
   "setting": {
     "newFeature": true,
     "urlCheck": true,
-    "es6": false,
+    "es6": true,
     "postcss": true,
     "minified": false,
     "checkSiteMap": false,
@@ -10,7 +10,7 @@
     "compileWorklet": false,
     "uglifyFileName": false,
     "uploadWithSourceMap": true,
-    "enhance": false,
+    "enhance": true,
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,