jufubao-base 1.0.117 → 1.0.119-beta10

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -88,13 +88,16 @@
           >
             <view class="jfb-base-success__body-cashier-text"
               >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
-            <image
-              :style="{
-                height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
-                width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
-              }"
-              :src="info.codes[0].code_url"
-            ></image>
+              <view style="position: relative">
+                <image
+                  :style="{
+                    height: info.codes[0].show_type === 'qrcode' ? '50vw' : '25vw',
+                    width: info.codes[0].show_type === 'qrcode' ? '50vw' : '85vw',
+                  }"
+                  :src="info.codes[0].code_url"
+                ></image>
+                <image v-if="info.codes[0].logo&&info.codes[0].show_type === 'qrcode'" class="logo-icon" :src="info.codes[0].logo"></image>
+              </view>
             <view class="jfb-base-success__body-cashier-text">
               {{ info.codes[0].can_read_code }}
             </view>
@@ -309,7 +312,17 @@
         class="jfb-base-success__body-dialog"
         :style="{ height: showType === 'qrcode' ? '70vw' : '35vw' }"
       >
-        <image :src="codeSrc" mode="aspectFit"></image>
+        <view style="position: relative">
+          <image :src="codeSrc" mode="aspectFit"></image>
+          <image v-if="logo&&showType === 'qrcode'" :src="logo" style="
+            width: 100rpx;
+            height: 100rpx;
+            position: absolute;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50rpx, -50rpx);">
+          </image>
+        </view>
       </view>
     </xd-dailog>
   </view>
@@ -329,6 +342,7 @@ import XdSuccess from "@/components/XdSuccess/XdSuccess";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import XdContentXss from "@/components/XdContentXss/XdContentXss";
 import StyleForm from "@/utils/StyleForm";
+import getServiceUrl from "@/common/getServiceUrl";
 import { Base64 } from "js-base64";
 import { getNoUrl } from "@/utils/nourl";
 import { mapState } from "vuex";
@@ -386,6 +400,7 @@ export default {
 
       showCode: false,
       codeSrc: "",
+      logo: "",
       ...styleForm.getDataItem(),
     };
   },
@@ -417,6 +432,7 @@ export default {
     handleShowCode(item) {
       this.codeSrc = item.code_url;
       this.showType = item.show_type;
+      this.logo = item.logo;
       this.showCode = true;
     },
     /**
@@ -545,6 +561,9 @@ export default {
       info.codes =
         info.codes &&
         info.codes.map((item) => {
+          if(item.logo) {
+            item.logo = getServiceUrl(item.logo)
+          }
           if (item.show_type === "qrcode" || item.show_type === "barcode") {
             let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
             if (!reg.test(item.code_url)) item.code_url = `${this.brandInfo["api_host"]}${item.code_url}`;
@@ -672,6 +691,13 @@ export default {
 
 .jfb-base-success {
   &__body {
+    .logo-icon {
+      width: unit(100, rpx) !important;
+      height: unit(100, rpx) !important;
+      position: absolute;
+      top: 50%;
+      transform: translate(-50rpx, -50rpx);
+    }
     &-card {
       padding: unit(30, rpx);
     }