jufubao-base 1.0.232-beta4 → 1.0.232-beta6

package/src/components/JfbBaseBalance/JfbBaseBalance.vue

@@ -1,26 +1,60 @@
 <template>
-  <view
-    class="jfb-base-balance"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-balance" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-balance__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-balance__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-balance__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-balance__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view class="jfb-base-balance__body-tab">
+        <view v-for="(item,index) in wallet_list" :key="index" @click="handleSwitchTab(item)"
+          class="jfb-base-balance__body-tab-item">
+          {{item.show_name}}
+          <view v-if="wallet_type===item.wallet_type" class="check" :style="{background: mainColor
+          }"></view>
+          <view class="check" v-else></view>
+        </view>
+      </view>
+      <view style="display: flex;justify-content: space-between;align-items: center;" :style="[bodyStyleComp]">
+        <view class="jfb-base-balance__body-points">
+          <view>
+            我的余额
+            <XdFontIcon @click="showDialog=true" style="margin-left: 10rpx" size="20" icon="iconmingchengtubiao">
+            </XdFontIcon>
+          </view>
+          <view>{{getAmout(amount)}}</view>
+          <view>可用：{{getAmout(amount)}}</view>
+        </view>
+        <xd-button v-if="isWithDraw==='Y'" style="margin: 0" size="mini" type="primary"
+          @click="handleWithdraw">提现</xd-button>
+      </view>
+      <view v-if="recordList&&recordList.length>0" :style="[bodyStyleComp]" class="jfb-base-balance__body-list">
+        <view v-for="(item,index) in recordList" :key="index" class="jfb-base-balance__body-list-item">
+          <view class="jfb-base-balance__body-list-item-info">
+            <view class="jfb-base-balance__body-list-item-info-label">{{item.trade_type_name}}</view>
+            <view :class="item.operate_type==='A'?'income':'expenses'"
+              class="jfb-base-balance__body-list-item-info-value">
+              <text>{{item.operate_type==='A'?'+':'-'}}</text>
+              {{getAmout(item.amount)}}
+            </view>
+          </view>
+          <view class="jfb-base-balance__body-list-item-date">{{item.created_time}}</view>
+        </view>
+      </view>
+      <XdNoData v-else></XdNoData>
+      <XdDailog :cancel="false" @onBtn="showDialog=false" confirmText="我知道了" title="积分说明" :show.sync="showDialog">
+        <xd-content-xss v-html="notice"></xd-content-xss>
+      </XdDailog>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdButton from "@/components/XdButton/XdButton";
+  import XdDailog from '@/components/XdDailog/XdDailog.vue';
+  import XdNoData from "@/components/XdNoData/XdNoData";
+  import XdContentXss from '@/components/XdContentXss/XdContentXss';
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseBalanceMixin from "./JfbBaseBalanceMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -29,17 +63,46 @@
   export default {
     name: "JfbBaseBalance",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdDailog,
+      XdContentXss,
+      XdButton,
+      XdNoData
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseBalanceMixin
     ],
     data() {
       return {
-
-        //todo
+        income: false,
+        radius: 0,
+        margin: {},
+        padding: {},
+        bgColor: '',
+        bodyBorder: {},
+        notice: '',
+        showDialog: false,
+        withDrawRoutePath: '',
+        wallet_type: '',
+        wallet_list: [],
+        amount: 0,
+        isWithDraw: 'N',
+        recordList: [],
+        hasNext: true,
+        page_token: 1,
       }
     },
