jufubao-base 1.0.232-beta5 → 1.0.232-beta6

package/src/components/JfbBaseWithDrawAgain/Attr.js

@@ -8,41 +8,85 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
+        label: '外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyMargin',
+        groupKey: 'style',
+        value: data['bodyMargin'] || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
       },
       {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        label: '外填充:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyPadding',
+        groupKey: 'style',
+        value: data['bodyPadding'] || null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          type: 'padding',
         },
+        placeholder: '请设置外填充',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</span>像素',
       },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: data['radius'] || '20',
+        labelInline: true,
+        groupKey: 'style',
+        placeholder: '请选择圆角设置',
+        multiple: false,
         className: 'input60',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: "边框设置:",
+        ele: "xd-border",
+        valueKey: "bodyBorder",
+        value: data['bodyBorder'] || { type: 'Y', value: { color: '#eee', style: "solid", width: '1' } },
+        className: 'input80',
+        groupKey: 'style',
       },
       {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: '背景颜色:',
+        ele: 'xd-color',
+        valueKey: 'bgColor',
+        groupKey: 'style',
+        value: data['bgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline: true,
+        classNmae: 'input80',
+      },
+      {
+        label: '提现成功路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'withDrawSuccessPath',
+        groupKey: 'advanced',
+        placeholder: '请选择提现成功路径',
+        value: data['withDrawSuccessPath'] || {},
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
-    ].filter(i=>i)
+    ].filter(i => i)
   },
   advanced: [],
 };

package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgain.vue

@@ -1,26 +1,54 @@
 <template>
-  <view
-    class="jfb-base-with-draw-again"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
+  <view class="jfb-base-with-draw-again" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
     <!--#ifdef H5-->
-    <view
-      class="jfb-base-with-draw-again__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
+    <view class="jfb-base-with-draw-again__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
       <view class="jfb-base-with-draw-again__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-with-draw-again__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view class="jfb-base-with-draw-again__body" :style="{minHeight: layoutInfo.bodyMinHeight}">
+      <view :style="[bodyStyleComp]">
+        <view class="jfb-base-with-draw-again__body-title">
+          <view>提现金额</view>
+        </view>
+        <view class="jfb-base-with-draw-again__body-amount">
+          {{getAmout(info.total_amount)}}
+        </view>
+      </view>
+      <view class="jfb-base-with-draw-again__body-tips">
+        <image :src="logo"></image>
+        <!-- <XdFontIcon size="60" color="#28C445" style="margin-right:20rpx" icon="iconwx"></XdFontIcon> -->
+        提现至{{channel_name}}
+      </view>
+      <view v-if="info.status==='N'" class="fixe_bottom" :style="prod_bottom">
+        <XdButton fontSize="32" type="primary" @click="handleWithDraw">确认提现</XdButton>
+        <view @click="handleCancelWithDraw">取消提现</view>
+      </view>
+      <XdDailog :radius="30" :showClose="false" :show.sync="showSuccess">
+        <template slot="title">
+          <view class="dialog-title">
+            <view>
+              提现成功
+            </view>
+            <XdFontIcon class="close" color="#333" size="26" icon="icondanchuangguanbi_xian"></XdFontIcon>
+          </view>
+        </template>
+        <template>
+          <XdFontIcon color="#00C800" size="96" icon="iconchenggong"></XdFontIcon>
+          <view class="dialog-content">成功提现 500 积分</view>
+        </template>
+        <template slot="btn">
+          <XdButton width="600" @click="handleWithDrawSuccess" type="primary" fontSize="32" style="width:100%">确定
+          </XdButton>
+        </template>
+      </XdDailog>
     </view>
   </view>
 </template>
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import XdDailog from "@/components/XdDailog/XdDailog";
+  import XdButton from "@/components/XdButton/XdButton";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseWithDrawAgainMixin from "./JfbBaseWithDrawAgainMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -29,17 +57,43 @@
   export default {
     name: "JfbBaseWithDrawAgain",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdDailog,
+      XdButton
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseWithDrawAgainMixin
     ],
     data() {
       return {
-
-        //todo
+        radius: 0,
+        margin: {},
+        padding: {},
+        bgColor: '',
+        bodyBorder: {},
+        showSuccess: false,
+        order_id: '',
+        info: {},
+        channel_name: '',
+        logo: '',
+        withDrawSuccessPath: '',
+        jwxSDK: null
       }
     },
