jufubao-base 1.0.134-beta8 → 1.0.134

package/src/components/JfbBaseSuccess/Attr.js

@@ -1,30 +1,33 @@
 'use strict';
 import StyleForm from "@/utils/StyleForm";
-let styleForm = new StyleForm(
-  {bgColor:null, border: null, shadow: null, spacing: '',  margin: null,radius:null},
-  null,
-  'list',
-  true
-);
+let styleForm = new StyleForm({border: null, shadow: null, spacing: '',  bgColor:'',  margin: null,radius:null}, null, 'list');
 export default {
   style: [],
-  content: (data={})=>{
+  content: (data)=>{
     return [
       {
         label: '自定义按钮名称:',
         ele: 'el-input',
         type: 'text',
         valueKey: 'custom_btn_name',
-        groupKey:'content',
         value: data['custom_btn_name'] || '',
         placeholder: '请输入自定义按钮名称',
         className: 'input80'
       },
+      {
+        "label": "自定义按钮跳转地址:",
+        "ele": "xd-select-pages-path",
+        "valueKey": "custom_btn_path",
+        "value": data['custom_btn_path'] || null,
+        "setting": {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        "inline": false,
+      },
       {
         label: '是否显示码:',
         ele: 'xd-radio',
         valueKey: 'is_show_code',
-        groupKey:'content',
         value:data['is_show_code']|| '',
         placeholder: '请选择',
         list: [
@@ -33,10 +36,9 @@ export default {
         ],
       },
       {
-        label: '是否显示商品信息:',
+        label: '是否显示商品:',
         ele: 'xd-radio',
         valueKey: 'is_show_product',
-        groupKey:'content',
         value:data['is_show_product']|| '',
         placeholder: '请选择',
         list: [
@@ -45,9 +47,8 @@ export default {
         ],
       },
       {
-        label: '温馨提示配置:',
+        label: '自定义内容:',
         ele: 'xd-site-news',
-        groupKey:'content',
         valueKey: 'notice',
         value: data['notice'] || null,
         className: 'input70',
@@ -69,12 +70,11 @@ export default {
           }
 
           //获取返回参数(场景类型名称为必填)
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
+          let loading = XdBus.getParentApi('loading')({});
 
           //获取显示内容
           if (action === 'screen') {
-            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
+            XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_bucket_content_tip' })
               .then(res => {
                 loading.close();
                 data.cb(res['list'])
@@ -91,7 +91,7 @@ export default {
             XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
               .then(res => {
                 loading.close()
-                data.cb({list: res.list, selectId: res.selected})
+                data.cb({ list: res.list, selectId: res.selected })
               })
               .catch(error => {
                 loading.close()
@@ -114,7 +114,6 @@ export default {
 
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('cmsPublishEditxContent')(data.params)
               .then(res => {
                 console.log('cmsPublishEditxContent', res)
@@ -129,7 +128,6 @@ export default {
 
           //位置列表
           if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -143,7 +141,6 @@ export default {
 
           //位置创建
           if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -158,7 +155,6 @@ export default {
 
           //位置编辑
           if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -173,7 +169,6 @@ export default {
 
           //位置删除
           if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsPosition')(data.params)
               .then(res => {
                 loading.close();
@@ -188,7 +183,6 @@ export default {
 
           //获取广告位内容列表
           if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getListNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -202,7 +196,6 @@ export default {
 
           //广告内容创建
           if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('addNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -217,7 +210,6 @@ export default {
 
           //广告内容编辑
           if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('updateNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -232,7 +224,6 @@ export default {
 
           //广告内容删除
           if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('deleteNewsContent')(data.params)
               .then(res => {
                 loading.close();
@@ -247,7 +238,6 @@ export default {
 
           //内容发布
           if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
             console.log('publish', data.params)
             XdBus.getParentApi('cmsPublishContent')(data.params)
               .then(res => {
@@ -262,74 +252,14 @@ export default {
 
           //通知页面进行刷新
           if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
             XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
             loading.close()
           }
         },
         inline: false,
-        notice: '温馨提示内容配置选用后(组件预览将不做实时生效处理)，将根据不同业务线展示对应提示内容。',
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'boxBgColor',
-        groupKey:'style',
-        value: data['boxBgColor'] || '',
-        placeholder: '请选择背景颜色',
-        classNmae: 'input80',
-      },
-      {
-        label: '支付状态背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'payBgColor',
-        groupKey:'style',
-        value: data['payBgColor'] || '',
-        placeholder: '请选择支付状态背景颜色',
-        classNmae: 'input80',
-      },
-      ...styleForm.getForm(data, '二维码样式配置'),
-      {
-        ele: 'title',
-        label: '操作按钮样式设置',
-        size: 'small',
-        groupKey:'style',
-      },
-      {
-        label: '边框颜色:',
-        ele: 'xd-color',
-        valueKey: 'btnBorderColor',
-        groupKey:'style',
-        value: data['btnBorderColor'] || '',
-        classNmae: 'input80',
-      },
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'btnBgColor',
-        groupKey:'style',
-        value: data.btnBgColor || '',
-        classNmae: 'input80',
-      },
-      {
-        label: '文字颜色:',
-        ele: 'xd-color',
-        valueKey: 'btnTextColor',
-        groupKey:'style',
-        value: data.btnTextColor || '',
-        classNmae: 'input80',
-      },
-      {
-        "label": "自定义按钮跳转地址:",
-        "ele": "xd-select-pages-path",
-        "valueKey": "custom_btn_path",
-        "value": data['custom_btn_path'] || null,
-        "groupKey":'advanced',
-        "setting": {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        "inline": false,
+        notice: '',
       },
+      ...styleForm.getForm(data, '内容配置')
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseSuccess/JfbBaseSuccess.vue

@@ -16,7 +16,10 @@
       <view class="jfb-base-success__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-success__body" :style="{backgroundColor: boxBgColor}">
+    <view
+      class="jfb-base-success__body"
+
+    >
       <view class="x-line"></view>
       <view
         v-if="noUserLoding === true"
@@ -33,8 +36,8 @@
               marginBottom: jfbListSpacing + 'rpx',
               boxShadow: jfbListShadowComputed,
               border: jfbListBorderComputed,
+              backgroundColor: jfbListBgColor,
               borderRadius: jfbListRadius + 'rpx',
-              backgroundColor:payBgColor,
             }"
           >
             <view class="jfb-base-success__body-icon-item">
@@ -82,7 +85,6 @@
                   border: jfbListBorderComputed,
                   backgroundColor: jfbListBgColor,
                   borderRadius: jfbListRadius + 'rpx',
-                  padding:jfbListSpacing + 'rpx',
                 }"
                 v-if="
                   info.codes.length === 1 &&
@@ -91,7 +93,8 @@
                 "
                 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="{
@@ -102,12 +105,9 @@
                     ></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"
-                  :style="{borderRadius: jfbListRadius + 'rpx', color:btnTextColor, backgroundColor:btnBgColor, borderColor:btnBorderColor}"
-                >{{ 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">
+                  {{ 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,7 +139,6 @@
                   <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>
@@ -147,7 +146,6 @@
                     <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']"
@@ -162,7 +160,6 @@
                   <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"
@@ -177,7 +174,6 @@
                       <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
@@ -190,7 +186,6 @@
                       <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']"
@@ -208,7 +203,6 @@
                   <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">
@@ -216,8 +210,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']"
@@ -235,7 +229,6 @@
                   <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">
@@ -244,7 +237,6 @@
                       <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']"
@@ -262,7 +254,6 @@
                   <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">
@@ -271,13 +262,11 @@
                       <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']"
@@ -308,13 +297,13 @@
             </view>
             <view
               class="jfb-base-success__body-detail"
-              v-if="is_show_product === 'Y'"
+              v-if="is_show_product === 'Y' && info.productDetail"
             >
-              <view class="jfb-base-success__body-detail-title" v-if="info.productDetail">
+              <view class="jfb-base-success__body-detail-title">
                 <view :style="{ background: mainColor }"></view>
                 <view>商品详情</view>
               </view>
-              <view class="jfb-base-success__body-detail-html x-content-info" v-if="info.productDetail">
+              <view class="jfb-base-success__body-detail-html">
                 <xd-content-xss v-html="info.productDetail"></xd-content-xss>
               </view>
             </view>
@@ -373,7 +362,7 @@ let styleForm = new StyleForm(
   {
     border: null,
     shadow: null,
-    spacing: 20,
+    spacing: 24,
     bgColor: "#FFFFFF",
     margin: {
       bottom: 20,
@@ -381,7 +370,7 @@ let styleForm = new StyleForm(
       right: 20,
       top: 20,
     },
-    radius: 10,
+    radius: null,
   },
   getContainerPropsValue,
   "list"
@@ -413,20 +402,14 @@ 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: "",
@@ -446,7 +429,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);
   },
@@ -461,7 +444,7 @@ export default {
       this.params = options;
       this.order_id = options.order_id;
 
-      //已登录
+      //已登陆
       if(this.noUserLoding === false || this.isPreview ) {
         setTimeout(()=>{
           this.getStatus();
@@ -517,11 +500,6 @@ 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",
@@ -600,7 +578,7 @@ export default {
       }
 
       //设置码状态
-      //info.codes = [info.codes[0]]
+      //info.codes = [info.codes[3]]
       info.codes =
         info.codes &&
         info.codes.map((item) => {
@@ -892,14 +870,14 @@ export default {
 
     &-detail {
       &-html {
-        padding: unit(20, rpx) 0;
+        padding: unit(20, rpx) unit(30, rpx);
         color: #999;
       }
       &-title {
         display: flex;
         align-items: center;
         border-bottom: unit(2, rpx) solid #f6f6f6;
-        padding: unit(30, rpx) unit(10, rpx);
+        padding: unit(30, rpx) unit(30, rpx);
 
         & > view:first-child {
           width: unit(6, rpx);

package/src/components/JfbBaseSuccess/JfbBaseSuccessLess.less

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

package/src/components/JfbBaseSuccess/Mock.js

@@ -55,14 +55,6 @@ 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: {