jufubao-base 1.0.284 → 1.0.286

package/get.package.path.js

@@ -8,11 +8,11 @@
  */
 const getPackagePath = (threePackagePath, packname = 'gxd-commands-bussiness')=>{
   if(packname === 'gxd-commands-bussiness') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-commands-bussiness/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-commands-bussiness/${threePackagePath}`;
   }
 
   if (packname === 'gxd-uni-library-editx') {
-    return `/Users/shiyonggao/Desktop/code/BASE/UNIAPP/xd-uni-library-editx/${threePackagePath}`;
+    return `/Users/shiyonggao/home/root/Base-Jufubao/xd-uni-library-editx/${threePackagePath}`;
   }
 
 };

package/package.json

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

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -915,26 +915,19 @@
       :cancel="false"
       :confirm="false"
       title="提示"
+      :class="{'cus-barcode-box': showType==='barcode'}"
     >
-      <view
-        :style="{
-          display: 'flex',
-          justifyContent: 'center',
-          alignItems: 'center',
-          paddingTop: '40rpx',
-          height: showType === 'qrcode' ? '70vw' : '35vw',
-        }"
-      >
-         <view style="position: relative">
-          <image :src="codeSrc" mode="aspectFit"></image>
-          <image v-if="logo&&showType === 'qrcode'" :src="logo" style="
+      <view :class="{'cus-qrcode':showType==='qrcode','cus-barcode': showType==='barcode'}">
+         <view style="position: relative;">
+           <image v-if="showType === 'qrcode'" :src="codeSrc" mode="aspectFit"></image>
+           <image v-else :src="codeSrc" mode="widthFix"></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>
+            transform: translate(-50rpx, -50rpx);"></image>
         </view>
       </view>
       <view v-if="dialogCode && dialogCode.tips" class="dialog_password"> {{ dialogCode.tips}}</view>
@@ -990,6 +983,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseOrderDetailMixin],
   data() {
     return {
+      closeMask: true,
       info: null,
       brandPath: "", //查看品牌路径
       showPayCard: false,
@@ -1681,6 +1675,44 @@ export default {
   flex-shrink: 0;
 }
 
+.cus-qrcode {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding-top: 40rpx;
+  height: 70vw;
+}
+
+.cus-barcode {
+  height: 100rpx;
+  width: 100%;
+  margin-bottom: 30rpx;
+
+  & > view {
+    height: 100rpx;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    & >image {
+      max-height: 100%;
+    }
+  }
+}
+
+.cus-barcode-box {
+  /deep/ .xd-dailog__body-content {
+    padding-left: 30rpx;
+    padding-right: 30rpx;
+    padding-bottom: 30rpx;
+  }
+
+  /deep/ .xd-dailog__body-content-box{
+    padding: 0;
+  }
+}
+
 
 .jfb-base-order-detail {
   &__body {

package/src/components/JfbBaseOrderDetail/Mock.js

@@ -35,7 +35,7 @@ module.exports = {
       {
         "code": "A1121|1234",
         "can_read_code": "取票码:A1121|验证码:1234",
-        "code_url": "\/xxx?text=A1121|1234",
+        "code_url": "\/common\/v1\/image\/qrcode?code_content=h.161.hmfrqwdfzd0b1eny&size=240",
         "password": "",
         "can_read_password": "",
         "show_type": "qrcode"
@@ -43,7 +43,7 @@ module.exports = {
       {
         "code": "A2222|2222",
         "can_read_code": "取票码:A2222|验证码:2222",
-        "code_url": "\/xxx?text=A2222|2222",
+        "code_url": "\/common\/v1\/image\/qrcode?code_content=h.161.hmfrqwdfzd0b1eny&size=240",
         "password": "",
         "can_read_password": "",
         "show_type": "qrcode"