jufubao-base 1.0.173 → 1.0.174-beta2

package/package.json

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

package/src/components/JfbBaseLogin/Attr.js

@@ -16,6 +16,44 @@ export default {
           { label: '账号登录页', value: 'account' },
         ],
       },
+      {
+        label: "logo配置:",
+        ele: "title",
+        groupKey: "content",
+        size: "small"
+      },
+      {
+        label: "是否展示logo:",
+        ele: "xd-radio",
+        valueKey: "showLogo",
+        value: data.showLogo || "Y",
+        groupKey: "content",
+        list: [
+          { label: '展示', value: "Y" },
+          { label: '隐藏', value: "N" },
+        ],
+      },
+      {
+        label: '自定义Logo:',
+        ele: "xd-upload",
+        valueKey: 'customLogoUrl',
+        groupKey:'content',
+        value: data.customLogoUrl || {},
+        defaultValue: data.customLogoUrl || null,
+        slot: true,
+        oneWidth: 100,
+        oneHeight: 100,
+        elinputClassName: 'input40',
+        tipsformet: '上传格式:@imageType@不超过@size@MB.建议比例1:1',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one',
+        uploadType: 'aliyun',
+        size: 5,
+        action: 'action',
+        sort: true,
+        maxlen: 100,
+        hidden: data.showLogo !== "Y",
+      },
       {
         ele: 'title',
         label: '按钮内容配置',
@@ -597,7 +635,7 @@ export default {
         label: 'logo样式配置',
         size: 'small',
         groupKey: 'style',
-        hidden: data.previewCurrent !== "auth",
+        hidden: data.showLogo !== "Y",
       },
       {
         label: "logo区域高度:",
@@ -608,7 +646,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo区域高度",
         className: 'input60',
-        hidden: data.previewCurrent !== "auth",
+        hidden: data.showLogo !== "Y",
       },
       {
         label: "logo图片高度:",
@@ -619,7 +657,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo图片高度",
         className: 'input60',
-        hidden: data.previewCurrent !== "auth",
+        hidden: data.showLogo !== "Y",
       },
       {
         label: 'logo圆角设置:',
@@ -639,7 +677,7 @@ export default {
               console.error(error);
             });
         },
-        hidden: data.previewCurrent !== "auth",
+        hidden: data.showLogo !== "Y",
       },
       {
         ele: "title",
@@ -648,6 +686,24 @@ export default {
         groupKey: "style",
         hidden: data.previewCurrent !== "account",
       },
+      {
+        label: '登录方式菜单外边距:',
+        ele: "xd-margin-padding",
+        valueKey: 'loginMenuMargin',
+        value: data.loginMenuMargin || {
+          top: 40,
+          right: 70,
+          bottom: 40,
+          left: 70
+        },
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+        hidden: data.previewCurrent !== "account",
+      },
       {
         label: "输入框样式:",
         ele: 'xd-radio',

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -19,13 +19,15 @@
     <view class="jfb-base-login__body" :style="{
       '--agreement-align': agreementAlign
     }">
+
+      <view v-if="showLogo === 'Y'" class="logo-wrap" :style="{
+        height: logoWrapHeight + 'rpx',
+      }">
+        <image :style="logoStyle" mode="heightFix" :src="logo" @click="openDebugger()" />
+        <view v-if="isShowSiteName === 'Y'" :style="{ color: logoTextColor,  }" >{{ partnerName }}</view>
+      </view>
+
       <view v-if="showStep === 1" class="panel-login-auth">
-        <view class="logo-wrap" :style="{
-          height: logoWrapHeight + 'rpx',
-        }">
-          <image :style="logoStyle" mode="heightFix" :src="logo" @click="openDebugger()" />
-          <view v-if="isShowSiteName === 'Y'" :style="{ color: logoTextColor,  }" >{{ partnerName }}</view>
-        </view>
         <view class="login_types" :style="authBtnBoxStyle">
           <!--#ifdef H5-->
           <xd-button
@@ -100,7 +102,7 @@
         </view>
       </view>
       <view v-if="showStep === 2" class="panel-login-password">
-        <view class="phone-login-type">
+        <view class="phone-login-type" :style="accountLoginTypeBoxStyle">
           <view
             v-if="phoneLogin"
             class="_item"
