jufubao-base 1.0.243-beta201 → 1.0.243-beta202

package/src/components/JfbBaseUserOrder/Attr.js

@@ -21,6 +21,21 @@ export default {
         groupKey:'advanced',
       },
       {
+        label: '是否展示我的订单:',
+        ele: 'xd-radio',
+        valueKey: 'isShowMyOrder',
+        value: data['isShowMyOrder'] || 'Y',
+        placeholder: '请选择是否展示我的订单',
+        groupKey:'content',
+        multiple: false,
+        labelInline:true,
+        className: 'input80',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ]
+      },
+      data['isShowMyOrder']==='Y'&&{
         label: '我的订单自定义名称:',
         ele: 'el-input',
         type: 'text',
@@ -101,6 +116,7 @@ export default {
               {"label": "待收货", "value": 'unreceived'},
               {"label": "已取消", "value": 'cancel'},
               {"label": "已完成", "value": 'com'},
+              {"label": "售后", "value": 'afterSale'},
             ])
           }
         },

package/src/components/JfbBaseUserOrder/JfbBaseUserOrder.vue

@@ -16,8 +16,9 @@
     <view class="jfb-base-user-order__body">
       <view class="x-line"></view>
       <view :style="[bodyStyleComp]" v-if="list.length > 0">
-        <view class="my-order__add" :style="[titleMarginComp]">
-          <view :style="[titleStyleComp]">{{myOrderName}}</view>
+        <view v-if="isShowMyOrder==='Y'||isShowBtn === 'Y'" class="my-order__add" :style="[titleMarginComp]">
+          <view v-if="isShowMyOrder==='Y'" :style="[titleStyleComp]">{{myOrderName}}</view>
+          <view v-else></view>
           <view
             v-if="isShowBtn === 'Y'"
             @click="handleToLink(afterUrl)"
@@ -179,6 +180,7 @@
         cardNameColor: '#333',
         titleStyle: {},
         titleMargin:{},
+        isShowMyOrder: '',
 
         //售后订单
         isShowBtn:'Y',
@@ -274,6 +276,7 @@
 
 
         //标题
+        this.isShowMyOrder = getContainerPropsValue(container, 'content.isShowMyOrder', 'Y');
         this.myOrderName = getContainerPropsValue(container, 'content.myOrderName', '我的订单')
         this.titleStyle = getContainerPropsValue(container, 'content.titleStyle', {});
         this.titleMargin = getContainerPropsValue(container,'content.titleMargin', {})
