jufubao-base 1.0.208-beta1 → 1.0.209-beta1

package/package.json

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

package/src/components/JfbBaseNotice/Attr.js

@@ -291,7 +291,6 @@ export default {
         groupKey:'content',
         value: data['btnConfirmBgColor'] || '',
         placeholder: '请选择按钮背景颜色',
-        groupKey: "content",
       },
       {
         label: "按钮文字颜色:",

package/src/components/JfbBasePoster/Attr.js

@@ -258,17 +258,6 @@ export default {
           },trigger: ['blur', 'change']
         }],
       },
-      params['isCarousel']=== 2 && (params.poster && params.poster['type'] && params.poster['type'] === '1') && {
-        label: '是否启用配套背景:',
-        ele: 'xd-radio',
-        valueKey: 'isSupport',
-        value: params['isSupport'] || 'Y',
-        groupKey:'style',
-        list: [
-          {"label": "启用", "value": 'Y'},
-          {"label": "禁用", "value": 'N'},
-        ]
-      },
       {
         ele: 'title',
         label: '广告位参数配置',
@@ -335,6 +324,19 @@ export default {
           {"label": "轮播图显示", "value": 2},
         ]
       },
+      params['isCarousel']=== 2 && (params.poster && params.poster['type'] && params.poster['type'] === '1') && {
+        label: '是否启用配套背景:',
+        ele: 'xd-radio',
+        valueKey: 'isSupport',
+        value: params['isSupport'] || 'Y',
+        groupKey:'content',
+        list: [
+          {"label": "启用", "value": 'Y'},
+          {"label": "禁用", "value": 'N'},
+        ],
+        inline: false,
+        notice: '广告位使用轮播图模式，每个页面中<span style="color:red">仅允许一个广告位启用配套背景功能</span>，否则无法达到效果。',
+      },
       params['isCarousel'] === 2 && {
         label: '广告位轮播周期:',
         ele: 'el-input',

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -577,7 +577,9 @@
           this.padding = 20;
         }
         this.rows = getContainerPropsValue(container, 'content.rows', 1);
-        if(this.posterType === '1' && this.isCarousel === 2) this.isSupport = getContainerPropsValue(container, 'content.isSupport', 'Y');
+        if(this.posterType === '1' && this.isCarousel === 2) {
+          this.isSupport = getContainerPropsValue(container, 'content.isSupport', 'Y');
+        }
         this.mS = getContainerPropsValue(container, 'content.margin', {});
         this.background = getContainerPropsValue(container, "content.background", '');
         this.bgImagePadding = getContainerPropsValue(container, 'content.bgImagePadding', {});

package/src/components/JfbBaseRecharge/Api.js

@@ -50,4 +50,25 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "cardRechargeNew",
+    title: "获取卡券套餐列表",
+    path: "/card/v1/new-card-recharge/create-order",
+    isRule: false,
+    data: {
+      package_id: ['套餐ID', "String", "必填"]
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    mapFnName: "cardRechargeList",
+    title: "卡券充值下单",
+    path: "/card/v1/new-card-recharge/list",
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true
+  },
+
 ];

package/src/components/JfbBaseRecharge/Attr.js

@@ -27,7 +27,6 @@ export default {
         placeholder: '请输入票券充值点数自定义文案',
         className: 'input80'
       },
-
       {
         label: '注意事项:',
         ele: 'xd-site-news',

package/src/components/JfbBaseRecharge/JfbBaseRecharge.vue

@@ -14,43 +14,47 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge__body">
-      <view class="jfb-base-recharge__body-card">
-        <view>
-          <view class="jfb-base-recharge__body-form">
-            <input v-model="cardNumber" :placeholder="card_num_placeholder" />
+      <view class="recharge">
+        <view class="recharge-list">
+          <view class="recharge-item">
+            <view class="jfb-base-recharge__body-card">
+              <view>
+                <view class="jfb-base-recharge__body-form">
+                  <input v-model="cardNumber" :placeholder="card_num_placeholder" />
+                </view>
+                <view class="jfb-base-recharge__body-form">
+                  <input v-model="card_point" :placeholder="point_placeholder" />
+                </view>
+                <view
+                  v-if="amount && card_point"
+                  :style="{
+                    color: mainColor,
+                    fontSize: '24rpx',
+                    paddingBottom: '32rpx',
+                  }"
+                >支付金额：{{ amount }} 元</view>
+                <xd-button
+                  size="medium"
+                  type="primary"
+                  :bgColor="mainColor"
+                  @click="handleToRecharge"
+                  :disabled="!amount || !card_point || !cardNumber"
+                >提交</xd-button>
+              </view>
+            </view>
           </view>
