jufubao-base 1.0.169-beta6 → 1.0.169-beta7

package/package.json

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

package/src/components/JfbBaseTfkCardDetail/JfbBaseTfkCardDetail.vue

@@ -582,6 +582,14 @@
             ._point{
               font-size: 40rpx;
               font-weight: bold;
+              ::v-deep .xd-unit{
+                height: auto !important;
+                font-weight: bold;
+                align-items: flex-end;
+                .xd-unit__unit{
+                  line-height: 1.5 !important;
+                }
+              }
               ._unit{
                 font-size: 24rpx;
                 margin-left: 4rpx;

package/src/components/JfbBaseTfkCardLogin/Attr.js

@@ -649,6 +649,17 @@ export default {
         },
         hidden: data.previewCurrent !== 'card'
       },
+      {
+        label: "票券高度设置:",
+        ele: "el-input",
+        valueKey: "cardHeight",
+        value: data.cardHeight || 270,
+        groupKey:'style',
+        placeholder: '请输入票券高度',
+        inline: false,
+        notice: '设置票券高度，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">100</span> 像素',
+        hidden: data.previewCurrent !== 'card'
+      },
       {
         label: "单项内边距设置:",
         groupKey:'style',
@@ -683,6 +694,17 @@ export default {
         },
         hidden: data.previewCurrent !== 'card'
       },
+      {
+        label: "按钮最小宽度设置:",
+        ele: "el-input",
+        valueKey: "cardBtnMinWidth",
+        value: data.cardBtnMinWidth || 100,
+        groupKey:'style',
+        placeholder: '请输入按钮最小宽度',
+        inline: false,
+        notice: '设置按钮最小宽度，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">100</span> 像素',
+        hidden: data.previewCurrent !== 'card'
+      },
       {
         label: "登录按钮文字背景色设置:",
         ele: "xd-text-and-bgc",

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -82,10 +82,14 @@
           <view v-if="loadingList">
             <view class="bind_list skeleton-wrap">
               <view class="bind_item" v-for="i in 5" :key="i" :style="cardItemBoxStyle">
-                <view class="bind_point"></view>
-                <view class="bind_deduct"></view>
-                <view class="bind_number"></view>
-                <view class="bind_time"></view>
+                <view>
+                  <view class="bind_point"></view>
+                  <view class="bind_deduct"></view>
+                </view>
+                <view>
+                  <view class="bind_number"></view>
+                  <view class="bind_time"></view>
+                </view>
                 <view class="bind_type"></view>
                 <view class="bind_btn"></view>
               </view>
@@ -95,20 +99,25 @@
             <view v-if="cardList.length" class="bind_list">
               <view class="bind_item" v-for="(item, i) in cardList" :key="i"
                 :style="cardItemBoxStyle" @click="toCardDetail(item)">
-                <view class="bind_point">
-                  <xd-unit
-                    :unitFontSize="24"
-                    :fontSize="48"
-                    :price="item.card_point"
-                    :isOld="false"
-                    :unit="item.unit || ''"
-                  ></xd-unit>
+                <view>
+                  <view class="bind_point">
+                    <xd-unit
+                      :unitFontSize="24"
+                      :fontSize="48"
+                      :price="item.card_point"
+                      :isOld="false"
+                      :unit="item.unit || ''"
+                      :colorNew="'#333333'"
+                    ></xd-unit>
+                  </view>
+                  <view v-if="item.other_card_point && item.card_point_type !== 1" class="bind_deduct">
+                    兑换其他商品可抵：{{ item.other_card_point }}
+                  </view>
                 </view>
-                <view v-if="item.other_card_point && item.card_point_type !== 1" class="bind_deduct">
-                  兑换其他商品可抵：{{ item.other_card_point }}
+                <view>
+                  <view class="bind_number">{{ item.card_number }}</view>
+                  <view class="bind_time">{{ item.end_time }}到期</view>
                 </view>
-                <view class="bind_number">{{ item.card_number }}</view>
-                <view class="bind_time">{{ item.end_time }}到期</view>
                 <view class="bind_type" :style="{
                   top: cardPadding.top + 'rpx',
                   right: cardPadding.right + 'rpx',
@@ -121,7 +130,8 @@
                     right: cardPadding.right + 'rpx',
                     bottom: cardPadding.bottom + 'rpx',
                     borderRadius: cardBtnRadius + 'rpx',
-                    padding: bindCardBtnPadding
+                    padding: bindCardBtnPadding,
+                    minWidth: cardBtnMinWidth + 'rpx',
                   }, item.is_login === 'Y' ? bindCardActiveStyle : bindCardBtnStyle]"
                   @click.stop="doCardLogin(item)"
                 >{{ item.is_login === 'Y' ? '已登录' : '登录'}}</view>
