jufubao-base 1.0.169-beta19 → 1.0.169-beta20

package/package.json

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

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -651,7 +651,7 @@ export default {
       this.formBgColor = getContainerPropsValue(value, "content.formBgColor", '#FFFFFF');
       this.labelAlign = getContainerPropsValue(value, "content.labelAlign", 'left');
       this.labelWidth = getContainerPropsValue(value, "content.labelWidth", '180');
-      this.labelPosition = getContainerPropsValue(value, "content.labelPosition", 'top');
+      this.labelPosition = getContainerPropsValue(value, "content.labelPosition", 'left');
       this.formPadding = getContainerPropsValue(value, "content.formPadding", {top: 20, left: 20, right: 20, bottom: 20});
       this.agreePadding = getContainerPropsValue(value, "content.agreePadding", {});
       this.authAgreePadding = getContainerPropsValue(value, "content.authAgreePadding", {top: 20, left: 20, right: 20, bottom: 20});
@@ -799,6 +799,8 @@ export default {
 
       let { redirect_url, callback_url } = this;
 
+      redirect_url = redirect_url || callback_url || this.$settings.index;
+
       //不同项目直接域名替换
       if (/^(@site_domain@).+$/.test(redirect_url)) {
         redirect_url = redirect_url.replace(/@site_domain@/, location.origin)

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -536,7 +536,13 @@
       toBindCardDigital(){
         const { code } = this.form;
 
-        if(!code) return "";
+        if(!code) {
+          uni.showToast({
+            title: '请输入电子码',
+            icon: "none"
+          });
+          return ""
+        };
         jfbRootExec("pwdCardBind", {
           vm: this,
           data: {
@@ -577,6 +583,7 @@
         this.valid_token = valid_token;
       },
       doScanCode(){
+        console.log("开始扫码");
         // #ifdef H5
         this.jwxSDK.scanQRCode({
           needResult: 1,

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -59,7 +59,7 @@
             </view>
           </view>
           <view v-else>
-            <xd-button type="primary" @click="doCardLogin">立即使用</xd-button>
+            <xd-button type="primary" @click="doCardLogin()">立即使用</xd-button>
           </view>
         </view>
         <view class="list_col_wrap" :style="listColWrapBoxStyle">

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -127,6 +127,7 @@
               :couponLeftBgColor="couponLeftBgColor"
               :item="item"
               @useCoupon="doCardLogin(item)"
+              @toDetail="toCardDetail(item)"
             ></xd-coupon-item>
             <view v-if="!hasCouponList" class="no_more_card" @click="toDisableUrl">没有更多券了，查看失效的票券 ></view>
           </view>

package/src/components/JfbBaseTfkCardLogin/XdCouponItem.vue

@@ -1,5 +1,6 @@
 <template>
-  <view class="xd-coupon_item" :style="couponItemBoxStyle">
+  <view class="xd-coupon_item" :style="couponItemBoxStyle"
+    @click="toDetail">
     <view class="coupon_left" :style="{
       background: couponLeftBgColor
     }">
@@ -42,11 +43,11 @@
               borderRadius: couponBtnRadius + 'rpx'
             }
           ]"
-          @click="goToUseCoupon"
+          @click.stop="goToUseCoupon"
         >{{item.is_login === 'Y' ? '已登录' : '去使用'}}</view>
       </view>
       <view class="cont_bottom">
-        <view class="switch_rule" @click="switchRule">
+        <view class="switch_rule" @click.stop="switchRule">
           <view>使用规则</view>
           <view>
             <xd-font-icon v-if="!expand" icon="iconxia_down" size="24"></xd-font-icon>
@@ -155,7 +156,7 @@
         let image = {};
         if(this.couponImageUrl) image = {
           backgroundImage: `url(${this.getCouponBgImage})`,
-          backgroundSize: '100%',
+          backgroundSize: 'cover',
           backgroundRepeat: 'no-repeat',
         }
         return this.styleObjectToString(image)
@@ -176,6 +177,9 @@
       switchRule(){
         this.expand = !this.expand;
       },
+      toDetail(){
+        this.$emit('toDetail', this.item);
+      },
       goToUseCoupon(){
         this.$emit('useCoupon', this.item);
       },

package/src/components/JfbBaseTfkSearch/Mock.js

@@ -20,7 +20,7 @@ module.exports = {
             brand_name: "品牌jls0519",
             list_title: "3",
             market_price: 2000,
-            market_tags: [],
+            market_tags: ['flashsale','hot','new', 'rec'],
             product_id: 60030143,
             product_name: "仅快递实物商品（北京廊坊支持配送）",
             product_type: "good",
@@ -28,14 +28,14 @@ module.exports = {
             sale_num: 8,
             sale_price: 3000,
             status: "ok",
-            thumb: "/uploads/20231215/b2ce0235129aa592044f96343f25c338.jpeg"
+            thumb: "/uploads/20231215/b2ce0235129aa592044f96343f25c338.jpeg",
           },
           {
             brand_id: 30000,
             brand_name: "其他",
             list_title: "清代戏剧文化史论/北京大学明清研究丛书",
             market_price: 2600,
-            market_tags: [],
+            market_tags: ['flashsale','hot','new', 'rec'],
             product_id: 60029756,
             product_name: "清代戏剧文化史论/北京大学明清研究丛书",
             product_type: "good",