+    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,
+        }
+      },
+      prod_bottom() {
+        return this.fixedStyle({ height: 0, zIndex: 111, paddingBottom: 70 });
+      },
+    },
     watch: {
       container(value, oldValue) {
         if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
@@ -48,31 +102,126 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
+        this.order_id = options.order_id;
+        this.getOrderDetail()
+        this.p_getH5WxAuthorize()
+      },
+      p_getH5WxAuthorize() {
+        jfbRootExec("getH5WxAuthorize", {
+          vm: this,
+          data: { jsApiList: ["requestMerchantTransfer"] },
+        })
+          .then((res) => {
+            console.log(res, 'appapa');
+            this.jwxSDK = res.jwxSDK;
 
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+          })
+          .catch(error => {
+            this.$xdAlert({
+              content: error,
+            });
+          });
+      },
+      getAmout(amount) {
+        return this.$xdUniHelper.divisionFloatNumber(amount, 100)
+      },
+      getOrderDetail() {
+        jfbRootExec("getWithdrawOrderDetail", {
+          vm: this,
+          data: {
+            order_id: this.order_id
+          },
+        }).then(res => {
+          this.info = res.detail;
+          this.channel_name = res.channel_name;
+          this.logo = res.logo;
+        }).catch(err => {
+          console.log(err, 'err')
+        })
       },
       /**
        * @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.withDrawSuccessPath = getContainerPropsValue(container, 'content.withDrawSuccessPath', { value: '' }).value;
+      },
+      handleWithDraw() {
+        jfbRootExec("getWithdrawThirdPlaceOrderList", {
+          vm: this,
+          data: {
+            order_id: this.order_id
+          },
+        }).then(res => {
+          //调用微信js
+          let that= this;
+          //#ifdef MP-WEIXIN
+          if (wx.canIUse('requestMerchantTransfer')) {
+            wx.requestMerchantTransfer({
+              mchId: mch_id,
+              appId: app_id,
+              package: channel_data,
+              success: (request) => {
+                console.log('success:', request);
+                that.$xdUniHelper.navigateTo({ url: this.withDrawSuccessPath })
+              },
+              fail: (request) => {
+                console.log('fail:', request);
+              },
+            });
+          } else {
+            wx.showModal({
+              content: '你的微信版本过低，请更新至最新版本。',
+              showCancel: false,
+            });
+          }
+          //#endif
+          //#ifdef H5
+          this.jwxSDK.checkJsApi({
+            jsApiList: ['requestMerchantTransfer'],
+            success: function (request) {
+              if (request.checkResult['requestMerchantTransfer']) {
+                WeixinJSBridge.invoke('requestMerchantTransfer', {
+                  mchId: res.mch_id,
+                  appId: res.app_id,
+                  package: res.channel_data,
+                },
+                  function (request) {
+                    if (request.err_msg === 'requestMerchantTransfer:ok') {
+                      console.log(request,'requestrequestrequest');
+                      that.$xdUniHelper.navigateTo({ url: this.withDrawSuccessPath })
+                    }
+                  }
+                );
+              } else {
+                alert('你的微信版本过低，请更新至最新版本。');
+              }
+            }
+          })
+          //#endif
+        })
+      },
+      handleCancelWithDraw() {
+        jfbRootExec("cancelWithdraw", {
+          vm: this,
+          data: {
+            order_id: this.order_id
+          },
+        }).then(res => {
+          this.$xdUniHelper.navigateBack();
+        })
+      },
+      handleWithDrawSuccess() {
+        this.showSuccess = false;
+        this.$xdUniHelper.navigateTo({ url: `${this.withDrawSuccessPath}` })
       },
       onJfbScroll(options) {
         console.log('event.onJfbScroll', options)
@@ -104,8 +253,82 @@
   @import "./JfbBaseWithDrawAgainLess.less";
 
   .jfb-base-with-draw-again {
-    &__body{
+    &__body {
+      &-title {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        font-size: 24rpx;
 
+        &>view:first-child {
+          color: #999999;
+        }
+
+        &>view:last-child {
+          color: #666666;
+        }
+      }
+
+      &-amount {
+        color: #333;
+        font-size: 64rpx;
+        font-weight: 500;
+        margin-top: 40rpx;
+      }
+
+      &-tips {
+        display: flex;
+        align-items: center;
+        padding-left: 60rpx;
+        margin-top: 40rpx;
+        font-size: 24rpx;
+        color: #333;
+
+        &>image {
+          width: 60rpx;
+          height: 60rpx;
+          margin-right: 20rpx;
+
+        }
+      }
+
+      .fixe_bottom {
+        position: fixed;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 999;
+        background: #fff;
+        padding: unit(48, rpx) unit(70, rpx);
+
+        &>view {
+          text-align: center;
+          font-size: 28rpx;
+          color: #999;
+          margin-top: 48rpx;
+        }
+      }
+
+      .dialog-title {
+        font-size: 36rpx;
+        font-weight: 500;
+        width: 570rpx;
+        text-align: center;
+        position: relative;
+
+        .close {
+          position: absolute;
+          right: 0;
+          top: 0;
+
+        }
+      }
+
+      .dialog-content {
+        color: #666666;
+        font-size: 36rpx;
+        margin-top: 32rpx;
+      }
     }
   }
-</style>
+</style>

package/src/components/JfbBaseWithDrawRecord/Api.js

@@ -6,51 +6,12 @@
  */
 module.exports = [
   {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'getWithByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getRecordWithdrawOrderList',
+    title: '用户资产 - 提现订单列表',
+    path: '/pay/v1/property/withdraw-order/list',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'updateWithFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'removeWithFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：With
-    mapFnName: 'addWithFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      page_size: ['每页条数', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,

package/src/components/JfbBaseWithDrawRecord/Attr.js

@@ -7,40 +7,71 @@ export default {
   style: [],
   content: (data) => {
     return [
+      {
+        label: '外边距:',
+        ele: 'xd-margin-padding',
+        valueKey: 'bodyMargin',
+        groupKey: 'style',
+        value: data['bodyMargin'] || null,
+        setting: {
+          type: 'margin',
+        },
+        placeholder: '请设置外边距',
+        inline: false,
+        notice: '设置外边距，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">0</span>像素',
+      },
+      {
+        label: '圆角设置:',
+        ele: 'xd-site-select-list',
+        valueKey: 'radius',
+        value: data['radius'] || '20',
+        labelInline: true,
+        groupKey: 'style',
+        placeholder: '请选择圆角设置',
+        multiple: false,
+        className: 'input60',
+        handleCustom({ action, data }) {
+          XdBus.getParentApi('getOptionsSettingList')({
+            setting_id: 'edtix_style_radius',
+            key: Date.now()
+          })
+            .then(res => {
+              data.cb(res.list)
+            })
+            .catch(error => {
+              console.error(error);
+            });
+        },
+      },
+      {
+        label: "边框设置:",
+        ele: "xd-border",
+        valueKey: "bodyBorder",
+        value: data['bodyBorder'] || { type: 'Y', value: { color: '#eee', style: "solid", width: '1' } },
+        className: 'input80',
+        groupKey: 'style',
+      },
       {
         label: '背景颜色:',
         ele: 'xd-color',
         valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
+        groupKey: 'style',
+        value: data['bgColor'] || null,
+        placeholder: '请选择背景颜色',
+        labelInline: true,
+        classNmae: 'input80',
       },
       {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
+        label: '重新提现路径:',
         ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        valueKey: 'againWithDrawPath',
+        groupKey:'advanced',
+        placeholder: '请选择重新提现路径',
+        value: data['againWithDrawPath'] || {},
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          router: XdBus.getParentApi('getPagesTree'),
         },
-      },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input60',
-      },
-      {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        inline: false,
       },
     ].filter(i=>i)
   },