jufubao-base 1.0.117 → 1.0.119-beta10

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -145,7 +145,10 @@
                   :color="mainColor"
                   icon="iconyouhuiquan1-011"
                 ></xd-font-icon>
-                <view>{{ tabIndex === 1 ? login_name : "转换" }}</view>
+                <view class="login_style" :style="{
+                  backgroundColor: '#FFFFFF',
+                  ...loginStyle
+                }">{{ tabIndex === 1 ? login_name : "转换" }}</view>
               </view>
               <view class="jfb-base-card__body-card-item-right">
                 <view class="jfb-base-card__body-card-item-right-top">
@@ -179,7 +182,10 @@
                   </view>
                   <view
                     @click.stop="toDetail(item)"
-                    :style="{ background: mainColor }"
+                    :style="{
+                      backgroundColor: mainColor,
+                      ...lookStyle
+                    }"
                     >查看</view
                   >
                 </view>
@@ -194,6 +200,8 @@
               :key="index"
               :cardInfo="item"
               :tabIndex="tabIndex"
+              :loginStyle="loginStyle"
+              :lookStyle="lookStyle"
               @toDetail="toDetail(item)"
               @bindLogin="handleBindLogin(item)">
             </xd-card-v2>
@@ -254,6 +262,22 @@ export default {
       jwxSDK: (state) => state.jwxSDK,
       jfbAuthorize: (state) => state.jfbAuthorize,
     }),
