jufubao-base 1.0.174-beta1 → 1.0.174-beta10

package/package.json

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

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -53,6 +53,7 @@
             v-if="useSearch==='Y'"
             :placeholder="placeholder"
             class="search_input"
+            :value="keyword"
             @input="handleInput"
             @click="toSearch"
             :placeholder-style="'color:' + inputTextColor"
@@ -100,6 +101,8 @@
         timer: null,
         saveKey: 'xd_user_current_access_city', //用户选中城市存储key
         loaded: false,
+        keyword: "",
+
         //面板
         showLocation: "",
         showLocationKey: 'showLocationKey',
@@ -204,6 +207,7 @@
 
       },
       handleInput(e){
+        this.keyword = e.detail.value;
         if(this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(() => {
           jfbRootFnExec(this, 'onCustomEvent')("baseHeader@search", e.detail.value);
@@ -242,6 +246,11 @@
         }
         this.$xdUniHelper.navigateBack();
       },
+      onJfbCustomEvent({action, data}){
+        if(action === 'baseTfkSearch@keyword'){
+          this.keyword = data;
+        }
+      }
     }
   }
 

package/src/components/JfbBaseLogin/Attr.js

@@ -635,7 +635,7 @@ export default {
         label: 'logo样式配置',
         size: 'small',
         groupKey: 'style',
-        hidden: data.previewCurrent !== "auth" || data.showLogo !== "Y",
+        hidden: data.showLogo !== "Y",
       },
       {
         label: "logo区域高度:",
@@ -646,7 +646,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo区域高度",
         className: 'input60',
-        hidden: data.previewCurrent !== "auth" || data.showLogo !== "Y",
+        hidden: data.showLogo !== "Y",
       },
       {
         label: "logo图片高度:",
@@ -657,7 +657,7 @@ export default {
         groupKey:'style',
         placeholder: "请输入logo图片高度",
         className: 'input60',
-        hidden: data.previewCurrent !== "auth" || data.showLogo !== "Y",
+        hidden: data.showLogo !== "Y",
       },
       {
         label: 'logo圆角设置:',
@@ -677,7 +677,7 @@ export default {
               console.error(error);
             });
         },
