jufubao-base 1.0.197-beta5 → 1.0.197-beta8

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -46,10 +46,11 @@
           :style="{
             background:inputBackgroundColor,
             color:inputTextColor,
-            borderRadius: searchBoxRadius + 'rpx'
+            borderRadius: searchBoxRadius + 'rpx',
+            border: inputBorder
           }"
         >
-          <view v-if="loaded && showLocation==='Y' && searchBoxPosition==='in'" class="header-city-in">
+          <view v-if="loaded && showLocation==='Y' && searchBoxPosition==='in'" class="header-city-in" @click.stop>
             <xd-city-show-api
               @done="handleCityDone"
               @onChange="handleCityChange"
@@ -73,12 +74,12 @@
           <xd-font-icon v-if="searchIconPosition==='right'" :icon="icon" :color="iconColor" size="32"/>
           <view v-if="showSearchBtn==='Y' && searchBtnPosition==='in'" 
             :style="[searchBtnStyle]"
-            style="padding: 4rpx 32rpx;"
-            @click="doSearch"
+            style="padding: 4rpx 32rpx;font-size: 28rpx;"
+            @click.stop="doSearch"
           >{{searchBtnText || '搜索'}}</view>
         </view>
         <view v-if="showSearchBtn==='Y' && searchBtnPosition==='out'"
-          style="margin-left: 4px;padding: 8rpx 32rpx;"
+          style="margin-left: 4px;padding: 8rpx 32rpx;font-size: 28rpx;"
           :style="[searchBtnStyle]"
           @click="doSearch"
         >{{searchBtnText || '搜索'}}</view>
@@ -168,6 +169,7 @@
         searchBtnRadius: 0,
         searchBoxRadius: 30,
         bottomBorder: "",
+        inputBorder: "",
       }
     },
     watch: {
@@ -229,6 +231,7 @@
           width: this.is_border_w,
           color: this.is_border_c
         })
+        this.inputBorder = this.getXdBorder({}, getContainerPropsValue(container, 'content.inputBorder', {}))
 
         let name , logo, platform_logo;
         if (this.projectAttr['site_name']) name = this.projectAttr['site_name'];

package/src/components/JfbBaseHeaderElephant/JfbBaseHeaderElephant.vue

@@ -46,7 +46,10 @@
         </view>
 
       </view>
-      <view v-if="isExtendCate && showCategory==='Y'" class="_modal"></view>
+      <view v-if="isExtendCate && showCategory==='Y'" class="_modal"
+        @click="isExtendCate=false"
+        @touchmove.stop.prevent="moveHandle"
+      ></view>
     </view>
   </view>
 </template>
