jufubao-base 1.0.233-beta2 → 1.0.233-beta31

package/package.json

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

package/src/components/JfbBaseCard/Attr.js

@@ -274,17 +274,6 @@ export default {
         inline: false,
         notice: '当未设置文案时，页面默认展示为"<span style="color:red">购买新卡</span>"，建议不超过<span style="color:red">4</span>个汉字'
       },
-      {
-        label: "优惠券是否单独展示:",
-        ele: 'xd-radio',
-        valueKey: 'show_coupon_tab',
-        groupKey: 'content',
-        value: data.show_coupon_tab || 'N',
-        list: [
-          { label: "是", value: "Y" },
-          { label: "否", value: "N" }
-        ],
-      },
       {
         ele: 'title',
         label: '登录样式设置',

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -16,11 +16,7 @@
       <view class="jfb-base-card__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view :style="{
-      paddingTop: bindCard!=='1'?'35rpx':'55rpx',
-      '--main-color': mainColor,
-      '--main-alpha-color': mainSubBorderColor
-    }" class="jfb-base-card__body">
+    <view :style="{paddingTop: bindCard!=='1'?'35rpx':'55rpx'}" class="jfb-base-card__body">
       <view v-if="bindCard==='1'" class="jfb-base-card__body-cut">
         <template v-if="isQrCode">
           <view
@@ -105,25 +101,22 @@
       </view>
       <!--notice end-->
       <view class="jfb-base-card__body-tab">
-        <view v-if="show_coupon_tab==='Y'" class="show_type_tab">
-          <view class="type_item" :class="{active: show_type==='normal'}" @click="switchShowType('normal')">已绑定票券</view>
-          <view class="type_item" :class="{active: show_type==='coupon'}" @click="switchShowType('coupon')">优惠券</view>
-        </view>
-        <view class="tab_index_wrap">
-          <view
-            @click="tabIndex = 1"
-            class="tab_item"
-            :class="{sub: show_coupon_tab==='Y', active: tabIndex===1}"
-          >{{ show_coupon_tab==='Y' ? '可用票券' : '已绑定票券' }}</view>
-          <view
-            v-if="changeList.length > 0"
-            @click="tabIndex = 2"
-            class="tab_item"
-            :class="{sub: show_coupon_tab==='Y', active: tabIndex===2}"
-          >可转换票券</view>
-          <view class="debuger" v-if="cardList.length === 0" @click="openDebugger(true)" style="opacity: 0">debuger</view>
-        </view>
-        
+        <view
+          @click="tabIndex = 1"
+          :style="{
+            color: tabIndex === 1 ? '#fff' : '#B8B7BE',
+            background: tabIndex === 1 ? mainColor : '#fff',
+          }"
+        >已绑定票券</view>
+        <view
+          v-if="changeList.length > 0"
+          @click="tabIndex = 2"
+          :style="{
+            color: tabIndex === 2 ? '#fff' : '#B8B7BE',
+            background: tabIndex === 2 ? mainColor : '#fff',
+          }"
+        >可转换票券</view>
+        <view class="debuger" v-if="cardList.length === 0" @click="openDebugger(true)" style="opacity: 0">debuger</view>
       </view>
       <view
         class="jfb-base-card__body-tips"