+    computed: {
+      bodyStyleComp() {
+        return {
+          borderRadius: `${this.radius}rpx`,
+          margin: this.getMarginAndPadding(this.margin, 20),
+          padding: this.getMarginAndPadding(this.padding, 40),
+          background: this.bgColor,
+          border: this.bodyBorder,
+        }
+      },
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -48,37 +111,109 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
+        this.method = options.method
+        this.getContent()
+        this.getDetail()
+      },
+      getAmout(amount) {
+        return this.$xdUniHelper.divisionFloatNumber(amount, 100)
+      },
+      getDetail() {
+        jfbRootExec("getBalanceDetail", {
+          vm: this,
+          data: {
+            method: this.method
+          },
+        }).then(res => {
+          this.wallet_type = res.wallet_list[0].wallet_type
+          this.isWithDraw = res.wallet_list[0].is_support_withdraw;
+          this.amount = res.wallet_list[0].amount;
+          this.wallet_list = res.wallet_list
+          this.getBalanceRecord()
+        }).catch(err => {
+          console.log(err, 'err');
 
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        })
+      },
+      getBalanceRecord(type) {
+        jfbRootExec("getBalanceWalletTradeList", {
+          vm: this,
+          data: {
+            wallet_type: this.wallet_type,
+            page_size: 10,
+            page_token: this.page_token
+          },
+        }).then(res => {
+          let list = res.list.map(item => {
+            item["created_time"] = this.$xdUniHelper.getDate(
+              item["created_time"] * 1000
+            ).fullTime;
+            return item;
+          })
+          this.hasNext = res.next_page_token !== "";
+          if (this.page_token === 1) {
+            this.recordList = list
+          } else {
+            this.recordList = this.recordList.concat(list);
+          }
+        })
+      },
+      getContent() {
+        jfbRootExec("getListBaseNewsContent", {
+          vm: this,
+          data: {
+            page_id: this.pageAttr["page_id"], //页面ID
+            container_id: this.containerId, //组件ID
+            limit: 1,
+          },
+        })
+          .then((res) => {
+            if (res.list.length > 0) {
+              if (res.list && res.list.length > 0) {
+                this.notice = this.$xdUniHelper.filterHtml(res.list[0].content);
+              }
+              this.noticeStatus = true;
+            }
+          })
+          .catch((error) => {
+            console.error(error);
+          });
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        this.radius = getContainerPropsValue(container, 'content.radius', '20');
+        this.margin = getContainerPropsValue(container, 'content.bodyMargin', {});
+        this.padding = getContainerPropsValue(container, 'content.bodyPadding', {});
+        this.bgColor = getContainerPropsValue(container, 'content.bgColor', '#fff');
+        this.bodyBorder = this.getXdBorder({}, getContainerPropsValue(container, 'content.bodyBorder', {}))
+        this.withDrawRoutePath = getContainerPropsValue(container, 'content.withDrawRoutePath', { value: '' }).value;
+      },
+      handleWithdraw() {
+        this.$xdUniHelper.navigateTo({ url: `${this.withDrawRoutePath}?wallet_type=${this.wallet_type}&method=${this.method}` })
+      },
+      handleSwitchTab(item) {
+        this.wallet_type = item.wallet_type;
+        this.isWithDraw = item.is_support_withdraw;
+        this.amount = item.amount;
+        this.hasNext = true;
+        this.page_token = 1;
+        this.recordList = [];
+        this.getBalanceRecord()
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
+        if (this.hasNext) {
+          this.page_token = this.next_page_token;
+          this.getBalanceRecord()
+        }
       },
       onJfbShow(options) {
         console.log('event.onJfbShow', options)
@@ -104,8 +239,91 @@
   @import "./JfbBaseBalanceLess.less";
 
   .jfb-base-balance {
-    &__body{
+    &__body {
+      &-tab {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        color: #666666;
+        font-size: 32rpx;
+        background: #fff;
+        padding: 24rpx 0;
 
+        &-item {
+          display: flex;
+          flex-direction: column;
+          align-items: center;
+        }
+
+        .check {
+          width: 60rpx;
+          height: 6rpx;
+          margin-top: 12rpx;
+        }
+      }
+
+      &-points {
+        background: #fff;
+
+        &>view:first-child {
+          display: flex;
+          align-items: center;
+          color: #333;
+          font-size: 24rpx;
+        }
+
+        &>view:nth-child(2) {
+          color: #333;
+          font-size: 64rpx;
+          font-weight: 500;
+          margin: 20rpx 0;
+        }
+
+        &>view:nth-child(3) {
+          color: #333333;
+          font-size: 28rpx;
+        }
+      }
+
+      &-list {
+        &-item {
+          margin-bottom: 40rpx;
+
+          &-info {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            &-label {
+              color: #333333;
+              font-size: 28rpx;
+            }
+
+            &-value {
+              font-size: 32rpx;
+              font-weight: 700;
+            }
+
+            .income {
+              color: #FF5A39;
+            }
+
+            .expenses {
+              color: #00C800;
+            }
+          }
+
+          &-date {
+            color: #999999;
+            font-size: 22rpx;
+            margin-top: 26rpx;
+          }
+        }
+
+        &-item:last-child {
+          margin-bottom: 0;
+        }
+      }
     }
   }
-</style>
+</style>

package/src/components/JfbBaseCodeOpenVip/Api.js

@@ -6,53 +6,31 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Code
-    mapFnName: 'getCodeByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
-    isRule: false,
+    mapFnName: "getExchangeCode",
+    title: "兑换码",
+    path: "/member/v1/:xnamespace/exchange/:exchange_code",
+    isRule: true,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      xnamespace: ['命名空间', 'String', '必选'],
+      exchange_code: ['兑换码', 'String', '必选']
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Code
-    mapFnName: 'updateCodeFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "createVipOrder",
+    title: "创建VIP订单",
+    path: "/member/v1/order/submit",
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Code
-    mapFnName: 'removeCodeFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      business_code: ['业务编码', 'String', '必选'],
+      product_id: ['商品id', 'Number', '必选'],
+      notify_provider_id: ['notify_provider_id', 'Number', '可选'],
+      selected_card_list_json: ['已使用的卡券数据', 'array', '可选'],
+      selected_wallet_list_json: ['已使用的钱包数据', 'array', '可选'],
+      need_pay_price: ['需要支付的价格', 'Number', '可选']
     },
     isConsole: true,
     disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Code
-    mapFnName: 'addCodeFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
+  }
 ];