@@ -71,6 +74,7 @@
       return {
         useNumber: 24,
         cateList: [],
+        previewCateList: [],
         site_logo: "",
         site_name: "",
         isPreview: false,
@@ -168,7 +172,7 @@
             page_size: this.useNumber //可以不传
           },
         }).then(res => {
-          
+          this.previewCateList = res.list;
           if(res.list.length === 0 && this.isPreview) {
             res.list = this.getTestData();
           }
@@ -209,7 +213,10 @@
 
         this.useNumber = this.navRow * this.navColumn;
         if(this.isPreview){
-          this.handleOne(this.getTestData());
+          let testData = this.getTestData();
+          testData.unshift(...this.previewCateList);
+          //从数组testData中取useNumber个数据
+          this.handleOne(testData.slice(0, this.useNumber));
           this.isExtendCate = this.navExpand === 'Y' ? true : false;
           if(this.isExtendCate){
             document.querySelector('.xd-Layout__top').style.zIndex = 149099;
@@ -218,6 +225,7 @@
           }
         }
       },
+      moveHandle(){},
       handleClick(item) {
         if(!item.redirect_data) {
           console.warn(`未配置链接地址: ${item.redirect_data}`);
@@ -387,6 +395,7 @@
 
   .jfb-base-header-elephant {
     &__body{
+      overflow: initial !important;
       ._modal{
         position: fixed;
         top: 0;

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -332,48 +332,50 @@ export default {
         notice: '间距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
       {
-        ele: 'title',
-        label: '投影设置',
-        size: 'small',
+        label: "主体信息行间距:",
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'lineHeight',
         groupKey:'style',
+        value: data['lineHeight'] || 20,
+        placeholder: '请输入主体信息行间距',
+        className: 'input80',
       },
       {
-        label: '是否有投影:',
-        ele: 'xd-radio',
+        label: '投影设置:',
+        ele: "xd-shadow",
+        valueKey: "sectionShadow",
+        value: data.sectionShadow || {},
         groupKey:'style',
-        valueKey: 'is_shadow',
-        value: data['is_shadow'] || 'N',
-        placeholder: '请选择是否投影',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
-        ]
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+              data.cb([])
+            });
+        },
       },
-      data['is_shadow'] === 'Y' && {
-        label: '投影颜色:',
-        ele: 'xd-color',
+      {
+        label: "边框设置:",
+        ele: "xd-border",
+        valueKey: "sectionBorder",
+        value: data.sectionBorder || {},
         groupKey:'style',
-        valueKey: 'is_shadow_bg',
-        value: data['is_shadow_bg'] || '',
-        placeholder: '请选择投影颜色',
-        classNmae: 'input80',
       },
-      data['is_shadow'] === 'Y' && {
-        label: '投影范围:',
+      {
+        label: '内容圆角设置:',
         ele: 'xd-site-select-list',
-        valueKey: 'is_shadow_w',
+        valueKey: 'radius',
         groupKey:'style',
-        value: data['is_shadow_w'] || '10',
-        placeholder: '请选择投影范围',
+        value: data['radius'] || '',
+        placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',
         handleCustom({ action, data }) {
-          XdBus.getParentApi('getOptionsSettingList')({
-            setting_id: 'edtix_style_radius',
-            key: Date.now()
-          })
+          XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_radius' })
             .then(res => {
               data.cb(res.list)
             })
@@ -383,50 +385,45 @@ export default {
         },
       },
       {
-        ele: 'title',
-        label: '边框设置',
-        size: 'small',
-        groupKey:'style',
+        label: "底部按钮配置",
+        ele: "title",
+        groupKey: "style",
+        size: "small"
       },
       {
-        label: '是否有边框:',
-        ele: 'xd-radio',
-        valueKey: 'is_border',
-        value: data['is_border'] || 'N',
+        label: "容器内边距:",
+        ele: 'xd-margin-padding',
+        valueKey: 'bottomPadding',
+        value: data['bottomPadding'] || null,
         groupKey:'style',
-        placeholder: '请选择是否有边框',
-        multiple: false,
-        className: 'input80',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' },
-        ]
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置容器内边距',
       },
-      data['is_border'] === 'Y' && {
-        label: '边框颜色:',
-        ele: 'xd-color',
-        groupKey:'style',
-        valueKey: 'is_border_c',
-        value: data['is_border_c'] || '',
-        placeholder: '请选择边框颜色',
-        classNmae: 'input80',
+      {
+        label: "容器背景颜色:",
+        ele: "xd-color",
+        valueKey: "bottomBgColor",
+        value: data.bottomBgColor || null,
+        groupKey: "style",
       },
-      data['is_border'] === 'Y' && {
-        label: '边框大小:',
-        groupKey:'style',
-        ele: 'el-input',
+      {
+        label: "按钮高度:",
+        ele: "el-input",
         type: 'number',
-        valueKey: 'is_border_w',
-        value: data['is_border_w'] || '',
-        placeholder: '请输入边框颜色',
+        valueKey: "bottomBtnHeight",
+        groupKey:'style',
+        value: data['bottomBtnHeight'] || 60,
+        placeholder: '请输入按钮高度',
         className: 'input80',
       },
       {
-        label: '内容圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
+        label: '按钮圆角:',
+        ele: "xd-site-select-list",
+        valueKey: "bottomBtnRadius",
+        value: data['bottomBtnRadius'] || '',
         groupKey:'style',
-        value: data['radius'] || '',
         placeholder: '请选择内容圆角设置',
         multiple: false,
         className: 'input80',
@@ -440,7 +437,6 @@ export default {
             });
         },
       },
-
       {
         label: '查看品牌路径:',
         ele: 'xd-select-pages-path',
@@ -489,7 +485,93 @@ export default {
         },
         inline: false,
       },
+
+      // 废弃 - 隐藏
+      {
+        label: '是否有投影:',
+        ele: 'xd-radio',
+        groupKey:'style',
+        valueKey: 'is_shadow',
+        value: data['is_shadow'] || 'N',
+        placeholder: '请选择是否投影',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ],
+        hidden: true,
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'is_shadow_bg',
+        value: data['is_shadow_bg'] || '',
+        placeholder: '请选择投影颜色',
+        classNmae: 'input80',
+        hidden: true,
+      },
+      data['is_shadow'] === 'Y' && {
+        label: '投影范围:',
+        ele: 'xd-site-select-list',
+        valueKey: 'is_shadow_w',
+        groupKey:'style',
+        value: data['is_shadow_w'] || '10',
+        placeholder: '请选择投影范围',
+        multiple: false,
+        className: 'input80',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+        hidden: true,
+      },
       {
+        label: '是否有边框:',
+        ele: 'xd-radio',
+        valueKey: 'is_border',
+        value: data['is_border'] || 'N',
+        groupKey:'style',
+        placeholder: '请选择是否有边框',
+        multiple: false,
+        className: 'input80',
+        list: [
+          { label: '是', value: 'Y' },
+          { label: '否', value: 'N' },
+        ],
+        hidden: true,
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框颜色:',
+        ele: 'xd-color',
+        groupKey:'style',
+        valueKey: 'is_border_c',
+        value: data['is_border_c'] || '',
+        placeholder: '请选择边框颜色',
+        className: 'input80',
+        hidden: true,
+      },
+      data['is_border'] === 'Y' && {
+        label: '边框大小:',
+        groupKey:'style',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'is_border_w',
+        value: data['is_border_w'] || '',
+        placeholder: '请输入边框颜色',
+        className: 'input80',
+        hidden: true,
+      },
+       {
         label: '是否展开票券信息:',
         ele: 'xd-radio',
         valueKey: 'is_open',

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -129,6 +129,9 @@
                 v-for="(Ditem, Dindex) in info.film_show.detail.items"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
               >
                 <view style="width: 130rpx"
                   >{{ Ditem.label }} <span v-if="Ditem.label">:</span>
@@ -209,11 +212,14 @@
               class="jfb-base-order-detail__body-delivery-bottom"
               v-if="item.info && item.info.length > 0"
             >
-              <view class="jfb-base-order-detail__body-delivery-bottom-title">配送信息</view>
+              <view class="jfb-base-order-detail__body-delivery-bottom-title">{{item.service_name}}</view>
               <view
                 v-for="(Ditem, Dindex) in item.info"
                 :key="Dindex"
                 class="jfb-base-order-detail__body-delivery-bottom-item"
+                :style="{
+                  marginBottom: lineHeight + 'rpx'
+                }"
               >
                 <view style="width: 130rpx;display: flex;">
                   <view v-html="Ditem.label"></view>
@@ -510,6 +516,9 @@
             v-for="(item, index) in info.detail"
             :key="index"
             class="jfb-base-order-detail__body-order"
+            :style="{
+              marginBottom: lineHeight + 'rpx'
+            }"
           >
             <view :style="{ fontWeight: item.style }">
               <view style="display: flex;">
@@ -541,6 +550,9 @@
             <view
               v-if="item.type !== 'line'"
               class="jfb-base-order-detail__body-price"
+              :style="{
+                marginBottom: lineHeight + 'rpx'
+              }"
             >
               <view :style="{ fontWeight: item.style }">{{ item.label }}</view>
               <xd-unit
@@ -699,41 +711,51 @@
         :style="prod_bottom"
         v-if="info.buttons && info.buttons.length > 0"
       >
-        <view v-for="(item, index) in info.buttons" :key="index">
-          <view
-            style="display: flex; align-items: center"
-            v-if="item.action === 'pay'"
-          >
+        <view :style="[bottomBoxStyle]" class="btn_wrap">
+          <view v-for="(item, index) in info.buttons" :key="index">
             <view
-              style="display: flex; align-items: center; margin-right: 30rpx"
-              v-if="biz_code !== 'gift' || info.is_show_gift_price"
+              style="display: flex; align-items: center"
+              v-if="item.action === 'pay'"
             >
-              <text>应付：</text>
-              <xd-unit
-                :price="info.pay_info.real_pay_amount"
-                :font-size="36"
-                :iocn-size="0.45"
-              ></xd-unit>
+              <view
+                style="display: flex; align-items: center; margin-right: 30rpx"
+                v-if="biz_code !== 'gift' || info.is_show_gift_price"
+              >
+                <text>应付：</text>
+                <xd-unit
+                  :price="info.pay_info.real_pay_amount"
+                  :font-size="36"
+                  :iocn-size="0.45"
+                ></xd-unit>
+              </view>
+              <view>
+                <xd-button
+                  @click="handleToPay"
+                  size="small"
+                  type="primary"
+                  :style="{
+                    height: bottomBtnHeight + 'rpx',
+                    lineHeight: bottomBtnHeight + 'rpx',
+                  }"
+                  :radius="bottomBtnRadius + 'rpx'"
+                  :bg-color="mainColor"
+                  >{{ item.text }}
+                </xd-button>
+              </view>
             </view>
-            <view>
+            <view v-else>
               <xd-button
-                @click="handleToPay"
                 size="small"
-                type="primary"
-                radius="40rpx"
-                :bg-color="mainColor"
-                >{{ item.text }}
-              </xd-button>
+                :type="item.type !== undefined ? item.type: 'primary'"
+                :radius="bottomBtnRadius + 'rpx'"
+                :style="{
+                  height: bottomBtnHeight + 'rpx',
+                  lineHeight: bottomBtnHeight + 'rpx',
+                }"
+                @click="handleAction(item)"
+              >{{ item.text }}</xd-button>
             </view>
           </view>