-        hidden: data.previewCurrent !== "auth" || data.showLogo !== "Y",
+        hidden: data.showLogo !== "Y",
       },
       {
         ele: "title",
@@ -699,6 +699,7 @@ export default {
         setting: {
           type: 'margin',
         },
+        groupKey:'style',
         placeholder: '请设置边距',
         inline: false,
         notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -174,7 +174,7 @@
             </xd-form-item>
             <xd-form-item
               v-if="accountLoginType === 'pwd'"
-              class="form-item"
+              class="form-item password-form-item"
               :class="[inputStyle]"
               label="密码"
               :leftIcon="passwordIcon"
@@ -190,6 +190,23 @@
           </xd-form>
         </view>
 
+        <view class="form-group" :style="btnWrapStyle">
+          <xd-button
+            style="flex: 1"
+            type="primary"
+            :radius="btnRadius + 'rpx'"
+            :bg-color="btnColor"
+            :disabled="!panelTwoIsChecked"
+            @click="doLoginForm"
+            >
+              <xd-font-icon v-if="phoneLoginBtnIcon"
+                style="display: inline-flex;margin-right: 12rpx;"
+                :icon="phoneLoginBtnIcon"
+              ></xd-font-icon>
+              {{ phoneLoginBtnText }}
+            </xd-button
+          >
+        </view>
         <view class="form-group" :style="agreementBoxStyle">
           <xd-form-checkbox
             class="xd-form-checkbox"
@@ -213,23 +230,6 @@
             </template>
           </xd-form-checkbox>
         </view>
-        <view class="form-group" :style="btnWrapStyle">
-          <xd-button
-            style="flex: 1"
-            type="primary"
-            :radius="btnRadius + 'rpx'"
-            :bg-color="btnColor"
-            :disabled="!panelTwoIsChecked"
-            @click="doLoginForm"
-            >
-              <xd-font-icon v-if="phoneLoginBtnIcon"
-                style="display: inline-flex;margin-right: 12rpx;"
-                :icon="phoneLoginBtnIcon"
-              ></xd-font-icon>
-              {{ phoneLoginBtnText }}
-            </xd-button
-          >
-        </view>
         <view
           v-if="accountLoginType === 'pwd'"
           class="forget_password"
@@ -1098,6 +1098,7 @@ export default {
   box-sizing: border-box;
 
   &__body {
+    padding-bottom: 160rpx;
     .xd-form-checkbox {
       ::v-deep .checklist-content .checklist-text {
         font-size: 26rpx !important;
@@ -1123,9 +1124,10 @@ export default {
     .form-group {
       padding: 40rpx 70rpx;
     }
+    // #ifdef H5
     .form-item {
       ::v-deep &.uni-forms-item {
-        padding-left: unit(30rpx) !important;
+        // padding-left: unit(30,rpx) !important;
         .uni-input-input{
           font-size: var(--content-font-size);
           color: var(--content-font-color);
@@ -1159,6 +1161,44 @@ export default {
 
       }
     }
+    // #endif
+
+    // #ifdef MP
+    ::v-deep .uni-forms-item {
+      // padding-left: 30rpx !important;
+      .uni-input-input{
+        font-size: var(--content-font-size);
+        color: var(--content-font-color);
+        font-weight: var(--content-font-weight);
+      }
+      .label-text {
+        font-size: var(--label-font-size);
+        color: var(--label-font-color);
+        font-weight: var(--label-font-weight);
+      }
+      .uni-easyinput__placeholder-class{
+        font-size: var(--placeholder-font-size);
+        color: var(--placeholder-font-color);
+        font-weight: var(--placeholder-font-weight);
+      }
+    }
+    .linear{
+      ::v-deep .uni-forms-item--border{
+        border-top: none !important;
+        border-bottom: var(--form-border-width) solid var(--form-border-color) !important;
+      }
+    }
+    .face{
+      ::v-deep .uni-forms-item__content{
+        background: #F7F7F7;
+        border-radius: 16rpx;
+      }
+      ::v-deep .uni-forms-item--border{
+        border: none;
+      }
+    }
+    // #endif
+
     .get_code {
       color: @xd-base-color;
       font-size: 24rpx;
@@ -1166,6 +1206,7 @@ export default {
       padding: 10rpx 24rpx;
       border: 1px solid @xd-base-color;
       border-radius: 40rpx;
+      white-space: nowrap;
     }
     .logo-wrap {
       display: flex;
@@ -1175,11 +1216,11 @@ export default {
       image {
         width: 180rpx;
         height: 180rpx;
-        margin-bottom: unit(12,rpx);
       }
       & > view {
         font-size: unit(36,rpx);
         font-weight: 600;
+        margin-top: 12rpx;
       }
     }
     .panel-login-auth {

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -38,11 +38,11 @@
         <view class="menu_list">
           <view class="menu_item" @click="switchShowType('ticket')">
             <view class="menu_inner" :class="menuShowType"
-              :style="[menuType == 'ticket' ? menuItemActiveStyle : menuItemStyle, menuItemBoxStyle]">实体券</view>
+              :style="menuType == 'ticket' ? menuItemActiveStyle : menuItemStyle">实体券</view>
           </view>
           <view class="menu_item" @click="switchShowType('code')">
             <view class="menu_inner" :class="menuShowType"
-              :style="[menuType == 'code' ? menuItemActiveStyle : menuItemStyle, menuItemBoxStyle]">电子码</view>
+              :style="menuType == 'code' ? menuItemActiveStyle : menuItemStyle">电子码</view>
           </view>
         </view>
       </view>
@@ -67,8 +67,9 @@
                 <xd-form-input
                   v-model="form.card_number"
                   placeholder="请输入票券号"
+                  style="width: 100%;"
                 />
-                <view @click="doScanCode">
+                <view @click.stop="doScanCode" style="margin-left: 20rpx;">
                   <xd-font-icon :icon="scanIcon.icon || 'iconsaoma'"
                     :color="scanIcon.color"
                     :style="{fontSize: scanIcon.fontSize}"
@@ -102,6 +103,7 @@
                 <xd-form-input
                   v-model="form.valid_code"
                   placeholder="请输入验证码"
+                  style="width: 100%;"
                 />
                 <view class="form_valid_code" @click="switchValidToken">
                   <image
@@ -178,6 +180,9 @@
   import extsMixins from "@/mixins/extsMixins";
   import { mapState } from "vuex";
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
     name: "JfbBaseTfkCardBind",
     components: {
       XdFontIcon,
@@ -332,14 +337,12 @@
           fontSize: '24rpx',
         })
       },
-      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 = {
@@ -347,6 +350,7 @@
           background: this.menuTabColor['bgColor'] || '#fff',
           fontSize: this.menuTabColor['fontSize'] || '30rpx',
           fontWeight: this.menuTabColor['fontWeight'] || 'normal',
+          padding: this.menuItemBoxPadding,
         }
 
         return this.styleObjectToString(styleObj)
@@ -358,6 +362,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}`;
@@ -678,6 +683,7 @@
 
   .jfb-base-tfk-card-bind {
     &__body{
+      // #ifdef H5
       .form-item {
         ::v-deep &.uni-forms-item {
           .is-required{
@@ -704,8 +710,6 @@
         }
         &.linear{
           ::v-deep &.uni-forms-item--border{
-            // border-color: var(--form-border-color) !important;
-            // border-width: var(--form-border-width) !important;
             border-top: none !important;
             border-bottom: var(--form-border-width) solid var(--form-border-color) !important;
           }
@@ -749,13 +753,83 @@
           ::v-deep .label-icon{
             font-size: var(--digital-icon-size) !important;
           }
-          ::v-deep .uni-forms-item__inner{
-            // padding-bottom: 0% !important;
-            // border: 1px solid var(--digital-border-color);
-            // border-radius: var(--digital-border-radius);
+        }
+      }
+      // #endif
+
+      // #ifdef MP
+      ::v-deep .uni-forms-item {
+        .is-required{
+          display: none;
+        }
+        .uni-input-input{
+          font-size: var(--content-font-size);
+          color: var(--content-font-color);
+          font-weight: var(--content-font-weight);
+        }
+        .label-text {
+          font-size: var(--label-font-size);
+          color: var(--label-font-color);
+          font-weight: var(--label-font-weight);
+        }
+        .uni-easyinput__placeholder-class{
+          font-size: var(--placeholder-font-size);
+          color: var(--placeholder-font-color);
+          font-weight: var(--placeholder-font-weight);
+        }
+      }
+      ::v-deep .uni-forms-item--border{
+        padding: var(--form-input-padding) 0;
+      }
+      .linear{
+        ::v-deep .uni-forms-item--border{
+          border-top: none !important;
+          border-bottom: var(--form-border-width) solid var(--form-border-color) !important;
+        }
+      }
+      .face{
+        ::v-deep .uni-forms-item__box{
+          background: #F7F7F7;
+          border-radius: var(--form-border-radius);
+          padding-right: 20rpx;
+        }
+        ::v-deep .uni-forms-item--border{
+          border: none;
+        }
+      }
+      .ticket_item{
+        ::v-deep .label-icon{
+          font-size: var(--ticket-icon-size) !important;
+        }
+      }
+      .password_item{
+        ::v-deep .label-icon{
+          font-size: var(--password-icon-size) !important;
+        }
+      }
+      .valid_item{
+        ::v-deep .label-icon{
+          font-size: var(--valid-icon-size) !important;
+        }
+      }
+      .digital_item{
+        &.linear{
+          ::v-deep .uni-forms-item--border{
+            border-color: var(--digital-border-color) !important;
+          }
+        }
+        &.face{
+          ::v-deep .uni-forms-item__box{
+            border-radius: var(--digital-border-radius);
           }
         }
+        ::v-deep .label-icon{
+          font-size: var(--digital-icon-size) !important;
+        }
       }
+      // #endif
+
+
       .menu_wrap{
         .menu_list{
           display: flex;

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -78,7 +78,7 @@
         </view>
       </view>
       <view v-if="curModule === 'rule'">
-        <view v-if="cardInfo.card_use_rule" v-html="cardInfo.card_use_rule" 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">
           使用规则暂无
@@ -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,13 +96,7 @@
                   <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>
@@ -273,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 = {
@@ -289,6 +281,7 @@
           fontSize: this.menuTabColor['fontSize'] || '30rpx',
           fontWeight: this.menuTabColor['fontWeight'] || 'normal',
           borderWidth: this.menuBorderWidth + 'px',
+          padding: this.menuItemBoxPadding,
         }
 
         return this.styleObjectToString(styleObj)
@@ -300,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}`
@@ -316,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)
       },
@@ -332,6 +336,7 @@
           background: this.cardBtnTextStyle['actBgColor'] || '#fff',
           fontSize: this.cardBtnTextStyle['actFontSize'] || '30rpx',
           fontWeight: this.cardBtnTextStyle['actFontWeight'] || 'normal',
+          ...this.bindCardBtnOther
         }
         return this.styleObjectToString(styleActiveObj)
       },
@@ -686,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 => {