jufubao-base 1.0.233-beta2 → 1.0.233-beta31

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -13,18 +13,12 @@
       <view class="jfb-base-card-v3__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-v3__body" :style="{
-      '--main-color': mainColor,
-    }">
+    <view class="jfb-base-card-v3__body">
       <view class="v3_title">选择登入票券</view>
       <view v-if="loadingCardList">
         <xd-card-v2-skeleton v-for="i in 3" :key="i"></xd-card-v2-skeleton>
       </view>
       <template v-else>
-        <view v-if="show_coupon_tab==='Y'" class="show_type_tab">
-          <view class="type_item" :class="{active: show_type==='normal'}" @click="switchShowType('normal')">已绑定票券</view>
-          <view class="type_item" :class="{active: show_type==='coupon'}" @click="switchShowType('coupon')">优惠券</view>
-        </view>
         <view class="card_list" v-if="cardList.length">
           <xd-card-v2
             v-for="(item, index) in cardList"
@@ -76,9 +70,6 @@
     ],
     data() {
       return {
-        options: {},
-        show_coupon_tab: "N",
-        show_type: "normal",
         cardList: [],
         inCallback: "",
         tabIndex: 1,
@@ -112,7 +103,6 @@
     },
     methods: {
       onJfbLoad(options) {
-        this.options = options;
         let { inCallback } = options;
         if(!inCallback) this.$storage.remove("inCallback"); //作为入口
         else {
@@ -128,32 +118,10 @@
         }
         this.inCallback = inCallback || this.settings.index;
 
-        this.getList();
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-        this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
-        this.changeUrl = getContainerPropsValue(container, "content.changeUrl", {value: ""}).value;
-        this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
-        this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
-        this.logged_name = getContainerPropsValue(container, "content.logged_name", "已登录");
-        this.isShowBuy = getContainerPropsValue(container, "content.isShowBuy", "N");
-        this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");
-        this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
-        this.show_coupon_tab = getContainerPropsValue(container, "content.show_coupon_tab", "N");
-      },
-      getList(){
-        let options = this.options;
         let params = {is_all: 'Y'};
         if (options['jfb_business_code']) {
           params['card_business_code'] = options['jfb_business_code'];
         }
-        if(this.show_coupon_tab === 'Y'){
-          params.show_type = this.show_type;
-        }
 
         jfbRootExec("getListCardBind", {
           vm: this,
@@ -167,8 +135,19 @@
           }).filter((item) => item["is_valid"] === "Y");
         });
       },
-      switchShowType(type){
-        this.show_type = type;
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) {
+        this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
+        this.changeUrl = getContainerPropsValue(container, "content.changeUrl", {value: ""}).value;
+        this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
+        this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
+        this.logged_name = getContainerPropsValue(container, "content.logged_name", "已登录");
+        this.isShowBuy = getContainerPropsValue(container, "content.isShowBuy", "N");
+        this.buy_name = getContainerPropsValue(container, "content.buy_name", "购买新卡");
+        this.buy_new_url = getContainerPropsValue(container,"content.buy_new_url",{value: ""}).value;
       },
       toBindCard(){
         let path = this.getUrlCallback(this.cardBindPath)
@@ -252,25 +231,6 @@
   .jfb-base-card-v3 {
     &__body{
       padding: 0 24rpx;
-      .show_type_tab{
-        display: flex;
-        align-items: center;
-        margin-bottom: 24rpx;
-        .type_item{
-          padding: unit(5, rpx) unit(22, rpx);
-          text-align: center;
-          line-height: unit(60, rpx);
-          border-radius: unit(60, rpx);
-          color: #B8B7BE;
-          & + .type_item{
-            margin-left: unit(30, rpx);
-          }
-          &.active{
-            background-color: var(--main-color);
-            color: #FFFFFF;
-          }
-        }
-      }
       .v3_title{
         padding: 16rpx 40rpx;
         border-radius: 40rpx;

package/src/components/JfbBaseHeader/Mock.js

@@ -11,5 +11,5 @@ module.exports = {
         "street_name": "崇文街道"
     },
     "request_id": "6777935abebcfb20"
-  }
+}
 }

package/src/components/JfbBaseNotice/Attr.js

@@ -262,33 +262,6 @@ export default {
           {"label": "弹窗显示", "value": '3'},
         ],
       },
