jmash-core-mp 0.1.77 → 0.1.79

package/lib/utils/common.d.ts

@@ -33,3 +33,5 @@ export declare const validateRules: (value: string, message: string, rules: any)
  * @param {string} message 错误提示信息
  */
 export declare const validateRequired: (value: string | number, message: string) => boolean;
+export declare function hasCategoryFeature(dictCode: string, feature: string): boolean;
+export declare const categoryFeatures: Record<string, string[]>;

package/lib/utils/common.js

@@ -163,3 +163,16 @@ export const validateRequired = (value, message) => {
     }
     return true;
 };
+// 判断当前商家分类是否支持某功能
+export function hasCategoryFeature(dictCode, feature) {
+    if (!dictCode)
+        return false;
+    const keywords = categoryFeatures[feature] || [];
+    return keywords.some((i) => dictCode.includes(i));
+}
+// 商家分类功能配置：功能名 -> 分类code关键词列表
+export const categoryFeatures = {
+    // AI换发型 - 0504美容美发
+    aiHairstyle: ["0504"],
+    // - 0502洗车保养- 0503足疗/按摩- 0506鲜花/园艺
+};

package/package.json

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

package/src/components/common/jmash-form-cell.mpx

@@ -66,20 +66,18 @@
 
             <!-- 选择器选项类型 -->
             <block wx:elif="{{ type === 'picker-option' }}">
-                <!-- 展示区 -->
-                <view class="form-cell-picker"
-                    style="{{ label ? 'justify-content: flex-end;' : 'justify-content: flex-start;' }}"
-                    data-field="{{ field }}" bind:tap="{{ readonly ? '' : 'handlePickerOptTap' }}">
-                    <view class="form-cell-picker-text {{ pickerOptDisplayText ? '' : 'form-cell-picker-empty' }}"
-                        style="{{ label ? '' : 'margin-right: auto;' }}">
-                        {{ pickerOptDisplayText || placeholder }}
+                <!-- 原生选择器：点击展示区唤起系统选择器，取消不触发 change，无需手动管理显隐 -->
+                <picker class="form-cell-picker-wrap" mode="selector" range="{{ pickerOptList }}" range-key="text"
+                    value="{{ pickerOptSelectedIndex }}" disabled="{{ readonly }}" bind:change="handlePickerOptChange"
+                    style="{{ label ? 'justify-content: flex-end;' : 'justify-content: flex-start;' }}">
+                    <view class="form-cell-picker">
+                        <view class="form-cell-picker-text {{ pickerOptDisplayText ? '' : 'form-cell-picker-empty' }}"
+                            style="{{ label ? '' : 'margin-right: auto;' }}">
+                            {{ pickerOptDisplayText || placeholder }}
+                        </view>
+                        <text class="form-cell-arrow">›</text>
                     </view>
-                    <text class="form-cell-arrow">›</text>
-                </view>
-                <!-- 弹出选择列表 -->
-                <cube-picker-popup wx:ref="pickerOption" show="{{ pickerOptShow }}" list="{{ pickerOptList }}"
-                    selectedIndex="{{ pickerOptSelectedIndex }}" fullyStop="true" bind:change="handlePickerOptChange"
-                    bind:confirm="handlePickerOptConfirm" bind:cancel="handlePickerOptClose" />
+                </picker>
             </block>
 
             <!-- 上传图片类型 -->
