jmash-diy-mp 0.1.2 → 0.1.4

package/lib/components/basic/basic-image-view.mpx.d.ts

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

package/lib/components/basic/basic-text-view.mpx.d.ts

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

package/lib/components/basic/basic-video-view.mpx.d.ts

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

package/lib/components/custom/custom-view.mpx.d.ts

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

package/lib/components/organ/organ-contact-view.mpx.d.ts

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

package/package.json

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

package/src/components/basic/basic-image-view.mpx

@@ -1,4 +1,9 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
+    <!-- 图片组件 -->
     <view class="vcard-album-grid" wx:if="{{ imageUrlArr.length > 0 }}">
         <view wx:if="{{ isGrid }}" class="main-grid-custom">
             <view class="grid-item" wx:for="{{ imageUrlArr }}" wx:for-item="item" wx:for-index="index" wx:key="index">
@@ -23,7 +28,7 @@
                 mode="widthFix" wx:for="{{ imageUrlArr }}" wx:for-item="item" wx:key="index" />
         </view>
     </view>
-    <basic-none-data wx:else></basic-none-data>
+    <basic-none-data wx:else />
 </template>
 
 <script lang="ts">
@@ -33,14 +38,17 @@ import { config, EventBase } from "jmash-core-mp";
 
 createComponent({
     properties: {
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as BusiDataModel
@@ -150,6 +158,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "./basic-title-view",
         "basic-none-data": "./basic-none-data"
     }
 }

package/src/components/basic/basic-text-view.mpx

@@ -1,11 +1,16 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
+    <!-- 文本组件 -->
     <view class="text-main" wx:if="{{ compModel.compData.text != '<p><br></p>' }}">
         <!-- TODO后期优化 <view wx:if="{{ compModel.compData.title !== '' }}" class="text-title">{{ compModel.compData.title }}</view>-->
         <view class="text-content">
             <rich-text nodes="{{ compModel.compData.text }}"></rich-text>
         </view>
     </view>
-    <basic-none-data wx:else></basic-none-data>
+    <basic-none-data wx:else />
 </template>
 
 <script lang="ts">
@@ -14,17 +19,17 @@ import { BusiDataModel, CompModel, PageModel } from "../../api/diy/types";
 
 createComponent({
     properties: {
-        //页面数据
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
-        //组件数据
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
-        //业务数据
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as BusiDataModel
@@ -56,6 +61,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "./basic-title-view",
         "basic-none-data": "./basic-none-data"
     }
 }

package/src/components/basic/basic-title-view.mpx

@@ -1,16 +1,16 @@
 <template>
     <view class="basic-title-main">
-        <!-- 标题 -->
+        <!-- 标题（style=0：原有左侧竖线，style=1：左侧自定义图标） -->
         <view class="main-left">
             <!-- 标题前面竖线 -->
-            <image wx:if="{{ !leftIcon }}" class="main-left-image"
-                src="{{ resourceUrl + 'rectangle2x_' + themeColor + '.png' }}" mode="aspectFit" />
-            <slot wx:else name="leftIcon"></slot>
+            <image wx:if="{{ titleStyle === '0' }}" class="main-left-image"
+                src="{{ resourceUrl + 'images/icon_image/rectangle2x_' + themeColor + '.png' }}" mode="aspectFit" />
+            <image wx:if="{{ titleStyle === '1' }}" class="title-left-icon" src="{{ resourceUrl + titleImage }}"
+                mode="aspectFit" />
             {{ title }}
         </view>
         <!-- 查看更多 -->
-        <view class="main-right" wx:if="{{ showMore }}" bind:tap="handleClickMore">{{ moreText }}</view>
-        <slot name="rightIcon"></slot>
+        <view class="main-right" wx:if="{{ showMore }}" bind:tap="handleClickMore">查看更多 ></view>
     </view>
 </template>
 
@@ -25,16 +25,6 @@ createComponent({
         multipleSlots: true,
     },
     properties: {
-        // 是否自定义左侧图标
-        leftIcon: {
-            type: Boolean,
-            default: false
-        },
-        // 标题
-        title: {
-            type: String,
-            default: ""
-        },
         // 页面数据
         pageModel: {
             type: Object,
@@ -50,28 +40,40 @@ createComponent({
             type: Object,
             value: {} as BusiDataModel
         },
+        // 标题
+        title: {
+            type: String,
+            default: ""
+        },
         // 是否显示查看更多
         showMore: {
             type: Boolean,
             value: false
         },
-        // 查看更多文本
-        moreText: {
-            type: String,
-            value: "查看更多"
-        },
     },
     setup(props) {
         // 资源路径
-        let resourceUrl = config.resourceUrl + "/images/icon_image/";
+        let resourceUrl = config.resourceUrl + '/';
         // 主题色
         let themeColor = ref(props.pageModel.pageData.theme);
+        // 样式（0：原有左侧竖线，1：自定义图标两侧）
+        let titleStyle = ref(props.compModel?.compData?.titleStyle ?? "0");
+        // 标题图标
+        let titleImage = ref(props.compModel?.compData?.titleImage ?? "");
 
         // 主题变化
         const { pageModel } = toRefs(props)
         watch(pageModel, (newVal) => {
             themeColor.value = newVal.pageData.theme;
-        })
+        });
+        // 监听 titleStyle 变化
+        watch(() => props.compModel?.compData?.titleStyle, (newVal) => {
+            titleStyle.value = newVal ?? "0";
+        });
+        // 监听 titleImage 变化
+        watch(() => props.compModel?.compData?.titleImage, (newVal) => {
+            titleImage.value = newVal ?? "";
+        });
 
         return {
             resourceUrl,
@@ -86,9 +88,9 @@ createComponent({
                 compModel: this.compModel,
                 busiDataModel: this.busiDataModel
             } as CompEventModel;
-            console.log("点击查看更多(DiyClickMore):", eventData);
-            this.triggerEvent("DiyClickMore", eventData);
-        }
+            console.log("点击查看更多(clickMore):", eventData);
+            this.triggerEvent("clickMore", eventData);
+        },
     },
 })
 </script>
@@ -106,7 +108,7 @@ createComponent({
         flex: 1;
         display: flex;
         align-items: center;
-        justify-content: flex-start;
+        gap: 16rpx;
         color: #333333;
         font-size: 30rpx;
         font-weight: 600;
@@ -114,7 +116,6 @@ createComponent({
         .main-left-image {
             width: 8rpx;
             height: 30rpx;
-            margin-right: 16rpx;
         }
     }
 
@@ -126,6 +127,11 @@ createComponent({
         line-height: 80rpx;
     }
 }
+
+.title-left-icon {
+    width: 36rpx;
+    height: 41rpx;
+}
 </style>
 
 <script type="application/json">

package/src/components/basic/basic-video-view.mpx

@@ -1,4 +1,8 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
     <!-- 卡片 视频介绍 查看 -->
     <view class="basic-video" style="height: {{ height }}px;" wx:if="{{ compData.videoUrl }}">
         <view class="main-video">
@@ -6,7 +10,7 @@
                 src="{{ videoUrl }}"></video>
         </view>
     </view>
-    <basic-none-data wx:else></basic-none-data>
+    <basic-none-data wx:else />
 </template>
 
 <script lang="ts">
@@ -16,17 +20,17 @@ import { config } from "jmash-core-mp";
 
 createComponent({
     properties: {
-        //页面数据
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
-        //组件数据
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
-        //业务数据
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as BusiDataModel
@@ -110,6 +114,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "./basic-title-view",
         "basic-none-data": "./basic-none-data"
     }
 }

package/src/components/custom/basic-custom-view.mpx

@@ -1,8 +1,4 @@
 <template>
-  <!-- title组件 -->
-  <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
-    pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}"
-    bind:pagesMore="onMoreEvent" showMore="{{ compModel.compData.showMore }}" />
 
   <!-- 文本组件 -->
   <basic-text-view wx:if="{{ compModel.compCode === 'text' }}" pageModel="{{ pageModel }}" compModel="{{ compModel }}"
@@ -31,15 +27,17 @@ createComponent({
     multipleSlots: true,
   },
   properties: {
-    compModel: {
-      type: Object,
-      value: {} as CompModel
-    },
+    // 页面数据 
     pageModel: {
       type: Object,
       value: {} as PageModel
     },
-    //业务数据
+    // 组件数据
+    compModel: {
+      type: Object,
+      value: {} as CompModel
+    },
+    // 业务数据
     busiDataModel: {
       type: Object,
       value: {} as BusiDataModel
@@ -51,12 +49,10 @@ createComponent({
 })
 </script>
 
-
 <script type="application/json">
   {
     "component": true,
     "usingComponents": {
-      "basic-title-view": "../basic/basic-title-view",
       "basic-text-view": "../basic/basic-text-view",
       "basic-image-view": "../basic/basic-image-view",
       "basic-video-view": "../basic/basic-video-view",

package/src/components/custom/custom-view.mpx

@@ -1,11 +1,11 @@
 <template>
 
   <!-- 基础组件 -->
-  <basic-custom-view wx:if="{{ compModel.compType == 'BASIC' }}" pageModel="{{ pageModel }}" compModel="{{ compModel }}"
-    busiDataModel="{{ busiDataModel }}" />
+  <basic-custom-view wx:if="{{ compModel.compType === 'BASIC' }}" pageModel="{{ pageModel }}"
+    compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
   <!-- 组织组件 -->
-  <organ-custom-view wx:if="{{ compModel.compType == 'ORGAN' }}" pageModel="{{ pageModel }}" compModel="{{ compModel }}"
-    busiDataModel="{{ busiDataModel }}" />
+  <organ-custom-view wx:if="{{ compModel.compType === 'ORGAN' }}" pageModel="{{ pageModel }}"
+    compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
 
 </template>
 
@@ -15,10 +15,12 @@ import { PageModel, CompModel, BusiDataModel } from "../../api/diy/types";
 
 createComponent({
   properties: {
+    // 页面数据
     pageModel: {
       type: Object,
       value: {} as PageModel
     },
+    // 组件数据
     compModel: {
       type: Object,
       value: {} as CompModel

package/src/components/custom/organ-custom-view.mpx

@@ -1,8 +1,4 @@
 <template>
-  <!-- title组件 -->
-  <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
-    pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}"
-    bind:pagesMore="onMoreEvent" showMore="{{ compModel.compData.showMore }}" />
 
   <!-- 通知组件 -->
   <organ-notice-view wx:if="{{ compModel.compCode === 'notice' }}" pageModel="{{ pageModel }}"
@@ -31,33 +27,33 @@ createComponent({
     multipleSlots: true,
   },
   properties: {
-    compModel: {
-      type: Object,
-      value: {} as CompModel
-    },
+    // 页面数据
     pageModel: {
       type: Object,
       value: {} as PageModel
     },
-    //业务数据
+    // 组件数据
+    compModel: {
+      type: Object,
+      value: {} as CompModel
+    },
+    // 业务数据
     busiDataModel: {
       type: Object,
       value: {} as OrganDataModel
     },
   },
   setup(props) {
-    console.log("props ==>", props);
-    return {}
+    console.log("Organ-props ==>", props.compModel.compCode, props.compModel.compName, props);
+    return { props }
   }
 })
 </script>
 
-
 <script type="application/json">
   {
     "component": true,
     "usingComponents": {
-      "basic-title-view": "../basic/basic-title-view",
       "organ-map-view": "../organ/organ-map-view",
       "organ-contact-view": "../organ/organ-contact-view",
       "organ-notice-view": "../organ/organ-notice-view",

package/src/components/organ/organ-contact-view.mpx

@@ -1,4 +1,8 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
     <!-- 合作招商预览组件-手机号 -->
     <view class="vcard-map">
         <view class="item" data-mobilePhone="{{ compData.mobilePhone }}" bind:tap="oncall">
@@ -14,17 +18,17 @@ import { CompModel, PageModel, OrganDataModel } from "../../api/diy/types";
 
 createComponent({
     properties: {
-        //页面数据
+        // 页面数据
         pageModel: {
             type: Object,
             value: {} as PageModel
         },
-        //组件数据
+        // 组件数据
         compModel: {
             type: Object,
             value: {} as CompModel
         },
-        //业务数据
+        // 业务数据
         busiDataModel: {
             type: Object,
             value: {} as OrganDataModel
@@ -70,6 +74,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "../basic/basic-title-view",
         "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index"
     }
 }

package/src/components/organ/organ-map-view.mpx

@@ -1,4 +1,9 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
+    <!-- 地图组件-地址、电话 -->
     <view class="vcard-map">
         <view class="item" data-latitude="{{ busiDataModel.latitude }}" data-longitude="{{ busiDataModel.longitude }}"
             bind:tap="onlocation">
@@ -101,6 +106,7 @@ createComponent({
 {
     "component": true,
     "usingComponents": {
+        "basic-title-view": "../basic/basic-title-view",
         "cube-icon": "@mpxjs/mpx-cube-ui/lib/components/icon/index"
     }
 }

package/src/components/organ/organ-notice-view.mpx

@@ -1,4 +1,8 @@
 <template>
+    <!-- title组件 -->
+    <basic-title-view wx:if="{{ compModel.compData.showTitle }}" title="{{ compModel.compName }}"
+        pageModel="{{ pageModel }}" compModel="{{ compModel }}" busiDataModel="{{ busiDataModel }}" />
+
     <!-- 通知栏组件 -->
     <view class="notify-view">
         <view class="notice-bar">
@@ -186,6 +190,8 @@ createComponent({
 <script type="application/json">
 {
     "component": true,
-    "usingComponents": {}
+    "usingComponents": {
+        "basic-title-view": "../basic/basic-title-view",
+    }
 }
 </script>