-      data.style === '1' && {
-        label: "是否显示提示图标:",
-        ele: "xd-radio",
-        valueKey: "show_tip_icon",
-        value: data['show_tip_icon'],
-        groupKey: 'content',
-        list: [
-          { label: '是', value: 'Y' },
-          { label: '否', value: 'N' }
-        ]
-      },
-      data.style === '1' && data.show_tip_icon === 'Y' && {
-        label: "提示图标:",
-        ele: 'xd-upload',
-        valueKey: 'staticTipIcon',
-        groupKey:'content',
-        value: data.staticTipIcon || {},
-        defaultValue: data.staticTipIcon || null,
-        slot: true,
-        tipsformet: '上传文件格式：@imageType@，不超过@size@MB。',
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        uploadType: 'aliyun',
-        size: .5,
-        action: 'action',
-        sort: true,
-      },
       {
         label: '是否隐藏弹框(仅预览模式生效):',
         ele: 'xd-radio',
@@ -355,15 +328,6 @@ export default {
           {"label": "右", "value": 'right'},
         ]
       },
-      data.style === '1' && data.show_tip_icon === 'Y' && {
-        label: "提示图标的高度:",
-        ele: 'el-input',
-        valueKey: 'tipIconHeight',
-        groupKey:'style',
-        className: 'input80',
-        value: data['tipIconHeight'] || '50',
-        placeholder: '请输入提示图标的高度'
-      },
       data.style === '1' && {
         label: '内容圆角设置:',
         ele: 'xd-site-select-list',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -103,14 +103,10 @@
                   color:textColor,
                   borderRadius: contRadius,
                   padding: paddingUi,
-                  lineHeight: '50rpx',
+                  lineHeight: '50rpx'
                 }"
                 v-if="content"
               >
-                <image v-if="show_tip_icon==='Y' && staticTipIcon" :src="staticTipIcon"
-                  :style="{height: tipIconHeight+'rpx'}"
-                  style="width: auto;margin-right: 12rpx;" mode="heightFix"
-                ></image>
                 <xd-content-xss
                   :key="contentKey"
                   :html="content"
@@ -166,7 +162,6 @@
   import extsMixins from "@/mixins/extsMixins"
   import XdDownDrawer from "@/components/XdDownDrawer/XdDownDrawer.vue";
   import { getContainerPropsValue } from "@/utils/xd.base";
-  import getServiceUrl from "@/common/getServiceUrl";
   import storage from "@/common/storage";
   import Color from "color";
   const color = require('color');
@@ -224,9 +219,6 @@
 
         backgroundColor: '',
         is_hide_dailog:'N',
-        show_tip_icon: "",
-        staticTipIcon: "",
-        tipIconHeight: 50,
 
         isMp:false,
 
@@ -345,16 +337,12 @@
         this.btnConfirmWidth = getContainerPropsValue(container, 'content.btnConfirmWidth', '');
         this.btnConfirmBgColor = getContainerPropsValue(container, 'content.btnConfirmBgColor', '');
         this.btnConfirmTextColor = getContainerPropsValue(container, 'content.btnConfirmTextColor', '');
-        this.show_tip_icon = getContainerPropsValue(container, 'content.show_tip_icon', '');
-        let staticTipIcon = getContainerPropsValue(container, 'content.staticTipIcon', '');
-        this.staticTipIcon = staticTipIcon ? getServiceUrl(staticTipIcon.url) : '';
-        this.tipIconHeight = getContainerPropsValue(container, 'content.tipIconHeight', 50);
         if (this.fontSize === 20) this.titleFontSize = 28;
         if (this.fontSize === 26) this.titleFontSize = 36;
         if (this.fontSize === 36) this.titleFontSize = 44;
         this.isTitle = getContainerPropsValue(container, 'content.isTitle', false);
 