package/src/components/JfbBaseCodeOpenVip/Attr.js

@@ -6,7 +6,26 @@
 export default {
   style: [],
   content: (data) => {
+    let imageConfig = {
+      sort: true,
+      maxlen: 100,
+      action: "aliyun",
+      qiniuCdn: "aliyun",
+      size: 2,
+      tipsformet: "上传文件格式：@imageType@，不超过@size@MB。该上传图会在用户端显示，不建议上传超过1920*1080图片。",
+      uploadType: "aliyun",
+      type: ["jpg", "png", "jpeg", "gif"],
+    };
     return [
+      {
+        label: "文案描述:", //label
+        ele: "xd-tinymce", //package 名称
+        valueKey: "description", //form[valueKey]
+        value: data.description || "",
+        imageConfig: imageConfig,
+        inline: false,
+        groupKey: "content",
+      },
       {
         label: '共享PLUS会员用户协议:',
         ele: 'xd-site-news',

package/src/components/JfbBaseCodeOpenVip/JfbBaseCodeOpenVip.vue

@@ -14,30 +14,32 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-code-open-vip__body" :style="[bodyStyle]">
-      <view v-if="0" class="vip_panel">
+      <view v-if="step === 1" class="vip_panel">
         <view class="combo_section">
           <view class="code_input_wrap">
-            <input class="code_input" placeholder="请输入兑换码"></input>
+            <input class="code_input" v-model="exchange_code" placeholder="请输入兑换码"></input>
           </view>
         </view>
         <view class="combo_section">
-          <view class="desc_tit">文案描述</view>
-          <view class="desc_cont">文案内容</view>
+          <!-- <view class="desc_tit">文案描述</view> -->
+          <view class="desc_cont">
+            <xd-content-xss :html="description"></xd-content-xss>
+          </view>
         </view>
         <view class="fixed_bottom" :style="[fixed_bottom]">
-          <xd-button type="primary" width="600rpx">查询</xd-button>
+          <xd-button type="primary" width="600rpx" @click="searchCode">查询</xd-button>
           <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
         </view>
       </view>
       <view v-else class="vip_panel">
         <view class="combo_section">
-          <view class="combo_section-title">兑换码：12312983719283711</view>
-          <xd-list-item label="套餐名称" paddingLR="40rpx">¥125.00</xd-list-item>
-          <xd-list-item label="套餐期限" paddingLR="40rpx">30天</xd-list-item>
-          <xd-list-item label="套餐金额" paddingLR="40rpx">¥125.00</xd-list-item>
+          <view class="combo_section-title">兑换码：{{ vipInfo.exchange_code }}</view>
+          <xd-list-item label="套餐名称" paddingLR="40rpx">{{ vipInfo.product_name }}</xd-list-item>
+          <xd-list-item label="套餐期限" paddingLR="40rpx">{{ vipInfo.life_cycle_label }}</xd-list-item>
+          <xd-list-item label="套餐金额" paddingLR="40rpx">¥{{ $xdUniHelper.divisionFloatNumber(vipInfo.sale_price, 100) }}</xd-list-item>
         </view>
         <view class="fixed_bottom" :style="[fixed_bottom]">
-          <xd-button type="primary" width="600rpx">立即兑换</xd-button>
+          <xd-button type="primary" width="600rpx" @click="p_createVipOrder">立即兑换</xd-button>
           <view class="plus_privacy">开通视为同意 <text @click.stop="handlePrivacy('privacy_service')"></text>《共享PLUS会员用户协议》</view>
         </view>
       </view>
@@ -47,8 +49,9 @@
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import XdListItem from "@/components/XdListItem/XdListItem"
+  import XdListItem from "@/components/CusListItem/CusListItem"
   import XdButton from "@/components/XdButton/XdButton";
+  import XdContentXss from "@/components/XdContentXss/XdContentXss"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseCodeOpenVipMixin from "./JfbBaseCodeOpenVipMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -59,15 +62,22 @@
     components: {
       XdFontIcon,
       XdListItem,
-      XdButton
+      XdButton,
+      XdContentXss
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseCodeOpenVipMixin
     ],
     data() {
       return {
-        //hideMask: true,
+        closeMask: true,
+        xnamespace: "",
+
+        exchange_code: "",
+        step: 1,
+        vipInfo: {},
         //todo
+        description: "",
         vipSuccessPath: "",
       }
     },
@@ -95,22 +105,14 @@
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.setNameSpace(options);
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
+        this.description = getContainerPropsValue(container, 'content.description', "");
         this.vipSuccessPath = getContainerPropsValue(container, 'content.vipSuccessPath', {value: ""}).value;
       },
       handlePrivacy(code){
@@ -120,8 +122,36 @@
           url: `/pages/content/content?${params}`
         })
       },
+      searchCode(){
+        if(!this.exchange_code) return;
+        this.$xdShowLoading({});
+        jfbRootExec("getExchangeCode", {
+          vm: this,
+          data: {
+            xnamespace: this.xnamespace,
+            exchange_code: this.exchange_code
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          this.step = 2;
+          this.vipInfo = res;
+        })
+      },
+      p_createVipOrder(){
+        jfbRootExec("createVipOrder", {
+          vm: this,
+          data: {
+            business_code: this.xnamespace,
+            product_id: this.vipInfo.product_id,
+            notify_provider_id: this.projectAttr.notify_provider_id,
+            need_pay_price: 0
+          }
+        }).then(res => {
+
+        })
+      },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        // console.log('event.onJfbScroll', options)
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -174,7 +204,6 @@
           text-align: center;
         }
         .desc_cont{
-          height: 100rpx;
           padding: 24rpx;
         }
         .code_input_wrap{

package/src/components/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -31,12 +31,12 @@
             <view class="vip-title">
               <view class="vip-title-left">PLUS会员专享</view>
               <view class="vip-title-right">
-                <span>8</span>折
+                <text>8</text>折
               </view>
             </view>
             <view class="vip-open" @click="handleToOpen">
               <xd-font-icon color="#FCBF28" size="20" icon="iconjinhangzhong"></xd-font-icon>
-              <span>立即开通</span>
+              <text>立即开通</text>
               <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon>
             </view>
           </view>

package/src/components/JfbBaseOpenVip/Api.js

@@ -6,53 +6,24 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'getOpenByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getBaseUserInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'updateOpenFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'removeOpenFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: "getVipList",
+    title: "会员中心 - 会员卡列表",
+    path: "/member/v1/:namespace/vip-card",
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
+      namespace: ['业务线', 'String', true],
+      is_show_exchange_code: ['是否展示 兑换码 ', 'Y/N，默认N', false],
     },
     isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Open
-    mapFnName: 'addOpenFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
+    disabled: true
+  }
 ];