npm - jufubao-base - Versions diffs - 1.0.174-beta1 → 1.0.174-beta10 - Mend

jufubao-base 1.0.174-beta1 → 1.0.174-beta10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/src/components/JfbBaseTfkSearch/JfbBaseTfkSearch.vue CHANGED Viewed

@@ -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"
@@ -69,7 +65,7 @@
 <script>
   import XdSearchHistory from "@/components/XdSearchHistory/XdSearchHistory";
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
+  import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
   import JfbBaseTfkSearchMixin from "./JfbBaseTfkSearchMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
@@ -96,10 +92,11 @@
       componentsMixins, extsMixins, JfbBaseTfkSearchMixin,listMixins
     ],
     data() {
+      let keyword = ''
+      if(this.$configProject['isPreview']) keyword = '商品'
       return {
-        hideMask: true,
         tabId: 'all', //cinema/film/shop/product
-        keyword: '',
+        keyword: keyword,
         options:{},
         menuList: [],
         //公共样式
@@ -159,14 +156,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 +170,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 +190,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 +225,7 @@
       },
     },
     created() {
       this.emitParent = new EmitParent({
         getParent: ()=>{
           return this;
@@ -305,15 +305,19 @@
         if(this.$configProject['isPreview']){
           this.menuList = this.searchScope;
-          this.keyword = "搜索关键字";
           this.isPreview = true;
         }
       },
       handleSwitchMenu(item){
         this.tabId = item.value;
+        uni.pageScrollTo({
+          scrollTop: 0,
+          duration: 0
+        });
       },
       handleToSearch(item){
         this.keyword = item;
+        jfbRootFnExec(this, 'onCustomEvent')("baseTfkSearch@keyword", item);
       },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
@@ -359,6 +363,10 @@
         overflow: auto;
         .menu_item{
           white-space: nowrap;
+          .isLast{
+            margin-right: 0;
+          }
         }
       }
     }

package/src/components/JfbBaseTfkSearch/Mock.js CHANGED Viewed

@@ -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: "剧情,奇幻"
           }
         ]

package/src/components/JfbBaseTfkSearch/handleKeyword.js CHANGED Viewed

@@ -4,7 +4,7 @@ export default ($vm, str , keyword='', options={})=>{
   if(keyword === '') return  str;
   try {
     let __option = {
-      tag: 'text',
+      tag: 'span',
       color: 'red',
       weight: '500',
     };