jufubao-base 1.0.118 → 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

@@ -43,10 +43,6 @@
         </view> -->
       <view class="qrcode_card">
         <view class="jfb-base-card-detail-entry__body-qrcode">
-          <view class="qrcode_card-title">
-            <xd-font-icon style="margin-right: 24rpx;" icon="iconsaoma-02" size="32"></xd-font-icon>
-            向商家付款
-          </view>
           <view class="barcode_wrap">
             <view>
               <image mode="aspectFit" :src="info.barcode"></image>

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) {

package/src/components/JfbBaseConPhone/Api.js

@@ -0,0 +1,70 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'sendMsgConPhone',
+    title: '发送验证码',
+    path: '/common/v1/valid_code/sms/send',
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      biz_name: ['业务名称', 'String', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getCouponPhoneList', //自定义方法名字（必选）
+    title: '获取优惠券列表',
+    path: '/sms-coupon/v1/activity-prizes-user/list',
+    isRule: false,
+    params: {
+      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
+      namespace: ['业务线', 'String', '必填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getAllCouponPhone', //自定义方法名字（必选）
+    title: '领取优惠券',
+    path: '/sms-coupon/v1/activity-prizes-user/set',
+    isRule: false,
+    params: {
+      distribution_method: ['发放方式 entry=主动发放, homed=首页发放,paid=消费后发放,card_binded=绑定卡后发放', 'String', '选填'],
+      namespace: ['业务线', 'String', '必填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getCouponPhoneResult', //自定义方法名字（必选）
+    title: '轮询查询活动结果',
+    path: '/sms-coupon/v1/activity-prizes-user/get',
+    isRule: false,
+    params: {
+      tmp_order_number: ['tmp_order_number', 'String', '选填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getUserPhone',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseConPhone/Attr.js

@@ -0,0 +1,10 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: [],
+  advanced: [],
+};