jufubao-base 1.0.209-beta1 → 1.0.209-beta2

package/package.json

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

package/src/components/JfbBaseRechargeNew/Api.js

@@ -11,45 +11,6 @@
  * @type {*[]}
  */
 module.exports = [
-  {
-    mapFnName: "cardRecharge",
-    title: "卡券充值下单",
-    path: "/card/v1/card-recharge/create-order",
-    isRule: false,
-    data: {
-      card_number: ['卡券号', "String", "必填"],
-      card_point: ['充值点数 单位是分', "String", '必选']
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: "getRechargeAmount",
-    title: "获得充值点数需要支付的钱",
-    path: "/card/v1/card-recharge/get-amount",
-    isRule: false,
-    params: {
-      card_number: ['卡券号', "String", "必填"],
-      card_point: ['充值点数 单位是分', "String", '必选']
-    },
-    isConsole: true,
-    disabled: true
-  },
-  {
-    mapFnName: 'getListRechargeNewsContent', //自定义方法名字（必选）
-    title: '获取内容',
-    path: '/cms/v1/news-content',
-    isRule: false,
-    params: {
-      scene: ['使用场景', 'String', '选填'],
-      container_id: ['插件ID', 'String', '必填'],
-      page_id: ['页面ID', 'String', '必填'],
-      page_size: ['记录条数', 'Number', '必填', 1],
-      code: ['业务线id', 'String', '选填'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
   {
     mapFnName: "cardRechargeNew",
     title: "获取卡券套餐列表",

package/src/components/JfbBaseRechargeNew/Attr.js

@@ -7,39 +7,7 @@ export default {
   style: [],
   content: (data) => {
     return [
-      {
-        ele: 'title',
-        label: '旧券充值',
-        size: 'small',
-        groupKey:'content',
-      },
-      {
-        label: '票券框自定义文案:',
-        ele: 'el-input',
-        type: 'text',
-        valueKey: 'card_num_placeholder',
-        groupKey:'content',
-        value: data.card_num_placeholder||'',
-        placeholder: '请输入票券框自定义文案',
-        className: 'input80'
-      },
-      {
-        label: '票券充值点数自定义文案:',
-        ele: 'el-input',
-        type: 'text',
-        valueKey: 'point_placeholder',
-        groupKey:'content',
-        value: data.point_placeholder || '',
-        placeholder: '请输入票券充值点数自定义文案',
-        className: 'input80'
-      },
-      {
-        ele: 'title',
-        label: '新券购买',
-        size: 'small',
-        groupKey:'content',
-      },
-      {
+      0&&{
         label: '立即购买自定义文案:',
         ele: 'el-input',
         type: 'text',
@@ -49,240 +17,6 @@ export default {
         placeholder: '请输入立即购买自定义文案',
         className: 'input80'
       },
-
-      {
-        ele: 'title',
-        label: '其他设置',
-        size: 'small',
-        groupKey:'content',
-      },
-
-      {
-        label: '注意事项:',
-        ele: 'xd-site-news',
-        valueKey: 'notice',
-        groupKey:'content',
-        value: data.notice || null,
-        className: 'input70',
-        setting: {
-          config: {
-            sort: true,
-            maxlen: 100,
-            action: 'aliyun',
-            size: 5,
-            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
-            uploadType: 'aliyun',
-            type: ['jpg', 'png', 'jpeg']
-          },
-        },
-        handleCustom({action, data}) {
-          if (data && data.params) {
-            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
-            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
-          }
-
-          //获取返回参数(场景类型名称为必填)
-          //let loading = XdBus.getParentApi('loading')({});
-
-          //获取返回参数(场景类型名称为必填)
-          let loading = { close(){}}
-
-          //获取显示内容
-          if (action === 'screen') {
-            XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
-              .then(res => {
-                loading.close();
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-              });
-
-          }
-
-          //获取返回参数(广告位高度必选项)
-          if (action === 'getNewsInfo') {
-            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
-              .then(res => {
-                loading.close()
-                data.cb({list: res.list, selectId: res.selected})
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //获取产品业务线列表
-          if (action === 'namespace') {
-            XdBus.getParentApi('getOptionsNamespaces')({})
-              .then(res => {
-                loading.close()
-                data.cb(res['list'])
-              })
-              .catch(error => {
-                loading.close()
-                console.error(error);
-              });
-          }
-
-          //使用内容分类
-          if (action === 'cmsPublishEditxContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
-              .then(res => {
-                console.log('cmsPublishEditxContent', res)
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置列表
-          if (action === 'getListPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //位置创建
-          if (action === 'addPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置编辑
-          if (action === 'editPostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //位置删除
-          if (action === 'deleltePostion') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsPosition')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //获取广告位内容列表
-          if (action === 'getListContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getListNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //广告内容创建
-          if (action === 'addContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('addNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容编辑
-          if (action === 'editContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('updateNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //广告内容删除
-          if (action === 'deleteContent') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('deleteNewsContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(true)
-              })
-              .catch(error => {
-                console.error(error);
-                loading.close();
-                data.cb(false)
-              });
-          }
-
-          //内容发布
-          if (action === 'publish') {
-            loading = XdBus.getParentApi('loading')({});
-            console.log('publish', data.params)
-            XdBus.getParentApi('cmsPublishContent')(data.params)
-              .then(res => {
-                loading.close();
-                data.cb(res)
-              })
-              .catch(error => {
-                loading.close();
-                console.error(error);
-              });
-          }
-
-          //通知页面进行刷新
-          if (action === 'update') {
-            loading = XdBus.getParentApi('loading')({});
-            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
-            loading.close()
-          }
-        },
-      },
       {
         label: '票券支付路径:',
         ele: 'xd-select-pages-path',

package/src/components/JfbBaseRechargeNew/JfbBaseRechargeNew.vue

@@ -14,25 +14,17 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-new__body">
-      <view class="recharge" :class="{active:tabsIndex === 'old'}" >
-        <view class="recharge-tab" v-if="tabs.length > 1">
-          <view
-            v-for="item in tabs"
-            :key="item.value"
-            @click.stop="handleTabs(item.value)"
-            :style="{ color: tabsIndex === item.value?mainColor: '#333'}"
-          >
-            <text>{{item.label}}</text>
-            <text class="recharge-tab-index" v-if="tabsIndex === item.value" :style="{background: tabsIndex === item.value?mainColor: '#fff'}"></text>
-          </view>
-        </view>
+      <view class="recharge">
         <view class="recharge-list">
-          <view class="recharge-item" v-if="tabsIndex === 'new'">
+          <view class="recharge-item">
             <view
               class="recharge-pack"
               v-for="item in newCardList"
               :key="item.package_id"
-              :style="{backgroundImage: 'url('+  item['package_image'] +')'}"
+              :style="{
+                backgroundImage: 'url('+  item['package_image'] +')',
+                color: item['package_color'] ? item['package_color']:'#fff'
+              }"
             >
               <view class="name">{{item.package_name}}</view>
               <view class="price">面值：{{item.card_point}}</view>
@@ -40,50 +32,19 @@
               <view class="line"></view>
               <view class="buy">
                 <view>
-                  <xd-unit :is-old="false" :price="item.card_amount" color-new="#fff" :font-size="40" :icon-size=".3"></xd-unit>
+                  <xd-unit
+                    :is-old="false"
+                    :price="item.card_amount"
+                    :color-new="item['package_color'] ? item['package_color']:'#fff'"
+                    :font-size="40"
+                    :icon-size=".3"
+                  ></xd-unit>
                 </view>
                 <view @click="handleNewBuy(item)">{{buyBtnName}}</view>
               </view>
             </view>
           </view>
-          <view class="recharge-item" v-if="tabsIndex === 'old'">
-            <view class="jfb-base-recharge-new__body-card">
-              <view>
-                <view class="jfb-base-recharge-new__body-form">
-                  <input v-model="cardNumber" :placeholder="card_num_placeholder" />
-                </view>
-                <view class="jfb-base-recharge-new__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>
-        <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>
   </view>
@@ -111,22 +72,7 @@ export default {
   data() {
     return {
       closeMask: true,
-      card_num_placeholder: "",
-      point_placeholder: "",
-      cardNumber: "",
-      card_point: "",
-      payPath: "",
-      amount: "",
-      timer:null,
-
-      //提示文案
       isPreview: false,
-      content: "",
-      statusContent: false,
-      noticeBgc:'',
-
-      tabs: [],
-      tabsIndex: '',
       buyBtnName: '立即购买' ,
       newCardList:[],
     };
@@ -136,53 +82,22 @@ export default {
       if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
       if (this.$configProject['isPreview']) this.init(value)
     },
-    card_point(value) {
-      if(this.timer) clearTimeout(this.timer);
-      this.timer = setTimeout(()=>{
-        if (value && value != 0) {
-          this.handleGetPrice();
-        }
-      }, 1000)
-    },
   },
   created() {
     this.isPreview = this.$configProject.isPreview;
-    this.noticeBgc = Color(this.dangerColor).alpha(0.1).toString();
     this.init(this.container);
   },
   methods: {
     onJfbLoad(options) {
-      this.getContent();
+      this.getNewCardList();
     },
     /**
      * @description 监听事件变化
      * @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.buyBtnName = getContainerPropsValue(container, 'content.buyBtnName', '立即购买')
-
-      //标签设置
-      let tabs = getContainerPropsValue(container, "content.tabs", [{label:'新券购买', value:'new', check: true},{label:'旧券充值', value:'old', check: true}]);
-      let isNewCard = false;
-      this.tabs = tabs.filter(item=>{
-        if(item.check && item.value === 'new') {
-          isNewCard = true;
-        }
-        return item.check
-      });
-      if(tabs.length === 2) this.tabsIndex = 'old';
-      else {
-        if(tabs.length > 0)  this.tabsIndex = tabs[0].value;
-      }
-      if(isNewCard) this.getNewCardList();
-    },
-
-    handleTabs(value){
-      if(this.tabsIndex === value) return;
-      this.tabsIndex = value;
     },
 
     //==套餐购买=============
@@ -249,74 +164,18 @@ export default {
     },
 
     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: "请输入卡券号" });
-        return;
-      }
-      if (!this.card_point) {
-        this.$xdAlert({ content: "请输入充值点数" });
-        return;
-      }
-
-      if( this.$configProject.isPreview) {
-        return;
-      }
-
-      this.$xdShowLoading({});
-      jfbRootExec("cardRecharge", {
-        vm: this,
-        data: {
-          card_number: this.cardNumber, //页面ID
-          card_point: this.card_point * 100, //组件ID
-        },
-      })
-        .then((res) => {
-          this.$xdHideLoading();
-          this.toLink(res.pay_order_id, res.order_id)
+      if(!this.payPath) {
+        this.$xdAlert({
+          time: 3000,
+          content: '支付路径未设置，清检查配置',
+          type: 'error',
+          isClose: false
         })
-        .catch((err) => {
-          this.$xdHideLoading();
-          console.log(err, "err");
-        });
-    },
-
-    handleGetPrice(e) {
-      //未填写值
-      if (!this.cardNumber || !this.card_point) {
-        return;
-      }
-
-      //预览模式
-      if( this.$configProject.isPreview) {
-        this.amount = this.card_point;
         return;
       }
-
-      jfbRootExec("getRechargeAmount", {
-        vm: this,
-        data: {
-          card_number: this.cardNumber, //页面ID
-          card_point: this.$xdUniHelper.multiplyFloatNumber(Number(this.card_point),100), //组件ID
-        },
-      })
-        .then((res) => {
-          this.amount = this.$xdUniHelper.divisionFloatNumber(res.amount ,100);
-        })
-        .catch((err) => {
-        });
-    },
-
-    onJfbUpdate(data) {
-      if( this.$configProject.isPreview) {
-        this.getContent();
-      }
-
+      this.$xdUniHelper.redirectTo({
+        url: `${this.payPath}?order_id=${pay_order_id}&main_order_id=${order_id}&type=recharge`,
+      }, false, true);
     },
 
     onJfbShow(options) {
@@ -334,135 +193,93 @@ export default {
 
 .jfb-base-recharge-new {
   &__body {
-    &-card {
-      box-shadow: 0 unit(16, rpx) unit(60, rpx) 0 rgba(227, 227, 227, 0.37);
-      border-radius: unit(20, rpx);
-      background: #fff;
+    .recharge {
       padding: 30rpx;
-    }
-    &-form {
-      input {
-        background: #eeeeee;
-        border-radius: unit(16, rpx);
-        padding: unit(30, rpx);
-        margin-bottom: unit(30, rpx);
-      }
-    }
 
-    .xd-notice-content {
-      padding: 0 40rpx 40rpx 40rpx;
-      & > view:first-child {
-        font-size: 32rpx;
-        font-weight: 500;
-        color: #333;
-        margin-bottom: 20rpx;
-      }
-      & > view:last-child {
-        line-height: 44rpx;
-        font-size: 26rpx;
-        color: #666;
-        /deep/ img, /deep/ image{
-          max-width: 100% !important;
-          height: auto !important;
-          margin: 22rpx 0;
+      &-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;
         }
 
-        /deep/ *{
-          max-width: 100% !important;
+        &-index {
+          height: 6rpx;
+          overflow: hidden;
+          border-radius: 4rpx;
+          position: absolute;
+          left: 0;
+          right: 0;
+          bottom: 16rpx;
         }
       }
-    }
-    .xd-notice {
-      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;
-    }
+      .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;
-    }
+        & .name {
+          font-size: 32rpx;
+          font-weight: 500;
+        }
 
-    & .price {
-      font-size: 28rpx;
-      font-weight: 400;
-      padding: 20rpx 0 10rpx;
-    }
+        & .price {
+          font-size: 28rpx;
+          font-weight: 400;
+          padding: 20rpx 0 10rpx;
+        }
 
-    & .time {
-      font-size: 28rpx;
-      font-weight: 400;
-    }
+        & .time {
+          font-size: 28rpx;
+          font-weight: 400;
+        }
 
-    & .line {
-      margin: 20rpx 0;
-      height: 2rpx;
-      background: rgba(255,255,255,.2);
-    }
+        & .line {
+          margin: 20rpx 0;
+          height: 2rpx;
+          background: rgba(255,255,255,.2);
+        }
 
-    & .buy {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
+        & .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;
 
-      & > 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>