jufubao-base 1.0.232-beta5 → 1.0.232-beta7

package/src/components/JfbBaseWithDrawRecord/JfbBaseWithDrawRecord.vue

@@ -1,26 +1,40 @@
 <template>
-  <view
-    class="jfb-base-with-draw-record"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-with-draw-record" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-with-draw-record__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-with-draw-record__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-with-draw-record__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-with-draw-record__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view v-if="orderList&&orderList.length>0" class="jfb-base-with-draw-record__body" :style="[bodyStyleComp]">
+      <view class="jfb-base-with-draw-record__body-title">
+        <view>提现记录</view>
+        <view>状态</view>
+      </view>
+      <view>
+        <view v-for="(item,index) in orderList" :key="index" class="jfb-base-with-draw-record__body-item">
+          <view class="jfb-base-with-draw-record__body-item-top">
+            <view>{{item.order_id}}</view>
+            <view v-if="item.status==='Y'" class="success">{{item.status_name}}</view>
+            <view v-if="item.status==='F'" class="fail">{{item.status_name}}</view>
+            <view v-if="item.status==='N'" class="processing">{{item.status_name}}</view>
+          </view>
+          <view class="jfb-base-with-draw-record__body-item-bottom">
+            <view>￥{{getAmout(item.total_amount)}}</view>
+            <view @click="handleToDetail(item)" v-if="item.status==='N'">
+              详细
+              <XdFontIcon style="margin-left:8rpx" icon="iconxiangyou_xian" size="20" color="#CCCCCC"></XdFontIcon>
+            </view>
+          </view>
+        </view>
+      </view>
     </view>
+    <XdNoData v-else></XdNoData>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdNoData from "@/components/XdNoData/XdNoData";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseWithDrawRecordMixin from "./JfbBaseWithDrawRecordMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -29,17 +43,34 @@
   export default {
     name: "JfbBaseWithDrawRecord",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdNoData
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseWithDrawRecordMixin
     ],
     data() {
       return {
-
-        //todo
+        radius: 0,
+        margin: {},
+        bgColor: '',
+        bodyBorder: {},
+        againWithDrawPath: '',
+        page_token: 1,
+        orderList: [],
+        hasNext: true
       }
     },
