jufubao-base 1.0.169-beta9 → 1.0.170

package/package.json

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

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -110,7 +110,7 @@
         partnerName: "",
         useSearch: "N",   //Y:用于搜索;  N:用于跳转搜索页面
         searchPagePath: "",
-        placeholder: "搜索商品名称",
+        placeholder: "请输入关键词",
         choseCityPath: "",  //选择城市i
 
 
@@ -166,7 +166,7 @@
         this.showBack = getContainerPropsValue(container, "content.showBack", "Y");
         this.showPartner = getContainerPropsValue(container, "content.showPartner", "N")
         this.showPartnerName = getContainerPropsValue(container, "content.showPartnerName", "N");
-        this.placeholder = getContainerPropsValue(container, "content.placeholder");
+        this.placeholder = getContainerPropsValue(container, "content.placeholder",'请输入关键词');
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;

package/src/components/JfbBaseLogin/Attr.js

@@ -775,6 +775,16 @@ export default {
         className: "input70",
         hidden: data.previewCurrent !== "account",
       },
+      {
+        label: '密码图标:',
+        ele: "el-input",
+        valueKey: "passwordIcon",
+        value: data.passwordIcon || "",
+        groupKey:'style',
+        placeholder: "请输入密码图标",
+        className: "input70",
+        hidden: data.previewCurrent !== "account",
+      },
       {
         label: "标签字体样式设置:",
         ele: "xd-font",

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -175,6 +175,7 @@
               class="form-item"
               :class="[inputStyle]"
               label="密码"
+              :leftIcon="passwordIcon"
               :labelWidth="labelWidth"
               content-align="left"
             >
@@ -398,6 +399,7 @@ export default {
       },
       phoneIcon: "", //手机号登录输入框图标
       codeIcon: "", //验证码登录输入框图标
+      passwordIcon: "", //密码登录输入框图标
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
       formBorderWidth: 1, //表单边框宽度
@@ -651,13 +653,14 @@ export default {
       this.formBgColor = getContainerPropsValue(value, "content.formBgColor", '#FFFFFF');
       this.labelAlign = getContainerPropsValue(value, "content.labelAlign", 'left');
       this.labelWidth = getContainerPropsValue(value, "content.labelWidth", '180');
-      this.labelPosition = getContainerPropsValue(value, "content.labelPosition", 'top');
+      this.labelPosition = getContainerPropsValue(value, "content.labelPosition", 'left');
       this.formPadding = getContainerPropsValue(value, "content.formPadding", {top: 20, left: 20, right: 20, bottom: 20});
       this.agreePadding = getContainerPropsValue(value, "content.agreePadding", {});
       this.authAgreePadding = getContainerPropsValue(value, "content.authAgreePadding", {top: 20, left: 20, right: 20, bottom: 20});
       this.authBtnPadding = getContainerPropsValue(value, "content.authBtnPadding", {top: 20, left: 20, right: 20, bottom: 20});
       this.phoneIcon = getContainerPropsValue(value, "content.phoneIcon", '');
       this.codeIcon = getContainerPropsValue(value, "content.codeIcon", '');
+      this.passwordIcon = getContainerPropsValue(value, "content.passwordIcon", '');
       this.inputStyle = getContainerPropsValue(value, "content.inputStyle", 'linear');
       this.formBorderColor = getContainerPropsValue(value, "content.formBorderColor", '#F9F9F9');
       this.formBorderWidth = getContainerPropsValue(value, "content.formBorderWidth", '1');
@@ -799,6 +802,8 @@ export default {
 
       let { redirect_url, callback_url } = this;
 
+      redirect_url = redirect_url || callback_url || this.$settings.index;
+
       //不同项目直接域名替换
       if (/^(@site_domain@).+$/.test(redirect_url)) {
         redirect_url = redirect_url.replace(/@site_domain@/, location.origin)

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -14,7 +14,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-notice__body">
-      <view class="jfb-base-notice__body-line"></view>
+      <view class="jfb-base-notice__body-line" v-if="contentList.length > 0"></view>
       <view>
         <template v-if="style === '3' && isPreview">
           <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">弹窗模式方便编辑(占位)，在线上此模块不显</view>
@@ -23,7 +23,7 @@
           <template v-if="contentList.length === 0 && isPreview">
             <view class="jfb-base-notice__body-pop" :style="{backgroundColor:backgroundColor, color:warningColor}">接口无数返回，请检查是否配置成功!</view>
           </template>
-          <view v-else class="jfb-base-notice__body-scroll">
+          <view v-if="contentList.length > 0" class="jfb-base-notice__body-scroll">
             <view
               class="upAndDown"
               :style="{

package/src/components/JfbBaseTfkCardBind/Attr.js

@@ -188,7 +188,7 @@ export default {
         ],
         hidden: data.previewCurrent !== 'ticket',
       },
-      data.inputStyle === 'linear' && {
+      {
         label: "标签文字对齐方式:",
         ele: 'xd-radio',
         valueKey: 'labelAlign',
@@ -215,6 +215,26 @@ export default {
         className: 'input60',
         hidden: data.previewCurrent !== 'ticket',
       },
+      data.inputStyle === 'face' && {
+        label: '面性输入框圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'formBorderRadius',
+        value: data.formBorderRadius ||'',
+        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 !== 'ticket',
+      },
       {
         label: "标签文字是否显示:",
         ele: 'xd-radio',
@@ -306,6 +326,7 @@ export default {
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
         hidden: data.previewCurrent !== 'ticket',
       },
+      
       {
         label: "票券号码图标:",
         ele: "xd-font",
@@ -557,6 +578,58 @@ export default {
         notice: '填充设置，单位：<span style="color: red">像素</span>。默认值：<span style="color: red">20</span> 像素',
         hidden: data.previewCurrent !== 'code',
       },
+      {
+        label: "输入框样式设置",
+        ele: "xd-radio",
+        valueKey: "digitalInputStyle",
+        value: data.digitalInputStyle || 'linear',
+        groupKey:'style',
+        list: [
+          { label: "线性", value: "linear" },
+          { label: "面性", value: "face"}
+        ],
+        hidden: data.previewCurrent !== 'code',
+      },
+      data.digitalInputStyle === 'linear' && {
+        label: "标签位置:",
+        ele: "xd-radio",
+        valueKey: "digitalLabelPosition",
+        value: data.digitalLabelPosition || "left",
+        groupKey:'style',
+        placeholder: "请选择标签对齐方式",
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: '居左', value: "left"},
+          {label: '居上', value: "top"},
+        ],
+        hidden: data.previewCurrent !== 'code',
+      },
+      {
+        label: "标签文字对齐方式:",
+        ele: 'xd-radio',
+        valueKey: 'digitalLabelAlign',
+        value: data.digitalLabelAlign || "right",
+        groupKey:'style',
+        placeholder: "请选择标签对齐方式",
+        multiple: false,
+        className: 'input80',
+        list: [
+          {label: '左对齐', value: "left"},
+          {label: '右对齐', value: "right"},
+          {label: '居中', value: "center"},
+        ],
+        hidden: data.previewCurrent !== 'code',
+      },
+      // {
+      //   label: "电子码标签文案",
+      //   ele: "el-input",
+      //   valueKey: "digitalCodeLabel",
+      //   value: data.digitalCodeLabel || '',
+      //   groupKey:'style',
+      //   type: "string",
+      //   hidden: data.previewCurrent !== 'code',
+      // },
       {
         label: "电子码标签宽度设置",
         ele: "el-input",
@@ -566,15 +639,15 @@ export default {
         type: "number",
         hidden: data.previewCurrent !== 'code',
       },
-      {
-        label: "电子码输入框颜色设置",
+      data.digitalInputStyle === 'linear' && {
+        label: "电子码输入框边框颜色设置",
         ele: "xd-color",
         valueKey: "digitalCodeColor",
-        value: data.digitalCodeColor || "#dddddd",
+        value: data.digitalCodeColor || "#F9F9F9",
         groupKey:'style',
         hidden: data.previewCurrent !== 'code',
       },
-      {
+      data.digitalInputStyle === 'face' && {
         label: '电子码输入框圆角设置:',
         ele: 'xd-site-select-list',
         valueKey: 'digitalCodeRadius',
@@ -631,7 +704,7 @@ export default {
         valueKey: 'my_card_url',
         groupKey: 'advanced',
         placeholder: '请选择我的票券跳转地址',
-        value: null,
+        value: data.my_card_url || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },
@@ -643,7 +716,7 @@ export default {
         valueKey: 'back_url',
         groupKey: 'advanced',
         placeholder: '请选择卡绑定成功回跳地址',
-        value: null,
+        value: data.back_url || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -16,6 +16,7 @@
     <view class="jfb-base-tfk-card-bind__body" :style="{
       '--form-border-color': formBorderColor,
       '--form-border-width': formBorderWidth + 'px',
+      '--form-border-radius': ($rpxNum * Number(formBorderRadius)) + 'px',
       '--form-input-padding': inputPadding + 'px',
       '--label-font-size': ($rpxNum * parseInt(labelFont.fontSize)) + 'px',
       '--label-font-color': labelFont.color,
@@ -67,7 +68,7 @@
                   v-model="form.card_number"
                   placeholder="请输入票券号"
                 />
-                <view>
+                <view @click="doScanCode">
                   <xd-font-icon :icon="scanIcon.icon || 'iconsaoma'"
                     :color="scanIcon.color"
                     :style="{fontSize: scanIcon.fontSize}"
@@ -128,13 +129,14 @@
       </view>
       <view v-else class="form_wrap" :style="digitalFormStyle">
         <xd-form :key="formRenderKey"
-          label-align="left"
-          labelPosition="left"
+          :label-align="digitalLabelAlign"
+          :labelPosition="digitalLabelPosition"
           :border="true"
           paddingBetween="0"
         >
           <xd-form-item class="form-item digital_item"
-            label=""
+            :class="[digitalInputStyle]"
+            :label="digitalCodeLabel"
             :labelWidth="digitalCodeLabelWidth"
             :leftIcon="digitalCodeIcon.icon"
             :iconColor="digitalCodeIcon.color"
@@ -201,7 +203,9 @@
         tips: "",
         labelWidth: 180,
         labelAlign: "left",
+        digitalLabelAlign: "left",
         labelPosition: "left",
+        digitalLabelPosition: "left",
         inputStyle: "linear",  //输入框样式 linear:线性  face: 面性
         formBorderColor: "#F9F9F9", //
         formBorderWidth: 1, //表单边框宽度
@@ -257,11 +261,15 @@
         digitalCodeColor: "",
         my_card_url: "",
         backUrl: "",
+        digitalInputStyle: "",
+        digitalCodeLabel: "",
+        formBorderRadius: 16,
       }
     },
     computed: {
       ...mapState({
-        brandInfo: state => state.brandInfo
+        brandInfo: state => state.brandInfo,
+        jwxSDK: (state) => state.jwxSDK,
       }),
       cardFormStyle(){
         let padding = `${this.checkValue(this.formPadding.top, 20)}rpx`;
@@ -369,6 +377,22 @@
       this.validImageAPIUrl = this.brandInfo['api_host'] + '/common/v1/valid_code/image/show'
       this.valid_token = this.$xdUniHelper.randomChar(20);
       //todo
+      //#ifdef H5
+      if (!this.$configProject.isPreview) {
+        jfbRootExec("getH5WxAuthorize", {
+          vm: this,
+          data: {site_id: "wx_pub"},
+        })
+          .then(res => {
+            console.log(0)
+          })
+          .catch(error=>{
+            this.$xdAlert({
+              content: error,
+            });
+          })
+      }
+      // #endif
     },
     methods: {
       onJfbLoad(options) {
@@ -413,14 +437,23 @@
         this.digitalCodeLabelWidth = getContainerPropsValue(value, "content.digitalCodeLabelWidth", '100');
         this.digitalCodeRadius = getContainerPropsValue(value, "content.digitalCodeRadius", '0');
         this.digitalCodeColor = getContainerPropsValue(value, "content.digitalCodeColor", '#dddddd');
+        this.digitalInputStyle = getContainerPropsValue(value, "content.digitalInputStyle", 'linear');
         this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
         this.backUrl = getContainerPropsValue(this.container, 'content.back_url', { value: "" }).value;
+        this.digitalLabelPosition = getContainerPropsValue(value, "content.digitalLabelPosition", 'left');
+        this.digitalLabelAlign = getContainerPropsValue(value, "content.digitalLabelAlign", 'left');
+        this.digitalCodeLabel = getContainerPropsValue(value, "content.digitalCodeLabel", '');
+        this.formBorderRadius = getContainerPropsValue(value, "content.formBorderRadius", 16);
 
         console.log(this.digitalCodeRadius, "digitalCodeRadius");
 
         if(this.inputStyle === 'face'){
           this.labelPosition = 'left';
-          this.labelAlign = 'left';
+          // this.labelAlign = 'left';
+        }
+        if(this.digitalInputStyle === 'face'){
+          this.digitalLabelPosition = 'left';
+          // this.digitalLabelAlign = 'left';
         }
         if(this.$configProject.isPreview){
           this.menuType = this.previewCurrent;
@@ -434,6 +467,7 @@
       },
       switchShowType(type){
         this.menuType = type;
+        this.formRenderKey = Date.now();
       },
       handlerAfterBindCard(res){
         //已绑定卡券处理
@@ -509,7 +543,13 @@
       toBindCardDigital(){
         const { code } = this.form;
 
-        if(!code) return "";
+        if(!code) {
+          uni.showToast({
+            title: '请输入电子码',
+            icon: "none"
+          });
+          return ""
+        };
         jfbRootExec("pwdCardBind", {
           vm: this,
           data: {
@@ -549,6 +589,50 @@
         let valid_token = this.$xdUniHelper.randomChar(20);
         this.valid_token = valid_token;
       },
+      p_qrCardBind(result){
+        jfbRootExec("qrCardBind", {
+          vm: this,
+          data: {
+            card_qrcode: result,
+            is_show_pop: "Y"
+          }
+        }).then(res => {
+          console.log(res);
+          this.handlerAfterBindCard(res)
+        }).catch(err => {
+          console.log(err);
+          this.$xdLog.catch(err)
+        })
+      },
+      doScanCode(){
+        console.log("开始扫码");
+        // #ifdef H5
+        this.jwxSDK.scanQRCode({
+          needResult: 1,
+          scanType: ["qrCode"],
+          success: res => {
+            // this.$set(this.form, 'card_number', res.resultStr)
+            this.p_qrCardBind(res.resultStr)
+          },
+          fail: (error) => {
+            if (typeof error === 'string') error = {error: error}
+            if (window['jwxJfbSDKParams']) error = Object.assign(error, window['jwxJfbSDKParams'])
+            this.$xdLog.setARMSError(error)
+          }
+        })
+        // #endif
+        // #ifdef MP
+        uni.scanCode({
+          success: res => {
+            // this.$set(this.form, 'card_number', res.result)
+            this.p_qrCardBind(res.result)
+          },
+          fail: (error) => {
+            this.$xdLog.setARMSError(error)
+          },
+        })
+        // #endif
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -589,6 +673,9 @@
     &__body{
       .form-item {
         ::v-deep &.uni-forms-item {
+          .is-required{
+            display: none;
+          }
           .uni-input-input{
             font-size: var(--content-font-size);
             color: var(--content-font-color);
@@ -610,14 +697,16 @@
         }
         &.linear{
           ::v-deep &.uni-forms-item--border{
-            border-color: var(--form-border-color) !important;
-            border-width: var(--form-border-width) !important;
+            // border-color: var(--form-border-color) !important;
+            // border-width: var(--form-border-width) !important;
+            border-top: none !important;
+            border-bottom: var(--form-border-width) solid var(--form-border-color) !important;
           }
         }
         &.face{
           ::v-deep .uni-forms-item__box{
             background: #F7F7F7;
-            border-radius: 16rpx;
+            border-radius: var(--form-border-radius);
             padding-right: 20rpx;
           }
           ::v-deep &.uni-forms-item--border{
@@ -640,13 +729,23 @@
           }
         }
         &.digital_item{
+          &.linear{
+            ::v-deep &.uni-forms-item--border{
+              border-color: var(--digital-border-color) !important;
+            }
+          }
+          &.face{
+            ::v-deep .uni-forms-item__box{
+              border-radius: var(--digital-border-radius);
+            }
+          }
           ::v-deep .label-icon{
             font-size: var(--digital-icon-size) !important;
           }
           ::v-deep .uni-forms-item__inner{
-            padding-bottom: 0% !important;
-            border: 1px solid var(--digital-border-color);
-            border-radius: var(--digital-border-radius);
+            // padding-bottom: 0% !important;
+            // border: 1px solid var(--digital-border-color);
+            // border-radius: var(--digital-border-radius);
           }
         }
       }

package/src/components/JfbBaseTfkCardDetail/Attr.js

@@ -333,7 +333,7 @@ export default {
         label: "票券高度",
         ele: "el-input",
         valueKey: 'cardHeight',
-        value: data.cardHeight || 260,
+        value: data.cardHeight || 340,
         type: 'number',
         groupKey:'style',
         placeholder: "请输入票券高度",
@@ -412,6 +412,26 @@ export default {
         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: "单项业务外边距",
         groupKey:'style',
@@ -498,6 +518,34 @@ export default {
         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',

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -59,7 +59,7 @@
             </view>
           </view>
           <view v-else>
-            <xd-button type="primary" @click="doCardLogin">立即使用</xd-button>
+            <xd-button type="primary" @click="doCardLogin()">立即使用</xd-button>
           </view>
         </view>
         <view class="list_col_wrap" :style="listColWrapBoxStyle">
@@ -147,7 +147,7 @@
         cardInfoMargin: {},
         cardInfoPadding: {},
         cardImageUrl: "",
-        cardHeight: 260,
+        cardHeight: 340,
         cardRadius: 10,
         bussPadding: {},
         bussMargin: {},
@@ -172,6 +172,9 @@
         codeDetailShadow: {},
         ruleDetailFontColor: "",
         ruleDetailRadius: 0,
+        bussTempRadius: 16,
+        listColBgColor: "",
+        listColRadius: 16,
       }
     },
     computed: {
@@ -204,6 +207,7 @@
           margin: margin,
           padding: padding,
           backgroundColor: this.bussTempBgColor,
+          borderRadius: this.bussTempRadius + 'rpx',
         })
       },
 
@@ -248,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(){
@@ -264,6 +268,8 @@
         return this.styleObjectToString({
           padding,
           marginBottom: this.listColSpace + 'rpx',
+          backgroundColor: this.listColBgColor,
+          borderRadius: this.listColRadius + 'rpx',
         })
       },
       ruleDetailBoxStyle(){
@@ -346,7 +352,7 @@
         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});
@@ -371,6 +377,9 @@
         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')
 
@@ -572,6 +581,7 @@
         flex-direction: column;
         justify-content: space-between;
         font-size: 26rpx;
+        box-sizing: border-box;
         .card_top{
           display: flex;
           flex-direction: column;
@@ -652,7 +662,6 @@
         }
       }
       .list_col_wrap{
-        margin: 40rpx 0;
 
         .list_item{
           display: flex;