-        console.log("this.staticTipIcon", this.staticTipIcon);
+        console.log("this.btnConfirmTextColor", this.btnConfirmTextColor);
 
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
@@ -532,8 +520,6 @@
 
       &-content {
         padding: unit(8, rpx) unit(10, rpx);
-        display: flex;
-        align-items: center;
       }
     }
 

package/src/components/JfbBasePosterType/Attr.js

@@ -34,35 +34,6 @@ export default {
     if(params['textColor']) fontColor = params['textColor']
     if(params.titleStyle && params.titleStyle.color) fontColor = params.titleStyle.color;
 
-    //图片高度= 上下内边距 + 单个内容高度*行数 + 指示器高度
-    //图片宽度= 750 - 左右外边距
-    let outWidth = 750;
-    if(!params.margin) params.margin = {};
-    if(!params.contentPadding) params.contentPadding = {};
-    let marginLeft = params.margin.left || 0;
-    let marginRight = params.margin.right || 0;
-    let paddingLeft = params.contentPadding.left || 0;
-    let paddingRight = params.contentPadding.right || 0;
-    let paddingTop = params.contentPadding.top || 0;
-    let paddingBottom = params.contentPadding.bottom || 0;
-    let columnSpacing = params.columnSpacing || 0;
-    let columnSpacings = columnSpacing * (params.cells-1);
-    let textHeight = 40;
-    if(params.titleStyle && params.titleStyle.lineHeight) textHeight = parseInt(params.titleStyle.lineHeight);
-
-    let itemWidth = (outWidth - (marginLeft + marginRight + paddingLeft + paddingRight + columnSpacings))/ params.cells;
-    let itemHeight = textHeight + itemWidth;
-    let indicatorHeight = 0;
-
-    if(params.dot_type){
-      if(['indexes', 'nav'].includes(params['dot_type'])) indicatorHeight = 60;
-      else indicatorHeight = params.dot_type === 'normal'?0:48;
-    }
-    let bgImgHeight = params.jdRows * itemHeight + paddingTop + paddingBottom + indicatorHeight;
-    let bgImgWidth = 750 - (marginLeft + marginRight);
-    // console.log("itemHeight", bgImgHeight, bgImgWidth, params['dot_type'])
-
-
     return [
       {
         label: '导航配置:',
@@ -541,23 +512,6 @@ export default {
           showAlpha: true
         },
       },
-      {
-        label: "背景图片：",
-        ele: 'xd-upload',
-        valueKey: 'bgImage',
-        groupKey: 'style',
-        value: params.bgImage || null,
-        defaultValue: params.bgImage || null,
-        slot: true,
-        tipsformet: `上传文件格式：@imageType@，不超过@size@MB.，建议尺寸：${bgImgWidth}*${bgImgHeight}像素`,
-        type: ['jpg', 'png', 'jpeg'],
-        styleType: 'one',
-        oneWidth: bgImgWidth/2,
-        oneHeight: bgImgHeight/2,
-        uploadType: 'aliyun',
-        size: 5, //5M
-        action: 'aliyun',
-      },
       {
         label: "圆角设置：",
         groupKey: 'style',

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -82,7 +82,6 @@
         contentPadding:{},
         bgColor:'rgba(0,0,0,0)',
         bgRadius: 0,
-        bgImage: "",
       }
     },
 		computed: {
@@ -193,7 +192,6 @@
           margin: this.getMarginAndPadding(this.margin, 0),
           padding:this.getMarginAndPadding(this.contentPadding, 0),
           backgroundColor: this.bgColor,
-          backgroundImage: this.bgImage ? `url(${getServiceUrl(this.bgImage)})` : '',
           borderRadius: this.bgRadius + 'rpx'
         }
       }
@@ -275,7 +273,6 @@
 
         //样式设置
         this.bgColor = getContainerPropsValue(container, 'content.bgColor','rgba(0,0,0,0)');