@@ -242,6 +252,8 @@
         cardShadow: {},
         cardImageMode: "",
         entryGroupId: "",
+        cardHeight: 270,
+        cardBtnMinWidth: 100,
       }
     },
     computed: {
@@ -388,6 +400,7 @@
           borderRadius: this.cardRadius + 'rpx',
           border: border,
           boxShadow: boxShadow,
+          height: this.cardHeight + 'rpx',
         })
       },
       listBoxStyle(){
@@ -520,6 +533,8 @@
         this.allEntryPath = getContainerPropsValue(value, "content.allEntryPath", {value: ""}).value;
         this.cardDetailPath = getContainerPropsValue(value, "content.cardDetailPath", {value: "/tfktest/system/card/tkfDetail"}).value;
         // this.entryGroupId = getContainerPropsValue(value,"content.entryGroupId","default");
+        this.cardHeight = getContainerPropsValue(value, "content.cardHeight", 270);
+        this.cardBtnMinWidth = getContainerPropsValue(value, "content.cardBtnMinWidth", 100);
 
         console.log(this.cardShadow, 'cardShadow')
         if(this.bindCardTextStyle && !this.bindCardTextStyle.color){
@@ -728,12 +743,23 @@
             padding: 32rpx;
             background: #fff;
             border-radius: 16rpx;
-            border: 1px solid #eeeeee;
+            box-sizing: border-box;
             margin: var(--card-list-margin) 0;
             position: relative;
+            display: flex;
+            flex-direction: column;
+            justify-content: space-between;
             .bind_point{
-              color: #000;
+              color: #333333;
               font-size: 48rpx;
+              ::v-deep .xd-unit{
+                height: auto !important;
+                font-weight: bold;
+                align-items: flex-end;
+                .xd-unit__unit{
+                  line-height: 1.7 !important;
+                }
+              }
             }
             .bind_deduct{
               font-size: 28rpx;
@@ -775,6 +801,9 @@
               background: #ddd;
               padding: 16rpx 60rpx;
               border-radius: 12rpx;
+              display: flex;
+              align-items: center;
+              justify-content: center;
             }
           }
         }

package/src/components/JfbBaseTfkSearch/AllList.vue

