jufubao-base 1.0.173 → 1.0.174-beta10

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();
@@ -675,7 +675,11 @@
           }
         }
       }
-
+      .rule_wrap{
+        font-size: 32rpx;
+        line-height: 1.7;
+        font-weight: 400;
+      }
       .code_wrap{
         display: flex;
         flex-direction: column;

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);
+          }
+        }
       }
     }
   }