jufubao-base 1.0.174-beta1 → 1.0.174-beta3

package/package.json

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

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">
           使用规则暂无

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

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -1,78 +1,81 @@
 <template>
   <view class="search_all_list" >
-    <view class="module_item" v-for="parent in list" :key="parent.setting_id"
-      :style="moduleItemStyle"
-    >
-      <view class="module_title" :style="moduleItemTitleStyle">{{ parent.name }}</view>
-      <view v-if="parent.type !== 'product'" class="module_cont">
-        <view v-for="(item, i) in parent.items" :key="item.key"
-          class="module_cont_inner"
-          :style="moduleItemContStyle"
-        >
-          <content-cinema v-if="parent.type === 'cinema'"
-            style="width: 100%; height: 100%"
-            :keyword="keyword"
-            :item="item"
-            :out-spacing="listItemStyle.outSpacing"
-            :color="{SEAT:listItemStyle.mainColor,CODE:listItemStyle.subMainColor,SELL:listItemStyle.successColor}"
-            :border-radius="listItemStyle.imgRradius"
-            :brand-color="listItemStyle.brandColor"
-            @on-schedule="handleFilmDetail"
-            @on-cashier-detail="handleCashierDetail"
-            @on-code-detail="handleCodeDetail"
-          ></content-cinema>
-          <content-film v-if="parent.type === 'film'"
-            type="hot"
-            style="width: 100%; height: 100%"
-            :keyword="keyword"
-            :item="item"
-            :out-spacing="listItemStyle.outSpacing"
-            :color="listItemStyle.mainColor"
-            :border-radius="listItemStyle.imgRradius"
-            :brand-color="listItemStyle.brandColor"
-            @on-film-detail="handleFilmDetail"
-            @on-buy="handleBuy"
-          ></content-film>
-          <content-shop v-if="parent.type === 'shop'"
-            style="width: 100%; height: 100%"
-            :keyword="keyword"
-            :item="item"
-            :out-spacing="listItemStyle.outSpacing"
-            :color="listItemStyle.mainColor"
-            :border-radius="listItemStyle.imgRradius"
-            :brand-color="listItemStyle.brandColor"
-            :is-echange="'Y' || listItemStyle.isShowExchange"
-            @on-shop-jhd="handleShopJhd"
-            @on-shop-detail="handleShopDetail"
-          ></content-shop>
+    <template v-if="!loadingList">
+      <view class="module_item" v-for="parent in list" :key="parent.setting_id"
+        :style="moduleItemStyle"
+      >
+        <view class="module_title" :style="moduleItemTitleStyle">{{ parent.name }}</view>
+        <view v-if="parent.type !== 'product'" class="module_cont">
+          <view v-for="(item, i) in parent.items" :key="item.key"
+            class="module_cont_inner"
+            :style="[moduleItemContStyle]"
+          >
+            <content-cinema v-if="parent.type === 'cinema'"
+              style="width: 100%; height: 100%"
+              :keyword="keyword"
+              :item="item"
+              :out-spacing="listItemStyle.outSpacing"
+              :color="{SEAT:listItemStyle.mainColor,CODE:listItemStyle.subMainColor,SELL:listItemStyle.successColor}"
+              :border-radius="listItemStyle.imgRradius"
+              :brand-color="listItemStyle.brandColor"
+              @on-schedule="data => handleFilmDetail(data, parent)"
+              @on-cashier-detail="data => handleCashierDetail(data, parent)"
+              @on-code-detail="data => handleCodeDetail(data, parent)"
+            ></content-cinema>
+            <content-film v-if="parent.type === 'film'"
+              type="hot"
+              style="width: 100%; height: 100%"
+              :keyword="keyword"
+              :item="item"
+              :out-spacing="listItemStyle.outSpacing"
+              :color="listItemStyle.mainColor"
+              :border-radius="listItemStyle.imgRradius"
+              :brand-color="listItemStyle.brandColor"
+              @on-film-detail="data => handleFilmDetail(data, parent)"
+              @on-buy="data => handleBuy(data, parent)"
+            ></content-film>
+            <content-shop v-if="parent.type === 'shop'"
+              style="width: 100%; height: 100%"
+              :keyword="keyword"
+              :item="item"
+              :out-spacing="listItemStyle.outSpacing"
+              :color="listItemStyle.mainColor"
+              :border-radius="listItemStyle.imgRradius"
+              :brand-color="listItemStyle.brandColor"
+              :is-echange="listItemStyle.isShowExchange"
+              @on-shop-jhd="data => handleShopJhd(data, parent)"
+              @on-shop-detail="data => handleShopDetail(data, parent)"
+            ></content-shop>
+          </view>
         </view>
