jufubao-base 1.0.133 → 1.0.134-beta10

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -16,10 +16,7 @@
       <view class="jfb-base-success__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view
-      class="jfb-base-success__body"
-
-    >
+    <view class="jfb-base-success__body" :style="{backgroundColor: boxBgColor}">
       <view class="x-line"></view>
       <view
         v-if="noUserLoding === true"
@@ -36,8 +33,8 @@
               marginBottom: jfbListSpacing + 'rpx',
               boxShadow: jfbListShadowComputed,
               border: jfbListBorderComputed,
-              backgroundColor: jfbListBgColor,
               borderRadius: jfbListRadius + 'rpx',
+              backgroundColor:payBgColor,
             }"
           >
             <view class="jfb-base-success__body-icon-item">
@@ -85,6 +82,7 @@
                   border: jfbListBorderComputed,
                   backgroundColor: jfbListBgColor,
                   borderRadius: jfbListRadius + 'rpx',
+                  padding:jfbListSpacing + 'rpx',
                 }"
                 v-if="
                   info.codes.length === 1 &&
@@ -93,8 +91,7 @@
                 "
                 class="jfb-base-success__body-card jfb-base-success__body-cashier"
               >
-                <view class="jfb-base-success__body-cashier-text"
-                  >{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
+                <view class="jfb-base-success__body-cashier-text">{{info.codes[0].show_type === "qrcode" ? "二维码" : "条形码" }}</view>
                   <view style="position: relative">
                     <image
                       :style="{
@@ -105,9 +102,12 @@
                     ></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 v-if="info.codes[0].can_read_password" class="jfb-base-success__body-cashier-password" @click="showPassword = true">
-                  {{ showPassword ? info.codes[0].can_read_code : "查看密码" }}
-                </view>
+                <view
+                  v-if="info.codes[0].can_read_password"
+                  class="jfb-base-success__body-cashier-password"
+                  @click="showPassword = true"
+                  :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
+                >{{ showPassword ? info.codes[0].can_read_code : "查看密码" }}</view>
                 <view v-else class="jfb-base-success__body-cashier-text">{{ info.codes[0].can_read_code }}</view>
                 <view v-if="info.codes[0].refund_tip_text" style="color:red;font-size:24rpx;text-align:center;margin-top:10rpx">{{info.codes[0].refund_tip_text}}</view>
                 <view
@@ -139,6 +139,7 @@
                   <view
                     class="jfb-base-success__body-card jfb-base-success__body-num"
                     v-if="item.show_type === 'text' && !item.password"
+                    :style="{padding:jfbListSpacing + 'rpx'}"
                   >
                     <view class="jfb-base-success__body-num-info">
                       <view>{{ item.can_read_code }}</view>
@@ -146,6 +147,7 @@
                     <view
                       class="jfb-base-success__body-num-info-copy"
                       @click="copy(item.code)"
+                      :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
                     >复制</view>
                     <view
                       v-if="item['code_end_time']"
@@ -160,6 +162,7 @@
                   <view
                     class="jfb-base-success__body-card"
                     v-if="item.show_type === 'text' && item.password"
+                    :style="{padding:jfbListSpacing + 'rpx'}"
                   >
                     <view
                       class="jfb-base-success__body-num"
@@ -174,6 +177,7 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="copy(item.code)"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
                       >复制</view>
                     </view>
                     <view
@@ -186,6 +190,7 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="copy(item.password)"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
                       >复制</view>
                       <view
                         v-if="item['code_end_time']"
@@ -203,6 +208,7 @@
                   <view
                     class="jfb-base-success__body-card"
                     v-if="item.show_type === 'qrcode'"
+                    :style="{padding:jfbListSpacing + 'rpx'}"
                   >
                     <view class="jfb-base-success__body-num">
                       <!-- <view class="jfb-base-success__body-num-info">
@@ -210,8 +216,8 @@
                       </view> -->
                       <view
                         class="jfb-base-success__body-num-info-copy"
-                        style="margin-top: 0;"
                         @click="handleShowCode(item)"
+                        :style="{marginTop:0, borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
                       >查看二维码和密码</view>
                       <view
                         v-if="item['code_end_time']"
@@ -229,6 +235,7 @@
                   <view
                     class="jfb-base-success__body-card"
                     v-if="item.show_type === 'barcode'"
+                    :style="{padding:jfbListSpacing + 'rpx'}"
                   >
                     <view class="jfb-base-success__body-num">
                       <view class="jfb-base-success__body-num-info">
@@ -237,6 +244,7 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleShowCode(item)"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
                         >查看一维码</view>
                       <view
                         v-if="item['code_end_time']"
@@ -254,6 +262,7 @@
                   <view
                     class="jfb-base-success__body-card jfb-base-success__body-num"
                     v-if="item.show_type === 'url'"
+                    :style="{padding:jfbListSpacing + 'rpx'}"
                   >
                     <view class="code-url">
                       <view class="jfb-base-success__body-num-info">
@@ -262,11 +271,13 @@
                       <view
                         class="jfb-base-success__body-num-info-copy"
                         @click="handleToLink(item.code)"
+                        :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
                       >访问</view>
                     </view>
                     <view
                       class="jfb-base-success__body-num-info-copy"
                       @click="copy(item.code)"
+                      :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
                     >复制</view>
                     <view
                       v-if="item['code_end_time']"
@@ -297,13 +308,13 @@
             </view>
             <view
               class="jfb-base-success__body-detail"
-              v-if="is_show_product === 'Y' && info.productDetail"
+              v-if="is_show_product === 'Y'"
             >
-              <view class="jfb-base-success__body-detail-title">
+              <view class="jfb-base-success__body-detail-title" v-if="info.productDetail">
                 <view :style="{ background: mainColor }"></view>
                 <view>商品详情</view>
               </view>
-              <view class="jfb-base-success__body-detail-html">
+              <view class="jfb-base-success__body-detail-html x-content-info" v-if="info.productDetail">
                 <xd-content-xss v-html="info.productDetail"></xd-content-xss>
               </view>
             </view>
@@ -362,7 +373,7 @@ let styleForm = new StyleForm(
   {
     border: null,
     shadow: null,
-    spacing: 24,
+    spacing: 20,
     bgColor: "#FFFFFF",
     margin: {
       bottom: 20,
@@ -370,7 +381,7 @@ let styleForm = new StyleForm(
       right: 20,
       top: 20,
     },
-    radius: null,
+    radius: 10,
   },
   getContainerPropsValue,
   "list"
@@ -402,14 +413,20 @@ export default {
       is_show_product: "",
       webViewPath: "/pages/webview/webview", //容器路径
       isPreview: false,
+      boxBgColor:'',
+      payBgColor:'',
+      bgColor:'',
+
+      //按钮
+      btnTextColor:'',
+      btnBgColor:'',
+      btnBorderColor:'',
+
       info: null,
       timeer: null,
       noUserLoding:null,
       showPassword: false,
-
-      //请求参数
       params: null,
-
       showCode: false,
       codeSrc: "",
       logo: "",
@@ -429,7 +446,7 @@ export default {
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
-    this.noUserLoding = !this.$root['isLogined']; //判断是否需要已登陆
+    this.noUserLoding = !this.$root['isLogined']; //判断是否需要已登录
     if(this.isPreview) this.noUserLoding = false;
     this.init(this.container);
   },
@@ -444,7 +461,7 @@ export default {
       this.params = options;
       this.order_id = options.order_id;
 
-      //已登陆
+      //已登录
       if(this.noUserLoding === false || this.isPreview ) {
         setTimeout(()=>{
           this.getStatus();
@@ -500,6 +517,11 @@ export default {
     init(value) {
       this.order_id = this.$xdUniHelper.parseURL()["params"].order_id;
       this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
+      this.boxBgColor =  getContainerPropsValue(value, "content.boxBgColor", '#f8f8f8');
+      this.btnBgColor =  getContainerPropsValue(value, "content.btnBgColor", '#e5e5e5');
+      this.btnTextColor =  getContainerPropsValue(value, "content.btnTextColor", '#666');
+      this.btnBorderColor = getContainerPropsValue(value, "content.btnBorderColor", 'rgba(0,0,0,0)');
+      this.payBgColor = getContainerPropsValue(value, "content.payBgColor", '#fff');
       this.custom_btn_path = getContainerPropsValue(
         value,
         "content.custom_btn_path",
@@ -578,7 +600,7 @@ export default {
       }
 
       //设置码状态
-      //info.codes = [info.codes[3]]
+      //info.codes = [info.codes[0]]
       info.codes =
         info.codes &&
         info.codes.map((item) => {
@@ -614,8 +636,8 @@ export default {
         jfbRootExec("getMallProductDetail", {
           vm: this,
           data: {
-            xnamespace: "cake" || info.product.business_code,
-            product_id: 60004641 || info.product.product_id,
+            xnamespace: (info.product && info.product.business_code) || 'cake',
+            product_id: (info.product && info.product.product_id) || 60004641,
           },
         })
           .then((res) => {
@@ -870,14 +892,14 @@ export default {
 
     &-detail {
       &-html {
-        padding: unit(20, rpx) unit(30, rpx);
+        padding: unit(20, rpx) 0;
         color: #999;
       }
       &-title {
         display: flex;
         align-items: center;
         border-bottom: unit(2, rpx) solid #f6f6f6;
-        padding: unit(30, rpx) unit(30, rpx);
+        padding: unit(30, rpx) unit(10, rpx);
 
         & > view:first-child {
           width: unit(6, rpx);

package/src/components/JfbBaseSuccess/JfbBaseSuccessLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-success {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-success {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseSuccess/Mock.js

@@ -55,6 +55,14 @@ module.exports = {
         "password": "",
         "can_read_password": "",
         "show_type": "url"
+      },
+      {
+        "code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "can_read_code": "https://sandbox-website-05.jufubao.cn/apply/system/card/detail?card_number=101001000007228",
+        "code_url": "//sandbox-img.jufubao.cn/uploads/20230531/aed3f3d2d6932c6bc31b065c7ede7fb7.png",
+        "password": "10004",
+        "can_read_password": "密码:10004",
+        "show_type": "qrcode-pass"
       }
     ],
     "custom_content":{

package/src/components/JfbBaseTestApi/JfbBaseTestApi.vue

@@ -18,13 +18,13 @@
     <!-- #endif -->
     <view class="jfb-base-test-api__body">
       <view>
-        <xd-button @click="getUserStatus" type="primary">获取用户登陆状态</xd-button>
+        <xd-button @click="getUserStatus" type="primary">获取用户登录状态</xd-button>
       </view>
       <view>
-        <xd-button @click="getCardStatus" type="primary">获取用户登陆卡状态</xd-button>
+        <xd-button @click="getCardStatus" type="primary">获取用户登录卡状态</xd-button>
       </view>
       <view>
-        <xd-button @click="handleGetByIdCardDetail('101001000005193')" type="primary">获取登陆('101001000005193')</xd-button>
+        <xd-button @click="handleGetByIdCardDetail('101001000005193')" type="primary">获取登录('101001000005193')</xd-button>
       </view>
     </view>
   </view>
@@ -74,15 +74,15 @@
           .catch(error => {
             console.error(error)
           })
-  
+
         // #endif
-      
+
       },
       getUserStatus(){
          jfbRootFnExec(this, 'checkLoginAndCardLogin')(
            true,
            'login',
-           false,//是否自动跳转到用户登陆页
+           false,//是否自动跳转到用户登录页
          )
            .then(status=>{
              console.log(status)
@@ -93,9 +93,9 @@
       },
       getCardStatus() {
         jfbRootFnExec(this, 'checkLoginAndCardLogin')(
-          true || this.pageAttr.permission['can_card'], //是否免登陆
+          true || this.pageAttr.permission['can_card'], //是否免登录
           'card', //检查卡类型
-          false,//是否自动跳转到卡登陆页
+          false,//是否自动跳转到卡登录页
         )
           .then(status => {
             this.$xdHideLoading();
@@ -110,7 +110,7 @@
           WxMiniProgram.reLaunch({url: '/pages/in/in?a=1&b=3'});
           console.error('11111');
         })
-        
+
         // jfbRootExec('getByIdCardDetail', {
         //   vm: this,
         //   data: {

package/src/components/JfbBaseTestApi/JfbBaseTestApiLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-test-api {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-test-api {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseTestBody/JfbBaseTestBodyLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-test-body {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-test-body {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseTestBottom/JfbBaseTestBottomLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-test-bottom {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-test-bottom {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/

package/src/components/JfbBaseTestNotice/JfbBaseTestNoticeLess.less

@@ -13,9 +13,8 @@
 
 //start
 .jfb-base-test-notice {
-  border: 1px dashed rgba(0, 0, 0, 0);
   box-sizing: border-box;
-  min-height: unit(50, rpx);
+  min-height: unit(100, rpx);
 
   &__body{
       position: relative;
@@ -23,21 +22,21 @@
       z-index: 2
   }
 
-  &.editx {
+  &.editx,&:hover {
     position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
 
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
   }
 
 
@@ -72,9 +71,9 @@
 
 /**notPreview**/
 .jfb-base-test-notice {
-  &:before {
-    content: " ";
-    display: table;
-  }
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
 }
 /**endNotPreview**/