@@ -0,0 +1,231 @@
+<template>
+  <view class="search_all_list" >
+    <view class="module_item" v-for="parent in list" :key="parent.setting_id"
+      :style="{
+        padding:contMarginComp,
+      }"
+    >
+      <view class="module_title">{{ parent.name }}</view>
+      <view class="module_cont">
+        <view v-for="(item, i) in parent.items" :key="i">
+          <content-cinema v-if="parent.type === 'cinema'"
+            style="width: 100%; height: 100%"
+            :item="item"
+            :out-spacing="$parentVm.outSpacing"
+            :color="{SEAT:$parentVm.mainColor,CODE:$parentVm.subMainColor,SELL:$parentVm.successColor}"
+            :border-radius="$parentVm.imgRradius"
+            @on-schedule="(cinema)=>{$parentVm.handleSchedule(cinema,parent)}"
+            @on-cashier-detail="(cinema)=>{$parentVm.handleCashierDetail(cinema,parent)}"
+            @on-code-detail="(cinema)=>{$parentVm.handleCodeDetail(cinema,parent)}"
+          ></content-cinema>
+
+          <content-film v-if="parent.type === 'film'"
+            style="width: 100%; height: 100%"
+            :item="item"
+            :out-spacing="$parentVm.outSpacing"
+            :color="$parentVm.mainColor"
+            :border-radius="$parentVm.imgRradius"
+            @on-film-detail="(film_id)=>{$parentVm.handleFilmDetail(film_id, parent)}"
+            @on-buy="(film_id)=>{$parentVm.handleBuy(film_id, parent)}"
+          ></content-film>
+
+          <content-shop v-if="parent.type === 'shop'"
+            style="width: 100%; height: 100%"
+            :item="item"
+            :out-spacing="$parentVm.outSpacing"
+            :color="$parentVm.mainColor"
+            :border-radius="$parentVm.imgRradius"
+            :is-echange="'Y' || $parentVm.isShowExchange"
+            @on-shop-jhd="(shop)=>{$parentVm.handleShopJhd(shop,parent)}"
+            @on-shop-detail="(shop)=>{$parentVm.handleShopDetail(shop,parent)}"
+          ></content-shop>
+
+          <content-product v-if="parent.type === 'product'"
+            style="width: 100%; height: 100%"
+            :item="item"
+            :product-config="$parentVm.productConfig"
+            :out-spacing="$parentVm.outSpacing"
+            :color="$parentVm.mainColor"
+            :border-radius="$parentVm.imgRradius"
+            :cell="1"
+            @on-product-detail="(product)=>{$parentVm.handleProductDetail(product,parent)}"
+          ></content-product>
+        </view>
+      </view>
+      <view class="module_more">
+        <view>查看全部{{ parent.name }} >></view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import ContentCinema from "./ContentCinema.vue"
+  import ContentFilm from "./ContentFilm.vue"
+  import ContentShop from "./ContentShop.vue"
+  import ContentProduct from "./ContentProduct.vue"
+  export default{
+    name: "SearchAllList",
+    components: {
+      ContentCinema,
+      ContentFilm,
+      ContentShop,
+      ContentProduct
+    },
+    props: {
+
+    },
+    computed: {
+      contMarginComp(){
+        let str = `${this.$parentVm.checkValue(this.$parentVm.contMargin.top, 20)}rpx`;
+        str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.right, 20)}rpx`;
+        str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.bottom, 20)}rpx`;
+        str = `${str} ${this.$parentVm.checkValue(this.$parentVm.contMargin.left, 20)}rpx`;
+        return str
+      },
+    },
+    data(){
+      return {
+        $parentVm:null,
+        parentStatus: false,
+
+        list: [
+              {
+                  "type": "product",
+                  "name": "蛋糕",
+                  "detail_redirect_data": "{\"dir\":\"wtxsaas\",\"host\":\"sandbox-website-05.jufubao.cn\",\"path\":\"\\/main\\/order\\/detail\",\"appType\":\"h5\",\"site_id\":\"17928cc37788be02\",\"site_url\":\"https:\\/\\/sandbox-website-05.jufubao.cn\\/wtxsaas\\/main\\/order\\/detail\",\"frontPath\":\"\\/wtxsaas\\/main\\/order\\/detail\",\"fixed_business_code\":\"\"}",
+                  "detail1_redirect_data": "",
+                  "more_redirect_data": "",
+                  "sort": 0,
+                  "setting_id": 1,
+                  "next_page_token": "a:2:{i:0;d:1705.0785;i:1;s:8:\"60030143\";}",
+                  "items": [
+                      {
+                          "brand_id": 100003,
+                          "brand_name": "品牌jls0519",
+                          "list_title": "3",
+                          "market_price": 2000,
+                          "market_tags": [],
+                          "product_id": 60030143,
+                          "product_name": "仅快递实物商品（北京廊坊支持配送）",
+                          "product_type": "good",
+                          "promo_price": 0,
+                          "sale_num": 8,
+                          "sale_price": 3000,
+                          "status": "ok",
+                          "thumb": "/uploads/20231215/b2ce0235129aa592044f96343f25c338.jpeg"
+                      }
+                  ]
+              },
+              {
+                  "type": "shop",
+                  "name": "蛋糕",
+                  "detail_redirect_data": "",
+                  "detail1_redirect_data": "",
+                  "more_redirect_data": "",
+                  "sort": 1,
+                  "setting_id": 5,
+                  "next_page_token": "a:1:{i:0;d:4.4;}",
+                  "items": [
+                      {
+                          "brand_id": 0,
+                          "brand_name": "",
+                          "shop_icon": "https://dimg04.uat.qa.nt.ctripcorp.com/images/1lo4a12000007fyeg8D96.gif",
+                          "distance": 4,
+                          "business_status": "5",
+                          "full_address": "北京北京北京市东城区景山前街4号",
+                          "phone": "",
+                          "consume_mode": [
+                              "TRAVEL"
+                          ],
+                          "consume_mode_name": "",
+                          "shop_id": 1052782,
+                          "resource_shop_id": 8000302,
+                          "resource_shop_name": "故宫-测试1-攻略修改",
+                          "shop_tags": {},
+                          "stars": 2
+                      }
+                  ]
+              },
+              {
+                  "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\":\"\"}",
+                  "more_redirect_data": "",
+                  "sort": 3,
+                  "setting_id": 10,
+                  "next_page_token": 1,
+                  "items": [
+                      {
+                          "address": "朝阳区安慧里三区10号 （北辰购物中心对面）",
+                          "brand_id": 0,
+                          "brand_name": "",
+                          "cinema_id": 6771413,
+                          "cinema_name": "北京剧院",
+                          "cinema_type": [
+                              "SEAT"
+                          ],
+                          "cinema_type_name": [
+                              "在线选座"
+                          ],
+                          "distance": "",
+                          "is_open": "Y",
+                          "shop_icon": ""
+                      }
+                  ]
+              }
+        ],
+      }
+    },
+    created(){
+      this.getParentMV();
+      this.getList();
+    },
+    methods: {
+      getParentMV(){
+        this.$emit('on-parent-vm', ($vm)=>{
+          this.$parentVm = $vm;
+          this.parentStatus = true;
+        })
+      },
+      getList(){
+        this.$xdShowLoading({});
+        this.$emit('on-list', {
+          params: {},
+          cb:(list)=>{
+            this.list = list;
+            this.$xdHideLoading();
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .search_all_list{
+    .module_item{
+      background-color: #FFFFFF;
+      margin-bottom: 20rpx;
+    }
+    .module_title{
+      height: 88rpx;
+      line-height: 88rpx;
+      border-bottom: 1px solid #EEEEEE;
+      font-size: 28rpx;
+      color: #333333;
+    }
+    .module_cont{
+      padding: 20rpx 0;
+    }
+    .module_more{
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      height: 80rpx;
+      font-size: 26rpx;
+      color: #999999;
+    }
+  }
+</style>

package/src/components/JfbBaseTfkSearch/Api.js

@@ -7,50 +7,19 @@
 module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'getTfkByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getTfkSearchList',
+    title: '获取s搜索列表',
+    path: '/mall/v1/search',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'updateTfkFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'removeTfkFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Tfk
-    mapFnName: 'addTfkFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      keyword: ['模糊搜索关键字', 'Number', '必选'],
+      namespace: ['业务线', 'Number', '必选'],
+      city_code: ['城市编码', 'Number', '必选'],
+      latitude: ['纬度', 'Number', '必选'],
+      longitude: ['经度', 'Number', '必选'],
+      search_range: ['搜索范围', 'Number', '必选'],
+      page_size: ['每页条数', 'Number', '必选'],
+      page_token: ['当前页码', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseTfkSearch/Attr.js

@@ -33,9 +33,132 @@ export default {
         inline: false,
         className: 'input60',
       },
-
       //todo
-
+      {
+        label: '菜单配置',
+        ele: "title",
+        groupKey:'style',
+        size: "small",
+      },
+      {
+        label: "菜单外边距",
+        ele: "xd-margin-padding",
+        valueKey: 'menuMargin',
+        value: data['menuMargin'] || {
+          top: 0,
+          right: 0,
+          bottom: 0,
+          left: 0,
+        },
+        groupKey:'style',
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+      },
+      {
+        label: "菜单内边距",
+        ele: "xd-margin-padding",
+        valueKey: 'menuPadding',
+        value: data['menuPadding'] || {
+          top: 0,
+          right: 0,
+          bottom: 0,
+          left: 0,
+        },
+        groupKey:'style',
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置内边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。',
+      },
+      {
+        label: "菜单背景色",
+        ele: "xd-color",
+        valueKey: 'menuBgColor',
+        value: data['menuBgColor'] || '#FFFFFF',
+        groupKey:'style',
+        placeholder: '请选择菜单背景色',
+      },
+      {
+        label: "菜单字体设置",
+        ele: "xd-text-and-bgc",
+        groupKey:'style',
+        valueKey: 'menuTabColor',
+        value: data['menuTabColor'] || null,
+        setting: {
+          fontSize: true, //字体大小选择
+          color: true, //文字颜色选项
+          bgColor: true, //背景选项
+          weight: true, //文字粗细
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
+      },
+      {
+        label: "菜单间距设置:",
+        groupKey:'style',
+        ele: 'el-input',
+        valueKey: 'menuItemMargin',
+        value: data.menuItemMargin || 40,
+        type: "number",
+        className: "input40",
+        placeholder: '请输入菜单间距',
+        inline: false,
+        notice: '设置菜单间距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">40</span>像素',
+      },
+      {
+        label: "菜单底部横线粗细:",
+        ele: "el-input",
+        valueKey: "menuBorderWidth",
+        value: data.menuBorderWidth || 1,
+        groupKey: "style",
+        type: "number",
+      },
+      {
+        label: '菜单单项内边距设置:',
+        groupKey:'style',
+        ele: 'xd-margin-padding',
+        valueKey: 'menuItemPadding',
+        value: data.menuItemPadding || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置边距',
+        inline: false,
+        notice: '设置内边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
+      },
+      {
+        label: "搜索范围",
+        ele: "xd-search-setting-options",
+        valueKey: 'searchScope',
+        value: data['searchScope'] || [],
+        groupKey:'content',
+        placeholder: '请选择内容圆角设置',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getSearchSettingOptions')()
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
 
       //列表相关属性
       ...CusAttr(data),

package/src/components/JfbBaseTfkSearch/ContentCinema.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="content" @click="handleCinemaDetail">
-    <view class="title">{{item['cinema_name']}}</view>
+    <view class="title" v-html="cusName"></view>
     <view class="address">{{item['address']}}</view>
     <view class="bottom">
       <view class="distance">
@@ -28,6 +28,7 @@
 <script>
   import XdButton from "@/components/XdButton/XdButton.vue";
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon.vue";
+  import handleKeyword from "./handleKeyword";
 
   export default {
     name:'ContentCinema',
@@ -36,6 +37,10 @@
       XdFontIcon
     },
     props:{
+      keyword:{
+        type:String,
+        default: '',
+      },
       item:Object,
       color: {
         type: Object,
@@ -43,6 +48,11 @@
       },
 
     },
+    computed:{
+      cusName(){
+        return handleKeyword(this, this.item['cinema_name'], this.keyword)
+      },
+    },
     data(){
       return {
 
@@ -99,7 +109,7 @@
 <style scoped lang="less">
 .content {
   .title {
-    font-size: 32rpx;
+    font-size: 30rpx;
     line-height: 40rpx;
     margin-bottom: 20rpx;
     color: #333;