jmash-core-mp 0.1.16 → 0.1.18

package/lib/api/types.d.ts

@@ -14,6 +14,7 @@ export interface AppConfig {
     siteId: string;
     dev: boolean;
     testNewUser: boolean;
+    [key: string]: any;
 }
 export interface ValidateData {
     validate: boolean;

package/lib/index.d.ts

@@ -7,7 +7,7 @@ export type { FileInfo, FileBase64Req, FileDownInfo, FileWebReq, } from "./api/f
 export type { DictRegionList, DictRegionReq, DictRegionModel, } from "./api/region/types";
 export type { StorageOrganInfoReq, StorageOrganInfoList, StorageOrganInfoModel, ShopBrowserUserList, ShopBrowserUserModel, StorageOrganBrowserUpdateReq, StorageOrganBrowserModel, } from "./api/storage/types";
 export { mpxFetch } from "./utils/request";
-export { config } from "./utils/config";
+export { config, initConfig, setConfig } from "./utils/config";
 export { grpc } from "./utils/grpc";
 export { db } from "./utils/db";
 export { useUserStore } from "./store/user";

package/lib/index.js

@@ -1,6 +1,6 @@
 export { EntryDict, EnumDict } from "./api/dicts";
 export { mpxFetch } from "./utils/request";
-export { config } from "./utils/config";
+export { config, initConfig, setConfig } from "./utils/config";
 export { grpc } from "./utils/grpc";
 export { db } from "./utils/db";
 export { useUserStore } from "./store/user";

package/lib/utils/config.d.ts

@@ -1,3 +1,5 @@
 import { AppConfig } from "../api/types";
 declare const config: AppConfig;
-export { config };
+declare function setConfig(cfg: Partial<AppConfig>): void;
+declare function initConfig(config: Partial<AppConfig>, mode: string): Partial<AppConfig>;
+export { config, setConfig, initConfig };

package/lib/utils/config.js

@@ -1,4 +1,5 @@
-const config = {
+import mpx from "@mpxjs/core";
+const defaultConfig = {
     name: "Jmash Core MPX",
     dev: true,
     testNewUser: false,
@@ -12,19 +13,17 @@ const config = {
     wechatBiz: "",
     siteId: "c0a28f0f-023a-420b-b4e8-0ce138ac8269",
 };
-if (__mpx_mode__ === "wx") {
-    // 微信
-    config.appId = "wx2a8b3d689b8959eb1";
+const config = { ...defaultConfig };
+function setConfig(cfg) {
+    Object.assign(config, cfg);
 }
-else if (__mpx_mode__ === "ali") {
-    // 支付宝
-    config.appId = "2016102700684542";
+function initConfig(config, mode) {
+    if (__mpx_mode__ !== "web") {
+        // 只有运行时才能调用
+        const accountInfo = mpx.getAccountInfoSync();
+        // 微信
+        config.appId = accountInfo.miniProgram.appId;
+    }
+    return config;
 }
-else if (__mpx_mode__ === "web") {
-    // Web
-    config.appId = "web";
-}
-else {
-    // 执行其他环境相关逻辑
-}
-export { config };
+export { config, setConfig, initConfig };

package/package.json

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

package/src/api/types.ts

@@ -30,6 +30,8 @@ export interface AppConfig {
   dev: boolean;
   //是否测试新用户.
   testNewUser: boolean;
+  // 其他配置项
+  [key: string]: any;
 }
 
 // 校验

package/src/app.mpx

@@ -7,20 +7,18 @@ mpx.use(apiProxy, { usePromise: true })
 import { createPinia } from '@mpxjs/pinia';
 createPinia();
 //网络请求和App配置
-import { mpxFetch, config } from "./index";
+import { mpxFetch, config, initConfig } from "./index";
 mpx.use(mpxFetch);
 
 createApp({
+  onLaunch(options) {
+    initConfig(config, "dev");
+    console.log("config", config);
+  },
   globalData: {
     config: config
   }
 })
-if (__mpx_mode__ !== "web") {
-  // 只有运行时才能调用
-  const accountInfo = mpx.getAccountInfoSync();
-  // 微信
-  config.appId = accountInfo.miniProgram.appId;
-}
 </script>
 
 <style></style>

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

@@ -6,7 +6,7 @@
       <view class="main-profile" wx:if="{{ isUserAvatar }}">
         <view class="profile-left">头像</view>
         <view class="profile-right">
-          <button class="avatar-wrapper" open-type="chooseAvatar" bind:chooseavatar@wx="onChooseAvatar"
+          <button class="avatar-wrapper" plain open-type="chooseAvatar" bind:chooseavatar@wx="onChooseAvatar"
             onChooseAvatar@ali="onChooseAvatar">
             <image class="avatar-img" src="{{ resourceUrl + '/components/gray_head2x.png' }}" mode="aspectFill"
               wx:if="{{ !userInfo.avatar }}" />
@@ -259,8 +259,12 @@ $bg-card: #ffffff;
           margin: 0;
           padding: 0;
           background: transparent;
-          border: none;
           line-height: 1;
+          border: 0;
+
+          &::after {
+            display: none;
+          }
 
           .avatar-img {
             width: 88rpx;

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

@@ -1,17 +1,16 @@
 <template>
   <view class="auth-user-box">
     <block wx:if="{{ isLogin }}">
-      <view class="auth-user-l">
+      <view class="auth-user-l" bind:tap="handleUpdateUser">
         <!-- 头像 -->
         <view class="avatar-wrapper">
           <image src="{{ baseUrl+'/v1/file/image/clip/200/200/' + userInfo.avatar }}" class="avatar-img"
             wx:if="{{ userInfo.avatar }}" mode="aspectFill"></image>
-          <image src="{{ resourceUrl + '/images/mall/' + defaultAvatar }}" class="avatar-img"
-            wx:elif="{{ defaultAvatar }}" mode="aspectFill"></image>
+          <image src="{{ defaultAvatar }}" class="avatar-img" wx:elif="{{ defaultAvatar }}" mode="aspectFill"></image>
           <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img" wx:else mode="aspectFill"></image>
-          <view class="avatar-badge">
+          <!-- <view class="avatar-badge">
             <text class="badge-icon">✎</text>
-          </view>
+          </view> -->
         </view>
 
         <!-- 用户信息 -->
@@ -27,9 +26,9 @@
         </view>
 
         <!-- 右侧箭头 -->
-        <view class="right-arrow" bind:tap="handleUpdateUser">
+        <!-- <view class="right-arrow" bind:tap="handleUpdateUser">
           <text class="arrow-icon">›</text>
-        </view>
+        </view> -->
       </view>
     </block>
 
@@ -37,7 +36,11 @@
     <view class="auth-user-l not-logged-in" wx:else>
       <view class="not-logged-wrapper">
         <view class="avatar-wrapper" bind:tap="handleLogin">
-          <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" mode="aspectFill"></image>
+          <!--  <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" mode="aspectFill"></image> -->
+          <image src="{{ defaultAvatar }}" class="avatar-img not-logged" wx:if="{{ defaultAvatar }}" mode="aspectFill">
+          </image>
+          <image src="{{ resourceUrl }}/images/mall/tswk.png" class="avatar-img not-logged" wx:else mode="aspectFill">
+          </image>
           <view class="avatar-plus">
             <text class="plus-icon">+</text>
           </view>
@@ -171,11 +174,11 @@ $bg-card: #ffffff;
         width: 130rpx;
         height: 130rpx;
         border-radius: 50%;
-        background-color: $bg-page;
+        // background-color: $bg-page;
         display: block;
         transition: all 0.3s;
-        border: 3rpx solid rgba(7, 193, 96, 0.1);
-        box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.1);
+        // border: 3rpx solid rgba(7, 193, 96, 0.1);
+        // box-shadow: 0 4rpx 12rpx rgba(7, 193, 96, 0.1);
 
         &:active {
           transform: scale(1.05);
@@ -228,9 +231,9 @@ $bg-card: #ffffff;
       }
 
       .edit-icon-bg {
-        width: 32rpx;
-        height: 32rpx;
-        background: rgba(7, 193, 96, 0.1);
+        width: 36rpx;
+        height: 36rpx;
+        background: $primary;
         border-radius: 50%;
         display: flex;
         align-items: center;
@@ -238,8 +241,8 @@ $bg-card: #ffffff;
         margin-left: 8rpx;
 
         .edit-icon {
-          font-size: 14rpx;
-          color: $primary;
+          font-size: 16rpx;
+          color: #fff;
         }
       }
     }

package/src/components/common/jmash-pic-swiper.mpx

@@ -12,11 +12,11 @@
 
 <script lang="ts">
 import mpx, { createComponent, ref } from "@mpxjs/core"
-import { config } from "../../utils/config";
 import { EventBase } from "../../api/types";
 
 createComponent({
   setup() {
+    let config = getApp().globalData.config;
     // 静态图片资源
     let imageUrl = config.baseUrl + "/v1/file/image/clip/750/750/"
     // 接口资源路径

package/src/index.ts

@@ -52,7 +52,7 @@ export type {
 } from "./api/storage/types";
 
 export { mpxFetch } from "./utils/request";
-export { config } from "./utils/config";
+export { config, initConfig, setConfig } from "./utils/config";
 export { grpc } from "./utils/grpc";
 export { db } from "./utils/db";
 export { useUserStore } from "./store/user";

package/src/utils/config.ts

@@ -1,6 +1,7 @@
 import { AppConfig } from "../api/types";
+import mpx from "@mpxjs/core";
 
-const config: AppConfig = {
+const defaultConfig: AppConfig = {
   name: "Jmash Core MPX",
   dev: true,
   testNewUser: false,
@@ -15,17 +16,20 @@ const config: AppConfig = {
   siteId: "c0a28f0f-023a-420b-b4e8-0ce138ac8269",
 };
 
-if (__mpx_mode__ === "wx") {
-  // 微信
-  config.appId = "wx2a8b3d689b8959eb1";
-} else if (__mpx_mode__ === "ali") {
-  // 支付宝
-  config.appId = "2016102700684542";
-} else if (__mpx_mode__ === "web") {
-  // Web
-  config.appId = "web";
-} else {
-  // 执行其他环境相关逻辑
+const config: AppConfig = { ...defaultConfig };
+
+function setConfig(cfg: Partial<AppConfig>) {
+  Object.assign(config, cfg);
+}
+
+function initConfig(config: Partial<AppConfig>, mode: string) {
+  if (__mpx_mode__ !== "web") {
+    // 只有运行时才能调用
+    const accountInfo = mpx.getAccountInfoSync();
+    // 微信
+    config.appId = accountInfo.miniProgram.appId;
+  }
+  return config;
 }
 
-export { config };
+export { config, setConfig, initConfig };