jmash-core-mp 0.1.76 → 0.1.78

package/src/components/common/jmash-upload-picture.mpx

@@ -1,199 +1,199 @@
-<template>
-  <!-- 上传图片组件 -->
-  <view class="upload-picture-box">
-    <block wx:for="{{ imageArray }}" wx:key="index">
-      <view class="image_box">
-        <image wx:if="{{ baseUrl }}" class="upload_image" src="{{ baseUrl + item }}" />
-        <image wx:if="{{ resourceUrl }}" class="del_image" src="{{ resourceUrl + 'file_del_icon.png' }}" mode="widthFix"
-          data-index="{{ index }}" bind:tap="handleDel" />
-      </view>
-    </block>
-    <view wx:if="{{ imageArray.length < limit }}" class="upload-box" bind:tap="handleUploadImage">
-      <image wx:if="{{ resourceUrl }}" class="upload-icon" src="{{ resourceUrl + 'upload_icon.png' }}"
-        mode="widthFix" />
-      <text>添加图片</text>
-    </view>
-  </view>
-
-</template>
-
-<script lang="ts">
-import mpx, { createComponent, ref, watch } from "@mpxjs/core";
-import { EventBase } from "../../api/types";
-import { db } from "../../utils/db";
-
-createComponent({
-  options: {
-    styleIsolation: "apply-shared",
-  },
-  properties: {
-    // 上传图片数量限制
-    limit: {
-      type: Number,
-      value: 6
-    },
-    // 回显图片（字符串或数组）
-    value: {
-      type: null,
-      value: ""
-    }
-  },
-  setup(props) {
-    let config = getApp().globalData.config;
-    // 资源路径
-    let resourceUrl = config.resourceUrl + "/images/mall/";
-    // 图片路径
-    let baseUrl = config.baseUrl + "/v1/file/image/clip/100/100/";
-    // 上传图片数组
-    let imageArray = ref([] as Array<string>);
-
-    // 回显已有图片（value 支持字符串或数组）
-    watch(() => props.value, (val) => {
-      if (Array.isArray(val)) {
-        imageArray.value = val;
-      } else if (val) {
-        imageArray.value = [val];
-      } else {
-        imageArray.value = [];
-      }
-    }, { immediate: true });
-
-    return {
-      resourceUrl,
-      baseUrl,
-      imageArray,
-    }
-  },
-  methods: {
-    handleUploadImage() {
-      if (this.imageArray.length > this.limit - 1) {
-        mpx.showToast({
-          title: "图片最多上传" + this.limit + "张",
-          icon: "none",
-          duration: 2000
-        });
-        return;
-      }
-      mpx.showActionSheet({
-        itemList: ["从相册中选择", "拍照"],
-        itemColor: "#486aff",
-        success: (res) => {
-          if (res.tapIndex === 0) {
-            this.chooseWxHeadImage("album");
-          } else if (res.tapIndex === 1) {
-            this.chooseWxHeadImage("camera");
-          }
-        }
-      });
-    },
-    chooseWxHeadImage: function (type: any) {
-      let config = getApp().globalData.config;
-      const expire = db.isTokenExpires();
-      const token: string = (!expire && db.getToken()) ? "Bearer " + db.getToken() : "";
-      mpx.chooseMedia({
-        count: this.limit,
-        mediaType: ['image'],
-        sizeType: ["original", "compressed"],
-        sourceType: [type],
-        success: (res) => {
-          console.log('chooseImage success, temp path is', res)
-          const files = res.tempFiles || [];
-          // 逐个上传
-          files.forEach((file: any) => {
-            mpx.uploadFile({
-              url: config.baseUrl + "/v1/file/upload?tenant=" + config.tenant,
-              filePath: file.tempFilePath,
-              header: {
-                "Content-Type": "multipart/form-data",
-                "Authorization": token
-              },
-              formData: {
-                method: "POST",
-              },
-              name: "file",
-              success: (response) => {
-                console.log(response);
-                if (response.statusCode === 200) {
-                  const src = JSON.parse(response.data).fileSrc;
-                  this.imageArray.push(src);
-                  this.triggerEvent("getImageArray", this.imageArray);
-                } else {
-                  mpx.showToast({
-                    title: "图片上传失败",
-                    icon: "none",
-                    duration: 2000
-                  });
-                }
-              }
-            })
-          });
-        }
-      })
-    },
-    // 删除图片
-    handleDel(e: EventBase) {
-      this.imageArray.splice(e.currentTarget.dataset.index, 1);
-      // 使用this.triggerEvent传索引值给页面
-      this.triggerEvent("getImageArray", this.imageArray);
-    }
-  }
-})
-</script>
-
-<style lang="scss">
-.upload-picture-box {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 20rpx;
-}
-
-.upload_image {
-  width: 196rpx;
-  height: 196rpx;
-  vertical-align: top;
-}
-
-.upload-box {
-  border: 2rpx dashed #dddddd;
-  font-size: 24rpx;
-  display: flex;
-  flex-direction: column;
-  width: 196rpx;
-  height: 196rpx;
-  justify-content: center;
-  align-items: center;
-  // flex: 0 0 calc((100% - 42rpx)/3);
-
-  .upload-icon {
-    width: 60rpx;
-    margin-bottom: 10rpx;
-  }
-}
-
-.image_box {
-  position: relative;
-  width: 196rpx;
-  height: 196rpx;
-  // flex: 0 0 calc((100% - 42rpx)/3);
-  // margin: 0 20rpx 20rpx 0;
-}
-
-.image_box:nth-child(3n) {
-  margin-right: 0;
-}
-
-.del_image {
-  width: 36rpx;
-  position: absolute;
-  right: -10rpx;
-  top: -10rpx;
-}
-</style>
-
-<script type="application/json">
-{
-  "component": true,
-  "usingComponents": {}
-}
-</script>
+<template>
+  <!-- 上传图片组件 -->
+  <view class="upload-picture-box">
+    <block wx:for="{{ imageArray }}" wx:key="index">
+      <view class="image_box">
+        <image wx:if="{{ baseUrl }}" class="upload_image" src="{{ baseUrl + item }}" />
+        <image wx:if="{{ resourceUrl }}" class="del_image" src="{{ resourceUrl + 'file_del_icon.png' }}" mode="widthFix"
+          data-index="{{ index }}" bind:tap="handleDel" />
+      </view>
+    </block>
+    <view wx:if="{{ imageArray.length < limit }}" class="upload-box" bind:tap="handleUploadImage">
+      <image wx:if="{{ resourceUrl }}" class="upload-icon" src="{{ resourceUrl + 'upload_icon.png' }}"
+        mode="widthFix" />
+      <text>添加图片</text>
+    </view>
+  </view>
+
+</template>
+
+<script lang="ts">
+import mpx, { createComponent, ref, watch } from "@mpxjs/core";
+import { EventBase } from "../../api/types";
+import { db } from "../../utils/db";
+
+createComponent({
+  options: {
+    styleIsolation: "apply-shared",
+  },
+  properties: {
+    // 上传图片数量限制
+    limit: {
+      type: Number,
+      value: 6
+    },
+    // 回显图片（字符串或数组）
+    value: {
+      type: null,
+      value: ""
+    }
+  },
+  setup(props) {
+    let config = getApp().globalData.config;
+    // 资源路径
+    let resourceUrl = config.resourceUrl + "/images/mall/";
+    // 图片路径
+    let baseUrl = config.baseUrl + "/v1/file/image/clip/100/100/";
+    // 上传图片数组
+    let imageArray = ref([] as Array<string>);
+
+    // 回显已有图片（value 支持字符串或数组）
+    watch(() => props.value, (val) => {
+      if (Array.isArray(val)) {
+        imageArray.value = val;
+      } else if (val) {
+        imageArray.value = [val];
+      } else {
+        imageArray.value = [];
+      }
+    }, { immediate: true });
+
+    return {
+      resourceUrl,
+      baseUrl,
+      imageArray,
+    }
+  },
+  methods: {
+    handleUploadImage() {
+      if (this.imageArray.length > this.limit - 1) {
+        mpx.showToast({
+          title: "图片最多上传" + this.limit + "张",
+          icon: "none",
+          duration: 2000
+        });
+        return;
+      }
+      mpx.showActionSheet({
+        itemList: ["从相册中选择", "拍照"],
+        itemColor: "#486aff",
+        success: (res) => {
+          if (res.tapIndex === 0) {
+            this.chooseWxHeadImage("album");
+          } else if (res.tapIndex === 1) {
+            this.chooseWxHeadImage("camera");
+          }
+        }
+      });
+    },
+    chooseWxHeadImage: function (type: any) {
+      let config = getApp().globalData.config;
+      const expire = db.isTokenExpires();
+      const token: string = (!expire && db.getToken()) ? "Bearer " + db.getToken() : "";
+      mpx.chooseMedia({
+        count: this.limit,
+        mediaType: ['image'],
+        sizeType: ["original", "compressed"],
+        sourceType: [type],
+        success: (res) => {
+          console.log('chooseImage success, temp path is', res)
+          const files = res.tempFiles || [];
+          // 逐个上传
+          files.forEach((file: any) => {
+            mpx.uploadFile({
+              url: config.baseUrl + "/v1/file/upload?tenant=" + config.tenant,
+              filePath: file.tempFilePath,
+              header: {
+                "Content-Type": "multipart/form-data",
+                "Authorization": token
+              },
+              formData: {
+                method: "POST",
+              },
+              name: "file",
+              success: (response) => {
+                console.log(response);
+                if (response.statusCode === 200) {
+                  const src = JSON.parse(response.data).fileSrc;
+                  this.imageArray.push(src);
+                  this.triggerEvent("getImageArray", this.imageArray);
+                } else {
+                  mpx.showToast({
+                    title: "图片上传失败",
+                    icon: "none",
+                    duration: 2000
+                  });
+                }
+              }
+            })
+          });
+        }
+      })
+    },
+    // 删除图片
+    handleDel(e: EventBase) {
+      this.imageArray.splice(e.currentTarget.dataset.index, 1);
+      // 使用this.triggerEvent传索引值给页面
+      this.triggerEvent("getImageArray", this.imageArray);
+    }
+  }
+})
+</script>
+
+<style lang="scss">
+.upload-picture-box {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 20rpx;
+}
+
+.upload_image {
+  width: 196rpx;
+  height: 196rpx;
+  vertical-align: top;
+}
+
+.upload-box {
+  border: 2rpx dashed #dddddd;
+  font-size: 24rpx;
+  display: flex;
+  flex-direction: column;
+  width: 196rpx;
+  height: 196rpx;
+  justify-content: center;
+  align-items: center;
+  // flex: 0 0 calc((100% - 42rpx)/3);
+
+  .upload-icon {
+    width: 60rpx;
+    margin-bottom: 10rpx;
+  }
+}
+
+.image_box {
+  position: relative;
+  width: 196rpx;
+  height: 196rpx;
+  // flex: 0 0 calc((100% - 42rpx)/3);
+  // margin: 0 20rpx 20rpx 0;
+}
+
+.image_box:nth-child(3n) {
+  margin-right: 0;
+}
+
+.del_image {
+  width: 36rpx;
+  position: absolute;
+  right: -10rpx;
+  top: -10rpx;
+}
+</style>
+
+<script type="application/json">
+{
+  "component": true,
+  "usingComponents": {}
+}
+</script>

