jufubao-base 1.0.320-beta3 → 1.0.320

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.320-beta3",
+  "version": "1.0.320",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseAfterSales/JfbBaseAfterSales.vue

@@ -222,11 +222,16 @@
       doAddImage(){
         uni.chooseImage({
           count: 1,
-          sourceType: ['camera'],
+          sourceType: ['camera','album'],
           success: async (res) => {
             console.log('chooseImage',res);
-            // let filePath = res.tempFilePaths[0];
-            let file = res.tempFiles[0];
+            let file
+            // #ifdef MP-WEIXIN
+            file = res.tempFilePaths[0];
+            // #endif
+            // #ifdef H5
+            file = res.tempFiles[0];
+            // #endif
             this.$xdShowLoading({});
             try{
               let image = await this.uploadImage(file);
@@ -239,7 +244,7 @@
         })
       },
       uploadImage(file){
-        let fileName = file.name;
+        let fileName = file.name||'image.png';
         return new Promise((resolve, reject) => {
           jfbRootExec("getConOssSign", {
             vm: this,
@@ -251,7 +256,12 @@
             delete res['cdn_url']
             uni.uploadFile({
               url: res.action,
+              // #ifdef H5
               file: file,
+              // #endif
+              // #ifdef MP-WEIXIN
+              filePath: file, // 小程序图片临时路径
+              // #endif
               name: 'file',
               formData: {
                 ...res,

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -146,6 +146,7 @@ import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import {mapState} from "vuex";
 import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer";
+import colorCardMixins from "@/mixins/colorCardMixins";
 
 
 export default {
@@ -156,7 +157,7 @@ export default {
     XdUnit,
     XdDownDrawer
   },
-  mixins: [componentsMixins, extsMixins, JfbBaseCardSweepInfoMixin],
+  mixins: [componentsMixins, extsMixins, JfbBaseCardSweepInfoMixin, colorCardMixins],
   data() {
     return {
       info: null,
@@ -235,6 +236,8 @@ export default {
           vm: this,
           data: {
             card_qrcode: this.pa,
+            multiple_id: this.multiple_id,
+            multiple_scene: this.multiple_scene
           },
         })
           .then((res) => {
@@ -522,6 +525,105 @@ export default {
       align-items: center;
       justify-content: center;
     }
+    &-type-choose {
+      background: #F8F8F8;
+      display: flex;
+      flex-direction: column;
+      height: 100%;
+
+      &-header {
+        padding: unit(20, rpx) unit(20, rpx) unit(24, rpx) unit(20, rpx);
+      }
+
+      &-title {
+        font-size: unit(28, rpx);
+        color: #333;
+        margin-bottom: unit(24, rpx);
+        text-align: center;
+      }
+
+      &-notice {
+        font-size: unit(24, rpx);
+        text-align: center;
+      }
+
+      &-scroll {
+        flex: 1;
+        padding: 0 unit(20, rpx) 0 unit(20, rpx);
+        overflow-y: auto;
+        max-height: 800rpx;
+      }
+
+      &-item {
+        background: #fff;
+        border-radius: unit(16, rpx);
+        padding: unit(32, rpx);
+        margin-bottom: unit(24, rpx);
+        border: unit(2, rpx) solid #eee;
+
+        &-header {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-bottom: unit(24, rpx);
+        }
+
+        &-header-left {
+          display: flex;
+          align-items: center;
+          flex: 1;
+        }
+
+        &-icon {
+          margin-right: unit(16, rpx);
+        }
+
+        &-title {
+          font-size: unit(28, rpx);
+          color: #333;
+          flex: 1;
+        }
+
+        &-validity {
+          font-size: unit(24, rpx);
+          color: #999;
+        }
+
+        &-content {
+          margin-bottom: unit(24, rpx);
+        }
+
+        &-field {
+          font-size: unit(24, rpx);
+          color: #333;
+
+          &:first-child {
+            margin-bottom: unit(24, rpx);
+          }
+        }
+
+        &-divider {
+          height: unit(1, rpx);
+          background: #F2F2F2;
+          margin-bottom: unit(24, rpx);
+        }
+
+        &-business {
+          font-size: unit(24, rpx);
+          color: #999;
+          line-height: unit(36, rpx);
+        }
+
+        &-btn-wrap {
+          display: flex;
+          margin-bottom: unit(24, rpx);
+        }
+
+        &-btn-inner {
+          margin-left: auto;
+        }
+      }
+    }
   }
 }
 </style>