jufubao-base 1.0.75-beta1 → 1.0.75

package/package.json

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

package/src/components/JfbBaseFastLink/Attr.js

@@ -30,6 +30,15 @@ export default {
           {label: '悬浮', value: 'fixed'},
         ]
       },
+      data['is_layout'] ==='fixed' && {
+        label: '自定义名称:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'fastName',
+        value: data['fastName']? data['fastName']: '快速导航',
+        placeholder: '请输入自定义名称',
+        className: 'input80',
+      },
       {
         label: '快速链接配置:', //label
         ele: 'xd-footer-setting', //package 名称

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -48,7 +48,13 @@
             :style="{backgroundColor:backgroundColor, color:warningColor}"
           >弹窗模式方便编辑(占位)，在线上此模块不显</view>
         </template>
-        <xd-fast-nav :list="listNave" :color="mainColor" :is-preview="isPreview"></xd-fast-nav>
+        <xd-fast-nav
+          :list="listNave"
+          :color="mainColor"
+          :is-preview="isPreview"
+          :fast-name="fastName"
+          :layoutInfo="layoutInfo"
+        ></xd-fast-nav>
       </template>
     </view>
   </view>
@@ -86,6 +92,7 @@
         radius: 10,
         iconColor: '#999',
         is_layout: 'noraml',
+        fastName:'快速导航',
 
 
         //边框
@@ -161,36 +168,37 @@
         this.radius = getContainerPropsValue(container, 'content.radius', 10);
         this.iconColor = getContainerPropsValue(container, 'content.iconColor', '#999');
         this.padding = getContainerPropsValue(container, 'content.padding', 20);
-        this.is_layout = getContainerPropsValue(container, 'content.is_layout', 'fixed');
-
+        this.is_layout = getContainerPropsValue(container, 'content.is_layout', 'noraml');
+        this.fastName = getContainerPropsValue(container, 'content.fastName', '快速导航');
         this.is_border = getContainerPropsValue(container, 'content.is_border', 'N');
         this.is_border_c = getContainerPropsValue(container, 'content.is_border_c', '#fff');
         this.is_border_w = getContainerPropsValue(container, 'content.is_border_w', 2);
-
         this.list = getContainerPropsValue(container, 'content.quick_link_list', []).map(item=>{
           return {
             ...item,
             key: this.$xdUniHelper.randomChar(20),
-            size: Number(item.size ? item.size : 18) * 2,
+            size: item.size * this.$pxNum
           }
         });
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
-        this.listNave = this.list.map(item=>{
-          const {dir, path,fixed_business_code} = item;
-          let bus = fixed_business_code? Base64.encodeURI(JSON.stringify({business_code: fixed_business_code})):'';
-          let jumpUrl = item.path;
-          //#ifdef H5
-          jumpUrl = `//${window.location.host}/${dir}${path}`;
-          //#endif
 
-          if(item['fixed_business_code'] === '') {
-            item['path'] = `${jumpUrl}?x-common=${bus}}`
+        this.listNave = this.list.map(item=>{
+          const {appValue,path} = item.path
+          if(appValue === undefined && path === undefined) {
+            return { name: item.name, path: item.path.value, icon: item.icon, size: item.size}
           }
           else{
-            item['redirect_data']['path'] = `${jumpUrl}?x-common=${bus}}`
+            const {dir,fixed_business_code} = item.path;
+            let bus = fixed_business_code? Base64.encodeURI(JSON.stringify({business_code: fixed_business_code})):'';
+            if(bus) bus = `?x-common=${bus}`;
+            let jumpUrl = '';
+            //#ifdef H5
+            if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
+            else jumpUrl = path;
+            //#endif
+            jumpUrl = `${jumpUrl}${bus}}`;
+            return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
           }
-
-          return { name: '首页', path: '/pages/company/zmyx11/index', icon: 'cakeiconfont cakeshouye', size: 24 }
         })
 
       },

package/src/components/JfbBaseFastLink/XdFastNav.vue

@@ -10,7 +10,7 @@
     <view class="xd-fast-nave__body">
       <view class="xd-fast-nave__body-close" v-if="close" @click="close=false">
         <xd-font-icon icon="iconjiantou_zuo" color="#fff" size="30"></xd-font-icon>
-        <view>快速导航</view>
+        <view>{{fastName}}</view>
       </view>
       <view class="xd-fast-nave__body-open" v-else @click="close=true">
         <xd-font-icon icon="iconjiantou_you" color="#fff" size="30"></xd-font-icon>
@@ -64,24 +64,42 @@
       isPreview:{
         type: Boolean,
         default: false
-      }
+      },
+      fastName:{
+        type:String,
+        default: '快速导航'
+      },
+      layoutInfo:{
+        type:Object,
+        default(){
+          return {}
+        }
+      },
     },
     data(){
       return {
-        uiTop: 100,
         uizIndex: 100,
         close: true,
         lineColor: '#fff'
       }
     },
 
+    computed:{
+      uiTop(){
+        return this.top + this.layoutInfo.bottomHeight + this.layoutInfo.footerHeight;
+      }
+    },
+
     created() {
       this.lineColor = Color(this.color).alpha(0.2).toString();
     },
 
     methods: {
       handleClick(item){
-        if(this.isPreview) return;
+        if(this.isPreview) {
+          console.warn(item.path);
+          return;
+        }
         this.close = true;
         this.$xdUniHelper.navigateTo({
           url: item.path
@@ -152,7 +170,8 @@
         background: rgba(0,0,0,.5);
         border-radius: unit(15,rpx) 0 0 unit(15, rpx);
         display: flex;
-        justify-content: flex-end;
+        justify-content: center;
+        text-align: center;
         align-items: center;
         height: unit(90, rpx);
         padding: 0 unit(15,rpx);

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -20,7 +20,9 @@
     <!-- #endif -->
     <view class="jfb-base-order-detail__body" v-if="info && info !== null">
       <view>
-        <view class="jfb-base-order-detail__body-time">
+        <view class="jfb-base-order-detail__body-time" :style="{
+          top: (layoutInfo.top-2) + 'rpx',
+        }">
           <xd-font-icon
             size="48"
             v-if="info.status.status_type === 'wait'"
@@ -54,6 +56,7 @@
             {{ info.status.status_name }}
           </view>
         </view>
+        <view style="height: 90rpx;"></view>
       </view>
       <view :style="{ padding: outMargin }">
         <view v-if="info.film_show && info.film_show !== null">
@@ -1289,6 +1292,11 @@ export default {
       font-weight: 500;
       color: #333333;
       font-size: unit(32, rpx);
+      position: fixed;
+      left: 0;
+      width: 100%;
+      background: #FFFFFF;
+      z-index: 999;
     }
 
     &-status {