-          <view class="jfb-base-recharge__body-form">
-            <input v-model="card_point" :placeholder="point_placeholder" />
-          </view>
-          <view
-            v-if="amount&&card_point"
-            :style="{
-              color: mainColor,
-              fontSize: '24rpx',
-              paddingBottom: '32rpx',
-            }"
-          >
-            支付金额：{{ amount }} 元
-          </view>
-          <xd-button
-            size="medium"
-            type="primary"
-            :bgColor="mainColor"
-            @click="handleToRecharge"
-            :disabled="!amount || !card_point || !cardNumber"
-            >提交</xd-button>
         </view>
+        <view class="xd-notice-content" v-if="content">
+          <view>注意事项:</view>
+          <view v-html="content" class="prod_info"></view>
+        </view>
+        <view
+          v-if="isPreview && statusContent === true && content === '' "
+          class="xd-notice"
+          :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc }"
+        >注意事项未配置数据，因此改模块在正式环境将不显示</view>
+        <view class="bottom_btn-mask"></view>
       </view>
-      <view class="xd-notice-content" v-if="content">
-        <view>注意事项:</view>
-        <view v-html="content" class="prod_info"></view>
-      </view>
-      <view
-        v-if="isPreview && statusContent === true && content === '' "
-        class="xd-notice"
-        :style="{ color: dangerColor,fontSize: 24 + 'rpx',backgroundColor:noticeBgc }"
-      >注意事项未配置数据，因此改模块在正式环境将不显示</view>
-      <view class="bottom_btn-mask"></view>
     </view>
   </view>
 </template>
@@ -58,24 +62,27 @@
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdButton from "@/components/XdButton/XdButton";
+import XdUnit from "@/components/XdUnit/XdUnit.vue";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseRechargeMixin from "./JfbBaseRechargeMixin";
 import { getContainerPropsValue } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import Color from "color";