+    computed: {
+      bodyStyleComp() {
+        return {
+          borderRadius: `${this.radius}rpx`,
+          margin: this.getMarginAndPadding(this.margin, 20),
+          background: this.bgColor,
+          border: this.bodyBorder,
+        }
+      },
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -48,40 +79,62 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+        this.getOrderRecord()
+      },
+      getAmout(amount) {
+        return this.$xdUniHelper.divisionFloatNumber(amount, 100)
       },
       /**
        * @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.bgColor = getContainerPropsValue(container, 'content.bgColor', '#fff');
+        this.bodyBorder = this.getXdBorder({}, getContainerPropsValue(container, 'content.bodyBorder', {}))
+        this.againWithDrawPath = getContainerPropsValue(container, 'content.againWithDrawPath', { value: '' }).value;
+      },
+      getOrderRecord() {
+        jfbRootExec("getRecordWithdrawOrderList", {
+          vm: this,
+          data: {
+            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;
+          })
+          if (this.page_token === 1) {
+            this.orderList = list
+          } else {
+            this.orderList = this.orderList.concat(list);
+          }
+          this.next_page_token = res.next_page_token
+          this.hasNext = res.next_page_token !== "";
+        })
+      },
+      handleToDetail(item) {
+        this.$xdUniHelper.navigateTo({ url: `${this.againWithDrawPath}?order_id=${item.order_id}` })
       },
       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.getOrderRecord()
+        }
       },
       onJfbShow(options) {
-        console.log('event.onJfbShow', options)
+        this.getOrderRecord()
       },
       onJfbHide(options) {
         console.log('event.onJfbHide', options)
@@ -104,8 +157,77 @@
   @import "./JfbBaseWithDrawRecordLess.less";
 
   .jfb-base-with-draw-record {
-    &__body{
+    &__body {
+      border-radius: 20rpx;
+      margin: 20rpx;
+
+      &-title {
+        background: #F3F3F3;
+        padding: 36rpx 48rpx;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        font-size: 28rpx;
+
+        &>view:first-child {
+          font-weight: 500;
+          color: #333;
+        }
 
+        &> :last-child {
+          color: #CCCCCC;
+        }
+      }
+
+      &-item {
+        margin-top: 24rpx;
+        padding: 20rpx 48rpx;
+        font-size: 28rpx;
+
+        &-top {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-bottom: 32rpx;
+
+          &>view:first-child {
+            color: #333333;
+          }
+        }
+
+        &-bottom {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+
+          &>view:first-child {
+            color: #999999;
+          }
+
+          &> :last-child {
+            color: #ccc;
+            font-size: 26rpx;
+            display: flex;
+            align-items: center;
+          }
+        }
+      }
+
+      &-item:last-child {
+        margin-bottom: 40rpx;
+      }
+
+      .success {
+        color: #00C800;
+      }
+
+      .fail {
+        color: #FF5A39;
+      }
+
+      .processing {
+        color: #999999
+      }
     }
   }
-</style>
+</style>

package/src/components/JfbBaseWithDrawRecord/Mock.js

@@ -1,13 +1,7 @@
 'use strict';
 
 module.exports = {
-  
-  getWithByIdFilmSquate:{},
-  
-  updateWithFilmPaiqiDate:{},
-  
-  removeWithFilmAddress:{},
-  
-  addWithFilmcart:{},
-  
+
+  getRecordWithdrawOrderList: { "next_page_token": "2", "total_size": 0, "list": [{ "order_id": "i771668569418104913", "channel_order_id": "1330001353947642504180083243436870", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 200, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744940123 }, { "order_id": "i771066286233878607", "channel_order_id": "1330001353947642504160061966293601", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744796566, "comment": "", "created_time": 1744796528 }, { "order_id": "i771065517556367438", "channel_order_id": "1330001353947642504160093737710292", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744796406, "comment": "", "created_time": 1744796345 }, { "order_id": "i771062549364867149", "channel_order_id": "1330001353947642504160084846150384", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795686, "comment": "", "created_time": 1744795637 }, { "order_id": "i771061580484837452", "channel_order_id": "1330001353947642504160039106651145", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795456, "comment": "", "created_time": 1744795406 }, { "order_id": "i771059916772212811", "channel_order_id": "1330001353947642504160031021516401", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744795088, "comment": "", "created_time": 1744795009 }, { "order_id": "i771054224359293002", "channel_order_id": "1330001353947642504160089300449824", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "Y", "status_name": "成功", "arrival_time": 1744794894, "comment": "", "created_time": 1744793652 }, { "order_id": "i771037005030096968", "channel_order_id": "1330001353947642504160086581901379", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 10, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789547 }, { "order_id": "i771034877834297415", "channel_order_id": "", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 1000, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789040 }, { "order_id": "i771034873199591494", "channel_order_id": "", "channel_code": "wxpay", "channel_code_name": "微信", "total_amount": 1000, "user_id": 5000358, "status": "F", "status_name": "失败", "arrival_time": 0, "comment": "", "created_time": 1744789038 }], "request_id": "e6f3ea562f8fd9e9" },
+
 }

package/src/components/JfbBaseWithdraw/Api.js

@@ -6,51 +6,41 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：Withdraw
-    mapFnName: 'getWithdrawByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getListBaseNewsContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填', 1],
+      code: ['业务线id', 'String', '选填'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Withdraw
-    mapFnName: 'updateWithdrawFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'getWithDrawDetail',
+    title: '用户资产 - 获取钱包(或积分)余额详情',
+    path: '/pay/v1/property/wallet-detail',
     isRule: false,
     params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
+      method: ['wallet 余额; score 积分;', 'Number', '非必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
-    //设置方法名字当别忘记加上【模块名字】：Withdraw
-    mapFnName: 'removeWithdrawFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'createWithdraw',
+    title: '用户资产 - 提现申请',
+    path: '/pay/v1/property/withdraw-order/create',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Withdraw
-    mapFnName: 'addWithdrawFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      total_amount: ['提现金额', 'Number', '必选'],
+      wallet_type: ['钱包类型', 'Number', '必选'],
+      login_providers: ['支持的登录方式（project.json接口的login_providers）', 'Number', '必选'],
+      pay_channel_providers: ['支持的登录方式（project.json接口的pay_channels）', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,