jmash-core-mp 0.1.21 → 0.1.22

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

@@ -1,172 +1,175 @@
 <template>
-    <!-- 上传图片组件 -->
-    <view class="upload-picture-box">
-        <block wx:for="{{ imageArray }}" wx:key="index">
-            <view class="image_box">
-                <image class="upload_image" src="{{ baseUrl + item }}" />
-                <image 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 class="upload-icon" src="{{ resourceUrl + 'upload_icon.png' }}" mode="widthFix" />
-            <text>添加图片</text>
-        </view>
+  <!-- 上传图片组件 -->
+  <view class="upload-picture-box">
+    <block wx:for="{{ imageArray }}" wx:key="index">
+      <view class="image_box">
+        <image class="upload_image" src="{{ baseUrl + item }}" />
+        <image 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 class="upload-icon" src="{{ resourceUrl + 'upload_icon.png' }}" mode="widthFix" />
+      <text>添加图片</text>
     </view>
+  </view>
 
 </template>
 
 <script lang="ts">
 import mpx, { createComponent, ref } from "@mpxjs/core";
 import { EventBase } from "../../api/types";
+// import { config } from "../../utils/config";
 
 createComponent({
-    properties: {
-        // 上传图片数量限制
-        limit: {
-            type: Number,
-            value: 6
-        }
-    },
-    setup() {
-        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>);
+  properties: {
+    // 上传图片数量限制
+    limit: {
+      type: Number,
+      value: 6
+    }
+  },
+  setup() {
+    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>);
 
-        return {
-            resourceUrl,
-            baseUrl,
-            imageArray,
+    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");
+          }
         }
+      });
     },
-    methods: {
-        handleUploadImage() {
-            if (this.imageArray.length > this.limit - 1) {
-                mpx.showToast({
-                    title: "图片最多上传" + this.limit + "张",
+    chooseWxHeadImage: function (type: any) {
+      let config = getApp().globalData.config;
+      const token: string = mpx.getStorageSync("token") ? "Bearer " + mpx.getStorageSync("token") : "";
+      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
-                });
-                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 token: string = mpx.getStorageSync("token") ? "Bearer " + mpx.getStorageSync("token") : "";
-            mpx.chooseMedia({
-                count: this.limit,
-                sizeType: ["original", "compressed"],
-                sourceType: [type],
-                success: (res) => {
-                    console.log('chooseImage success, temp path is', res)
-                    const tempFilePaths = res.tempFiles[0].tempFilePath;
-                    // 上传文件
-                    mpx.uploadFile({
-                        url: config.baseUrl + "/v1/file/upload?tenant=" + config.tenant,
-                        filePath: tempFilePaths,
-                        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传索引值给页面
-                                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);
+          });
         }
+      })
+    },
+    // 删除图片
+    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;
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
 }
 
 .upload_image {
-    width: 100%;
-    height: 196rpx;
-    vertical-align: top;
+  width: 100%;
+  height: 196rpx;
+  vertical-align: top;
 }
 
 .upload-box {
-    border: 2rpx dashed #dddddd;
-    font-size: 24rpx;
-    display: flex;
-    flex-direction: column;
-    height: 192rpx;
-    justify-content: center;
-    align-items: center;
-    flex: 0 0 calc((100% - 42rpx)/3);
+  border: 2rpx dashed #dddddd;
+  font-size: 24rpx;
+  display: flex;
+  flex-direction: column;
+  height: 192rpx;
+  justify-content: center;
+  align-items: center;
+  flex: 0 0 calc((100% - 42rpx)/3);
 
-    .upload-icon {
-        width: 60rpx;
-        margin-bottom: 10rpx;
-    }
+  .upload-icon {
+    width: 60rpx;
+    margin-bottom: 10rpx;
+  }
 }
 
 .image_box {
-    position: relative;
-    height: 196rpx;
-    flex: 0 0 calc((100% - 42rpx)/3);
-    margin: 0 20rpx 20rpx 0;
+  position: relative;
+  height: 196rpx;
+  flex: 0 0 calc((100% - 42rpx)/3);
+  margin: 0 20rpx 20rpx 0;
 }
 
 .image_box:nth-child(3n) {
-    margin-right: 0;
+  margin-right: 0;
 }
 
 .del_image {
-    width: 36rpx;
-    position: absolute;
-    right: -10rpx;
-    top: -10rpx;
+  width: 36rpx;
+  position: absolute;
+  right: -10rpx;
+  top: -10rpx;
 }
 </style>
 
 <script type="application/json">
 {
-    "component": true,
-    "usingComponents": {}
+  "component": true,
+  "usingComponents": {}
 }
-</script>
+</script>

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

@@ -1,67 +1,67 @@
-<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: ""
-        }
-    },
-    setup(props) {
-        let contents = ref([{ contentId: "123" }]);
-        let title = ref("");
-        const { channelAlias } = toRefs(props)
-        watch(channelAlias, (newVal) => {
-            cmsApi.findCmsContentInfo({ siteId: props.siteId, channelAlias: newVal, 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: ""
+        }
+    },
+    setup(props) {
+        let contents = ref([{ contentId: "123" }]);
+        let title = ref("");
+        const { channelAlias } = toRefs(props)
+        watch(channelAlias, (newVal) => {
+            cmsApi.findCmsContentInfo({ siteId: props.siteId, channelAlias: newVal, 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>