+import getServiceUrl from "@/common/getServiceUrl";
 export default {
   name: "JfbBaseRecharge",
   components: {
     XdFontIcon,
     XdButton,
+    XdUnit
   },
   mixins: [componentsMixins, extsMixins, JfbBaseRechargeMixin],
   data() {
     return {
+      closeMask: true,
       card_num_placeholder: "",
       point_placeholder: "",
-
       cardNumber: "",
       card_point: "",
       payPath: "",
@@ -117,20 +124,12 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
-      this.card_num_placeholder = getContainerPropsValue(
-        this.container,
-        "content.card_num_placeholder",
-        "输入券号"
-      );
-      this.point_placeholder = getContainerPropsValue(
-        this.container,
-        "content.point_placeholder",
-        "充值点数"
-      );
-      this.payPath = getContainerPropsValue(container, "content.payPath", {
-        value: "",
-      }).value;
+      this.card_num_placeholder = getContainerPropsValue(this.container, "content.card_num_placeholder", "输入券号");
+      this.point_placeholder = getContainerPropsValue(this.container, "content.point_placeholder", "充值点数");
+      this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
     },
+
+
     getContent() {
       jfbRootExec("getListRechargeNewsContent", {
         vm: this,
@@ -149,6 +148,13 @@ export default {
           console.error(error);
         });
     },
+
+    toLink(pay_order_id, order_id){
+      this.$xdUniHelper.redirectTo({
+        url: `${this.payPath}?order_id=${pay_order_id}&main_order_id=${order_id}&type=recharge`,
+      }, false, true);
+    },
+
     handleToRecharge() {
       if (!this.cardNumber) {
         this.$xdAlert({ content: "请输入卡券号" });
@@ -158,7 +164,12 @@ export default {
         this.$xdAlert({ content: "请输入充值点数" });
         return;
       }
-      // this.$xdShowLoading({})
+
+      if( this.$configProject.isPreview) {
+        return;
+      }
+
+      this.$xdShowLoading({});
       jfbRootExec("cardRecharge", {
         vm: this,
         data: {
@@ -168,41 +179,47 @@ export default {
       })
         .then((res) => {
           this.$xdHideLoading();
-          this.$xdUniHelper.navigateTo({
-            url: `${this.payPath}?order_id=${res.pay_order_id}&main_order_id=${res.order_id}&type=recharge`,
-          });
+          this.toLink(res.pay_order_id, res.order_id)
         })
         .catch((err) => {
           this.$xdHideLoading();
           console.log(err, "err");
         });
     },
+
     handleGetPrice(e) {
+      //未填写值
       if (!this.cardNumber || !this.card_point) {
         return;
       }
-      this.$xdShowLoading({});
+
+      //预览模式
+      if( this.$configProject.isPreview) {
+        this.amount = this.card_point;
+        return;
+      }
+
       jfbRootExec("getRechargeAmount", {
         vm: this,
         data: {
           card_number: this.cardNumber, //页面ID
-          card_point: this.card_point * 100, //组件ID
+          card_point: this.$xdUniHelper.multiplyFloatNumber(Number(this.card_point),100), //组件ID
         },
       })
         .then((res) => {
-          this.$xdHideLoading();
-          this.amount = res.amount / 100;
+          this.amount = this.$xdUniHelper.divisionFloatNumber(res.amount ,100);
         })
         .catch((err) => {
-          this.$xdHideLoading();
         });
     },
+
     onJfbUpdate(data) {
-      this.getContent();
-    },
-    onJfbScroll(options) {
-      console.log("event.onJfbScroll", options);
+      if( this.$configProject.isPreview) {
+        this.getContent();
+      }
+
     },
+
     onJfbShow(options) {
       this.onJfbLoad(options);
     },
@@ -219,17 +236,16 @@ export default {
 .jfb-base-recharge {
   &__body {
     &-card {
-      box-shadow: 0px unit(16, rpx) unit(60, rpx) 0px rgba(227, 227, 227, 0.37);
-      background: #ffffff;
-      padding: unit(48, rpx);
-      margin: unit(40, rpx);
+      box-shadow: 0 unit(16, rpx) unit(60, rpx) 0 rgba(227, 227, 227, 0.37);
       border-radius: unit(20, rpx);
+      background: #fff;
+      padding: 30rpx;
     }
     &-form {
       input {
         background: #eeeeee;
         border-radius: unit(16, rpx);
-        padding: unit(30, rpx) unit(40, rpx);
+        padding: unit(30, rpx);
         margin-bottom: unit(30, rpx);
       }
     }
@@ -258,10 +274,96 @@ export default {
       }
     }
     .xd-notice {
-      margin-top: unit(20, rpx);
+      margin-top: unit(40, rpx);
       padding: unit(40, rpx);
       border-radius: unit(15, rpx)
     }
   }
 }
+
+.recharge {
+  padding: 30rpx;
+
+  &-tab {
+    height: 100rpx;
+    margin-bottom: 15rpx;
+    display:flex;
+    justify-content: flex-start;
+    align-items: center;
+    & > view {
+      margin: 0 50rpx 0 0;
+      font-size: 32rpx;
+      position: relative;
+      height: 100%;
+      line-height: 100rpx;
+      cursor: pointer;
+    }
+
+    &-index {
+      height: 6rpx;
+      overflow: hidden;
+      border-radius: 4rpx;
+      position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 16rpx;
+    }
+  }
+
+  .recharge-pack {
+    height: 330rpx;
+    background-position: top left;
+    background-size: 100% 100%;
+    background-repeat: no-repeat;
+    color: #fff;
+    padding: 30rpx;
+    box-sizing: border-box;
+    border-radius: 16rpx;
+    margin-bottom: 30rpx;
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    & .name {
+      font-size: 32rpx;
+      font-weight: 500;
+    }
+
+    & .price {
+      font-size: 28rpx;
+      font-weight: 400;
+      padding: 20rpx 0 10rpx;
+    }
+
+    & .time {
+      font-size: 28rpx;
+      font-weight: 400;
+    }
+
+    & .line {
+      margin: 20rpx 0;
+      height: 2rpx;
+      background: rgba(255,255,255,.2);
+    }
+
+    & .buy {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      & > view:nth-child(2) {
+        height: 60rpx;
+        min-width: 120rpx;
+        text-align: center;
+        border-radius: 40rpx;
+        line-height: 60rpx;
+        border: 4rpx solid #fff;
+        padding: 0 25rpx;
+        font-size: 28rpx;
+
+      }
+    }
+
+  }
+}
 </style>

package/src/components/JfbBaseRechargeNew/Api.js

@@ -1,58 +1,74 @@
 'use strict';
+
 /**
- * @description  接口配置，
- * 在设置方法名字当时候，别忘记加上【模块名字】：Recharge
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
  * @type {*[]}
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Recharge
-    mapFnName: 'getRechargeByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: "cardRecharge",
+    title: "卡券充值下单",
+    path: "/card/v1/card-recharge/create-order",
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+    data: {
+      card_number: ['卡券号', "String", "必填"],
+      card_point: ['充值点数 单位是分', "String", '必选']
     },
     isConsole: true,
-    disabled: true,
+    disabled: true
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Recharge
-    mapFnName: 'updateRechargeFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "getRechargeAmount",
+    title: "获得充值点数需要支付的钱",
+    path: "/card/v1/card-recharge/get-amount",
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+      card_number: ['卡券号', "String", "必填"],
+      card_point: ['充值点数 单位是分', "String", '必选']
     },
     isConsole: true,
-    disabled: true,
+    disabled: true
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Recharge
-    mapFnName: 'removeRechargeFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getListRechargeNewsContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填', 1],
+      code: ['业务线id', 'String', '选填'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Recharge
-    mapFnName: 'addRechargeFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "cardRechargeNew",
+    title: "获取卡券套餐列表",
+    path: "/card/v1/new-card-recharge/create-order",
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      package_id: ['套餐ID', "String", "必填"]
     },
     isConsole: true,
-    disabled: true,
+    disabled: true
+  },
+  {
+    mapFnName: "cardRechargeList",
+    title: "卡券充值下单",
+    path: "/card/v1/new-card-recharge/list",
+    isRule: false,
+    params: {},
+    isConsole: true,
+    disabled: true
   },
+
 ];