package/src/components/core/jmash-cms-protocol.mpx

@@ -1,73 +1,73 @@
-<template>
-    <view class="cms_box" wx:for="{{ contents }}" wx:key="*this">
-        <view class="cms_title">{{ title }}</view>
-        <rich-text nodes="{{ item.infoContent }}"></rich-text>
-    </view>
-</template>
-
-<script>
-import { createComponent, ref, toRefs, watch } from '@mpxjs/core'
-import { cmsApi } from '../../api/cms/index'
-
-createComponent({
-    properties: {
-        // 站点ID
-        siteId: {
-            type: String,
-            value: ""
-        },
-        // 租户
-        tenant: {
-            type: String,
-            value: ""
-        },
-        // 别名
-        channelAlias: {
-            type: String,
-            value: ""
-        },
-        // refreshKey
-        refreshKey: {
-            type: Number,
-            value: 0
-        },
-    },
-    setup(props) {
-        let contents = ref([{ contentId: "123" }]);
-        let title = ref("");
-        const { refreshKey } = toRefs(props)
-        watch(refreshKey, () => {
-            if (!props.channelAlias) return;
-            cmsApi.findCmsContentInfo({ siteId: props.siteId, channelAlias: props.channelAlias, tenant: props.tenant }).then(({ data }) => {
-                console.log(data)
-                title.value = data.cmsInfo.infoTitle;
-                contents.value = data.infoContentResults;
-                console.log(contents)
-            })
-        })
-        return {
-            title,
-            contents
-        };
-    },
-})
-</script>
-
-<style lang="scss">
-.cms_box {
-    padding: 15px 3%;
-    font-size: 28rpx;
-    line-height: 25px;
-}
-
-.cms_title {
-    text-align: center;
-}
-</style>
-
-<script type="application/json">
-{
-    "component": true,
-    "usingComponents": {}
-}
+<template>
+    <view class="cms_box" wx:for="{{ contents }}" wx:key="*this">
+        <view class="cms_title">{{ title }}</view>
+        <rich-text nodes="{{ item.infoContent }}"></rich-text>
+    </view>
+</template>
+
+<script>
+import { createComponent, ref, toRefs, watch } from '@mpxjs/core'
+import { cmsApi } from '../../api/cms/index'
+
+createComponent({
+    properties: {
+        // 站点ID
+        siteId: {
+            type: String,
+            value: ""
+        },
+        // 租户
+        tenant: {
+            type: String,
+            value: ""
+        },
+        // 别名
+        channelAlias: {
+            type: String,
+            value: ""
+        },
+        // refreshKey
+        refreshKey: {
+            type: Number,
+            value: 0
+        },
+    },
+    setup(props) {
+        let contents = ref([{ contentId: "123" }]);
+        let title = ref("");
+        const { refreshKey } = toRefs(props)
+        watch(refreshKey, () => {
+            if (!props.channelAlias) return;
+            cmsApi.findCmsContentInfo({ siteId: props.siteId, channelAlias: props.channelAlias, tenant: props.tenant }).then(({ data }) => {
+                console.log(data)
+                title.value = data.cmsInfo.infoTitle;
+                contents.value = data.infoContentResults;
+                console.log(contents)
+            })
+        })
+        return {
+            title,
+            contents
+        };
+    },
+})
+</script>
+
+<style lang="scss">
+.cms_box {
+    padding: 15px 3%;
+    font-size: 28rpx;
+    line-height: 25px;
+}
+
+.cms_title {
+    text-align: center;
+}
+</style>
+
+<script type="application/json">
+{
+    "component": true,
+    "usingComponents": {}
+}
 </script>