@@ -116,7 +118,7 @@
             >密码登录<text :style="{ background: mainColor }"></text
           ></view>
         </view>
-        <view style="margin-top: 40rpx" :style="loginFormStyle">
+        <view :style="loginFormStyle">
           <xd-form
             :label-align="labelAlign"
             :labelPosition="labelPosition"
@@ -434,6 +436,9 @@ export default {
       }, //条款内边距
       authAgreePadding: {}, //授权登录条款内边距
       authBtnPadding: {}, //授权登录按钮内边距
+      showLogo: "Y", //是否显示logo
+      customLogoUrl: {}, //自定义logo地址
+      loginMenuMargin: {},
     };
   },
   computed: {
@@ -493,9 +498,18 @@ export default {
     },
     btnWrapStyle(){
       let padding = `${this.checkValue(this.btnMargin.top, 20)}rpx`;
-      padding = `${padding} ${this.checkValue(this.btnMargin.right, 40)}rpx`;
+      padding = `${padding} ${this.checkValue(this.btnMargin.right, 20)}rpx`;
       padding = `${padding} ${this.checkValue(this.btnMargin.bottom, 20)}rpx`;
-      padding = `${padding} ${this.checkValue(this.btnMargin.left, 40)}rpx`;
+      padding = `${padding} ${this.checkValue(this.btnMargin.left, 20)}rpx`;
+      return this.styleObjectToString({
+        padding: padding,
+      })
+    },
+    accountLoginTypeBoxStyle(){
+      let padding = `${this.checkValue(this.loginMenuMargin.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.loginMenuMargin.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.loginMenuMargin.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.loginMenuMargin.left, 20)}rpx`;
       return this.styleObjectToString({
         padding: padding,
       })
@@ -621,7 +635,7 @@ export default {
         name = this["siteInfo"]["mapping"]["site_name"];
       if (this.projectAttr["site_logo"])
         logo = getServiceUrl(this.projectAttr["site_logo"], "size3");
-      this.logo = logo || "//dummyimage.com/100x100";
+      
       this.partnerName = name || "聚福宝福利";
       this.logoTextColor = getContainerPropsValue(value, "content.logoTextColor", "#333");
       this.callback_url = getContainerPropsValue(value, "content.callback_url", {value: ''}).value;
@@ -668,6 +682,15 @@ export default {
       this.contentFont = getContainerPropsValue(value, "content.contentFont", {});
       this.placeholderFont = getContainerPropsValue(value, "content.placeholderFont", {});
       this.getCodeFont = getContainerPropsValue(value, "content.getCodeFont", {});
+      this.showLogo = getContainerPropsValue(value, "content.showLogo", 'Y');
+      this.customLogoUrl = getContainerPropsValue(value, "content.customLogoUrl", {});
+      this.loginMenuMargin = getContainerPropsValue(value, "content.loginMenuMargin", {});
+
+      if(this.customLogoUrl && this.customLogoUrl.path){
+        logo = this.customLogoUrl.path;
+      }
+      this.logo = logo || "//dummyimage.com/100x100";
+
       let agreeFont = getContainerPropsValue(value, "content.agreeFont", {});
       if(!agreeFont.color) {
         agreeFont.color = '#666'
@@ -680,7 +703,7 @@ export default {
       this.privacyFont = privacyFont;
 
       this.agreementAlign = getContainerPropsValue(value, "content.agreementAlign", 'center');
-      console.log(this.agreePadding, 'this.agreePadding');
+      console.log(this.customLogoUrl, 'this.customLogoUrl');
       if(this.inputStyle === 'face'){
         this.labelPosition = 'top';
         this.labelAlign = 'left';
@@ -1100,9 +1123,10 @@ export default {
     .form-group {
       padding: 40rpx 70rpx;
     }
+    // #ifdef H5
     .form-item {
       ::v-deep &.uni-forms-item {
-        padding-left: unit(30rpx) !important;
+        // padding-left: unit(30,rpx) !important;
         .uni-input-input{
           font-size: var(--content-font-size);
           color: var(--content-font-color);
@@ -1136,6 +1160,46 @@ export default {
 
       }
     }
+    // #endif
+
+    // #ifdef MP
+    ::v-deep .uni-forms-item {
+      // padding-left: 30rpx !important;
+      .uni-input-input{
+        font-size: var(--content-font-size);
+        color: var(--content-font-color);
+        font-weight: var(--content-font-weight);
+      }
+      .label-text {
+        font-size: var(--label-font-size);
+        color: var(--label-font-color);
+        font-weight: var(--label-font-weight);
+      }
+      .uni-easyinput__placeholder-class{
+        font-size: var(--placeholder-font-size);
+        color: var(--placeholder-font-color);
+        font-weight: var(--placeholder-font-weight);
+      }
+    }
+    .linear{
+      ::v-deep .uni-forms-item--border{
+        border-color: var(--form-border-color) !important;
+        border-width: var(--form-border-width) !important;
+      }
+    }
+    .face{
+      ::v-deep .uni-forms-item__content{
+        background: #F7F7F7;
+        border-radius: 16rpx;
+      }
+      ::v-deep .uni-forms-item--border{
+        border: none;
+      }
+    }
+    // #endif
+
+
+    
     .get_code {
       color: @xd-base-color;
       font-size: 24rpx;
@@ -1143,6 +1207,22 @@ export default {
       padding: 10rpx 24rpx;
       border: 1px solid @xd-base-color;
       border-radius: 40rpx;
+      white-space: nowrap;
+    }
+    .logo-wrap {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      image {
+        width: 180rpx;
+        height: 180rpx;
+        margin-bottom: unit(12,rpx);
+      }
+      & > view {
+        font-size: unit(36,rpx);
+        font-weight: 600;
+      }
     }
     .panel-login-auth {
       ::v-deep .uni-forms-item__label {
@@ -1151,21 +1231,7 @@ export default {
           color: #a6a6a6;
         }
       }
-      .logo-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        flex-direction: column;
-        image {
-          width: 180rpx;
-          height: 180rpx;
-          margin-bottom: unit(12,rpx);
-        }
-        view {
-          font-size: unit(36,rpx);
-          font-weight: 600;
-        }
-      }
+      
       .login_types {
         padding: 10rpx 50rpx;
 

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -442,6 +442,9 @@
   @import "./JfbBaseNoticeLess.less";
 
   .jfb-base-notice {
+    position: relative;
+    z-index: 100;
+
     &__body{
       .content-list {
         display: flex;

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -38,11 +38,11 @@
         <view class="menu_list">
           <view class="menu_item" @click="switchShowType('ticket')">
             <view class="menu_inner" :class="menuShowType"
-              :style="[menuType == 'ticket' ? menuItemActiveStyle : menuItemStyle, menuItemBoxStyle]">实体券</view>
+              :style="menuType == 'ticket' ? menuItemActiveStyle : menuItemStyle">实体券</view>
           </view>
           <view class="menu_item" @click="switchShowType('code')">
             <view class="menu_inner" :class="menuShowType"
-              :style="[menuType == 'code' ? menuItemActiveStyle : menuItemStyle, menuItemBoxStyle]">电子码</view>
+              :style="menuType == 'code' ? menuItemActiveStyle : menuItemStyle">电子码</view>
           </view>
         </view>
       </view>
@@ -67,6 +67,7 @@
                 <xd-form-input
                   v-model="form.card_number"
                   placeholder="请输入票券号"
+                  style="width: 100%;"
                 />
                 <view @click="doScanCode">
                   <xd-font-icon :icon="scanIcon.icon || 'iconsaoma'"
@@ -102,8 +103,9 @@
                 <xd-form-input
                   v-model="form.valid_code"
                   placeholder="请输入验证码"
+                  style="width: 100%;"
                 />
-                <view class="form_valid_code">
+                <view class="form_valid_code" @click="switchValidToken">
                   <image
                     style="width: 100%;height:100%"
                     :src="validImageAPIUrl + '?image_width=160&image_height=50&token='+ valid_token"
@@ -178,6 +180,9 @@
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex";
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
     name: "JfbBaseTfkCardBind",
     components: {
       XdFontIcon,
@@ -332,14 +337,12 @@
           fontSize: '24rpx',
         })
       },
-      menuItemBoxStyle(){
+      menuItemBoxPadding(){
         let padding = `${this.checkValue(this.menuBtnPadding.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuBtnPadding.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuBtnPadding.bottom, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuBtnPadding.left, 20)}rpx`;
-        return this.styleObjectToString({
-          padding
-        })
+        return padding;
       },
       menuItemStyle(){
         let styleObj = {
@@ -347,6 +350,7 @@
           background: this.menuTabColor['bgColor'] || '#fff',
           fontSize: this.menuTabColor['fontSize'] || '30rpx',
           fontWeight: this.menuTabColor['fontWeight'] || 'normal',
+          padding: this.menuItemBoxPadding,
         }
 
         return this.styleObjectToString(styleObj)
@@ -358,6 +362,7 @@
           background: this.menuTabColor['actBgColor'] || '#fff',
           fontSize: this.menuTabColor['actFontSize'] || '30rpx',
           fontWeight: this.menuTabColor['actFontWeight'] || 'normal',
+          padding: this.menuItemBoxPadding,
         }
         if(this.menuShowType === 'text'){
           styleActiveObj['borderBottom'] = `${this.menuBorderWidth}px solid ${this.menuTabColor['actColor'] || defaultTextColor}`;
@@ -461,7 +466,7 @@
         }
       },
       toShowCouponDialog(){
-        if(this.info){
+        if(this.form.card_number){
           jfbRootFnExec(this, 'onCustomEvent')("@showBaseConDialog", {user_card_number: this.form.card_number})
         }
       },
@@ -478,6 +483,7 @@
         let path = this.getUrlCallback(this.my_card_url || this.backUrl);
         //有优惠券处理
         if(this.hasCon){
+          console.warn("绑定成功有优惠券处理");
           this.toShowCouponDialog();
           this.$bus.$on("onCloseConDialog",(container_id) => {
             if(container_id === this.hasCon){
@@ -526,18 +532,24 @@
           title: '请输入验证码',
           icon: "none"
         })
-        await this.checkValidToken();
+        this.$xdShowLoading({});
 
-        jfbRootExec("pwdCardBind", {
-          vm: this,
-          data: {
-            card_password: card_password,
-            card_number: card_number + "",
-            is_show_pop: "Y"
-          }
-        }).then(res => {
-          this.handlerAfterBindCard(res);
+        this.checkValidToken().then(() => {
+          jfbRootExec("pwdCardBind", {
+            vm: this,
+            data: {
+              card_password: card_password,
+              card_number: card_number + "",
+              is_show_pop: "Y"
+            }
+          }).then(res => {
+            this.$xdHideLoading();
+            this.handlerAfterBindCard(res);
+          })
+        }).catch(err => {
+          this.$xdHideLoading();
         })
+
       },
       //绑定电子码票券
       toBindCardDigital(){
@@ -671,6 +683,7 @@
 
   .jfb-base-tfk-card-bind {
     &__body{
+      // #ifdef H5
       .form-item {
         ::v-deep &.uni-forms-item {
           .is-required{
@@ -697,8 +710,6 @@
         }
         &.linear{
           ::v-deep &.uni-forms-item--border{
-            // 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;
           }
@@ -742,13 +753,83 @@
           ::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);
+        }
+      }
+      // #endif
+
+      // #ifdef MP
+      ::v-deep .uni-forms-item {
+        .is-required{
+          display: none;
+        }
+        .uni-input-input{
+          font-size: var(--content-font-size);
+          color: var(--content-font-color);
+          font-weight: var(--content-font-weight);
+        }
+        .label-text {
+          font-size: var(--label-font-size);
+          color: var(--label-font-color);
+          font-weight: var(--label-font-weight);
+        }
+        .uni-easyinput__placeholder-class{
+          font-size: var(--placeholder-font-size);
+          color: var(--placeholder-font-color);
+          font-weight: var(--placeholder-font-weight);
+        }
+      }
+      ::v-deep .uni-forms-item--border{
+        padding: var(--form-input-padding) 0;
+      }
+      .linear{
+        ::v-deep .uni-forms-item--border{
+          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: var(--form-border-radius);
+          padding-right: 20rpx;
+        }
+        ::v-deep .uni-forms-item--border{
+          border: none;
+        }
+      }
+      .ticket_item{
+        ::v-deep .label-icon{
+          font-size: var(--ticket-icon-size) !important;
+        }
+      }
+      .password_item{
+        ::v-deep .label-icon{
+          font-size: var(--password-icon-size) !important;
+        }
+      }
+      .valid_item{
+        ::v-deep .label-icon{
+          font-size: var(--valid-icon-size) !important;
+        }
+      }
+      .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;
+        }
       }
+      // #endif
+
+
       .menu_wrap{
         .menu_list{
           display: flex;

package/src/components/JfbBaseTfkCardDetail/Attr.js

@@ -52,230 +52,6 @@ export default {
         maxlen: 100,
         hidden: data.previewCurrent !== 'main'
       },
-      {
-        label: "票券使用规则",
-        ele: 'xd-site-news',
-        valueKey: 'cardRule',
-        groupKey:'content',
-        value: data.cardRule || null,
-        className: 'input70',
-        setting: {
-          config: {
-            sort: true,
-            maxlen: 100,
-            action: 'aliyun',
-            size: 5,
-            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-            uploadType: 'aliyun',
-            type: ['jpg', 'png', 'jpeg']
-          },
-        },
-        handleCustom({action, data}) {
-          if (data && data.params) {
-            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
-            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
-          }
-
-          //获取返回参数(场景类型名称为必填)
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
-
-          //获取显示内容
-          if (action === 'screen') {
-            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
-              .then(res => {
-                loading.close();
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-              });
-
-          }
-
-          //获取返回参数(广告位高度必选项)
-          if (action === 'getNewsInfo') {
-            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-              .then(res => {
-                loading.close()
-                data.cb({list: res.list, selectId: res.selected})
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //获取产品业务线列表
-          if (action === 'namespace') {
-            XdBus.getParentApi('getOptionsNamespaces')({})
-              .then(res => {
-                loading.close()
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //使用内容分类
-          if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
-              .then(res => {
-                console.log('cmsPublishEditxContent', res)
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置列表
-          if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置创建
-          if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置编辑
-          if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置删除
-          if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //获取广告位内容列表
-          if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //广告内容创建
-          if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容编辑
-          if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容删除
-          if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //内容发布
-          if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
-            console.log('publish', data.params)
-            XdBus.getParentApi('cmsPublishContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //通知页面进行刷新
-          if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-            loading.close()
-          }
-        },
-      },
       {
         label: "票券信息样式配置",
         ele: "title",

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -78,7 +78,7 @@
         </view>
       </view>
       <view v-if="curModule === 'rule'">
-        <view v-if="cardRule" v-html="cardRule" class="rule_wrap" :style="ruleDetailBoxStyle">
+        <view v-if="cardInfo.card_rule_info" v-html="cardInfo.card_rule_info" class="rule_wrap" :style="ruleDetailBoxStyle">
         </view>
         <view v-else class="rule_wrap" :style="ruleDetailBoxStyle">
           使用规则暂无
@@ -141,7 +141,7 @@
         time: 2, //时间幂指数
         stopTimer: false, //停止轮询
 
-        cardRule: "",
+        // cardRule: "",
         showBusinessList: "Y",
         //todo
         cardInfoMargin: {},
@@ -340,7 +340,7 @@
       onJfbLoad(options) {
         this.card_number = options.card_number;
         this.getCardDetail();
-        this.getContent();
+        // this.getContent();
       },
       /**
        * @description 监听事件变化
@@ -496,27 +496,27 @@
         if(regHttp.test(jumpUrl)) this.$xdUniHelper.redirectTo({url:jumpUrl}, false)
         else this.$xdUniHelper.navigateTo({url:jumpUrl}, false)
       },
-      getContent() {
-        jfbRootExec("getListBaseNewsContent", {
-          vm: this,
-          data: {
-            page_id: this.pageAttr["page_id"], //页面ID
-            container_id: this.containerId, //组件ID
-            limit: 1,
-          },
-        })
-          .then((res) => {
-            if (res.list.length > 0) {
-              if(res.list && res.list.length > 0) {
-                this.cardRule = this.$xdUniHelper.filterHtml(res.list[0].content);
-              }
-              // this.noticeStatus = true;
-            }
-          })
-          .catch((error) => {
-            console.error(error);
-          });
-      },
+      // getContent() {
+      //   jfbRootExec("getListBaseNewsContent", {
+      //     vm: this,
+      //     data: {
+      //       page_id: this.pageAttr["page_id"], //页面ID
+      //       container_id: this.containerId, //组件ID
+      //       limit: 1,
+      //     },
+      //   })
+      //     .then((res) => {
+      //       if (res.list.length > 0) {
+      //         if(res.list && res.list.length > 0) {
+      //           this.cardRule = this.$xdUniHelper.filterHtml(res.list[0].content);
+      //         }
+      //         // this.noticeStatus = true;
+      //       }
+      //     })
+      //     .catch((error) => {
+      //       console.error(error);
+      //     });
+      // },
       handleRefresh(){
         clearInterval(this.timeer);
         this.getCardDetail();

package/src/components/JfbBaseTfkCardDetail/Mock.js

@@ -23,6 +23,8 @@ module.exports = {
     is_show_qrcode_logo: "Y",
     is_can_unbind: "Y",
     is_can_transfer: "Y",
+    card_use_rule: "可凭本票券到电影(勿改)、商城(对应百货)(勿改)、蛋糕(勿改",
+    card_rule_info: "<p>购买范围：</p> <ul style='padding-left: 20px;'><li>可凭本票券到xxxxx进行提货</li></ul> <br/> <p>券内额度：</p><ul style='padding-left: 20px;'><li>提货额度为xx点/次</li></ul><br/><p>线下提货：</p><ul style='padding-left: 20px;'><li>1</li><li>2</li></ul>",
     site_entry_settings: [
       {
         id: 63,

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -25,11 +25,11 @@
             @click="changeMenu('card')"
           >
             <view class="menu_item_inner"
-              :style="[menuType === 'card' ? menuItemActiveStyle : menuItemStyle,  menuItemBoxStyle]">我的票券包</view>
+              :style="menuType === 'card' ? menuItemActiveStyle : menuItemStyle">我的票券包</view>
           </view>
           <view class="menu_item" @click="changeMenu('coupon')">
             <view class="menu_item_inner"
-              :style="[menuType === 'coupon' ? menuItemActiveStyle : menuItemStyle,  menuItemBoxStyle]">我的优惠券</view>
+              :style="menuType === 'coupon' ? menuItemActiveStyle : menuItemStyle">我的优惠券</view>
           </view>
         </view>
         <view class="bind_card" :style="bindCardBoxStyle" @click="toBindCard">
@@ -96,20 +96,15 @@
                   <view v-if="item.is_exchange === 'Y'">(可转票券)</view>
                 </view>
                 <view class="bind_btn"
-                  :style="[{
-                    right: cardPadding.right + 'rpx',
-                    bottom: cardPadding.bottom + 'rpx',
-                    borderRadius: cardBtnRadius + 'rpx',
-                    padding: bindCardBtnPadding,
-                    minWidth: cardBtnMinWidth + 'rpx',
-                  }, item.is_login === 'Y' ? bindCardActiveStyle : bindCardBtnStyle]"
+                  :style="item.is_login === 'Y' ? bindCardActiveStyle : bindCardBtnStyle"
                   @click.stop="doCardLogin(item)"
                 >{{ item.is_login === 'Y' ? '已登录' : '登录'}}</view>
               </view>
               <view v-if="!hasCardList" class="no_more_card" @click="toDisableUrl">没有更多券了，查看失效的票券 ></view>
             </view>
-            <view v-else>
-              <!-- 暂无数据 -->
+            <view v-else class="empty_data">
+              <image :src="emptyBg"></image>
+              暂无票券
             </view>
           </view>
         </template>
@@ -131,8 +126,9 @@
             ></xd-coupon-item>
             <view v-if="!hasCouponList" class="no_more_card" @click="toDisableUrl">没有更多券了，查看失效的票券 ></view>
           </view>
-          <view v-else>
-            暂无数据
+          <view v-else class="empty_data">
+            <image :src="emptyBg"></image>
+            暂无票券
           </view>
 
         </template>
@@ -151,6 +147,7 @@
   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 XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar";
   import XdCouponItem from "./XdCouponItem";
@@ -166,7 +163,7 @@
       XdNotice,
     },
     mixins: [
-      componentsMixins, extsMixins, JfbBaseTfkCardLoginMixin
+      componentsMixins, extsMixins, JfbBaseTfkCardLoginMixin, colorCardMixins
     ],
     data() {
       return {
@@ -256,6 +253,9 @@
         jwxSDK: (state) => state.jwxSDK,
         jfbAuthorize: (state) => state.jfbAuthorize,
       }),
+      emptyBg() {
+        return this.getNoData();
+      },
       menuBoxStyle(){
         let padding = `${this.checkValue(this.menuPadding.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuPadding.right, 20)}rpx`;
@@ -267,14 +267,12 @@
           padding: padding,
         })
       },
-      menuItemBoxStyle(){
+      menuItemBoxPadding(){
         let padding = `${this.checkValue(this.menuBtnPadding.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuBtnPadding.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuBtnPadding.bottom, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuBtnPadding.left, 20)}rpx`;
-        return this.styleObjectToString({
-          padding
-        })
+        return padding;
       },
       menuItemStyle(){
         let styleObj = {
@@ -283,6 +281,7 @@
           fontSize: this.menuTabColor['fontSize'] || '30rpx',
           fontWeight: this.menuTabColor['fontWeight'] || 'normal',
           borderWidth: this.menuBorderWidth + 'px',
+          padding: this.menuItemBoxPadding,
         }
 
         return this.styleObjectToString(styleObj)
@@ -294,6 +293,7 @@
           background: this.menuTabColor['actBgColor'] || '#fff',
           fontSize: this.menuTabColor['actFontSize'] || '30rpx',
           fontWeight: this.menuTabColor['actFontWeight'] || 'normal',
+          padding: this.menuItemBoxPadding,
         }
         if(this.menuShowType === 'text'){
           styleActiveObj.borderBottom = `${this.menuBorderWidth}px solid ${this.menuTabColor['actColor'] || defaultTextColor}`
@@ -310,12 +310,22 @@
         padding = `${padding} ${this.checkValue(this.cardBtnPadding.left, 20)}rpx`;
         return padding;
       },
+      bindCardBtnOther(){
+        return {
+          right: this.cardPadding.right + 'rpx',
+          bottom: this.cardPadding.bottom + 'rpx',
+          borderRadius: this.cardBtnRadius + 'rpx',
+          padding: this.bindCardBtnPadding,
+          minWidth: this.cardBtnMinWidth + 'rpx',
+        }
+      },
       bindCardBtnStyle(){
         let styleObj = {
           color: this.cardBtnTextStyle['color'] || '#333',
           background: this.cardBtnTextStyle['bgColor'] || '#fff',
           fontSize: this.cardBtnTextStyle['fontSize'] || '30rpx',
           fontWeight: this.cardBtnTextStyle['fontWeight'] || 'normal',
+          ...this.bindCardBtnOther
         }
         return this.styleObjectToString(styleObj)
       },
@@ -326,6 +336,7 @@
           background: this.cardBtnTextStyle['actBgColor'] || '#fff',
           fontSize: this.cardBtnTextStyle['actFontSize'] || '30rpx',
           fontWeight: this.cardBtnTextStyle['actFontWeight'] || 'normal',
+          ...this.bindCardBtnOther
         }
         return this.styleObjectToString(styleActiveObj)
       },
@@ -680,13 +691,18 @@
         })
       },
       apiGetContent(params){
+        let _this = this;
+        // #ifdef MP-WEIXIN
+        _this = this.$parent;
+        //#endif
+
         return new Promise((resolve, reject) => {
           jfbRootExec("getListBaseNewsContent", {
             vm: this,
             data: {
-              page_id: this.pageAttr["page_id"], //页面ID
-              container_id: this.containerId, //组件ID
-              page_size: this.noticeNum || 1,
+              page_id: _this.pageAttr["page_id"], //页面ID
+              container_id: _this.containerId, //组件ID
+              page_size: _this.noticeNum || 1,
               ...params
             },
           }).then(res => {
@@ -863,6 +879,19 @@
           color: #CCCCCC;
           font-size: 28rpx;
         }
+        .empty_data{
+          color: #888;
+          font-size: unit(24,rpx);
+          height: 60vh;
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+          justify-content: center;
+          & > image {
+            width: unit(460,rpx);
+            height: unit(400,rpx);
+          }
+        }
       }
     }
   }

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -7,7 +7,7 @@
       <view v-if="parent.type !== 'product'" class="module_cont">
         <view v-for="(item, i) in parent.items" :key="item.key"
           class="module_cont_inner"
-          :style="moduleItemContStyle"
+          :style="[moduleItemContStyle]"
         >
           <content-cinema v-if="parent.type === 'cinema'"
             style="width: 100%; height: 100%"
@@ -157,14 +157,14 @@
         padding = `${padding} ${this.checkValue(contMargin.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(contMargin.bottom, 20)}rpx`;
         padding = `${padding} ${this.checkValue(contMargin.left, 20)}rpx`;
-        return this.styleObjectToString({
+        return {
           padding: padding,
           border: contBorder,
           borderRadius: contRradius + 'rpx',
           boxShadow: contShadow,
           marginBottom: outSpacing + 'rpx',
           background: contBgColor,
-        })
+        }
       },
       moduleMoreStyle(){
         const { allModuleMoreStyle } = this.allStyle;

package/src/components/JfbBaseTfkSearch/ContentShop.vue

@@ -115,6 +115,7 @@ export default {
     &-cont {
       flex: 1;
       height: 100%;
+      overflow: hidden;
 
       & .title {
         margin-bottom: 10rpx;

package/src/components/JfbBaseTfkSearch/CustomList.vue

@@ -77,7 +77,7 @@
             :item="item"
             :color="listItemStyle.mainColor"
             :border-radius="listItemStyle.imgRradius"
-            :is-echange="'Y' || listItemStyle.isShowExchange"
+            :is-echange="listItemStyle.isShowExchange"
             @on-shop-jhd="handleShopJhd"
             @on-shop-detail="handleShopDetail"
           ></content-shop>

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -29,13 +29,8 @@
               @click="handleSwitchMenu(item)"
             >
               <view class="menu_inner"
-                :style="[
-                  menuItemBoxStyle,
-                  item.value === tabId ? menuItemActiveStyle : menuItemStyle,
-                  {
-                    marginRight: i === showMenuList.length - 1 ? '0' : menuItemMargin + 'rpx',
-                  }
-                ]"
+                :style="item.value === tabId ? menuItemActiveStyle : menuItemStyle"
+                :class="{isLast: i === showMenuList.length - 1}"
               >{{ item.label }}</view>
             </view>
           </view>
@@ -159,14 +154,12 @@
           backgroundColor: this.menuBgColor,
         })
       },
-      menuItemBoxStyle(){
+      menuItemBoxPadding(){
         let padding = `${this.checkValue(this.menuItemPadding.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuItemPadding.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuItemPadding.bottom, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuItemPadding.left, 20)}rpx`;
-        return this.styleObjectToString({
-          padding
-        })
+        return padding;
       },
       menuItemStyle(){
         let styleObj = {
@@ -175,6 +168,8 @@
           fontSize: this.menuTabColor['fontSize'] || '30rpx',
           fontWeight: this.menuTabColor['fontWeight'] || 'normal',
           borderWidth: this.menuBorderWidth + 'px',
+          padding: this.menuItemBoxPadding,
+          marginRight: this.menuItemMargin + 'rpx',
         }
 
         return this.styleObjectToString(styleObj)
@@ -193,7 +188,9 @@
           background: this.menuTabColor['actBgColor'] || 'transparent',
           fontSize: this.menuTabColor['actFontSize'] || '30rpx',
           fontWeight: this.menuTabColor['actFontWeight'] || 'normal',
-          borderBottom: `${this.menuBorderWidth}px solid ${this.menuTabColor['actColor'] || defaultTextColor}`
+          borderBottom: `${this.menuBorderWidth}px solid ${this.menuTabColor['actColor'] || defaultTextColor}`,
+          padding: this.menuItemBoxPadding,
+          marginRight: this.menuItemMargin + 'rpx',
         }
         return this.styleObjectToString(styleActiveObj)
       },
@@ -356,6 +353,14 @@
       .menu_list{
         display: flex;
         box-sizing: border-box;
+        overflow: auto;
+        .menu_item{
+          white-space: nowrap;
+
+          .isLast{
+            margin-right: 0;
+          }
+        }
       }
     }
   }

package/src/components/JfbBaseTfkSearch/listMixins.js

@@ -145,6 +145,7 @@ export default {
         if(item['exts_params']) {
           url = url + `&exts_params=${item['exts_params']}`
         }
+        url = url + `&xnamespace=${item.business_code}`;
         console.warn(`handleShopDetail.url:${url}`)
         this.toLink(url)
       });