jufubao-base 1.0.204 → 1.0.205-beta1

package/package.json

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

package/src/components/JfbBaseBackground/JfbBaseBackground.vue

@@ -14,7 +14,11 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-background__body">
-      <view :style="{background:backgroundColor,color:warningColor}" class="jfb-base-background__body-pop" v-if="isPreview">设置背景模式方便编辑(占位)，在线上此模块不显</view>
+      <view
+        :style="{background:backgroundColor,color:warningColor}"
+        class="jfb-base-background__body-pop"
+        v-if="isPreview"
+      >设置背景模式方便编辑(占位)，在线上此模块不显</view>
     </view>
   </view>
 </template>
@@ -95,7 +99,7 @@ export default {
 
 .jfb-base-background {
   &__body {
-    min-height: 100rpx;
+
     &-pop {
       min-height: 100rpx;
       text-align: center;

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -154,7 +154,7 @@
           this.$xdHideLoading();
           let isH5FilterEntryList = [];
           let isMpFilterEntryList = [];
-          this.entryList = res.list.filter(item=>{
+          let entryList = res.list.filter(item=>{
             //#ifdef H5
             //在H5平台应用中不可跳转到微信小程序应用
             if(item.redirect_data.appType === 'wxmp'){
@@ -172,59 +172,70 @@
             }
             return true
             //#endif
-          }).map(item => {
-            const {dir, path, host,appType} = item['redirect_data'];
-            if(appType === undefined) item.redirect_data.appType = 'h5';
-            item['image_url'] = getServiceUrl(item.image_url);
-            item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
-            item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
-            let nsp = Base64.encodeURI(JSON.stringify({business_code: item['business_code']}));
+          })
+            .map(item => {
+              const {dir, path, host,appType} = item['redirect_data'];
+              if(appType === undefined) item.redirect_data.appType = 'h5';
+              item['image_url'] = getServiceUrl(item.image_url);
+              item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
+              item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
+              let nsp = Base64.encodeURI(JSON.stringify({business_code: item['business_code']}));
 
-            //外站配置地址
-            if(item.redirect_type === 'URL') {
-              if(item['redirect_data']['path'].indexOf('?') === -1) {
-                item['redirect_data']['path'] = `${item['redirect_data']['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
+              //外站配置地址
+              if(item.redirect_type === 'URL') {
+                if(item['redirect_data']['path'].indexOf('?') === -1) {
+                  item['redirect_data']['path'] = `${item['redirect_data']['path']}?x-common=${nsp}&vs=${new Date().getTime()}`
+                }
+                else item['redirect_data']['path'] = `${item['redirect_data']['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
+                return item;
               }
-              else item['redirect_data']['path'] = `${item['redirect_data']['path']}&x-common=${nsp}&vs=${new Date().getTime()}`;
-              return item;
-            }
 
-            let jumpUrl = path;
+              let jumpUrl = path;
 
-            //域名相同并且应用路径不相同时候处理
-            if(host === this.projectAttr.host && this.projectAttr['deploy_dir'] !== dir){
-              jumpUrl = `//${host}/${dir}${path}`;
+              //域名相同并且应用路径不相同时候处理
+              if(host === this.projectAttr.host && this.projectAttr['deploy_dir'] !== dir){
+                jumpUrl = `//${host}/${dir}${path}`;
+                //#ifdef MP-WEIXIN
+                jumpUrl = `https:${jumpUrl}`;
+                //#endif
+              }
+
+              //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+              let cardPathStr = '';
               //#ifdef MP-WEIXIN
-              jumpUrl = `https:${jumpUrl}`;
+              if(item.redirect_data.appType === 'h5') {
+                const custom_redirect_data = this.$xdUniHelper.checkVarType(item['custom_redirect_data']) === 'object'?item['custom_redirect_data']:{};
+                const cardPathObject = this.getCardPath(custom_redirect_data);
+                if(cardPathObject !== null) {
+                  const {cardPath, cardSelf} =cardPathObject
+                  if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+                }
+              }
               //#endif
-            }
+              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
+              return item;
+            });
 
-            //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
-            let cardPathStr = '';
-            //#ifdef MP-WEIXIN
-            if(item.redirect_data.appType === 'h5') {
-              const custom_redirect_data = this.$xdUniHelper.checkVarType(item['custom_redirect_data']) === 'object'?item['custom_redirect_data']:{};
-              const cardPathObject = this.getCardPath(custom_redirect_data);
-              if(cardPathObject !== null) {
-                const {cardPath, cardSelf} =cardPathObject
-                if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
-              }
-            }
-            //#endif
-            item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
-            return item;
-          });
           //#ifdef MP-WEIXIN
           console.warn(`微信小程序端被过滤的入口列表：${JSON.stringify(isMpFilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
           //#endif
           //#ifdef H5
           console.warn(`H5端被过滤的入口列表：${JSON.stringify(isH5FilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
           //#endif
-          console.warn(`福利入口链接列表:${JSON.stringify(this.entryList.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
-          if(res.list.length === 1) this.toLink(this.entryList[0]);
+          console.warn(`福利入口链接列表:${JSON.stringify(entryList.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
+
+          //一条数据直接跳转到入口
+          if(entryList.length === 1){
+            this.toLink(entryList[0]);
+            return
+          }
+          //无数据提示
           if(res.list.length === 0) {
             this.$xdAlert({content: '当前票券暂无支持服务'})
+            return;
           }
+          //复制
+          this.entryList = entryList;
         })
       },
       toLink(item){

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -242,18 +242,16 @@
 
   .jfb-base-fast-link {
     display: flex;
-    min-height: unit(100, rpx);
 
     &__body{
       flex: 1;
 
       &-pop {
-        min-height: 58rpx;
+        min-height: 100rpx;
         text-align: center;
-        line-height: 58rpx;
+        line-height: 100rpx;
         color: #666;
         font-size: unit(24, rpx);
-        padding:unit(20, rpx);
       }
     }
   }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -678,7 +678,7 @@
                 size="28"
                 icon="iconxia_down"
               ></xd-font-icon>
-            </view>         
+            </view>
           </view>
           <view class="jfb-base-order-detail__body-html" v-if="showAllProductDetail">
             <view v-html="info.productDetail"></view>
@@ -967,7 +967,7 @@ export default {
         this.getCountDown();
       }
     },
-    getOrderDetail() {      
+    getOrderDetail() {
       jfbRootExec("getBaseOrderDetail", {
         vm: this,
         data: {
@@ -979,6 +979,13 @@ export default {
         },
       })
         .then((res) => {
+
+          //跳转到第三方订单
+          if(res['third_order_detail_url']) {
+            this.$xdUniHelper.redirectTo({url: res['third_order_detail_url']}, false, false);
+            return;
+          }
+
           this.biz_code = res.biz_code;
           this.is_not_show_price = res.is_not_show_price;
 
@@ -1135,9 +1142,9 @@ export default {
               });
             } catch (error) {
               console.log(error,'apapapa');
-              
+
             }
-            
+
           }
           else {
             this.info = res;

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -68,6 +68,7 @@
                 :current="current"
                 circular
                 @animationfinish="handleAnimationfinish"
+                @change="handleChange"
               >
                 <swiper-item v-for="(item,index) in info" :key="index" @click.stop="handleClick(item,index)">
                   <image :style="{width: getOneWidth + 'rpx', height: getOneHeight + 'rpx'}" :src="item['image_url']" mode="aspectFill"></image>
@@ -83,6 +84,7 @@
                 :height="getOneHeight + 'rpx'"
                 :interval="carouselTime"
                 @onClickItem="handleClick"
+                @change="handleChange"
                 @animationfinish="handleAnimationfinish"
               >
                 <template slot-scope="{ item, index}">
@@ -446,7 +448,14 @@
 				}
         return temp
 			},
-      handleAnimationfinish(e) {
+
+      handleAnimationfinish(e){
+
+      },
+
+      handleChange(e) {
+        this.current = e.detail.current;
+
         //不支持背景不处理
         if(this.isSupport==='N') return;
         console.warn(`handleAnimationfinish.start`)
@@ -469,7 +478,6 @@
           let bg = null;
           if(this.currentImage) bg = this.currentImage;
           this.$xdRoot.$emit("setLayoutPageBg", bg);
-          this.current = e.detail.current;
         }
       },
 
@@ -544,6 +552,7 @@
           }
         })
 			},
+
       handleOne(list){
         this.info = this.handleImage(list);
 

package/src/components/JfbBasePosterType/Attr.js

@@ -1,6 +1,6 @@
 'use strict';
 
-import console from "@dcloudio/uni-h5/src/core/helpers/console";
+import {oldTonNewBorAndSha} from "@/utils/AttrTools";
 
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
@@ -14,9 +14,26 @@ export default {
     if (params['shadow'] === undefined) params['shadow'] = 2;
     if (!params['cells']) params['cells'] = 4;
     if (!params['jdRows']) params['jdRows'] = 1;
-    if (!params['radius']) params['radius'] = '20';
     if (!params['carouselTime']) params['carouselTime'] = 5;
-    if(params['cells'] === 4) defaultPadding = 30
+    if(params['cells'] === 4) defaultPadding = 25;
+    let iconSetBaseStyle = 'Y';
+    if(params['iconSetBaseStyle']) iconSetBaseStyle = params['iconSetBaseStyle'];
+
+
+    let defContShadow = oldTonNewBorAndSha(
+      params['iconShadow'],
+      params.shadow===1?'Y':'N',
+      '10',
+      params.shadowColor|| 'rgba(0,0,0,0)',
+    );
+    if(defContShadow.type === 'Y' && params.shadow ===1) {
+      params.shadow = 2
+    }
+
+    let fontColor = '#333';
+    if(params['textColor']) fontColor = params['textColor']
+    if(params.titleStyle && params.titleStyle.color) fontColor = params.titleStyle.color;
+
     return [
       {
         label: '导航配置:',
@@ -255,36 +272,68 @@ export default {
         label: '导航显示方式:',
         ele: 'xd-radio',
         valueKey: 'isCarousel',
-        value: params['isCarousel'],
+        value: params['isCarousel'] || 1,
         groupKey:'content',
-        rules: [
-          {required: true, message: '请选择导航显示方式', trigger: ['blur', 'change']}
-        ],
+        labelInline: true,
         list: [
           {"label": "焦点图显示", "value": 1},
           {"label": "轮播图显示", "value": 2},
         ]
       },
-      {
-        label: '导航轮播周期:',
+      params['isCarousel'] === 2 && {
+        labelInline: true,
+        label: '轮播速度:',
         ele: 'el-input',
         type: 'number',
         isKey: true,
         groupKey:'content',
         valueKey: 'carouselTime',
         value: params.carouselTime,
-        placeholder: '请输入导航轮播周期，单位秒',
+        placeholder: '请输入轮播速度，单位秒',
         className: 'input60',
         inline: false,
-        notice: '轮播周期时间设置仅在“<span style="color:red">轮播图显示</span>”生效，单位:<span style="color:red">秒</span>',
+        notice: '轮播速度设置仅在“<span style="color:red">轮播图显示</span>”生效，单位:<span style="color:red">秒</span>',
       },
-      {
-        label: '导航内容显示行数:',
+      params['isCarousel'] === 2 && {
+        labelInline: true,
+        label: '导航数量:',
+        ele: 'el-input',
+        type: 'number',
+        valueKey: 'number',
+        groupKey:'content',
+        value: params.number || '20',
+        placeholder: '请输入导航数量',
+        className: 'input60',
+        unit:'条',
+      },
+      params['isCarousel'] === 2 && {
+        label: '广告显示dot类型:',
         ele: 'xd-select-list',
+        valueKey: 'dot_type',
+        value: params['dot_type'] || 'round',
+        groupKey:'content',
+        placeholder: '请选择广告显示dot类型',
+        multiple: false,
+        className: 'input80',
+        list:[
+          {label: '显示圆点', value: 'dot'},
+          {label: '显示长方形', value: 'default'},
+          {label: '显示圆点+长条', value: 'round'},
+          {label: '显示索引+标题', value: 'nav'},
+          {label: '显示索引', value: 'indexes'},
+          {label: '不显示', value: 'normal'},
+        ],
+        notice: '在使用非通屏显示类型广告位之外的样式时，<span style="color: red">(显示索引+标题|显示索引)</span>使用"<span style="color: red">显示圆点</span>"',
+        inline: false,
+      },
+      {
+        label: '导航显示行数:',
+        ele: 'xd-radio',
         valueKey: 'jdRows',
         groupKey:'content',
         value: params.jdRows,
         className: 'input60',
+        labelInline: true,
         list: [
           {"label": "一行", "value": 1},
           {"label": "两行", "value": 2},
@@ -292,57 +341,91 @@ export default {
         ]
       },
       {
-        label: '导航内容置使用张数:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'number',
-        groupKey:'content',
-        value: params.number,
-        placeholder: '请输入导航内容置使用张数',
-        className: 'input60',
-        unit:'张',
-        rules: [
-          {
-            required: true,
-            message: '请输入导航内容置使用张数',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '导航内容显示列数:',
-        ele: 'xd-select-list',
+        label: '导航显示列数:',
+        ele: 'xd-radio',
         valueKey: 'cells',
         groupKey:'content',
         value: params.cells,
         className: 'input60',
+        labelInline: true,
         list: [
           {"label": "四列", "value": 4},
           {"label": '五列', "value": 5},
         ]
       },
       {
-        label: 'ICON图标填充设置:',
-        ele: 'xd-margin-padding',
-        valueKey: 'iconPadding',
+        ele: 'title',
+        label: '导航ICON设置',
+        size: 'small',
         groupKey:'content',
-        value: params.iconPadding || null,
-        setting: {
-          type: 'margin',
-        },
-        placeholder: '请设置外边距',
-        inline: false,
-        notice: `ICON图标填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">${defaultPadding}</span> 像素，<br/><span style="color: red">注意</span>：上下填充数值相加=左右填充数值相加时，ICON才会时正方形。`,
       },
       {
-        label: '导航ICON圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'radius',
-        value: params['radius'],
+        label: '基础样式设置:',
+        ele: 'xd-radio',
+        valueKey: 'iconSetBaseStyle',
+        value: iconSetBaseStyle,
         groupKey:'content',
-        placeholder: '请选择导航ICON圆角设置',
-        multiple: false,
-        className: 'input60',
+        labelInline: true,
+        list: [
+          {"label": "默认", "value": 'N'},
+          {"label": "自定义", "value": 'Y'},
+        ]
+      },
+      iconSetBaseStyle === 'Y' && {
+        label: "ICON大小设置：",
+        groupKey: 'content',
+        labelInline: true,
+        ele: 'xd-slider',
+        valueKey: "columnSpacing",
+        value:  params['columnSpacing'] === undefined?0:params['columnSpacing'],
+        className: "input80",
+        setting:{
+          min: 0,
+          max: 60,
+          step:1,
+          showStops:false,
+        }
+      },
+      iconSetBaseStyle === 'Y' && {
+        label: "ICON圆角：",
+        groupKey: 'content',
+        labelInline: true,
+        ele: 'xd-slider',
+        valueKey: "radius",
+        value:  params['radius'] === undefined?20:params['radius'],
+        className: "input80",
+        setting:{
+          min: 0,
+          max: 100,
+          step:1,
+          showStops:false,
+        }
+      },
+      iconSetBaseStyle === 'Y' && {
+        label: "ICON边距设置：",
+        groupKey: 'content',
+        labelInline: true,
+        ele: 'xd-slider',
+        valueKey: "iconMargin",
+        value:  params['iconMargin'] === undefined?defaultPadding:params['iconMargin'],
+        className: "input80",
+        setting:{
+          min: 0,
+          max: 60,
+          step:1,
+          showStops:false,
+        }
+      },
+      iconSetBaseStyle === 'Y' && {
+        label: '投影设置:',
+        ele: 'xd-shadow',
+        groupKey:'content',
+        labelInline: true,
+        valueKey: 'iconShadow',
+        value: defContShadow,
+        setting: {
+          selected: defContShadow.type,
+        },
         handleCustom({action, data}) {
           XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
             .then(res => {
@@ -350,10 +433,48 @@ export default {
             })
             .catch(error => {
               console.error(error);
+              data.cb([])
             });
         },
       },
-      {
+      iconSetBaseStyle === 'Y' && {
+        label: "导航文字设置:",
+        ele: "xd-font",
+        valueKey: "titleStyle",
+        value: params.titleStyle || {},
+        groupKey:'content',
+        setting: {
+          color:true,
+          fontSize: true,
+          decoration: true,
+          weight: true,
+          lineHeight: true,
+          icon: false,
+          style:false,
+          align:false,
+          isEmpty: true,
+          default:{
+            color: fontColor,
+            fontSize:'24rpx',
+            lineHeight: '36rpx',
+            decoration:'none',
+            weight:'normal'
+          }
+        },
+        handleCustom({action, data}) {
+          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_font_size'})
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              data.cb([])
+              console.error(error);
+            });
+        },
+
+      },
+
+      iconSetBaseStyle === 'Y' && {
         label: '导航ICON是否阴影设置:',
         ele: 'xd-radio',
         valueKey: 'shadow',
@@ -361,12 +482,14 @@ export default {
         value: params['shadow'],
         placeholder: '请选择导航ICON阴影设置',
         className: 'input60',
+        hidden:true,
         list: [
           {"label": "是", "value": 1},
           {"label": "否", "value": 2},
         ]
       },
-      params['shadow'] === 1 && {
+      iconSetBaseStyle === 'Y' && {
+        hidden:true,
         label: '导航ICON阴影颜色配置:',
         ele: 'xd-color',
         valueKey: 'shadowColor',
@@ -376,12 +499,7 @@ export default {
         classNmae: 'input60',
       },
 
-      {
-        ele: 'title',
-        label: '样式设置',
-        size: 'small',
-        groupKey:'style',
-      },
+
       {
         label: '背景颜色:',
         ele: 'xd-color',
@@ -390,27 +508,27 @@ export default {
         value: params['bgColor'] || '',
         placeholder: '请选择背景颜色',
         classNmae: 'input60',
-      },
-      {
-        label: '背景圆角设置:',
-        ele: 'xd-site-select-list',
-        valueKey: 'bgRadius',
-        value: params['bgRadius'],
-        groupKey:'style',
-        placeholder: '请选择背景圆角设置',
-        multiple: false,
-        className: 'input60',
-        handleCustom({action, data}) {
-          XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_style_radius'})
-            .then(res => {
-              data.cb(res.list)
-            })
-            .catch(error => {
-              console.error(error);
-            });
+        setting: {
+          showAlpha: true
         },
       },
       {
+        label: "圆角设置：",
+        groupKey: 'style',
+        labelInline: true,
+        ele: 'xd-slider',
+        valueKey: "bgRadius",
+        value:  params['bgRadius'] === undefined?'':params['bgRadius'],
+        className: "input80",
+        setting:{
+          isOptions: true,
+          min: 0,
+          max: 100,
+          step:1,
+          showStops:false,
+        }
+      },
+      iconSetBaseStyle === 'Y' && {
         label: '文字颜色:',
         ele: 'xd-color',
         valueKey: 'textColor',
@@ -420,7 +538,7 @@ export default {
         classNmae: 'input80',
       },
       {
-        label: '内容设置外边距:',
+        label: '外边距设置:',
         ele: 'xd-margin-padding',
         valueKey: 'margin',
         groupKey:'style',
@@ -430,10 +548,10 @@ export default {
         },
         placeholder: '请设置外边距',
         inline: false,
-        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
+        notice: '外边距设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
       },
       {
-        label: '内容设置填充:',
+        label: '填充设置:',
         ele: 'xd-margin-padding',
         valueKey: 'contentPadding',
         groupKey:'style',
@@ -441,10 +559,10 @@ export default {
         setting: {
           type: 'padding',
         },
-        placeholder: '内容设置填充',
         inline: false,
-        notice: '设置外填充，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
+        notice: '设置填充设置，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span> 像素',
       },
+
     ].filter(i=>i)
   },
   advanced: [