jmash-core-mp 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "private": false,
   "dependencies": {
     "@mpxjs/api-proxy": "^2.10.19",

package/src/app.mpx

@@ -14,6 +14,10 @@ createApp({
     config: config
   }
 })
+// 只有运行时才能调用
+const accountInfo = mpx.getAccountInfoSync();
+// 微信
+config.appId = accountInfo.miniProgram.appId;
 </script>
 
 <style></style>

package/src/components/auth-user/jmash-user.mpx

@@ -28,6 +28,7 @@
 import mpx, { createComponent, ref, onShow } from '@mpxjs/core'
 import { db } from '../../utils/db';
 import { authApi } from '../../api/auth/index';
+import { auth } from "../../utils/auth.ts";
 
 createComponent({
   properties: {
@@ -35,6 +36,14 @@ createComponent({
       type: String,
       value: ''
     },
+    backurl: {
+      type: String,
+      value: '/pages/home'
+    },
+    tabbar: {
+      type: String,
+      value: 'false'
+    }
   },
   setup(props, context) {
     let config = getApp().globalData.config;
@@ -42,21 +51,28 @@ createComponent({
     let baseUrl = ref(config.baseUrl);
     let token = ref('');
     let userInfo = ref({});
-
-    onShow(() => {
+    let refreshFunc = () => {
       token.value = db.getToken();
       authApi.userInfo().then((resp) => {
         userInfo.value = resp.data;
       })
-    })
+    };
+    onShow(refreshFunc);
     console.log(resourceUrl);
-    return { resourceUrl, baseUrl, token, userInfo };
+    return { resourceUrl, baseUrl, token, userInfo, refreshFunc };
   },
   methods: {
     handleLogin() {
-      mpx.navigateTo({
-        url: '/jmash/pages/auth/login'
-      })
+      //检查登录并跳转登录
+      auth.loginOnlyAC().then(() => {
+        //登录成功，加载业务
+        console.log("静默登录成功");
+        this.refreshFunc();
+      }).catch(() => {
+        mpx.navigateTo({
+          url: '/jmash/pages/auth/login' + "?backurl=" + encodeURIComponent(this.properties.backurl) + "&tabbar=" + this.properties.tabbar
+        })
+      });
     },
     handleUpdateUser() {
       mpx.navigateTo({

package/src/packages/pages/auth/login.mpx

@@ -1,5 +1,5 @@
 <template>
-  <jmash-login tabbar="{{ tabbar }}" backurl="{{ backurl }}">
+  <jmash-login linkType="{{ linkType }}" backurl="{{ backurl }}">
     <image mode="widthFix" src="{{ resourceUrl }}/images/login_bg.png" class="index_bj" slot="before">
       <image mode="widthFix" src="{{ resourceUrl }}/images/logo.png" class="login_logo"></image>
     </image>
@@ -11,13 +11,23 @@
 import { createPage, ref } from '@mpxjs/core'
 
 createPage({
+  properties: {
+    tabbar: {
+      type: String,
+      value: 'false'
+    },
+    backurl: {
+      type: String,
+      value: '/pages/home'
+    }
+  },
   setup(props) {
     let resourceUrl = ref(getApp().globalData.config.resourceUrl);
     let appName = ref(getApp().globalData.config.name);
-    let tabbar = ref(props.tabbar === 'true');
-    let backurl = ref(props.backurl || '');
-    console.log(appName);
-    return { resourceUrl, appName, tabbar, backurl };
+    let linkType = ref(props.tabbar === 'true' ? "switchTab" : "redirectTo");
+    let backurl = ref(props.backurl);
+    console.log(appName, linkType, backurl);
+    return { resourceUrl, appName, linkType, backurl };
   }
 })
 </script>

package/src/pages/home.mpx

@@ -6,17 +6,20 @@
 
 <script>
 import { createPage } from '@mpxjs/core'
-import { db } from '../utils/db'
 import mpx from '@mpxjs/core'
+import { auth } from "../utils/auth.ts";
 
 createPage({
   setup() {
-    // 无法退回,检查登录状态
-    if (!db.getToken()) {
+    //检查登录并跳转登录
+    auth.loginOnlyAC().then(() => {
+      //登录成功，加载业务
+      console.log("静默登录成功");
+    }).catch(() => {
       mpx.navigateTo({
         url: '/jmash/pages/auth/login'
       })
-    }
+    });
     return {}
   }
 })

package/src/pages/tabbar/my.mpx

@@ -1,6 +1,6 @@
 <template>
   <view class="basic-component-page">
-    <jmash-user></jmash-user>
+    <jmash-user tabbar="true" backurl="/pages/tabbar/my"></jmash-user>
     <text>{{ title }}</text>
   </view>
 </template>

package/src/utils/config.ts

@@ -3,7 +3,7 @@ import { AppConfig } from "../types/core";
 const config: AppConfig = {
   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",
@@ -17,7 +17,7 @@ const config: AppConfig = {
 
 if (__mpx_mode__ === "wx") {
   // 微信
-  config.appId = "wx2a8b3d689b8959eb";
+  config.appId = "wx2a8b3d689b8959eb1";
 } else if (__mpx_mode__ === "ali") {
   // 支付宝
   config.appId = "2016102700684542";