-      </view>
-      <view v-else class="module_cont product_wrap">
-        <view v-for="(item, i) in parent.items" :key="item.key"
-          class="module_cont_inner"
-          :style="[moduleItemContStyle, {
-            width: getProductCell(parent.tab) == 2 ? `calc(50% - ${listItemStyle.outSpacing/2}rpx)`: '100%',
-          }]"
-        >
-          <content-product v-if="parent.type === 'product'"
-            style="width: 100%; height: 100%"
-            :keyword="keyword"
-            :item="item"
-            :height="outItemProduct"
-            :product-config="productConfig"
-            :out-spacing="listItemStyle.outSpacing"
-            :color="listItemStyle.mainColor"
-            :brand-color="listItemStyle.brandColor"
-            :border-radius="listItemStyle.imgRradius"
-            :cell="getProductCell(parent.tab)"
-            @on-product-detail="handleProductDetail"
-          ></content-product>
+        <view v-else class="module_cont product_wrap">
+          <view v-for="(item, i) in parent.items" :key="item.key"
+            class="module_cont_inner"
+            :style="[moduleItemContStyle, {
+              width: getProductCell(parent.tab) == 2 ? `calc(50% - ${listItemStyle.outSpacing/2}rpx)`: '100%',
+            }]"
+          >
+            <content-product v-if="parent.type === 'product'"
+              style="width: 100%; height: 100%"
+              :keyword="keyword"
+              :item="item"
+              :height="outItemProduct"
+              :product-config="productConfig"
+              :out-spacing="listItemStyle.outSpacing"
+              :color="listItemStyle.mainColor"
+              :brand-color="listItemStyle.brandColor"
+              :border-radius="listItemStyle.imgRradius"
+              :cell="getProductCell(parent.tab)"
+              @on-product-detail="data => handleProductDetail(data, parent)"
+            ></content-product>
+          </view>
+        </view>
+        <view class="module_more">
+          <view class="more_inner" :style="moduleMoreStyle" @click="switchMenu(parent)">查看全部</view>
         </view>
       </view>
-      <view class="module_more">
-        <view class="more_inner" :style="moduleMoreStyle" @click="switchMenu(parent)">查看全部</view>
-      </view>
-    </view>
+      <xd-no-data v-if="list && list.length ===0" height="60vh" icon-type="search">商品正在上架中</xd-no-data>
+    </template>
   </view>
 </template>
 
@@ -82,13 +85,15 @@
   import ContentShop from "./ContentShop.vue"
   import ContentProduct from "./ContentProduct.vue"
   import {mapState} from "vuex";