-          <view v-else>
-            <xd-button
-              size="small"
-              :type="item.type !== undefined ? item.type: 'primary'"
-              radius="40rpx"
-              @click="handleAction(item)"
-            >{{ item.text }}</xd-button>
-          </view>
         </view>
       </view>
     </view>
@@ -840,17 +862,20 @@ export default {
       is_border_w: 0,
       is_border_c: "",
 
+
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
+      margin: {},
       is_hot: "Y",
       logo: "",
+      lineHeight: 20,
 
       noticeBgc:'',
+      sectionShadow: "",
+      sectionBorder: "",
+      bottomBtnRadius: 0,
+      bottomPadding: "",
+      bottomBgColor: "",
+      bottomBtnHeight: "",
       is_open: '',
       is_show: '',
       showAllProductDetail: false,
@@ -895,15 +920,21 @@ export default {
       return str
     },
     shadowBox() {
-      if (this.is_shadow === "Y")
-        return `0 0 ${this.is_shadow_w}rpx ${this.is_shadow_bg}`;
-      else return "0 0 0 rgba(0,0,0,0)";
+      return this.sectionShadow;
     },
     borderBox() {
-      if (this.is_border === "Y")
-        return `${this.is_border_w}rpx solid ${this.is_border_c}`;
-      else return "0";
+      return this.sectionBorder;
     },
+    bottomBoxStyle(){
+      let padding = `${this.checkValue(this.bottomPadding.top, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.right, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.bottom, 20)}rpx`;
+      padding = `${padding} ${this.checkValue(this.bottomPadding.left, 20)}rpx`;
+      return {
+        padding: padding,
+        backgroundColor: this.bottomBgColor,
+      }
+    }
   },
   created() {
     this.noticeBgc = Color(this.warningColor).alpha(0.2).toString();
@@ -1143,12 +1174,30 @@ export default {
       this.is_shadow_w = getContainerPropsValue(container, "content.is_shadow_w", "10");
 
       this.is_border = getContainerPropsValue(container, "content.is_border", "N");
-      this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
       this.is_border_c = getContainerPropsValue(container, "content.is_border_c", "#fff");
       this.is_border_w = getContainerPropsValue(container, "content.is_border_w", 2);
+
+      this.is_hot = getContainerPropsValue(container, "content.is_hot", "Y");
       this.viewStatus = getContainerPropsValue(container, "content.viewStatus", "mall");
       this.is_show_support_shop = getContainerPropsValue(container, "content.is_show_support_shop", "N");
       this.is_show_delete_order = getContainerPropsValue(container, "content.is_show_delete_order", "N");
+      this.lineHeight = getContainerPropsValue(container, "content.lineHeight", 20);
+      let sectionShadow = getContainerPropsValue(container, "content.sectionShadow", "");
+      this.sectionShadow = this.getShadowCompatibleOldStyle(sectionShadow, {
+        type: this.is_shadow,
+        width: this.is_shadow_w,
+        color: this.is_shadow_bg,
+      })
+      let sectionBorder = getContainerPropsValue(container, "content.sectionBorder", "");
+      this.sectionBorder = this.getBorderCompatibleOldStyle(sectionBorder, {
+        type: this.is_border,
+        width: this.is_border_w,
+        color: this.is_border_c,
+      })
+      this.bottomBtnRadius = getContainerPropsValue(container, "content.bottomBtnRadius", 0);
+      this.bottomPadding = getContainerPropsValue(container, "content.bottomPadding", {});
+      this.bottomBgColor = getContainerPropsValue(container, "content.bottomBgColor", "#ffffff");
+      this.bottomBtnHeight = getContainerPropsValue(container, "content.bottomBtnHeight", 60);
       this.is_open = getContainerPropsValue(container, "content.is_open", "N");
       this.is_show = getContainerPropsValue(container, "content.is_show", '1');
       this.showPayCard = this.is_open==='Y'
@@ -1801,8 +1850,6 @@ export default {
       position: fixed;
       left: 0;
       right: 0;
-      height: unit(100, rpx);
-      padding: 0 unit(30, rpx);
       box-shadow: 0 0 unit(10, rpx) rgba(0, 0, 0, 0.15);
       background: #fff;
       z-index: 3000;
@@ -1810,9 +1857,12 @@ export default {
       justify-content: flex-end;
       align-items: center;
 
-      & > view {
-        margin-left: unit(20, rpx);
-        font-size: @xd-font-size-lg;
+      .btn_wrap{
+        display: flex;
+        & > view {
+          margin-left: unit(20, rpx);
+          font-size: @xd-font-size-lg;
+        }
       }
     }