-        this.bgImage = getServiceUrl(getContainerPropsValue(container, 'content.bgImage', {url: ""}).url)
         this.bgRadius = getContainerPropsValue(container, 'content.bgRadius', '0');
         this.contentPadding = getContainerPropsValue(container, 'content.contentPadding', {});
         this.margin = getContainerPropsValue(container, 'content.margin', {});
@@ -330,7 +327,6 @@
         justify-content: center;
         align-items: center;
         display: flex;
-        background-size: cover;
       }
 
     }

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -10,9 +10,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-recharge-order__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-recharge-order__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-order__body">
@@ -67,16 +65,11 @@
             }"
           >
             <view class="jfb-base-recharge-order__body-order-header">
-              {{ type === "recharge" ? "充值订单" : "延期订单" }}
+              {{ item.rechargeType === "recharge" ? "充值订单" : "延期订单" }}
             </view>
             <view class="jfb-base-recharge-order__body-order-middle">
-              <view
-                >订单编号：
-                {{ item.order_id }}
-              </view>
-              <view :style="{ color: item.textColor }">
-                {{ item.pay_status_name }}
-              </view>
+              <view>订单编号： {{ item.order_id }}</view>
+              <view :style="{ color: item.textColor }">{{ item.pay_status_name }}</view>
             </view>
             <view class="jfb-base-recharge-order__body-order-bottom">
               <view>交易日期：{{ item.created_time }} </view>
@@ -158,13 +151,7 @@ export default {
       is_border_c: "",
 
       //其他
-      margin: {
-        top: 0,
-        left: 0,
-        right: 0,
-        bottom: 0,
-      },
-      type: "recharge",
+      margin: {top: 0, left: 0, right: 0, bottom: 0,},
     };
   },
   watch: {
@@ -197,7 +184,6 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.type = options.type || "recharge";
       this.getList();
     },
     /**
@@ -260,8 +246,7 @@ export default {
       }).value;
     },
     getList() {
-      let fnName = this.type === "recharge" ? "getRechargeOrderList" : "getDelayOrderList";
-      jfbRootExec(fnName, {
+      jfbRootExec('getRechargeOrderList', {
         vm: this,
         data: {
           page_size: this.page_size,
@@ -282,6 +267,12 @@ export default {
             } else {
               item.textColor = "#FA5C5C";
             }
+
+            //订单设置
+            item['rechargeType'] = item.source;
+            if(['new-recharge','recharge'].includes(item.source)) {
+              item['rechargeType'] = 'recharge'
+            }
             return item;
           });
           this.hasNext = res.next_page_token !== "";
@@ -293,12 +284,12 @@ export default {
     },
     handleToPay(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${this.type}`,
+        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${item.rechargeType}`,
       });
     },
     handleToDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.detailPath}?id=${item.order_id}&type=${this.type}`,
+        url: `${this.detailPath}?id=${item.order_id}&type=${item.rechargeType}`,
       });
     },
 

package/src/components/JfbBaseHeaderColumn/Api.js

@@ -1,32 +0,0 @@
-'use strict';
-/**
- * @description  接口配置，
- * 在设置方法名字当时候，别忘记加上【模块名字】：Header
- * @type {*[]}
- */
-module.exports = [
-  {
-    mapFnName: "getCityInfoByLocation",
-    title: '根据经纬度获取城市信息',
-    path: "/common/v1/region/city/get-code-by-geo",
-    isRule: false,
-    params: {
-      latitude: ['latitude', 'Number', true],
-      longitude: ['longitude', 'Number', true]
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "getLoadingCityBaseHeaderByLocationLv4",
-    title: '根据经纬度获取城市信息',
-    path: "/common/v1/region/city/get-trans-lv4-by-geo",
-    isRule: false,
-    params: {
-      latitude: ['latitude', 'Number', true],
-      longitude: ['longitude', 'Number', true]
-    },
-    isConsole: true,
-    disabled: true
-  }
-];