@@ -187,23 +185,19 @@ createComponent({
         },
     },
     setup(props) {
-        // 自动选择器弹框显隐
-        let pickerOptShow = ref(false);
         // 自动选择器当前选中索引
-        let pickerOptSelectedIndex = ref([0]);
+        let pickerOptSelectedIndex = ref(0);
         // 自动选择器展示文本
         let pickerOptDisplayText = ref("");
-        // 自动选择器数据转 cube-picker-popup 格式（二维数组）
+        // 自动选择器数据转原生 picker range 格式
         let pickerOptList = computed(() => {
             const { pickerData, pickerOptions } = props;
-            if (!pickerData || !pickerData.length) return [[]];
-            return [
-                pickerData.map((item: any) => ({
-                    text: item[pickerOptions.valueLable],
-                    value: item[pickerOptions.valueKey],
-                    ...item,
-                })),
-            ];
+            if (!pickerData || !pickerData.length) return [];
+            return pickerData.map((item: any) => ({
+                text: item[pickerOptions.valueLable],
+                value: item[pickerOptions.valueKey],
+                ...item,
+            }));
         });
 
         // 单选选项 value 是否为 boolean 类型
@@ -234,7 +228,6 @@ createComponent({
         }, { immediate: true });
 
         return {
-            pickerOptShow,
             pickerOptSelectedIndex,
             pickerOptDisplayText,
             pickerOptList,
@@ -247,15 +240,13 @@ createComponent({
         // 当 value、data 或 options 变化时，刷新展示文本和选中索引
         "value, pickerData, pickerOptions"(value: any, pickerData: any[], pickerOptions: any) {
             if (!pickerData || !pickerData.length || !pickerOptions || !pickerOptions.valueKey) {
-                this.pickerOptSelectedIndex = [0];
+                this.pickerOptSelectedIndex = 0;
                 this.pickerOptDisplayText = "";
                 return;
             }
             const index = pickerData.findIndex((item) => item[pickerOptions.valueKey] === value);
-            const selectedIndex = index >= 0 ? index : 0;
-            const displayText = index >= 0 ? pickerData[index][pickerOptions.valueLable] : "";
-            this.pickerOptSelectedIndex = [selectedIndex];
-            this.pickerOptDisplayText = displayText;
+            this.pickerOptSelectedIndex = index >= 0 ? index : 0;
+            this.pickerOptDisplayText = index >= 0 ? pickerData[index][pickerOptions.valueLable] : "";
         },
     },
     methods: {
@@ -296,32 +287,13 @@ createComponent({
 
         // === 自动选择器方法 ===
 
-        // 点击展示区，打开选择弹框
-        handlePickerOptTap() {
-            // 同步当前 value 对应的索引
-            this._feedbackPickerOpt();
-            this.pickerOptShow = true;
-            if (this.$refs.pickerOption) this.$refs.pickerOption.show();
-        },
-        // 关闭弹框（未确认，索引回滚到当前值对应项）
-        handlePickerOptClose() {
-            this.pickerOptShow = false;
-            if (this.$refs.pickerOption) this.$refs.pickerOption.hide();
-            this._feedbackPickerOpt();
-        },
-        // 滚动选择（仅记录索引，显示文本保持已确认值，避免未确认关闭时显示与数据不一致）
+        // 确认选择（原生 picker 的 change 在点击确定后触发，取消不触发任何回调，无需回滚索引）
         handlePickerOptChange(e: EventBase) {
-            const index = e.detail.selectedIndex as number[];
-            this.pickerOptSelectedIndex = index;
-        },
-        // 确认选择
-        handlePickerOptConfirm(e: EventBase) {
-            const index = e.detail.selectedIndex as number[];
-            const item = this.pickerData[index[0]];
+            const index = e.detail.value as number;
+            const item = this.pickerData[index];
+            if (!item) return;
             this.pickerOptSelectedIndex = index;
             this.pickerOptDisplayText = item[this.pickerOptions.valueLable];
-            // 关闭弹框
-            this.handlePickerOptClose();
             this.triggerEvent("change", {
                 field: this.field,
                 value: item[this.pickerOptions.valueKey],
@@ -329,17 +301,6 @@ createComponent({
                 info: item,
             });
         },
-        // 同步 value 到选中索引
-        _feedbackPickerOpt() {
-            if (!this.pickerData || !this.pickerData.length || !this.pickerOptions || !this.pickerOptions.valueKey) {
-                this.pickerOptSelectedIndex = [0];
-                return;
-            }
-            const index = this.pickerData.findIndex(
-                (item: any) => item[this.pickerOptions.valueKey] === this.value
-            );
-            this.pickerOptSelectedIndex = [index >= 0 ? index : 0];
-        },
     },
 });
 </script>
@@ -423,6 +384,12 @@ createComponent({
         }
     }
 
+    // 原生选择器包裹层
+    .form-cell-picker-wrap {
+        flex: 1;
+        display: flex;
+    }
+
     // 自动选择器
     .form-cell-picker {
         flex: 1;
@@ -517,7 +484,6 @@ createComponent({
     "usingComponents": {
         "jmash-upload-picture": "./jmash-upload-picture",
         "cube-popup": "@mpxjs/mpx-cube-ui/lib/components/popup/index",
-        "cube-picker-popup": "@mpxjs/mpx-cube-ui/lib/components/picker-popup/index",
         "cube-radio-group": "@mpxjs/mpx-cube-ui/lib/components/radio-group/index",
         "cube-radio": "@mpxjs/mpx-cube-ui/lib/components/radio/index",
     }

package/src/index.ts

@@ -86,6 +86,7 @@ export {
   formatDateTime,
   validateRules,
   validateRequired,
+  hasCategoryFeature,
 } from "./utils/common";
 
 import * as dayjsLocaleZhCn from "dayjs/locale/zh-cn";

package/src/utils/common.ts

@@ -141,7 +141,7 @@ export const formatDateTime = (dateTimeString: string, format?: any) => {
 export const validateRules = (
   value: string,
   message: string,
-  rules: any
+  rules: any,
 ): boolean => {
   if (value && !rules.test(value)) {
     // 显示错误提示
@@ -162,7 +162,7 @@ export const validateRules = (
  */
 export const validateRequired = (
   value: string | number,
-  message: string
+  message: string,
 ): boolean => {
   const valueStr = typeof value === "number" ? String(value) : value;
   if (!valueStr || valueStr.trim() === "") {
@@ -176,3 +176,21 @@ export const validateRequired = (
   }
   return true;
 };
+
+// 判断当前商家分类是否支持某功能
+export function hasCategoryFeature(dictCode: string, feature: string): boolean {
+  if (!dictCode) return false;
+  const keywords = categoryFeatures[feature] || [];
+  return keywords.some((i) => dictCode.includes(i));
+}
+// 商家分类功能配置：功能名 -> 分类code关键词列表
+export const categoryFeatures: Record<string, string[]> = {
+  // 0502洗车保养
+  serveCar: ["0502"],
+  // 0503足疗/按摩
+  serveFoot: ["0503"],
+  // 0504美容美发
+  serveHair: ["0504"],
+  // 0506鲜花/园艺
+  serveFlower: ["0506"],
+};

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

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

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

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

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

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

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

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

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

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

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

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

package/lib/components/cms/jmash-cms-product-item.mpx.d.ts

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

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

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

package/lib/components/common/jmash-search.mpx.d.ts

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

package/lib/components/core/jmash-login.mpx.d.ts

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

package/lib/components/organ/organ-item.mpx.d.ts

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

package/lib/components/shop/branch-item.mpx.d.ts

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

package/lib/components/shop/shop-item.mpx.d.ts

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

package/lib/packages/pages/auth/setting-page.mpx.d.ts

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

package/lib/packages/pages/cms/cms-activity-list.mpx.d.ts

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

package/lib/packages/pages/cms/cms-article-list.mpx.d.ts

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

package/lib/packages/pages/cms/cms-location-list.mpx.d.ts

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

package/lib/packages/pages/cms/cms-product-list.mpx.d.ts

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

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

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