+  import XdNoData from "@/components/XdNoData/XdNoData"
   export default{
     name: "SearchAllList",
     components: {
       ContentCinema,
       ContentFilm,
       ContentShop,
-      ContentProduct
+      ContentProduct,
+      XdNoData,
     },
     props: {
       keyword:{
@@ -157,14 +162,14 @@
         padding = `${padding} ${this.checkValue(contMargin.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(contMargin.bottom, 20)}rpx`;
         padding = `${padding} ${this.checkValue(contMargin.left, 20)}rpx`;
-        return this.styleObjectToString({
+        return {
           padding: padding,
           border: contBorder,
           borderRadius: contRradius + 'rpx',
           boxShadow: contShadow,
           marginBottom: outSpacing + 'rpx',
           background: contBgColor,
-        })
+        }
       },
       moduleMoreStyle(){
         const { allModuleMoreStyle } = this.allStyle;
@@ -202,11 +207,13 @@
         getParent:null,
         $parentVm:null,
         parentStatus: false,
+        loadingList: true,
 
         list: [],
       }
     },
     created(){
+      this.loadingList = true;
       this.getParentMV();
       this.getList();
     },
@@ -243,6 +250,7 @@
         this.$emit('on-list', {
           params: params,
           cb:(list)=>{
+            this.loadingList = false;
             this.list = (list || []).map(parent => {
               parent.items = parent.items.map(item => {
                 item['key'] = item.product_id || item.resource_shop_id || item.cinema_id || item.film_id;
@@ -260,35 +268,35 @@
 
 
       //影片
-      handleFilmDetail(film){
-        this.getParent().handleFilmDetail(film, this.dataConfig)
+      handleFilmDetail(film, dataConfig){
+        this.getParent().handleFilmDetail(film, dataConfig)
       },
-      handleBuy(film){
-        this.getParent().handleBuy(film, this.dataConfig)
+      handleBuy(film, dataConfig){
+        this.getParent().handleBuy(film, dataConfig)
       },
 
       //影院
-      handleSchedule(cinema){
-        this.getParent().handleSchedule(cinema, this.dataConfig)
+      handleSchedule(cinema, dataConfig){
+        this.getParent().handleSchedule(cinema, dataConfig)
       },
-      handleCashierDetail(cinema){
-        this.getParent().handleCashierDetail(cinema, this.dataConfig)
+      handleCashierDetail(cinema, dataConfig){
+        this.getParent().handleCashierDetail(cinema, dataConfig)
       },
-      handleCodeDetail(cinema){
-        this.getParent().handleCodeDetail(cinema, this.dataConfig)
+      handleCodeDetail(cinema, dataConfig){
+        this.getParent().handleCodeDetail(cinema, dataConfig)
       },
 
       //门店
-      handleShopJhd(shop){
-        this.getParent().handleShopJhd(shop, this.dataConfig)
+      handleShopJhd(shop, dataConfig){
+        this.getParent().handleShopJhd(shop, dataConfig)
       },
-      handleShopDetail(shop){
-        this.getParent().handleShopDetail(shop, this.dataConfig)
+      handleShopDetail(shop, dataConfig){
+        this.getParent().handleShopDetail(shop, dataConfig)
       },
 
       //商品
-      handleProductDetail(product){
-        this.getParent().handleProductDetail(product, this.dataConfig)
+      handleProductDetail(product, dataConfig){
+        this.getParent().handleProductDetail(product, dataConfig)
       },
     }
   }

package/src/components/JfbBaseTfkSearch/ContentCinema.vue

@@ -114,6 +114,8 @@
     margin-bottom: 20rpx;
     color: #333;
     font-weight: 500;
+    word-wrap: break-word;
+    word-break: break-all;
   }
   .address {
     font-size: 24rpx;

package/src/components/JfbBaseTfkSearch/ContentFilm.vue

@@ -9,7 +9,7 @@
     </view>
     <view class="middle">
       <view class="top">
-        <view class="name">{{item['show_name']}}</view>
+        <view class="name" v-html="cusName"></view>
         <view class="score">
           <template v-if="item['remark']">
             <text>评分：</text><text :style="{color:color}">{{item['remark']}}</text>
@@ -61,12 +61,17 @@
 
 <script>
   import XdButton from "@/components/XdButton/XdButton.vue";
+  import handleKeyword from "./handleKeyword";
   export default {
     name:'ContentItem',
     components:{
       XdButton
     },
     props:{
+      keyword:{
+        type:String,
+        default:''
+      },
       item:Object,
       outSpacing: {
         type: Number|String,
@@ -86,6 +91,11 @@
       }
 
     },
+    computed:{
+      cusName(){
+        return handleKeyword(this, this.item['show_name'], this.keyword)
+      },
+    },
     data(){
       return {
         errorImage: 'https://img.jufubao.cn/common/error_movie.png?v20',
@@ -143,6 +153,8 @@
         font-weight: 600;
         .uni-max-cut(2, 90);
         line-height: 45rpx;
+        word-wrap: break-word;
+        word-break: break-all;
       }
       & >view:nth-child(2) {
         flex-shrink: 0;

package/src/components/JfbBaseTfkSearch/ContentProduct.vue

@@ -16,7 +16,7 @@
       <view class="prodcut-content-info">
         <view class="name" v-html="cusName" :class="{showOne: isOne}"></view>
         <view class="brand" v-if="productConfig.is_show_brand==='Y'" :style="{color:brandColor}">{{item['brand_name']}}</view>
-        <view class="tags" v-if="productConfig.isShowTag === 'Y'">
+        <view class="tags" :class="{showTwo:!isOne}" v-if="productConfig.isShowTag === 'Y'">
           <view
             v-for="tag in tagsList"
             :key="tag"
@@ -217,6 +217,7 @@ export default {
     }
 
     &-content {
+      overflow: hidden;
       &-info {
 
       }
@@ -274,6 +275,13 @@ export default {
         margin-bottom: 10rpx;
         line-height: 40rpx;
         .uni-max-cut(2,80);
+        word-wrap: break-word;
+        word-break: break-all;
+
+        & > text {
+          display: inline-block;
+
+        }
 
         &.showOne {
           .uni-max-cut(1,40);
@@ -295,6 +303,11 @@ export default {
         margin-bottom: 10rpx;
         flex-flow: wrap;
 
+        &.showTwo {
+          &:nth-child(4),&:nth-child(5),&:nth-child(6){
+            margin-top: 8rpx;
+          }
+        }
         & > view {
           padding: 0 14rpx;
           height: 32rpx;
@@ -307,11 +320,10 @@ export default {
           &:last-child {
             margin-right: 0;
           }
-          &:nth-child(4),&:nth-child(5),&:nth-child(6){
-            margin-top: 8rpx;
-          }
+
         }
       }
+
     }
   }
 </style>

package/src/components/JfbBaseTfkSearch/ContentShop.vue

@@ -128,6 +128,8 @@ export default {
           font-weight: 500;
           .uni-max-cut(2,80);
           line-height: 40rpx;
+          word-wrap: break-word;
+          word-break: break-all;
 
           &.one {
             .uni-max-cut(1,40);

package/src/components/JfbBaseTfkSearch/CustomList.vue

@@ -70,14 +70,14 @@
             @on-code-detail="handleCodeDetail"
           ></content-cinema>
           <content-shop
-            v-if="type_code === 'shop'"
+            v-if="productConfig !== null && type_code === 'shop'"
             style="width: 100%; height: 100%"
             :keyword="keyword"
             :out-spacing="listItemStyle.outSpacing"
             :item="item"
             :color="listItemStyle.mainColor"
             :border-radius="listItemStyle.imgRradius"
-            :is-echange="listItemStyle.isShowExchange"
+            :is-echange="productConfig.isShowExchange"
             @on-shop-jhd="handleShopJhd"
             @on-shop-detail="handleShopDetail"
           ></content-shop>
@@ -94,7 +94,9 @@
             :cell="type_other"
             @on-product-detail="handleProductDetail"
           ></content-product>
+
         </view>
+        <view class="hasNoData" v-if="dataList && dataList.length > 0 && page_token === ''">已经到底没有更多数据了</view>
       </template>
       <view v-else class="productBox2">
         <view v-for="(value, listKey) in productTowList" :key="listKey">
@@ -226,7 +228,7 @@ export default {
       let h = 'auto'
       if(this.type_code === 'film') h = '240rpx'
       if(this.type_code === 'cinema') h = 'auto';
-      if(this.type_code === 'shop') h = '200rpx';
+      if(this.type_code === 'shop') h = '220rpx';
       return h;
     }
   },
@@ -239,7 +241,7 @@ export default {
       hasNoData: false,
 
       page_token:'1',
-      page_size: 20,
+      page_size: 10,
 
       //参数
       type_code:'',
@@ -360,8 +362,16 @@ export default {
             return
           }
 
+          // res.items = res.items.map(item=>{
+          //   if(item.market_tags) {
+          //     item.market_tags = ['flashsale','hot','new', 'rec']
+          //   }
+          //   return item
+          // });
+
           //正常数据处理
-          this.dataConfig = res;
+          this.dataConfig = res
+
 
           //整理为统一ID
           res.items = res.items.map((item,index)=>{
@@ -450,4 +460,14 @@ export default {
     flex-flow: wrap;
   }
 
+  .hasNoData {
+    height: 80rpx;
+    line-height: 80rpx;
+    font-size: 24rpx;
+    text-align: center;
+    color: #ccc;
+    background-color: rgba(255, 255, 255, .05);
+    margin: 20rpx 0
+  }
+
 </style>

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue

@@ -29,13 +29,8 @@
               @click="handleSwitchMenu(item)"
             >
               <view class="menu_inner"
-                :style="[
-                  menuItemBoxStyle,
-                  item.value === tabId ? menuItemActiveStyle : menuItemStyle,
-                  {
-                    marginRight: i === showMenuList.length - 1 ? '0' : menuItemMargin + 'rpx',
-                  }
-                ]"
+                :style="item.value === tabId ? menuItemActiveStyle : menuItemStyle"
+                :class="{isLast: i === showMenuList.length - 1}"
               >{{ item.label }}</view>
             </view>
           </view>
@@ -52,6 +47,7 @@
             @on-switch="handleSwitchMenu"
           ></all-list>
           <custom-list
+            v-else
             :tab-id="tabId"
             :keyword="keyword"
             :list-item-style="listItemStyle"
@@ -97,7 +93,6 @@
     ],
     data() {
       return {
-        hideMask: true,
         tabId: 'all', //cinema/film/shop/product
         keyword: '',
         options:{},
@@ -159,14 +154,12 @@
           backgroundColor: this.menuBgColor,
         })
       },
-      menuItemBoxStyle(){
+      menuItemBoxPadding(){
         let padding = `${this.checkValue(this.menuItemPadding.top, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuItemPadding.right, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuItemPadding.bottom, 20)}rpx`;
         padding = `${padding} ${this.checkValue(this.menuItemPadding.left, 20)}rpx`;
-        return this.styleObjectToString({
-          padding
-        })
+        return padding;
       },
       menuItemStyle(){
         let styleObj = {
@@ -175,6 +168,8 @@
           fontSize: this.menuTabColor['fontSize'] || '30rpx',
           fontWeight: this.menuTabColor['fontWeight'] || 'normal',
           borderWidth: this.menuBorderWidth + 'px',
+          padding: this.menuItemBoxPadding,
+          marginRight: this.menuItemMargin + 'rpx',
         }
 
         return this.styleObjectToString(styleObj)
@@ -193,7 +188,9 @@
           background: this.menuTabColor['actBgColor'] || 'transparent',
           fontSize: this.menuTabColor['actFontSize'] || '30rpx',
           fontWeight: this.menuTabColor['actFontWeight'] || 'normal',
-          borderBottom: `${this.menuBorderWidth}px solid ${this.menuTabColor['actColor'] || defaultTextColor}`
+          borderBottom: `${this.menuBorderWidth}px solid ${this.menuTabColor['actColor'] || defaultTextColor}`,
+          padding: this.menuItemBoxPadding,
+          marginRight: this.menuItemMargin + 'rpx',
         }
         return this.styleObjectToString(styleActiveObj)
       },
@@ -226,6 +223,7 @@
       },
     },
     created() {
+      if(this.$configProject['isPreview']) this.keyword = '商品'
       this.emitParent = new EmitParent({
         getParent: ()=>{
           return this;
@@ -359,6 +357,10 @@
         overflow: auto;
         .menu_item{
           white-space: nowrap;
+
+          .isLast{
+            margin-right: 0;
+          }
         }
       }
     }

package/src/components/JfbBaseTfkSearch/Mock.js

@@ -7,8 +7,7 @@ module.exports = {
         tab: "1@product@Y@2",
         type: "product",
         name: "蛋糕",
-        detail_redirect_data:
-          '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/mall\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/mall\\/detail","frontPath":"\\/market\\/main\\/mall\\/detail","fixed_business_code":""}',
+        detail_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/mall\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/mall\\/detail","frontPath":"\\/market\\/main\\/mall\\/detail","fixed_business_code":""}',
         detail1_redirect_data: "",
         more_redirect_data: "",
         sort: 3,
@@ -37,7 +36,7 @@ module.exports = {
             market_price: 2600,
             market_tags: ['flashsale','hot','new', 'rec'],
             product_id: 60029756,
-            product_name: "清代戏剧文化史论/北京大学明清研究丛书",
+            product_name: "清代戏剧文化史论/北京大学明清研究丛书商品",
             product_type: "good",
             promo_price: 0,
             sale_num: 0,
@@ -49,11 +48,11 @@ module.exports = {
           {
             brand_id: 30000,
             brand_name: "其他",
-            list_title: "亚洲的崛起(傅骊元文集)/北京大学经济学院教授文库",
+            list_title: "亚洲的崛起(傅骊元文集)/北京大学经济学院教授文库商品",
             market_price: 5000,
             market_tags: [],
             product_id: 60030080,
-            product_name: "亚洲的崛起(傅骊元文集)/北京大学经济学院教授文库",
+            product_name: "亚洲的崛起(傅骊元文集)/北京大学经济学院教授文库商品",
             product_type: "good",
             promo_price: 0,
             sale_num: 0,
@@ -65,13 +64,11 @@ module.exports = {
           {
             brand_id: 30000,
             brand_name: "其他",
-            list_title:
-              "保险.社会保障与经济改革(孙祁祥文集)/北京大学经济学院教授文库",
+            list_title: "保险.社会保障与经济改革(孙祁祥文集)/北京大商品学经济学院教授文库",
             market_price: 5200,
             market_tags: [],
             product_id: 60030078,
-            product_name:
-              "保险.社会保障与经济改革(孙祁祥文集)/北京大学经济学院教授文库",
+            product_name: "保险.社会保障与经济改革(孙祁祥文集)/北京大商品学经济学院教授文库",
             product_type: "good",
             promo_price: 0,
             sale_num: 0,
@@ -86,10 +83,8 @@ module.exports = {
         tab: "5@shop@N@1",
         type: "shop",
         name: "门店",
-        detail_redirect_data:
-          '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/cake\\/storedetail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/cake\\/storedetail","frontPath":"\\/market\\/main\\/cake\\/storedetail","fixed_business_code":""}',
-        detail1_redirect_data:
-          '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/cashier\\/index","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/cashier\\/index","frontPath":"\\/market\\/main\\/cashier\\/index","fixed_business_code":""}',
+        detail_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/cake\\/storedetail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/cake\\/storedetail","frontPath":"\\/market\\/main\\/cake\\/storedetail","fixed_business_code":""}',
+        detail1_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/cashier\\/index","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/cashier\\/index","frontPath":"\\/market\\/main\\/cashier\\/index","fixed_business_code":""}',
         more_redirect_data: "",
         sort: 4,
         setting_id: 5,
@@ -97,7 +92,7 @@ module.exports = {
         items: [
           {
             brand_id: 20003,
-            brand_name: "幸福西饼",
+            brand_name: "幸福西饼商品",
             brand_type: "MA",
             business_status: "1",
             consume_mode: ["STOD", "CODE", "SELL", "SELF"],
@@ -110,11 +105,9 @@ module.exports = {
             area_name: "",
             street_name: "",
             phone: "18843854566",
-            resource_shop_id:
-              "eyJyZXNvdXJjZV9zaG9wX2lkIjozMTg1NDY4LCJzaG9wX2lkIjo1MjY0OH0",
-            resource_shop_name: "福司令渠道门店",
-            shop_icon:
-              "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
+            resource_shop_id: "eyJyZXNvdXJjZV9zaG9wX2lkIjozMTg1NDY4LCJzaG9wX2lkIjo1MjY0OH0",
+            resource_shop_name: "福司商品令渠道门店",
+            shop_icon: "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
             shop_id: 52648,
             shop_tags: [],
             stars: 0,
@@ -138,11 +131,9 @@ module.exports = {
             area_name: "",
             street_name: "",
             phone: "18843854566",
-            resource_shop_id:
-              "eyJyZXNvdXJjZV9zaG9wX2lkIjozMTg1NDY4LCJzaG9wX2lkqewqweH0",
-            resource_shop_name: "福司令渠道门店",
-            shop_icon:
-              "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
+            resource_shop_id: "eyJyZXNvdXJjZV9zaG9wX2lkIjozMTg1NDY4LCJzaG9wX2lkqewqweH0",
+            resource_shop_name: "福司令商品渠道门店",
+            shop_icon: "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20220629/dda58a5983eeae3cfdea8bccc7cea714.jpg",
             shop_id: 526428,
             shop_tags: [],
             stars: 0,
@@ -157,10 +148,8 @@ module.exports = {
         tab: "10@cinema@Y@1",
         type: "cinema",
         name: "影院",
-        detail_redirect_data:
-          '{"dir":"apply06","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/suhedule","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/apply06\\/main\\/movie\\/suhedule","frontPath":"\\/apply06\\/main\\/movie\\/suhedule","fixed_business_code":""}',
-        detail1_redirect_data:
-          '{"dir":"apply06","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/cdetailnew","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/apply06\\/main\\/movie\\/cdetailnew","frontPath":"\\/apply06\\/main\\/movie\\/cdetailnew","fixed_business_code":""}',
+        detail_redirect_data: '{"dir":"apply06","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/suhedule","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/apply06\\/main\\/movie\\/suhedule","frontPath":"\\/apply06\\/main\\/movie\\/suhedule","fixed_business_code":""}',
+        detail1_redirect_data: '{"dir":"apply06","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/cdetailnew","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/apply06\\/main\\/movie\\/cdetailnew","frontPath":"\\/apply06\\/main\\/movie\\/cdetailnew","fixed_business_code":""}',
         more_redirect_data: "",
         sort: 1,
         setting_id: 10,
@@ -171,7 +160,7 @@ module.exports = {
             brand_id: 16,
             brand_name: "万达院线jls",
             cinema_id: 8000121,
-            cinema_name: "电影门店jls-20231204（新建）北京",
+            cinema_name: "电影门店jls-20231204（新建）商品北京",
             cinema_type: ["SELL", "CODE"],
             cinema_type_name: ["线下核销", "电子码"],
             distance: "21.9km",
@@ -184,14 +173,12 @@ module.exports = {
             brand_id: 16,
             brand_name: "万达院线jls",
             cinema_id: 7,
-            cinema_name:
-              "聚福宝测试影院聚福宝测试影院聚福宝测试影院聚福宝测试影院",
+            cinema_name: "聚福宝影院商品",
             cinema_type: ["SEAT", "SELL"],
             cinema_type_name: ["在线选座", "线下核销"],
             distance: "20.8km",
             is_open: "Y",
-            shop_icon:
-              "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20221018/5c1f49a47055a452ac6c5a3efd9d5174.jpg"
+            shop_icon: "https://jfbcake.oss-cn-beijing.aliyuncs.com/uploads/20221018/5c1f49a47055a452ac6c5a3efd9d5174.jpg"
           }
         ]
       },
@@ -199,10 +186,8 @@ module.exports = {
         tab: "11@film@Y@1",
         type: "film",
         name: "影片",
-        detail_redirect_data:
-          '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/choose","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/movie\\/choose","frontPath":"\\/market\\/main\\/movie\\/choose","fixed_business_code":""}',
-        detail1_redirect_data:
-          '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/movie\\/detail","frontPath":"\\/market\\/main\\/movie\\/detail","fixed_business_code":""}',
+        detail_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/choose","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/movie\\/choose","frontPath":"\\/market\\/main\\/movie\\/choose","fixed_business_code":""}',
+        detail1_redirect_data: '{"dir":"market","host":"sandbox-website-05.jufubao.cn","path":"\\/main\\/movie\\/detail","appType":"h5","site_id":"17928cc37788be02","site_url":"https:\\/\\/sandbox-website-05.jufubao.cn\\/market\\/main\\/movie\\/detail","frontPath":"\\/market\\/main\\/movie\\/detail","fixed_business_code":""}',
         more_redirect_data: "",
         sort: 2,
         setting_id: 11,
@@ -213,13 +198,11 @@ module.exports = {
             director: "",
             is_can_buy: false,
             language: "汉语普通话",
-            leading_role:
-              "费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
+            leading_role: "费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
             open_time: 1689782400,
-            poster:
-              "https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
+            poster: "https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
             remark: "9.1分",
-            show_name: "封神第一部",
+            show_name: "封神商品第一部",
             type: "剧情,奇幻"
           },
           {
@@ -227,13 +210,11 @@ module.exports = {
             director: "",
             is_can_buy: false,
             language: "汉语普通话",
-            leading_role:
-              "费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
+            leading_role: "费翔,李雪健,黄渤,于适,陈牧驰,娜然,此沙,武亚凡,夏雨,袁泉,王洛勇,侯雯元,黄曦彦,李昀锐,杨玏,陈坤",
             open_time: 1689782400,
-            poster:
-              "https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
+            poster: "https://gw.alicdn.com/tfscom/i1/O1CN01w8TjZl1xzSq3CothJ_!!6000000006514-0-alipicbeacon.jpg_320x320.jpg",
             remark: "9.1分",
-            show_name: "封神第二部",
+            show_name: "封神商品第二部",
             type: "剧情,奇幻"
           }
         ]