+    loginStyle(){
+      let style = {};
+      if(this.login_text_size) style['fontSize'] = this.login_text_size + 'rpx';
+      if(this.login_text_color) style['color'] = this.login_text_color;
+      if(this.login_text_bg_color) style['backgroundColor'] = this.login_text_bg_color;
+      if(this.login_text_radius) style['borderRadius'] = this.login_text_radius + 'rpx'
+      return style;
+    },
+    lookStyle(){
+      let style = {};
+      if(this.look_text_size) style['fontSize'] = this.look_text_size + 'rpx';
+      if(this.look_text_color) style['color'] = this.look_text_color;
+      if(this.look_text_bg_color) style['backgroundColor'] = this.look_text_bg_color;
+      if(this.look_text_radius) style['borderRadius'] = this.look_text_radius + 'rpx'
+      return style;
+    }
   },
   watch: {
     tabIndex(newVal, oldVal) {
@@ -297,6 +321,16 @@ export default {
       allEntryPath: "", //综合福利入口页
       disabledUrl: "",
       cardLayout: "1",  //票券布局
+      
+      //样式
+      login_text_size: "",
+      login_text_color: "",
+      login_text_bg_color: "",
+      login_text_radius: "",
+      look_text_size: "",
+      look_text_color: "",
+      look_text_bg_color: "",
+      look_text_radius: "",
 
       showDisabled: 'Y',
 
@@ -342,6 +376,16 @@ export default {
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;
       this.allEntryPath = getContainerPropsValue(container,"content.allEntryPath",{value: ""}).value;
       this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
+      //样式
+      this.login_text_size = getContainerPropsValue(container, 'content.login_text_size', 24);
+      this.login_text_color = getContainerPropsValue(container, 'content.login_text_color', '');
+      this.login_text_bg_color = getContainerPropsValue(container, 'content.login_text_bg_color', '');
+      this.login_text_radius = getContainerPropsValue(container, 'content.login_text_radius', '');
+
+      this.look_text_size = getContainerPropsValue(container, 'content.look_text_size', 24);
+      this.look_text_color = getContainerPropsValue(container, 'content.look_text_color', '');
+      this.look_text_bg_color = getContainerPropsValue(container, 'content.look_text_bg_color', '');
+      this.look_text_radius = getContainerPropsValue(container, 'content.look_text_radius', '');
     },
 
     handleToLink(path) {
@@ -701,6 +745,11 @@ export default {
           align-items: center;
           justify-content: center;
           font-size: unit(24, rpx);
+          .login_style{
+            min-width: 80rpx;
+            padding: 4rpx 16rpx;
+            text-align: center;
+          }
         }
 
         &-right {

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -16,7 +16,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-card-detail-entry__body" v-if="info!==null">
-      <view class="card-list" :style="{
+      <!-- <view class="card-list" :style="{
             background: headerBg['color'],
             backgroundSize: '100%'
           }">
@@ -40,23 +40,40 @@
               <view><text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text></view>
             </view>
           </view>
-        </view>
-      <view class="jfb-base-card-detail-entry__body-qrcode">
-        <view>
-          <view>
-            <image mode="aspectFit" :src="info.barcode"></image>
+        </view> -->
+      <view class="qrcode_card">
+        <view class="jfb-base-card-detail-entry__body-qrcode">
+          <view class="barcode_wrap">
+            <view>
+              <image mode="aspectFit" :src="info.barcode"></image>
+            </view>
+          </view>
+          <view class="qrcode_wrap" style="position: relative">
+            <image
+              :style="{width: '300rpx', height: '300rpx'}"
+              :src="info.card_qrcode"
+            ></image>
+            <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
+          </view>
+          <!-- <view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view> -->
+          <view v-if="timeStr">{{ timeStr }}后自动刷新</view>
+          <view class="refresh_wrap" @click="handleRefresh">
+            <xd-font-icon icon="iconshuaxin"
+              style="margin-right: 24rpx;"
+              size="28"></xd-font-icon> 刷新二维码
           </view>
         </view>
-        <view style="position: relative">
-          <image
-            :style="{width: '300rpx', height: '300rpx'}"
-            :src="info.card_qrcode"
-          ></image>
-          <image v-if="isBrandLogo" class="logo-icon" :src="brandLogo"></image>
+        <view class="card_info">
+          <view class="card_type">{{ info['card_type_name'] }}</view>
+          <view class="card_sec">券号：{{ info.card_number }}</view>
+          <view class="card_sec">有效期：{{ info.end_time }}</view>
+          <view class="card_sec">余额：{{ info.card_point }}{{ info.unit }}</view>
+          <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
+            <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
+          </view>
         </view>
-        <view :style="{marginTop: '20rpx'}" v-if="timeStr">消费二维码，有效期为{{ info["card_qrcode_expire"] / 60 }}分钟</view>
-        <view v-if="timeStr">距离刷新还有{{ timeStr }}</view>
       </view>
+      
       <view
       v-if="info.site_entry_settings&&info.site_entry_settings.length>0"
       class="jfb-base-card-detail-entry__body-business"
@@ -287,6 +304,11 @@ export default {
           // this.$refs["pwPay"].clearPwd();
         });
     },
+    handleRefresh(){
+      clearInterval(this.timeer);
+      this.detail();
+      // this.refrush();
+    },
     refrush() {
       if (this.stopTimer) return;
       if (this.time >= this.maxTime) {
@@ -558,6 +580,37 @@ export default {
 .jfb-base-card-detail-entry {
   &__body {
     color: #333;
+
+    .qrcode_card{
+      background-color: #FF2121;
+      border-radius: 24rpx;
+      padding: 24rpx;
+      &-title{
+        display: flex;
+        font-size: 32rpx;
+      }
+      .card_info{
+        color: #FFFFFF;
+        font-size: 28rpx;
+        padding-left: 40rpx;
+        .card_type{
+          font-size: 40rpx;
+          font-weight: 600;
+          margin-top: 70rpx;
+        }
+        .card_sec{
+          margin: 12rpx 0;
+        }
+        .card_other{
+          background-color: rgba(255,255,255, 0.2);
+          border-radius: 8rpx;
+          padding: 8rpx 20rpx;
+          display: inline-block;
+        }
+      }
+    }
+
+    
     .logo-icon {
       width: unit(100, rpx) !important;
       height: unit(100, rpx) !important;
@@ -784,9 +837,20 @@ export default {
       line-height: unit(36, rpx);
       background: #fff;
       border-radius: unit(16,rpx);
-      margin-top: unit(24, rpx);
-      padding: unit(20,rpx) unit(70,rpx) unit(70,rpx) unit(70,rpx);
+      padding: unit(20,rpx) unit(70,rpx) 0 unit(70,rpx);
       color: #000;
+      position: relative;
+      &::after{
+        content: " ";
+        position: absolute;
+        left: 0;
+        bottom: -40rpx;
+        width: 100%;
+        height: 100rpx;
+        background: #FFFFFF;
+        border-radius: 100%;
+        z-index: 1;
+      }
 
       & > view {
         // margin-bottom: unit(20, rpx);
@@ -795,8 +859,21 @@ export default {
           margin-bottom: 0;
         }
       }
+      .refresh_wrap{
+        width: 300rpx;
+        height: 80rpx;
+        display: flex;
+        align-items: center;
+        border: 1px solid #999999;
+        color: #999999;
+        border-radius: 40rpx;
+        justify-content: center;
+        margin: 36rpx auto 0;
+        position: relative;
+        z-index: 10;
+      }
 
-      & > view:nth-child(1) {
+      .barcode_wrap {
         display: flex;
         justify-content: center;
         align-items: center;
@@ -819,7 +896,7 @@ export default {
         }
       }
 
-      & > view:nth-child(2) {
+      .qrcode_wrap {
         display: flex;
         justify-content: center;
         align-items: center;

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -177,7 +177,7 @@
                     <text>券号：</text>
                     <text>{{item.card_number}}</text>
                   </view>
-                  <view @click.stop="toDetail(item)" v-if="0">
+                  <view @click.stop="toDetail(item)">
                     <view>
                       <xd-font-icon icon="iconerweima" width="56" height="56" size="50" color="#fff"></xd-font-icon>
                     </view>

package/src/components/JfbBaseCardInfo/Attr.js

@@ -15,6 +15,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '我的票券跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'my_card_url', //form[valueKey]
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '券号框自定义文案:',
       ele: 'el-input',
@@ -33,5 +44,15 @@ export default {
       placeholder: '请输入密码框自定义文案',
       className: 'input80'
     },
+    {
+      label: "票券过期是否展示余额",
+      ele: "xd-radio",
+      valueKey: "is_show_balance",
+      value: "N",
+      list: [
+        {label: "是", value: "Y"},
+        {label: "否", value: "N"},
+      ]
+    }
   ],
 };

package/src/components/JfbBaseCardInfo/JfbBaseCardInfo.vue

@@ -63,7 +63,7 @@
               info[item.key]
             }}</view>
           </view>
-          <view class="jfb-base-card-info__body-residue">
+          <view v-if="isShowBalance" class="jfb-base-card-info__body-residue">
             <view class="jfb-base-card-info__body-residue-wrap">
               <view class="jfb-base-card-info__body-residue-label">
                 <view :style="{ color: '#242424', fontSize: '28rpx' }"
@@ -166,12 +166,20 @@ export default {
 
       //页面跳转地址
       backUrl: "",
+      is_show_balance: "N", //是否显示余额
+      my_card_url: "", //我的票券跳转地址
     };
   },
   computed: {
     prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
+    isShowBalance(){
+      if(this.info.is_expired === "Y"){
+        return this.is_show_balance === "Y";
+      }
+      return true;
+    }
   },
   created() {},
   methods: {
@@ -187,10 +195,11 @@ export default {
           vm: this,
           data: {
             card_qrcode: this.qrcode,
+            is_show_pop: "Y"
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       } else {
@@ -199,15 +208,21 @@ export default {
           data: {
             card_password: this.card_password,
             card_number: this.card_number + "",
+            is_show_pop: "Y"
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
+    handlerAfterBindCard(res){
+      if(res.pop_info && res.pop_info.pop_code === '1001'){
+        this.handleBindConfirm();
+        return;
+      }
+
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
@@ -228,6 +243,25 @@ export default {
         });
       }
     },
+    //卡券已被自己绑定时的弹框
+    handleBindConfirm(){
+      this.$xdConfirm({
+        $vm: this,
+        width: '90%',
+        content: '您已绑定该票券，无需再次绑定',
+        confirmText: '我的票券',
+        cancelText: '返回',
+        showClose: false,
+        success: (res) => {
+          if (res.confirm) {
+            this.$xdUniHelper.redirectTo({
+              url: this.my_card_url || this.backUrl,
+            });
+          }else{
+          }
+        }
+      })
+    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -244,6 +278,8 @@ export default {
         "content.card_pwd_placeholder",
         "请输入密码"
       );
+      this.is_show_balance = getContainerPropsValue(this.container, 'content.is_show_balance', "N");
+      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
       this.init();

package/src/components/JfbBaseCardInfoEntry/Attr.js

@@ -15,6 +15,17 @@ export default {
       },
       inline: false,
     },
+    {
+      label: '我的票券跳转地址:', //label
+      ele: 'xd-select-pages-path', //package 名称
+      valueKey: 'my_card_url', //form[valueKey]
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
     {
       label: '券号框自定义文案:',
       ele: 'el-input',

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -162,6 +162,7 @@ export default {
       //页面跳转地址
       backUrl: "",
       headerBg: {},
+      my_card_url: "",  //我的票券跳转地址
     };
   },
   watch: {
@@ -204,10 +205,11 @@ export default {
           vm: this,
           data: {
             card_qrcode: this.qrcode,
+            is_show_pop: "Y",
           },
         })
           .then((res) => {
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       } else {
@@ -216,17 +218,24 @@ export default {
           data: {
             card_password: this.card_password,
             card_number: this.card_number + "",
-            is_show_entry_settings: "Y"
+            is_show_entry_settings: "Y",
+            is_show_pop: "Y",
           },
         })
           .then((res) => {
             console.log(this.$xdAlert, "this.$xdAlertfsdfs");
-            this.handlerAfterBindCard();
+            this.handlerAfterBindCard(res);
           })
           .catch();
       }
     },
-    handlerAfterBindCard(){
+    handlerAfterBindCard(res){
+
+      if(res.pop_info && res.pop_info.pop_code === '1001'){
+        this.handleBindConfirm();
+        return;
+      }
+
       if(this.hasCon){
         this.toShowCouponDialog();
         this.$bus.$on("onCloseConDialog",(container_id) => {
@@ -247,6 +256,25 @@ export default {
         });
       }
     },
+    //卡券已被自己绑定时的弹框
+    handleBindConfirm(){
+      this.$xdConfirm({
+        $vm: this,
+        width: '90%',
+        content: '您已绑定该票券，无需再次绑定',
+        confirmText: '我的票券',
+        cancelText: '返回',
+        showClose: false,
+        success: (res) => {
+          if (res.confirm) {
+            this.$xdUniHelper.redirectTo({
+              url: this.my_card_url || this.backUrl,
+            });
+          }else{
+          }
+        }
+      })
+    },
     init() {
       this.backUrl = getContainerPropsValue(
         this.container,
@@ -263,6 +291,7 @@ export default {
         "content.card_pwd_placeholder",
         "请输入密码"
       );
+      this.my_card_url = getContainerPropsValue(this.container, 'content.my_card_url', { value: "" }).value;
     },
     onJfbLoad(options) {
       this.init();

package/src/components/JfbBaseCardMerge/JfbBaseCardMerge.vue

@@ -45,6 +45,7 @@
           content-align="left"
           labelPosition="left"
           labelAlign="left"
+          v-if="0"
         >
           <view class="flex align-center">
             <xd-form-input
@@ -207,13 +208,13 @@ export default {
       this.$set(this.mergeForm, "valid_token", valid_token);
     },
     handleToSubmit() {
-      if (!this.mergeForm.valid_code) {
-        uni.showToast({
-          title: "验证码不能为空！",
-          icon: "none",
-        });
-        return;
-      }
+      // if (!this.mergeForm.valid_code) {
+      //   uni.showToast({
+      //     title: "验证码不能为空！",
+      //     icon: "none",
+      //   });
+      //   return;
+      // }
       this.$xdConfirm({
         title: "是否确认合并卡",
         isHtml: true,
@@ -237,8 +238,8 @@ export default {
               data: {
                 from_card_number: this.mergeForm.from_card_number,
                 to_card_number: this.mergeForm.to_card_number,
-                valid_code: this.mergeForm.valid_code,
-                valid_token: this.mergeForm.valid_token
+                // valid_code: this.mergeForm.valid_code,
+                // valid_token: this.mergeForm.valid_token
               },
             })
               .then((res) => {

package/src/components/JfbBaseCardMergeEntry/JfbBaseCardMergeEntry.vue

@@ -62,7 +62,7 @@
           </view>
         </view>
       </view>
-      <view class="code">
+      <view class="code" v-if="0">
         <view>验证码：</view>
         <view>
           <input v-model="valid_code" class="uni-input" placeholder="请输入验证码"/>
@@ -248,13 +248,13 @@ export default {
     },
     
     handleToSubmit() {
-      if (!this.valid_code) {
-        uni.showToast({
-          title: "验证码不能为空！",
-          icon: "none",
-        });
-        return;
-      }
+      // if (!this.valid_code) {
+      //   uni.showToast({
+      //     title: "验证码不能为空！",
+      //     icon: "none",
+      //   });
+      //   return;
+      // }
       
       let outPrice = this.$xdUniHelper.divisionFloatNumber(this.fromSelect.card_point, 100);
       let outHtml = `${this.fromSelect.value}（剩余：${outPrice}）`;
@@ -269,8 +269,8 @@ export default {
           let params = {
             from_card_number: this.fromSelect.value,
             to_card_number: this.toSelect.value,
-            valid_code: this.valid_code,
-            valid_token: this.valid_token
+            // valid_code: this.valid_code,
+            // valid_token: this.valid_token
           };
           
           if (action.confirm) {

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -321,9 +321,14 @@ export default {
           otherParams = this.$xdUniHelper.jsonToParams(this.dispatchData);
         }
       } catch (error) {}
+      let curCoup = this.list[this.currentIndex];
+      let linkUrl = this.list_url;
+      if(curCoup.show_url){
+        linkUrl = curCoup.show_url
+      }
 
       this.$xdUniHelper.navigateTo({
-        url: `${this.list_url}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
+        url: `${linkUrl}?activity_id=${this.activity_id}&distribution_method=${this.distribution_method}&${otherParams}`,
       });
     },
     handleClose() {

package/src/components/JfbBaseConList/JfbBaseConList.vue

@@ -153,6 +153,7 @@ export default {
       done: false,
       message: "",
       options: {},
+      next_url: "",
 
       collectedPath: "",
     };
@@ -197,6 +198,7 @@ export default {
           this.used_up_url = res.used_up_url && getServiceUrl(res.used_up_url);
           this.can_take = res.can_take;
           this.has_times = res.has_times;
+          this.next_url = res.next_url;
           
           this.couponList =
             res.list &&
@@ -258,7 +260,7 @@ export default {
             });
           console.log("couponList", this.couponList);
           this.message = res.message;
-          this.notice = res.rule;
+          this.notice = res.about;
           this.done = true;
         })
         .catch((err) => {
@@ -267,7 +269,7 @@ export default {
     },
     toCoupon(){
       this.$xdUniHelper.navigateTo({
-        url: this.collectedPath,
+        url: this.next_url || this.collectedPath,
       });
     },
     getCoupont(item) {