@@ -333,6 +336,12 @@
 
       handleToLink(path, type) {
         if (this.$configProject['isPreview']) return;
+        if(type==='afterSale'){
+          this.$xdUniHelper.navigateTo({
+            url: this.afterUrl
+          })
+          return
+        }
         this.$xdUniHelper.navigateTo({
           url: type ? `${path}?type=${type}` : path
         })

package/src/components/JfbBaseWithDrawAgain/Api.js

@@ -0,0 +1,41 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：With
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'cancelWithdraw',
+    title: '用户资产 - 提现取消',
+    path: '/pay/v1/property/withdraw-order/cancel',
+    isRule: false,
+    data: {
+      order_id: ['提现订单号', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getWithdrawOrderDetail',
+    title: '用户资产 - 提现订单详情',
+    path: '/pay/v1/property/withdraw-order/detail',
+    isRule: false,
+    params: {
+      order_id: ['提现订单号', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'getWithdrawThirdPlaceOrderList',
+    title: '用户资产 - 提现渠道下单',
+    path: '/pay/v1/property/withdraw-order/third-place',
+    isRule: false,
+    params: {
+      order_id: ['提现订单号', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseWithDrawAgain/Attr.js

@@ -0,0 +1,92 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+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-margin-padding',
+        valueKey: 'bodyPadding',
+        groupKey: 'style',
+        value: data['bodyPadding'] || null,
+        setting: {
+          type: 'padding',
+        },
+        placeholder: '请设置外填充',
+        inline: false,
+        notice: '设置填充值，<span style="color: red">单位：像素</span>。默认值：<span style="color: red">20</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',
+        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)
+  },
+  advanced: [],
+};

package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgain.vue

@@ -0,0 +1,354 @@
+<template>
+  <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-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <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 v-if="showDisabled" disabled fontSize="32" type="primary">确认提现</XdButton>
+        <XdButton v-else 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";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import extsMixins from "@/mixins/extsMixins";
+  export default {
+    name: "JfbBaseWithDrawAgain",
+    components: {
+      XdFontIcon,
+      XdDailog,
+      XdButton
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseWithDrawAgainMixin
+    ],
+    data() {
+      return {
+        radius: 0,
+        margin: {},
+        padding: {},
+        bgColor: '',
+        bodyBorder: {},
+        showSuccess: false,
+        order_id: '',
+        info: {},
+        channel_name: '',
+        logo: '',
+        withDrawSuccessPath: '',
+        jwxSDK: null,
+        showDisabled: false
+      }
+    },
+    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;
+        if (this.$configProject['isPreview']) this.init(value)
+      },
+    },
+    created() {
+      console.log(this.$configProject,this.settings.index,'apapapa');
+      
+      this.init(this.container);
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.order_id = options.order_id;
+        this.getOrderDetail()
+        // #ifdef H5
+        this.p_getH5WxAuthorize()
+        // #endif
+      },
+      p_getH5WxAuthorize() {
+        jfbRootExec("getH5WxAuthorize", {
+          vm: this,
+          data: { jsApiList: ["requestMerchantTransfer"] },
+        })
+          .then((res) => {
+            console.log(res, 'appapa');
+            this.jwxSDK = res.jwxSDK;
+
+          })
+          .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.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() {
+        this.showDisabled = true
+        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: res.mch_id,
+              appId: res.app_id,
+              package: res.channel_data,
+              success: (request) => {
+                console.log('success:', request);
+                if(that.withDrawSuccessPath){
+                  that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
+                } else {
+                  that.$xdUniHelper.navigateTo({ url: that.settings.index })
+                }
+              },
+              fail: (request) => {
+                this.showDisabled = false
+                console.log('fail:', request);
+              },
+            });
+          } else {
+            this.showDisabled = false
+            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,that.withDrawSuccessPath,'requestrequestrequest');
+                      if(that.withDrawSuccessPath){
+                        that.$xdUniHelper.navigateTo({ url: that.withDrawSuccessPath })
+                      } else {
+                        that.$xdUniHelper.navigateTo({ url: that.settings.index })
+                      }
+                    }
+                  }
+                );
+              } else {
+                this.showDisabled = false
+                alert('你的微信版本过低，请更新至最新版本。');
+              }
+            }
+          })
+          //#endif
+        }).catch(err=>{
+          this.showDisabled = false
+        })
+      },
+      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)
+      },
+      onJfbReachBottom(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+      onJfbShow(options) {
+        console.log('event.onJfbShow', options)
+      },
+      onJfbHide(options) {
+        console.log('event.onJfbHide', options)
+      },
+      onJfbBack(options) {
+        console.log('event.onJfbBack', options)
+      },
+      onJfbUpdate(...data) {
+        console.log('event.onJfbUpdate', data)
+      },
+      onJfbCustomEvent(options) {
+        console.log('event.onJfbReachBottom', options)
+      },
+    }
+  }
+
+</script>
+
+<style scoped lang="less">
+  @import "./JfbBaseWithDrawAgainLess.less";
+
+  .jfb-base-with-draw-again {
+    &__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>

package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgainLess.less

@@ -0,0 +1,79 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+//start
+.jfb-base-with-draw-again {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end
+
+
+/**notPreview**/
+.jfb-base-with-draw-again {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseWithDrawAgain/JfbBaseWithDrawAgainMixin.js

@@ -0,0 +1,30 @@
+'use strict';
+
+
+//@AttrImport
+import Attr from "./Attr";
+//@EndAttrImport
+
+
+export default {
+  data() {
+    return {
+      //#ifdef H5
+      
+      //@AttrData
+      Attr:{}, //对外开发编辑属性
+      //@EndAttrData
+      
+      // #endif
+      cssRoot: 'jfb-base-with-draw-again'
+    }
+  },
+  created() {
+    
+    //@AttrDataCreated
+    this.Attr = this.$xdUniHelper.customClone(Attr);
+    //@EndAttrDataCreated
+    
+
+  },
+}

package/src/components/JfbBaseWithDrawAgain/Mock.js

@@ -0,0 +1,10 @@
+'use strict';
+
+module.exports = {
+
+  getWithdrawOrderDetail: { "detail": { "partner_id": 161, "site_id": "04c78d51890a18b8", "user_id": 5000358, "wallet_type": "UC", "total_amount": 200, "channel_amount": 200, "order_id": "i771668569418104913", "channel_code": "wxpay", "channel_code_name": "微信", "channel_order_id": "", "channel_user_id": "oJM1I6-ns0kM_byNgio_n_ZuTqCk", "channel_app_id": "wxad70f65127f9471c", "wallet_nnid": "", "wallet_trade_nnid": "", "arrival_time": 0, "extras": "", "comment": "", "created_time": 1744940123, "updated_time": 0, "status": "N", "status_name": "提现中", "service_amount": 0, "service_rate": 0 }, "channel_name": "微信", "logo": "https:\/\/jfb-public-images.oss-cn-qingdao.aliyuncs.com\/system-paychannel-logo-wxpay.png?x-oss-process=style\/200_200", "request_id": "473e8bf6986efc25" },
+
+  getWithdrawThirdPlaceOrderList: { "order_id": "i771668569418104913", "channel_data": "ABBQO+oYAAABAAAAAAAvz7kzb9HMNRWNvawBaBAAAADnGpepZahT9IkJjn90+1qgAYQYW\/LmJL0WH47tlOYOunGem4Trqj+ox5EfmQFESJ76f9lMWaLN2pvCJ5stBUZFIFIjhvk8fybnzYnmaUkvbpln+bc=", "app_id": "wxad70f65127f9471c", "mch_id": "1614921673", "request_id": "48ef7a43d95aa020" },
+
+  cancelWithdraw: { "request_id": "48ef7a43d95aa020" }
+}

package/src/components/JfbBaseWithDrawRecord/Api.js

@@ -0,0 +1,19 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：With
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getRecordWithdrawOrderList',
+    title: '用户资产 - 提现订单列表',
+    path: '/pay/v1/property/withdraw-order/list',
+    isRule: false,
+    params: {
+      page_size: ['每页条数', 'Number', '必选'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];