jmash-core-mp 0.1.90 → 0.1.92

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

@@ -96,21 +96,41 @@ export interface CmsInfoModel {
     infoId?: string;
     modelCode?: string;
     infoTitle: string;
+    rgb?: string;
     subTitle?: string;
+    sourceName?: string;
+    sourceUrl?: string;
     imgUrl?: string;
+    isImg?: boolean;
     author?: string;
     intro?: string;
     top?: number;
+    commentCountReview?: number;
+    isLink?: boolean;
+    linkUrl?: string;
     status?: string;
+    isLeads?: boolean;
     publishDate?: string;
     publishDateStr?: string;
     dueTime?: string;
+    deptId?: string;
+    deptName?: string;
+    createTime?: string;
+    createBy?: string;
+    updateTime?: string;
+    updateBy?: string;
+    deleted?: boolean;
+    deleteTime?: string;
+    deleteBy?: string;
     channelId: Array<string>;
-    sourceName?: string;
     siteId: string;
+    sessionId?: string;
     address?: string;
     geoLongitude?: number;
     geoLatitude?: number;
+    tenant?: string;
+    tradeMark?: string;
+    specsModel?: string;
 }
 export interface CmsInfoContentReq {
     tenant?: string;

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

@@ -20,6 +20,7 @@ export interface ShopInfoModel {
     adPics?: string;
     organId?: string;
     organTenant?: string;
+    isCaptcha?: boolean;
     createBy?: string;
     createTime?: string;
 }

package/lib/store/user.js

@@ -67,6 +67,9 @@ export const useUserStore = defineStore("user", {
         },
         /** 静默登录 */
         silentLogin() {
+            if (__mpx_mode__ === "web") {
+                return Promise.reject(new Error("Web 不支持静默登录!"));
+            }
             const obj = __mpx_mode__ === "ali" ? { scopes: "auth_base" } : {};
             const config = getApp().globalData.config;
             return mpx

package/package.json

@@ -1,22 +1,22 @@
 {
   "name": "jmash-core-mp",
-  "version": "0.1.90",
+  "version": "0.1.92",
   "private": false,
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "dependencies": {
-    "@mpxjs/api-proxy": "^2.10.19",
-    "@mpxjs/core": "^2.10.19",
-    "@mpxjs/fetch": "^2.10.19",
-    "@mpxjs/mpx-cube-ui": "^1.4.15",
-    "@mpxjs/pinia": "^2.10.18",
-    "@mpxjs/store": "^2.10.18",
-    "@mpxjs/utils": "^2.10.18",
-    "dayjs": "^1.11.21",
+    "@mpxjs/api-proxy": "^2.11.1",
+    "@mpxjs/core": "^2.11.1",
+    "@mpxjs/fetch": "^2.11.1",
+    "@mpxjs/mpx-cube-ui": "^1.4.17",
+    "@mpxjs/pinia": "^2.11.0",
+    "@mpxjs/store": "^2.11.0",
+    "@mpxjs/utils": "^2.11.0",
+    "dayjs": "^1.11.23",
     "pinia": "^2.0.14",
-    "sm-crypto": "^0.4.0",
     "vue": "^2.7.0",
-    "vue-demi": "^0.14.6",
+    "sm-crypto": "0.4.0",
+    "vue-demi": "^0.14.10",
     "vue-i18n": "^8.27.2",
     "vue-i18n-bridge": "^9.2.2",
     "vue-router": "^3.1.3"
@@ -26,36 +26,27 @@
     "@babel/plugin-transform-runtime": "^7.10.4",
     "@babel/preset-env": "^7.10.4",
     "@babel/runtime-corejs3": "^7.10.4",
-    "@mini-types/global": "^1.0.33",
-    "@mpxjs/babel-plugin-inject-page-events": "^2.9.0",
-    "@mpxjs/eslint-config": "^2.0.3",
-    "@mpxjs/miniprogram-simulate": "^1.4.17",
-    "@mpxjs/mpx-cli-service": "^2.0.0",
-    "@mpxjs/mpx-jest": "^0.0.32",
-    "@mpxjs/size-report": "^2.10.0",
-    "@mpxjs/unocss-base": "^2.9.0",
-    "@mpxjs/unocss-plugin": "^2.9.0",
-    "@mpxjs/vue-cli-plugin-mpx": "^2.0.0",
-    "@mpxjs/vue-cli-plugin-mpx-eslint": "^2.0.0",
-    "@mpxjs/vue-cli-plugin-mpx-typescript": "^2.0.0",
-    "@mpxjs/vue-cli-plugin-mpx-unit-test": "^2.0.0",
-    "@mpxjs/vue-cli-plugin-mpx-utility-first-css": "^2.0.0",
-    "@mpxjs/webpack-plugin": "^2.10.0",
-    "@types/jest": "^27.5.1",
-    "@vue/cli-service": "~5.0.0",
-    "autoprefixer": "^10.2.4",
-    "babel-jest": "^27.4.5",
-    "eslint": "^9.0.0",
-    "jest": "^27.4.5",
-    "postcss": "^8.2.6",
+    "@mini-types/global": "^3.0.14",
+    "@mpxjs/babel-plugin-inject-page-events": "^2.10.21",
+    "@mpxjs/eslint-config": "^2.0.14",
+    "@mpxjs/miniprogram-simulate": "^1.4.21",
+    "@mpxjs/size-report": "^2.11.0",
+    "@mpxjs/mpx-cli-service": "^2.2.32",
+    "@mpxjs/vue-cli-plugin-mpx": "^2.2.32",
+    "@mpxjs/vue-cli-plugin-mpx-eslint": "^2.2.32",
+    "@mpxjs/vue-cli-plugin-mpx-typescript": "^2.2.32",
+    "@mpxjs/webpack-plugin": "^2.11.1",
+    "@vue/cli-service": "~5.0.9",
+    "autoprefixer": "^10.6.1",
+    "eslint": "^9.39.5",
+    "postcss": "^8.5.31",
     "process": "^0.11.10",
-    "sass": "^1.99.0",
-    "sass-loader": "^16.0.7",
+    "sass": "^1.106.0",
+    "sass-loader": "^17.0.1",
     "stylus": "^0.55.0",
     "stylus-loader": "^6.1.0",
-    "ts-jest": "^27.1.2",
-    "typescript": "^4.1.3",
-    "webpack": "^5.43.0"
+    "typescript": "^4.9.5",
+    "webpack": "~5.83.1"
   },
   "browserslist": [
     "ios >= 8",

package/src/api/cms/types.ts

@@ -190,36 +190,76 @@ export interface CmsInfoModel {
   modelCode?: string;
   // 内容标题
   infoTitle: string;
+  // 标题颜色
+  rgb?: string;
   // 副标题
   subTitle?: string;
+  // 来源名称
+  sourceName?: string;
+  // 来源地址
+  sourceUrl?: string;
   // 封面图片
   imgUrl?: string;
+  // 是否图片新闻
+  isImg?: boolean;
   // 作者
   author?: string;
   // 摘要
   intro?: string;
   // 是否置顶
   top?: number;
+  // 待审评论数
+  commentCountReview?: number;
+  // 是否外部链接
+  isLink?: boolean;
+  // 外部链接地址
+  linkUrl?: string;
   // 文章状态
   status?: string;
+  // 是否线索收集
+  isLeads?: boolean;
   // 发布时间
   publishDate?: string;
   // 发布时间字符串
   publishDateStr?: string;
   // 到期时间
   dueTime?: string;
+  // 创建部门ID
+  deptId?: string;
+  // 创建部门名称
+  deptName?: string;
+  // 创建时间
+  createTime?: string;
+  // 创建者
+  createBy?: string;
+  // 更新时间
+  updateTime?: string;
+  // 更新者
+  updateBy?: string;
+  // 是否删除
+  deleted?: boolean;
+  // 删除时间
+  deleteTime?: string;
+  // 删除者
+  deleteBy?: string;
   // 栏目ID
   channelId: Array<string>;
-  // 来源名称
-  sourceName?: string;
   // 站点Id
   siteId: string;
+  // 会话ID（AI）
+  sessionId?: string;
   // 地址
   address?: string;
   // 经度
   geoLongitude?: number;
   // 纬度
   geoLatitude?: number;
+  // 租户
+  tenant?: string;
+  // 注册商标
+  tradeMark?: string;
+  // 规格型号
+  specsModel?: string;
 }
 // 信息内容查询
 export interface CmsInfoContentReq {

package/src/api/shop/types.ts

@@ -42,6 +42,8 @@ export interface ShopInfoModel {
   organId?: string;
   // 组织租户
   organTenant?: string;
+  // 是否开启公众号安全核验（用卡消费时）
+  isCaptcha?: boolean;
   // 创建人
   createBy?: string;
   // 创建时间

package/src/app.mpx

@@ -11,6 +11,11 @@ import { mpxFetch, config, initConfig } from "./index";
 mpx.use(mpxFetch);
 
 createApp({
+  // custom-tab-bar 挂在 app 层，不在任何 page 的 provide 链内，
+  // 组件内建的 inject: ['__pageId'] 会取不到值并报警告，这里补一个兜底。
+  provide: {
+    __pageId: -1
+  },
   onLaunch(options) {
     initConfig(config, "dev");
     console.log("config", config);
@@ -21,7 +26,15 @@ createApp({
 })
 </script>
 
-<style></style>
+<style lang="scss">
+@use './styles/theme-default' as theme;
+
+// 更换主题
+page,
+#app {
+  @include theme.variables;
+}
+</style>
 
 <script type="application/json">
   {
@@ -39,6 +52,7 @@ createApp({
       "./pages/organ-search",
       "./pages/shop-search",
       "./pages/branch-search",
+      "./pages/cube-theme",
     ],
     "packages": [
       "./packages/index?root=jmash"

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

@@ -1,7 +1,7 @@
 <template>
   <view class="logout-section">
     <!-- 登录状态才显示退出按钮 -->
-    <button class="logout-btn" bind:tap="handleLogout" wx:if="{{ isLogin }}">退出登录</button>
+    <cube-button primary class="jmash-btn btn-width-50" bind:tap="handleLogout" wx:if="{{ isLogin }}">退出登录</cube-button>
     <text class="version-text">当前版本 V{{ version }}</text>
   </view>
 </template>
@@ -47,40 +47,20 @@ createComponent({
 </script>
 
 <style lang="scss">
-$primary: #07c160;
-$text-3: #999999;
+@import "../../styles/mixin.css";
+
+.btn-width-50 {
+  width: 50%;
+}
 
 .logout-section {
-  // 底部留空适配tabbar
-  padding: 40rpx 16rpx 80rpx;
   display: flex;
   flex-direction: column;
   align-items: center;
 
-  .logout-btn {
-    width: 300rpx;
-    height: 72rpx;
-    border-radius: 36rpx;
-    border: 2rpx solid #ff4d4f;
-    background: #fff;
-    color: #ff4d4f;
-    font-size: 28rpx;
-    font-weight: 500;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    margin-bottom: 24rpx;
-    transition: all 0.2s;
-
-    &:active {
-      background: #fff1f0;
-      transform: scale(0.98);
-    }
-  }
-
   .version-text {
-    font-size: 24rpx;
-    color: $text-3;
+    font-size: var(--cube-font-size-sm);
+    color: var(--cube-text-color-hint);
   }
 }
 </style>
@@ -88,6 +68,8 @@ $text-3: #999999;
 <script type="application/json">
 {
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "cube-button": "@mpxjs/mpx-cube-ui/lib/components/button/index.mpx"
+  }
 }
 </script>