jufubao-base 1.0.169-beta2 → 1.0.169-beta20

package/src/components/JfbBaseTfkCardDetail/Attr.js

@@ -29,6 +29,7 @@ export default {
           { label: "隐藏业务线", value: "N" },
           { label: "展示业务线", value: "Y" }
         ],
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: '票券背景图:',
@@ -49,6 +50,7 @@ export default {
         action: 'action',
         sort: true,
         maxlen: 100,
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "票券使用规则",
@@ -279,6 +281,7 @@ export default {
         ele: "title",
         size: "small",
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "字体颜色",
@@ -286,6 +289,7 @@ export default {
         valueKey: 'cardFontColor',
         value: data.cardFontColor || '#303133',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "外边距设置",
@@ -304,6 +308,7 @@ export default {
         placeholder: '请设置边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "内边距设置",
@@ -322,15 +327,17 @@ export default {
         placeholder: '请设置内边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "票券高度",
         ele: "el-input",
         valueKey: 'cardHeight',
-        value: data.cardHeight || 260,
+        value: data.cardHeight || 340,
         type: 'number',
         groupKey:'style',
         placeholder: "请输入票券高度",
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "票券圆角",
@@ -350,12 +357,14 @@ export default {
               console.error(error);
             });
         },
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块样式配置",
         ele: 'title',
         size: 'small',
         groupKey: 'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块外边距",
@@ -374,6 +383,7 @@ export default {
         placeholder: '请设置内边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块容器内边距",
@@ -392,13 +402,35 @@ export default {
         placeholder: '请设置内边距',
         inline: false,
         notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "业务板块背景色",
         groupKey:'style',
         ele: 'xd-color',
         valueKey: 'bussTempBgColor',
-        value: data.bussTempBgColor || '#ffffff',
+        value: data.bussTempBgColor || '',
+        hidden: data.previewCurrent !== 'main'
+      },
+      {
+        label: "业务板块圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'bussTempRadius',
+        value: data['bussTempRadius'] || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "单项业务外边距",
@@ -417,6 +449,7 @@ export default {
         placeholder: '请设置外边距',
         inline: false,
         notice: '设置外边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main' || data.showBusinessList !== 'Y'
       },
       {
         label: "单项业务宽度",
@@ -427,12 +460,14 @@ export default {
         type: "number",
         className: 'input70',
         placeholder: "请输入单项业务宽度",
+        hidden: data.previewCurrent !== 'main' || data.showBusinessList !== 'Y'
       },
       {
         label: "使用规则、提货码样式配置",
         ele: 'title',
         size: 'small',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "外边距",
@@ -451,6 +486,7 @@ export default {
         placeholder: '请设置外边距',
         inline: false,
         notice: '设置外边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "单项内边距",
@@ -468,7 +504,8 @@ export default {
         },
         placeholder: '请设置内边距',
         inline: false,
-        notice: '设置内边距，<span style="color: red">单位：像素</span>。'
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "单项间隔距离",
@@ -479,12 +516,42 @@ export default {
         type: "number",
         className: 'input70',
         placeholder: "请输入间隔距离",
+        hidden: data.previewCurrent !== 'main'
+      },
+      {
+        label: "单项背景色",
+        groupKey:'style',
+        ele: 'xd-color',
+        valueKey: 'listColBgColor',
+        value: data.listColBgColor || '#ffffff',
+        hidden: data.previewCurrent !== 'main'
+      },
+      {
+        label: "单项圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'listColRadius',
+        value: data['listColRadius'] || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: data.previewCurrent !== 'main'
       },
       {
         label: "提货码详情样式配置",
         ele: 'title',
         size: 'small',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "提货码详情外边距",
@@ -502,7 +569,8 @@ export default {
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "提货码详情内边距",
@@ -520,7 +588,8 @@ export default {
         },
         placeholder: '请设置内边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "提货码详情背景色",
@@ -528,6 +597,53 @@ export default {
         ele: 'xd-color',
         valueKey: 'codeDetailBgColor',
         value: data.codeDetailBgColor || '#ffffff',
+        hidden: data.previewCurrent !== 'pickup'
+      },
+      {
+        label: "提货码详情圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'codeDetailRadius',
+        value: data['codeDetailRadius'] || 16,
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: data.previewCurrent !== 'pickup'
+      },
+      {
+        label: "提货码详情边框",
+        ele: "xd-border",
+        valueKey: 'codeDetailBorder',
+        value: data.codeDetailBorder || null,
+        groupKey:'style',
+        hidden: data.previewCurrent !== 'pickup'
+      },
+      {
+        label: "提货码详情边框阴影",
+        ele: "xd-shadow",
+        valueKey: 'codeDetailShadow',
+        value: data.codeDetailShadow || null,
+        groupKey:'style',
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "二维码长宽设置",
@@ -538,6 +654,7 @@ export default {
         type: "number",
         className: 'input70',
         placeholder: "请输入二维码长宽",
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "向商家付款前置图标配置",
@@ -548,6 +665,7 @@ export default {
         type: "text",
         className: 'input70',
         placeholder: "请输入图标代码",
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "刷新二维码图标配置",
@@ -558,12 +676,14 @@ export default {
         type: "text",
         className: 'input70',
         placeholder: "请输入图标代码",
+        hidden: data.previewCurrent !== 'pickup'
       },
       {
         label: "规则详情样式配置",
         ele: 'title',
         size: 'small',
         groupKey:'style',
+        hidden: data.previewCurrent !== 'rule'
       },
       {
         label: "规则详情外边距",
@@ -581,7 +701,8 @@ export default {
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'rule'
       },
       {
         label: "规则详情内边距",
@@ -599,7 +720,8 @@ export default {
         },
         placeholder: '请设置内边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>'
+        notice: '设置外边距，<span style="color: red">单位：像素</span>',
+        hidden: data.previewCurrent !== 'rule'
       },
       {
         label: "规则详情背景色",
@@ -607,6 +729,35 @@ export default {
         ele: 'xd-color',
         valueKey: 'ruleDetailBgColor',
         value: data.ruleDetailBgColor || '#ffffff',
+        hidden: data.previewCurrent !== 'rule'
+      },
+      {
+        label: "规则字体颜色",
+        groupKey:'style',
+        ele: 'xd-color',
+        valueKey: 'ruleDetailFontColor',
+        value: data.ruleDetailFontColor || '#303133',
+        hidden: data.previewCurrent !== 'rule'
+      },
+      {
+        label: "规则信息边框圆角",
+        ele: 'xd-site-select-list',
+        valueKey: 'ruleDetailRadius',
+        value: data.ruleDetailRadius || '0',
+        groupKey:'style',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: data.previewCurrent !== 'rule'
       }
     ].filter(i=>i)
   },

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -48,7 +48,9 @@
             <view class="bus_title">进入业务板块</view>
             <view class="bus_list">
               <view class="bus_item" v-for="(item, i) in businessList" :key="i"
-                :style="businessItemBox">
+                :style="businessItemBox"
+                @click="handleBusinessLogin(item)"
+              >
                 <view class="bus_img">
                   <image :src="item.image_url" />
                 </view>
@@ -57,17 +59,17 @@
             </view>
           </view>
           <view v-else>
-            <xd-button type="primary">立即使用</xd-button>
+            <xd-button type="primary" @click="doCardLogin()">立即使用</xd-button>
           </view>
         </view>
         <view class="list_col_wrap" :style="listColWrapBoxStyle">
-          <view class="list_item" :style="listColItemStyle">
+          <view class="list_item" :style="listColItemStyle" @click="switchModule('rule')">
             <view class="list_title">使用规则</view>
             <view class="list_icon">
               <xd-font-icon icon="iconxiangyou_xian" size="24"></xd-font-icon>
             </view>
           </view>
-          <view class="list_item" :style="listColItemStyle">
+          <view class="list_item" :style="listColItemStyle" @click="switchModule('pickup')">
             <view class="list_title">提货码</view>
             <view class="list_icon">
               <xd-font-icon icon="iconxiangyou_xian" size="24"></xd-font-icon>
@@ -114,7 +116,9 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import colorCardMixins from "@/mixins/colorCardMixins";
   import getServiceUrl from '@/common/getServiceUrl'
+  import { mapState, mapActions } from "vuex";
   export default {
     name: "JfbBaseTfkCardDetail",
     components: {
@@ -123,7 +127,7 @@
       XdUnit,
     },
     mixins: [
-      componentsMixins, extsMixins, JfbBaseTfkCardDetailMixin
+      componentsMixins, extsMixins, JfbBaseTfkCardDetailMixin, colorCardMixins
     ],
     data() {
       return {
@@ -143,7 +147,7 @@
         cardInfoMargin: {},
         cardInfoPadding: {},
         cardImageUrl: "",
-        cardHeight: 260,
+        cardHeight: 340,
         cardRadius: 10,
         bussPadding: {},
         bussMargin: {},
@@ -163,9 +167,21 @@
         payPreIcon: "",
         refreshIcon: "",
         bussWidth: 100,
+        codeDetailRadius: 16,
+        codeDetailBorder: {},
+        codeDetailShadow: {},
+        ruleDetailFontColor: "",
+        ruleDetailRadius: 0,
+        bussTempRadius: 16,
+        listColBgColor: "",
+        listColRadius: 16,
       }
     },
     computed: {
+      ...mapState({
+        jwxSDK: (state) => state.jwxSDK,
+        jfbAuthorize: (state) => state.jfbAuthorize,
+      }),
       cardWrapBoxStyle(){
         let padding = `${this.checkValue(this.cardInfoMargin.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.cardInfoMargin.right, 20)}rpx`;
@@ -191,6 +207,7 @@
           margin: margin,
           padding: padding,
           backgroundColor: this.bussTempBgColor,
+          borderRadius: this.bussTempRadius + 'rpx',
         })
       },
 
@@ -235,12 +252,12 @@
         return bg
       },
       listColWrapBoxStyle(){
-        let margin = `${this.checkValue(this.listColMargin.top, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.right, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.bottom, 20)}rpx`;
-        margin = `${margin} ${this.checkValue(this.listColMargin.left, 20)}rpx`;
+        let padding = `${this.checkValue(this.listColMargin.top, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.right, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.bottom, 20)}rpx`;
+        padding = `${padding} ${this.checkValue(this.listColMargin.left, 20)}rpx`;
         return this.styleObjectToString({
-          margin: margin,
+          padding: padding,
         })
       },
       listColItemStyle(){
@@ -251,6 +268,8 @@
         return this.styleObjectToString({
           padding,
           marginBottom: this.listColSpace + 'rpx',
+          backgroundColor: this.listColBgColor,
+          borderRadius: this.listColRadius + 'rpx',
         })
       },
       ruleDetailBoxStyle(){
@@ -266,9 +285,21 @@
           margin: margin,
           padding: padding,
           backgroundColor: this.ruleDetailBgColor,
+          color: this.ruleDetailFontColor,
+          borderRadius: this.ruleDetailRadius + 'rpx',
         })
       },
       codeDetailBoxStyle(){
+        let border = "none";
+        let boxShadow = "none";
+        if(this.codeDetailBorder && this.codeDetailBorder.type === 'Y'){
+          let { width, color } = this.codeDetailBorder.value || {};
+          border = `${width || 0}rpx solid ${color || 'transparent'}`;
+        }
+        if(this.codeDetailShadow && this.codeDetailShadow.type === 'Y'){
+          let { width, color } = this.codeDetailShadow.value || {};
+          boxShadow = `0 0 ${width || 0}rpx ${color || 'transparent'}`;
+        }
         let padding = `${this.checkValue(this.codeDetailPadding.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.codeDetailPadding.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.codeDetailPadding.bottom, 20)}rpx`;
@@ -281,6 +312,9 @@
           margin: margin,
           padding: padding,
           backgroundColor: this.codeDetailBgColor,
+          borderRadius: this.codeDetailRadius + 'rpx',
+          border: border,
+          boxShadow: boxShadow,
         })
       },
       qrcodeBoxStyle(){
@@ -318,12 +352,12 @@
         this.cardInfoMargin = getContainerPropsValue(value, 'content.cardInfoMargin', {top: 20, left: 20, right: 20, bottom: 20});
         this.cardInfoPadding = getContainerPropsValue(value, 'content.cardInfoPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.cardImageUrl = getContainerPropsValue(value, 'content.cardImageUrl', '');
-        this.cardHeight = getContainerPropsValue(value, 'content.cardHeight', 260);
+        this.cardHeight = getContainerPropsValue(value, 'content.cardHeight', 340);
         this.cardRadius = getContainerPropsValue(value, 'content.cardRadius', 16);
         this.bussPadding = getContainerPropsValue(value, 'content.bussPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.bussMargin = getContainerPropsValue(value, 'content.bussMargin', {top: 20, left: 20, right: 20, bottom: 20});
         this.bussTempMargin = getContainerPropsValue(value, 'content.bussTempMargin', {top: 20, left: 20, right: 20, bottom: 20});
-        this.bussTempBgColor = getContainerPropsValue(value, 'content.bussTempBgColor', '#fff');
+        this.bussTempBgColor = getContainerPropsValue(value, 'content.bussTempBgColor', 'transparent');
         this.listColMargin = getContainerPropsValue(value, 'content.listColMargin', {top: 20, left: 20, right: 20, bottom: 20});
         this.listColPadding = getContainerPropsValue(value, 'content.listColPadding', {top: 20, left: 20, right: 20, bottom: 20});
         this.listColSpace = getContainerPropsValue(value, 'content.listColSpace', 10);
@@ -338,25 +372,72 @@
         this.payPreIcon = getContainerPropsValue(value, 'content.payPreIcon', '');
         this.refreshIcon = getContainerPropsValue(value, 'content.refreshIcon', '');
         this.bussWidth = getContainerPropsValue(value, 'content.bussWidth', 100);
+        this.codeDetailRadius = getContainerPropsValue(value, 'content.codeDetailRadius', 16);
+        this.codeDetailBorder = getContainerPropsValue(value, 'content.codeDetailBorder', {});
+        this.codeDetailShadow = getContainerPropsValue(value, 'content.codeDetailShadow', {});
+        this.ruleDetailFontColor = getContainerPropsValue(value, 'content.ruleDetailFontColor', '');
+        this.ruleDetailRadius = getContainerPropsValue(value, 'content.ruleDetailRadius', 0);
+        this.bussTempRadius = getContainerPropsValue(value, 'content.bussTempRadius', 16);
+        this.listColBgColor = getContainerPropsValue(value, 'content.listColBgColor', '#fff');
+        this.listColRadius = getContainerPropsValue(value, 'content.listColRadius', 16);
+
+        console.log(this.codeDetailBorder, 'codeDetailBorder')
 
         if(this.$configProject.isPreview){
           this.curModule = this.previewCurrent;
         }
       },
+      switchModule(module){
+        this.curModule = module;
+      },
+      handleBusinessLogin(item){
+        this.doCardLogin(() => {
+          this.handleClick(item);
+        })
+      },
+      doCardLogin(cb){
+        this.$xdShowLoading({});
+        jfbRootExec("loginTfkCardBind", {
+          vm: this,
+          data: {
+            card_number: this.card_number
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          //#ifdef MP-WEIXIN
+          if (this.jfbAuthorize !== null) {
+            this.jfbAuthorize.setCardToken(res);
+          }
+          //#endif
+
+          if(cb) return cb();
+
+          if (this.$configProject.isPreview) {
+            console.log("handleBindLogin", "预览模式不跳转", this.inCallback);
+          } else {
+            this.$xdUniHelper.redirectTo({
+              url: this.settings.index
+            });
+          }
+        }).catch((res) => {
+          this.$xdHideLoading();
+        });
+      },
       getCardDetail(){
         jfbRootExec("getTfkCardDetail", {
           vm: this,
           data: {
             card_number: this.card_number,
-            is_show_entry_settings: this.showBusinessList,
+            is_show_entry_settings: this.curModule === 'main' ? this.showBusinessList : "N",
           }
         }).then(res => {
           this.cardInfo = Object.assign({}, res, {
             other_card_point: res.other_card_point ? this.$xdUniHelper.divisionFloatNumber(res.other_card_point, 100) : 0
           });
-          this.businessList = res.site_entry_settings.map(item => {
+          let businessList = this.filterNotSupportEntry(res.site_entry_settings);
+          this.businessList = businessList.filter(item => {
             item['image_url'] = getServiceUrl(item.image_url);
-            return item;
+            return res.business_codes.includes(item.business_code);
           })
           if(!this.$configProject.isPreview) {
             this.setIntval(res.card_qrcode_expire);
@@ -365,6 +446,56 @@
           }
         })
       },
+      handleClick(entry){
+        const {dir, path, host, appType} = entry['redirect_data'];
+        let regHttp = /^(\/\/|http:\/\/|https:\/\/).+$/;
+        let regSp = /(-apiuri\/v)/;
+
+        if(!appType) entry.redirect_data.appType = 'h5';
+        let nsp = Base64.encodeURI(JSON.stringify({business_code: entry['business_code']}));
+
+        //外站配置地址
+        if(entry.redirect_type === 'URL') {
+          if(regHttp.test(entry.redirect_data['path']) || regSp.test(entry.redirect_data['path'])) {
+            this.$xdUniHelper.redirectTo({
+              url:`${entry.redirect_data['path']}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+            }, false)
+          }
+          else {
+            console.error(`配置错误：${entry.redirect_data['path']}`);
+            throw new Error(`配置错误：${entry.redirect_data['path']}`)
+          }
+          return
+        }
+
+        //站内应用处理
+        let jumpUrl = path;
+        let cardPathStr = '';
+        const {deploy_dir} = this.projectAttr;
+        if(host === this.projectAttr.host && deploy_dir !== dir){
+          jumpUrl = `//${host}/${dir}${path}`;
+          //#ifdef MP-WEIXIN
+          jumpUrl = `https:${jumpUrl}`;
+          //#endif
+        }
+
+        //#ifdef MP-WEIXIN
+        //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+        if(entry.redirect_data.appType === 'h5') {
+          const custom_redirect_data = this.$xdUniHelper.checkVarType(entry['custom_redirect_data']) === 'object'?entry['custom_redirect_data']:{};
+          const cardPathObject = this.getCardPath(custom_redirect_data);
+          if(cardPathObject !== null) {
+            const {cardPath, cardSelf} =cardPathObject
+            if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+          }
+        }
+        //#endif
+
+        jumpUrl = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`;
+        console.warn(`entry.path:${jumpUrl}`);
+        if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
+        else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
+      },
       getContent() {
         jfbRootExec("getListBaseNewsContent", {
           vm: this,
@@ -449,6 +580,8 @@
         display: flex;
         flex-direction: column;
         justify-content: space-between;
+        font-size: 26rpx;
+        box-sizing: border-box;
         .card_top{
           display: flex;
           flex-direction: column;
@@ -459,6 +592,14 @@
             ._point{
               font-size: 40rpx;
               font-weight: bold;
+              ::v-deep .xd-unit{
+                height: auto !important;
+                font-weight: bold;
+                align-items: flex-end;
+                .xd-unit__unit{
+                  line-height: 1.5 !important;
+                }
+              }
               ._unit{
                 font-size: 24rpx;
                 margin-left: 4rpx;
@@ -521,7 +662,6 @@
         }
       }
       .list_col_wrap{
-        margin: 40rpx 0;
 
         .list_item{
           display: flex;
@@ -539,11 +679,13 @@
       .code_wrap{
         display: flex;
         flex-direction: column;
+        font-size: 28rpx;
         .code_title{
           display: flex;
           align-items: center;
           ._title{
             margin-left: 30rpx;
+            font-size: 32rpx;
           }
         }
         .barcode{