@@ -350,7 +343,6 @@ export default {
   },
   data() {
     return {
-      show_type: "normal",  //normal正常票券;coupon 满减券
       options: {},
       inCallbackUrlOrg:'',//是否带有回调地址
       mainBorderColor:'',
@@ -404,7 +396,6 @@ export default {
       showDisabled: 'Y',
 
       dialogEvent: false,
-      show_coupon_tab: "N",
       // is_show_change: false,
       popup: "https://img.zcool.cn/community/01784158abe781a801219c77e981ee.jpg?x-oss-process=image/auto-orient,1/resize,m_lfit,w_1280,limit_1/sharpen,100",
       buy_name: '',
@@ -469,7 +460,6 @@ export default {
       this.isShowBuy = getContainerPropsValue(container, "content.isShowBuy", "N");
       this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");      
       this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
-      this.show_coupon_tab = getContainerPropsValue(container, "content.show_coupon_tab", "N");
     },
 
     handleToLink(path) {
@@ -478,10 +468,7 @@ export default {
         url: path,
       });
     },
-    switchShowType(show_type) {
-      this.show_type = show_type;
-      this.getCardList(this.options);
-    },
+
     getContent() {
       jfbRootExec("getListBaseNewsContent", {
         vm: this,
@@ -644,9 +631,6 @@ export default {
       if(options['jfb_business_code']) {
         params['card_business_code'] = options['jfb_business_code'];
       }
-      if(this.show_coupon_tab === 'Y'){
-        params.show_type = this.show_type;
-      }
       this.$xdShowLoading({});
       jfbRootExec("getListCardBind", {
         vm: this,
@@ -757,30 +741,6 @@ export default {
     padding: unit(55, rpx) unit(35, rpx);
     color: #333;
 
-    .show_type_tab{
-      display: flex;
-      align-items: center;
-      margin-bottom: 24rpx;
-      .type_item{
-        padding: unit(5, rpx) unit(22, rpx);
-        text-align: center;
-        line-height: unit(60, rpx);
-        border-radius: unit(60, rpx);
-        color: #B8B7BE;
-        & + .type_item{
-          margin-left: unit(30, rpx);
-        }
-        &.active{
-          background-color: var(--main-color);
-          color: #FFFFFF;
-        }
-      }
-    }
-    .tab_index_wrap{
-      display: flex;
-      align-items: center;
-    }
-
     &-empty {
       color: #888;
       font-size: unit(24,rpx);
@@ -929,13 +889,12 @@ export default {
 
     &-tab {
       display: flex;
-      flex-direction: column;
-      align-items: flex-start;
+      align-items: center;
       font-size: unit(28, rpx);
       margin-bottom: unit(46, rpx);
       margin-top: unit(46, rpx);
 
-      .tab_item {
+      & > view {
         // width: unit(214, rpx);
         // height: unit(60, rpx);
         padding: unit(5, rpx) unit(22, rpx);
@@ -943,22 +902,6 @@ export default {
         line-height: unit(60, rpx);
         margin-right: unit(30, rpx);
         border-radius: unit(60, rpx);
-        color: #B8B7BE;
-        background: #FFFFFF;
-        &.active{
-          color: #FFFFFF;
-          background-color: var(--main-color);
-        }
-        &.sub{
-          border-radius: unit(8, rpx);
-          line-height: unit(40, rpx);
-          color: #FFFFFF;
-          background-color: #B8B7BE;
-          &.active{
-            color: var(--main-color);
-            background-color: var(--main-alpha-color);
-          }
-        }
       }
     }
 

package/src/components/JfbBaseCardDelay/JfbBaseCardDelay.vue

@@ -46,35 +46,21 @@
               @click="activeIndex = index"
               :style="{
                 background: activeIndex === index ? backgroundColor : '#fff',
-                color: activeIndex === index ? mainColor : '#333',
-                marginRight: (index + 1) % 3 == 0 ? '0' : '36rpx',
+                color: activeIndex === index ? mainColor : '#333'
               }"
               class="package-item"
             >
               <view>{{ item.package_name }}</view>
-              <view>
-                <text>{{ item.pay_amount }}</text
-                >元宝</view
-              >
+              <view><text>{{ item.pay_amount }}</text><text>元宝</text></view>
             </view>
           </view>
-          <xd-no-data height="20vh" v-else :iconType="empty">
-            当前票券无套餐
-          </xd-no-data>
+          <xd-no-data height="20vh" v-else :iconType="empty">当前票券无套餐</xd-no-data>
         </view>
-        <view class="wrap" style="margin-top: 28rpx" v-if="notice&&packageList !== null&&packageList.length > 0">
-          <view
-            style="
-              text-align: center;
-              padding-bottom: 36rpx;
-              color: #333;
-              font-weight: 500;
-              font-size: 28rpx;
-            "
-            >延期规则</view
-          >
+        <view class="wrap" style="margin-top: 28rpx" v-if="notice">
+          <view style=" text-align: center; padding-bottom: 36rpx;color: #333;font-weight: 500;font-size: 28rpx;">延期规则</view>
           <xd-content-xss :html="notice"></xd-content-xss>
         </view>
+        <view class="wrap-mask"></view>
         <view
           v-if="!package_id"
           class="jfb-base-card-delay__body-footer"
@@ -101,9 +87,7 @@
           class="jfb-base-card-delay__body-footer"
           :style="prod_bottom"
         >
-          <xd-button width="560rpx" type="primary" @click="handleBuy"
-            >{{ pay_amount }}元延期</xd-button
-          >
+          <xd-button width="560rpx" type="primary" @click="handleBuy">{{ pay_amount }}元延期</xd-button>
         </view>
       </view>
     </view>
@@ -295,6 +279,9 @@ export default {
       border: 1rpx solid #eeeeee;
       padding: 36rpx;
       background: #fff;
+      &-mask {
+        height: 100rpx;
+      }
       input {
         height: 30rpx;
         border-radius: 16rpx;
@@ -317,19 +304,33 @@ export default {
       display: flex;
       align-items: center;
       flex-wrap: wrap;
-      margin-top: 30rpx;
+      margin-top: 20rpx;
       &-item {
-        padding: 40rpx 20rpx;
+        padding: 30rpx 20rpx;
         font-size: 28rpx;
         text-align: center;
         border-radius: 16rpx;
-        margin-right: 36rpx;
-        margin-bottom: 36rpx;
-        width: 24%;
+        margin-right: 30rpx;
+        margin-bottom: 30rpx;
+        width: 172rpx;
+        flex-shrink: 0;
+        &:nth-child(3n) {
+          margin-right: 0;
+        }
+
+        & > view:nth-child(1) {
+          margin-bottom: 10rpx;
+          .uni-one-cut(40);
+        }
 
         & > view:nth-child(2) {
           & > text {
-            font-size: 48rpx;
+            font-size: 36rpx;
+
+            &:nth-child(2) {
+              font-size: 24rpx;
+              margin-left: 4rpx;
+            }
           }
         }
       }

package/src/components/JfbBaseCardGive/Api.js

@@ -39,17 +39,4 @@ module.exports = [
     },
     disabled: true,
   },
-  {
-    mapFnName: "generateQrCode",
-    title: "生成二维码",
-    path: "/common/v1/image/qrcode",
-    isRule: false,
-    params: {
-      code_content: ['二维码内容', 'String', true],
-      size: ['二维码大小', 'Number', true],
-      margin: ['二维码边距', 'Number', true]
-    },
-    isConsole: true,
-    disabled: true
-  }
 ];

package/src/components/JfbBaseCardGive/Attr.js

@@ -38,7 +38,7 @@ export default {
         ]
       },
       {
-        label: '分享图片(适用于小程序):', //label
+        label: '分享图片:', //label
         ele: 'xd-upload', //package 名称
         valueKey: 'shareImage', //form[valueKey]
         value: data.shareImage || null, //v-model
@@ -60,29 +60,6 @@ export default {
           { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
         ]
       },
-      {
-        label: '分享图片(适用于下载保存):', //label
-        ele: 'xd-upload', //package 名称
-        valueKey: 'shareDownloadImage', //form[valueKey]
-        value: data.shareDownloadImage || null, //v-model
-        defaultValue: data.shareDownloadImage || null, //默认图片对象
-        groupKey: "style",
-        slot: true, //按钮是否使用slot
-        oneWidth: 218, //单个图片显示宽度
-        oneHeight: 323, //单个图片显示高度
-        elinputClassName: 'input40',
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.建议尺寸：654*968px.',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
-        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
-        size: 5, //5M
-        action: 'aliyun',
-        sort: true, //当上传图片列表时候，是否启用排序
-        maxlen: 100, //当上传图片列表时候，最大数量数量
-        rules: [
-          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
-        ]
-      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -83,7 +83,6 @@
           rows="10"
         ></textarea>
         <xd-button @click="handleGive" type="primary">确认赠送</xd-button>
-        <xd-button type="primary" @click="handleShare">test分享</xd-button>
       </view>
       <view
         class="jfb-base-card-give__body-footer"
@@ -150,13 +149,6 @@
           >
         </view>
       </xd-dailog>
-      <view class="share_card_dialog" v-show="showShareCard">
-        <view class="share_modal" @click="showShareCard=false"></view>
-        <view class="share_content">
-          <image :src="canvasUrl" v-if="canvasUrl" class="share_img"  style="width: 654rpx; height: 968rpx;"></image>
-        </view>
-      </view>
-      <canvas class="renderCanvas" canvas-id="shareCanvas" id="shareCanvas" style="width: 654rpx; height: 968rpx;" ></canvas>
     </view>
   </view>
 </template>
@@ -191,21 +183,13 @@ export default {
       get_url: null,
       back_url: null,
       shareImage: "",
-      shareDownloadImage: "",
       isPreview: false,
       errMsg: "",
       resultDialog: false,
-      showShareDialog: true,
-      imageCache: {},
-      showShareCard: false,
-      canvasUrl: "",
     };
   },
   computed: {
     ...mapState(["shareInfo"]),
-    ...mapState({
-      brandInfo: state => state.brandInfo
-    }),
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
@@ -226,32 +210,6 @@ export default {
     async onJfbLoad(options) {
       this.card_number = options.card_number;
       await this.getDetail();
-
-      
-    },
-    async toSetShareImg(){
-      // if(this.info.transfer_record && this.info.transfer_record.transfer_auth_code){
-      //   let url = `${document.location.origin}/${this.projectAttr.deploy_dir}${this.get_url}?transfer_auth_code=${this.info.transfer_record.transfer_auth_code}`;
-      //   let ctx = uni.createCanvasContext("shareCanvas");
-      //   console.log(ctx);
-      //   ctx.save();
-      //   ctx.drawImage(this.shareDownloadImage, 0, 0, 654*this.$rpxNum, 968*this.$rpxNum);
-      //   ctx.restore();
-
-      //   let qrImg = this.brandInfo['api_host'] + `/common/v1/image/qrcode?code_content=${url}`
-      //   ctx.drawImage(qrImg, 200*this.$rpxNum, 500*this.$rpxNum, 250*this.$rpxNum, 250*this.$rpxNum);
-      //   ctx.draw();
-      // }
-      let url = `123`;
-      let ctx = uni.createCanvasContext("shareCanvas");
-      console.log(ctx);
-      ctx.save();
-      ctx.drawImage(this.shareDownloadImage, 0, 0, 654*this.$rpxNum, 968*this.$rpxNum);
-      ctx.restore();
-
-      let qrImg = this.brandInfo['api_host'] + `/common/v1/image/qrcode?code_content=${url}`
-      ctx.drawImage(qrImg, 200*this.$rpxNum, 500*this.$rpxNum, 250*this.$rpxNum, 250*this.$rpxNum);
-      ctx.draw();
     },
     getDetail() {
       this.$xdShowLoading({});
@@ -286,9 +244,6 @@ export default {
                 return this.info.business_codes.includes(item.business_code);
               });
           }
-          setTimeout(() => {
-            this.toSetShareImg()
-          }, 300);
         })
         .catch((err) => {
           this.$xdHideLoading({});
@@ -311,7 +266,6 @@ export default {
         "content.shareImage",
         { url: "" }
       ).url;
-      this.shareDownloadImage = getServiceUrl(getContainerPropsValue(container, 'content.shareDownloadImage', { url: '' }).url);
     },
     handleCancel() {
       this.resultDialog = false;
@@ -378,21 +332,7 @@ export default {
     handleShare() {
       //#ifdef H5
       let share = `${document.location.origin}/${this.projectAttr.deploy_dir}${this.get_url}?transfer_auth_code=${this.info.transfer_record.transfer_auth_code}`;
-      this.showShareCard = true;
-      if(this.canvasUrl) return;
-      this.$nextTick(() => {
-        uni.canvasToTempFilePath({
-          canvasId: "shareCanvas",
-          success: (res) => {
-            this.canvasUrl = res.tempFilePath;
-            console.log(res, 'canvasUrl');
-          },
-          fail: (err) => {
-            this.$xdHideLoading({});
-            console.log(err);
-          },
-        })
-      })
+      this.copy(share);
       // #endif
       // #ifdef MP-WEIXIN
       this.setShareInfo({
@@ -421,33 +361,6 @@ export default {
   &__body {
     padding: 28rpx;
     color: #333;
-    .renderCanvas{
-      position: fixed;
-      bottom: -999999px;
-    }
-    .share_card_dialog{
-      .share_modal{
-        width: 100vh;
-        height: 100vh;
-        position: fixed;
-        top: 0;
-        left: 0;
-        background: rgba(0, 0, 0, 0.5);
-      }
-      .share_content{
-        width: 654rpx;
-        height: 968rpx;
-        position: fixed;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-        .share_img{
-          position: absolute;
-          top: 0;
-          left: 0;
-        }
-      }
-    }
     .qrcode_card {
       position: relative;
       border-radius: unit(16, rpx);

package/src/components/JfbBaseCardV2/Attr.js

@@ -67,17 +67,6 @@ export default {
         inline: false,
         notice: '当未设置文案时，页面默认展示为"<span style="color:red">购买新卡</span>"，建议不超过<span style="color:red">4</span>个汉字'
       },
-      {
-        label: "优惠券是否单独展示:",
-        ele: 'xd-radio',
-        valueKey: 'show_coupon_tab',
-        groupKey: 'content',
-        value: data.show_coupon_tab || 'N',
-        list: [
-          { label: "是", value: "Y" },
-          { label: "否", value: "N" }
-        ],
-      },
       {
         label: '填充设置:',
         ele: 'xd-margin-padding',

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -13,9 +13,7 @@
       <view class="jfb-base-card-v2__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-v2__body" :style="{
-      '--main-color': mainColor,
-    }">
+    <view class="jfb-base-card-v2__body">
       <view v-if="loadingCardList">
         <view
           class="jfb-base-card__body-card skeleton-card"
@@ -51,12 +49,6 @@
           class="jfb-base-card__body-card"
           :style="{padding: marginUi}"
         >
-          <view class="card_filter">
-            <view v-if="show_coupon_tab==='Y'" class="show_type_tab">
-              <view class="type_item" :class="{active: show_type==='normal'}" @click="switchShowType('normal')">已绑定票券</view>
-              <view class="type_item" :class="{active: show_type==='coupon'}" @click="switchShowType('coupon')">优惠券</view>
-            </view>
-          </view>
           <view v-if="cardList&&cardList.length>0">
             <view
               v-for="(item, index) in cardList"
@@ -161,15 +153,12 @@
     ],
     data() {
       return {
-        options: {},
         cardList: [],
         inCallback: "",
         mainBorderColor:'',
         mainSubBorderColor:'',
-        show_type: "normal",
 
         //面板
-        show_coupon_tab: "N",
         cardInfoPath: "", //卡券详情
         cardBindPath: "",
         orderListPath: "",
@@ -216,7 +205,6 @@
     },
     methods: {
       onJfbLoad(options) {
-        this.options = options;
         let { inCallback } = options;
         if(!inCallback) this.$storage.remove("inCallback"); //作为入口
         else {
@@ -231,7 +219,24 @@
           }
         }
         this.inCallback = inCallback || this.settings.index;
-        this.getList();
+
+
+        let params = {is_all: 'Y'};
+        if (options['jfb_business_code']) {
+          params['card_business_code'] = options['jfb_business_code'];
+        }
+
+        jfbRootExec("getListCardBind", {
+          vm: this,
+          data: params,
+        }).then((res) => {
+          this.loadingCardList = false;
+          this.cardList = res.list.map((item) => {
+            item['card_point'] = this.$xdUniHelper.divisionFloatNumber(item.card_point,100);
+            item['other_card_point'] = this.$xdUniHelper.divisionFloatNumber(item.other_card_point,100);
+            return item;
+          }).filter((item) => item["is_valid"] === "Y");
+        })
       },
 
       /**
@@ -250,33 +255,9 @@
         this.isShowBuy = getContainerPropsValue(container, "content.isShowBuy", "N");
         this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");
         this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
-        this.show_coupon_tab = getContainerPropsValue(container, "content.show_coupon_tab", "N");
-      },
-      getList(){
-        let options = this.options;
-        let params = {is_all: 'Y'};
-        if (options['jfb_business_code']) {
-          params['card_business_code'] = options['jfb_business_code'];
-        }
-        if(this.show_coupon_tab === 'Y'){
-          params.show_type = this.show_type;
-        }
 
-        jfbRootExec("getListCardBind", {
-          vm: this,
-          data: params,
-        }).then((res) => {
-          this.loadingCardList = false;
-          this.cardList = res.list.map((item) => {
-            item['card_point'] = this.$xdUniHelper.divisionFloatNumber(item.card_point,100);
-            item['other_card_point'] = this.$xdUniHelper.divisionFloatNumber(item.other_card_point,100);
-            return item;
-          }).filter((item) => item["is_valid"] === "Y");
-        })
-      },
-      switchShowType(type){
-        this.show_type = type;
       },
+
       handleBindLogin(item){
         this.$xdShowLoading({});
         jfbRootExec("loginCardBind", {
@@ -343,25 +324,6 @@
 
   .jfb-base-card-v2 {
     &__body{
-      .show_type_tab{
-        display: flex;
-        align-items: center;
-        margin-bottom: 24rpx;
-        .type_item{
-          padding: unit(5, rpx) unit(22, rpx);
-          text-align: center;
-          line-height: unit(60, rpx);
-          border-radius: unit(60, rpx);
-          color: #B8B7BE;
-          & + .type_item{
-            margin-left: unit(30, rpx);
-          }
-          &.active{
-            background-color: var(--main-color);
-            color: #FFFFFF;
-          }
-        }
-      }
       .bottom_fix{
         position: fixed;
         right: 0;

package/src/components/JfbBaseCardV3/Attr.js

@@ -54,17 +54,6 @@ export default {
         inline: false,
         notice: '当未设置文案时，页面默认展示为"<span style="color:red">购买新卡</span>"，建议不超过<span style="color:red">4</span>个汉字'
       },
-      {
-        label: "优惠券是否单独展示:",
-        ele: 'xd-radio',
-        valueKey: 'show_coupon_tab',
-        groupKey: 'content',
-        value: data.show_coupon_tab || 'N',
-        list: [
-          { label: "是", value: "Y" },
-          { label: "否", value: "N" }
-        ],
-      },
       {
         label: '绑定新票券地址:',
         ele: 'xd-select-pages-path',