jufubao-base 1.0.176-beta1 → 1.0.177-beta1

package/src/components/JfbBaseCardReceiveCover/Attr.js

@@ -8,49 +8,74 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgcolor',
-        value: data.bgcolor || '',
-        placeholder: '请输入占位框背景颜色',
-        classNmae: 'input80',
+        label: '按钮背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'btnBg', //form[valueKey]
+        value: data.btnBg || null, //v-model
+        defaultValue: data.btnBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 163, //单个图片显示宽度
+        oneHeight: 45, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
         rules: [
-          {
-            required: true,
-            message: '请输入占位框背景颜色',
-            trigger: 'blur'
-          },
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
         ]
       },
       {
-        label: '选中路径:',
+        label: '内容背景图:', //label
+        ele: 'xd-upload', //package 名称
+        valueKey: 'contentBg', //form[valueKey]
+        value: data.contentBg || null, //v-model
+        defaultValue: data.contentBg || null, //默认图片对象
+        groupKey: "style",
+        slot: true, //按钮是否使用slot
+        oneWidth: 300, //单个图片显示宽度
+        oneHeight: 200, //单个图片显示高度
+        elinputClassName: 'input40',
+        tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+        type: ['jpg', 'png', 'jpeg'],
+        styleType: 'one', //其值：one=>单文件上传 auth=>证件正反面上传 list=>多文件上传
+        uploadType: 'aliyun', //''=>API服务上传  qiniu=>七牛云OSS上传  aliyun=> 阿里云OSS上传
+        size: 5, //5M
+        action: 'aliyun',
+        sort: true, //当上传图片列表时候，是否启用排序
+        maxlen: 100, //当上传图片列表时候，最大数量数量
+        rules: [
+          { required: true, message: '请上传图片', trigger: ['blur', 'change'] },
+        ]
+      },
+      {
+        label: '领取跳转地址:',
         ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
+        valueKey: 'receive_get_url',
+        groupKey:'advanced',
+        placeholder: '请选择领取跳转地址',
+        value: null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          router: XdBus.getParentApi('getPagesTree'),
         },
-      },
-      data.bgcolor && {
-        label: '高度:',
-        ele: 'el-input',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80',
+        inline: false,
         rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
+          { required: true, message: '请选择领取地址', trigger: ['blur', 'change'] },
         ]
       },
       {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: '按钮文字颜色:',
+        ele: 'xd-color',
+        valueKey: 'btnColor',
+        value: data['btnColor'] || '',
+        groupKey: "content",
+        placeholder: '请输入按钮文字颜色',
+        classNmae: 'input80',
       },
     ].filter(i=>i)
   },

package/src/components/JfbBaseCardReceiveCover/JfbBaseCardReceiveCover.vue

@@ -2,110 +2,171 @@
   <view
     class="jfb-base-card-receive-cover"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-card-receive-cover__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-card-receive-cover__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-card-receive-cover__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
-    <view class="jfb-base-card-receive-cover__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view
+      :style="{ height: layoutInfo.bodyMinHeightRpx + 'rpx' }"
+      class="jfb-base-card-receive-cover__body"
+    >
+      <view class="content" :style="contentBgStyle">
+        <view class="content-info">{{ greeting }}</view>
+      </view>
+      <xd-button class="btn" @click="handleToReceive" :style="btnBgStyle"
+        >立即领取</xd-button
+      >
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseCardReceiveCoverMixin from "./JfbBaseCardReceiveCoverMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseCardReceiveCover",
-    components: {
-      XdFontIcon
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import XdButton from "@/components/XdButton/XdButton";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseCardReceiveCoverMixin from "./JfbBaseCardReceiveCoverMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+export default {
+  name: "JfbBaseCardReceiveCover",
+  components: {
+    XdFontIcon,
+    XdButton,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseCardReceiveCoverMixin],
+  data() {
+    return {
+      btnBg: "",
+      contentBg: "",
+      greeting: "我的时代看哈稍等哈手机卡好卡哈哈哈哈哈哈",
+      receive_get_url: "",
+      btnColor: "",
+      transfer_auth_code: null
+    };
+  },
+  computed: {
+    btnBgStyle() {
+      return this.styleObjectToString({
+        backgroundImage: "url(" + this.btnBg + ")",
+        backgroundRepeat: "no-repeat",
+        backgroundSize: "100% 100%",
+        width: "326rpx",
+        height: "90rpx",
+        color: this.btnColor,
+        border: "none",
+      });
     },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseCardReceiveCoverMixin
-    ],
-    data() {
-      return {
-
-        //todo
-      }
+    contentBgStyle() {
+      return this.styleObjectToString({
+        backgroundImage: "url(" + this.contentBg + ")",
+        backgroundRepeat: "no-repeat",
+        backgroundSize: "100% 100%",
+        color: this.mainColor,
+      });
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
-    created() {
-      this.init(this.container);
+  },
+  created() {
+    this.init(this.container);
 
-      //todo
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      this.transfer_auth_code = options.transfer_auth_code
+      jfbRootExec("getReceiveGreetingCard", {
+        vm: this,
+        data: {
+          transfer_auth_code: this.transfer_auth_code,
+        },
+      }).then(res=>{
+        this.greeting = res.transfer_record.greeting
+      }).catch(err=>{
+        console.log(err,'err');
+        
+      })
     },
-    methods: {
-      onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      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)
-      },
-    }
-  }
-
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
+      //this.height = getContainerPropsValue(container, 'content.height', 10);
+    },
+    init(container) {
+      this.btnBg = getContainerPropsValue(container, "content.btnBg", {
+        path: "",
+      }).path;
+      this.contentBg = getContainerPropsValue(container, "content.contentBg", {
+        path: "",
+      }).path;
+      this.receive_get_url = getContainerPropsValue(
+        container,
+        "content.receive_get_url",
+        {
+          value: "",
+        }
+      ).value;
+      this.btnColor = getContainerPropsValue(
+        container,
+        "content.btnColor",
+        "#000"
+      );
+    },
+    handleToReceive() {
+      this.$xdUniHelper.navigateTo({
+        url: `${this.receive_get_url}?transfer_auth_code=${this.transfer_auth_code}`,
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="less">
-  @import "./JfbBaseCardReceiveCoverLess.less";
-
-  .jfb-base-card-receive-cover {
-    &__body{
+@import "./JfbBaseCardReceiveCoverLess.less";
 
+.jfb-base-card-receive-cover {
+  &__body {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: flex-end;
+    .content {
+      position: relative;
+      min-height: 400rpx;
+      min-width: 600rpx;
+      display: flex;
+      justify-content: center;
+      font-size: 40rpx;
+      font-weight: 500;
+      &-info {
+        padding-top: 70rpx;
+        width: 300rpx;
+        text-align: center;
+      }
+    }
+    .btn {
+      margin-top: 50rpx;
+      margin-bottom: 100rpx;
+      font-size: 36rpx;
+      text-align: center;
     }
   }
+}
 </style>

package/src/components/JfbBasePay/Attr.js

@@ -21,6 +21,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '票券支付成功跳转路径:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'rechargeSuccessPath', //form[valueKey]
+        placeholder: '请选择票券支付成功跳转路径',
+        value: data.rechargeSuccessPath || null,
+        groupKey:'advanced',
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
 }

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -227,7 +227,7 @@ export default {
     },
     getSuccessUrl(){
       let url = this.paySuccessPath;
-      if(this.type === 'recharge') {
+      if(this.type === 'recharge'||this.type==='delay') {
         url = this.rechargeSuccessPath || url;
       }
       return url
@@ -252,8 +252,8 @@ export default {
       this.p_getPayOrderDetail();
       this.p_getListUserPayChannel();
 
-      //充值不进行检查订单状态
-      if(this.type !== 'recharge') {
+      //充值延期不进行检查订单状态
+      if((this.type !== 'recharge'&&this.type!=='delay')) {
         this.p_getBaseOrderDetail();
       }
     },
@@ -361,7 +361,7 @@ export default {
     async doThirdPay() {
       if (this.$configProject.isPreview) return;
 
-      if(this.type !== 'recharge') {
+      if((this.type !== 'recharge'&&this.type!=='delay')) {
         await this.p_getBaseOrderDetail();
       }
       const {channel_provider_id, order_id, payInfo} = this;

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -57,7 +57,7 @@
             }"
           >
             <view class="jfb-base-recharge-order__body-order-header">
-              充值订单
+              {{item.source==='recharge'?'充值订单':'延期订单'}}
             </view>
             <view class="jfb-base-recharge-order__body-order-middle">
               <view
@@ -273,7 +273,7 @@ export default {
     },
     handleToPay(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=recharge`,
+        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=${item.source}`,
       });
     },
     handleToDetail(item) {

package/src/components/JfbBaseRechargeOrderDetail/JfbBaseRechargeOrderDetail.vue

@@ -10,25 +10,52 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-recharge-order-detail__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-recharge-order-detail__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
-    <view v-if="info!==null" class="jfb-base-recharge-order-detail__body">
+    <view v-if="info !== null" class="jfb-base-recharge-order-detail__body">
+      <view
+        v-if="info.source === 'delay'"
+        class="jfb-base-recharge-order-detail__body-delay jfb-base-recharge-order-detail__body-card"
+      >
+        <image
+          src="https://img.js.design/assets/img/66bad59319ceba995cccf478.png#fbe012b12eff21137811ee558189f911"
+        ></image>
+        <view class="jfb-base-recharge-order-detail__body-delay-info">
+          <view>{{info.package_name}}</view>
+          <view>
+            <xd-unit
+              :price="info.total_amount"
+              :fontSize="32"
+              :iocnSize="0.32"
+            ></xd-unit>
+          </view>
+        </view>
+      </view>
       <view
         class="jfb-base-recharge-order-detail__body-point jfb-base-recharge-order-detail__body-card"
+        v-if="info.source === 'recharge'"
       >
         <view>充值点数</view>
         <xd-unit
           :price="info.card_point"
           :fontSize="80"
-          :iocnSize="0.50"
+          :iocnSize="0.5"
         ></xd-unit>
       </view>
       <view
+        v-if="info.source === 'recharge'"
         class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
       >
         <view class="jfb-base-recharge-order-detail__body-order-header">
-          <view> 充值订单编号：{{ info.order_id }} </view>
+          <view> 订单编号：{{ info.order_id }} </view>
+          <view
+            class="jfb-base-recharge-order-detail__body-order-header-copy"
+            @click="copy(info.order_id)"
+            >复制单号</view
+          >
         </view>
         <view class="jfb-base-recharge-order-detail__body-order-item">
           <view>充值券号：{{ info.card_number }} </view>
@@ -38,13 +65,39 @@
         </view>
       </view>
       <view
+        v-if="info.source === 'delay'"
+        class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
+      >
+        <view class="jfb-base-recharge-order-detail__body-order-header">
+          <view> 订单编号：{{ info.order_id }} </view>
+          <view
+            class="jfb-base-recharge-order-detail__body-order-header-copy"
+            @click="copy(info.order_id)"
+            >复制单号</view
+          >
+        </view>
+        <view class="jfb-base-recharge-order-detail__body-order-item">
+          <view>延期券号：{{ info.card_number }} </view>
+        </view>
+        <view class="jfb-base-recharge-order-detail__body-order-item">
+          <view>延期时间：{{ info.delay_days }}天</view>
+        </view>
+        <view class="jfb-base-recharge-order-detail__body-order-item">
+          <view>到期时间：{{ info.card_end_time }}</view>
+        </view>
+      </view>
+      <view
+        v-if="info.source === 'recharge'"
         class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
       >
-        <view style="padding-top: 0;" class="jfb-base-recharge-order-detail__body-order-item">
+        <view
+          style="padding-top: 0"
+          class="jfb-base-recharge-order-detail__body-order-item"
+        >
           <view>支付方式：微信</view>
         </view>
         <view class="jfb-base-recharge-order-detail__body-order-item">
-          <view>充值金额：{{ info.pay_amount/100 }} </view>
+          <view>充值金额：{{ info.pay_amount / 100 }} </view>
         </view>
         <view class="jfb-base-recharge-order-detail__body-order-item">
           <view>充值点数：{{ info.card_point }} </view>
@@ -53,6 +106,23 @@
           <view>充值状态：{{ info.pay_status_name }}</view>
         </view>
       </view>
+       <view
+        v-if="info.source === 'delay'"
+        class="jfb-base-recharge-order-detail__body-order jfb-base-recharge-order-detail__body-card"
+      >
+        <view
+          style="padding-top: 0"
+          class="jfb-base-recharge-order-detail__body-order-item"
+        >
+          <view>延期方式：微信</view>
+        </view>
+        <view class="jfb-base-recharge-order-detail__body-order-item">
+          <view>下单时间：{{ info.created_time }} </view>
+        </view>
+        <view class="jfb-base-recharge-order-detail__body-order-item">
+          <view>订单状态：{{ info.pay_status_name }}</view>
+        </view>
+      </view>
     </view>
   </view>
 </template>
@@ -79,9 +149,9 @@ export default {
     };
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
   },
   created() {
@@ -108,18 +178,45 @@ export default {
         },
       })
         .then((res) => {
-
-          res.total_amount = this.$xdUniHelper.divisionFloatNumber(res.total_amount,100);
-          res.card_point = this.$xdUniHelper.divisionFloatNumber(res.card_point,100);
+          res.total_amount = this.$xdUniHelper.divisionFloatNumber(
+            res.total_amount,
+            100
+          );
+          res.card_point = this.$xdUniHelper.divisionFloatNumber(
+            res.card_point,
+            100
+          );
           res["created_time"] = this.$xdUniHelper.getDate(
             res["created_time"] * 1000
           ).fullTime;
+          res["card_end_time"] = this.$xdUniHelper.getDate(
+            res["card_end_time"] * 1000
+          ).fullTime;
           this.info = res;
         })
         .catch((err) => {
           console.log(err, "err");
         });
     },
+    /**
+     *@description 复制功能
+     * @param  text
+     */
+    copy(text) {
+      // #ifdef H5
+      this.$copyText(text).then((res) => {
+        this.$xdAlert({ content: "复制成功" });
+      });
+      // #endif
+      // #ifndef H5
+      uni.setClipboardData({
+        data: text,
+        success: () => {
+          //this.$xdAlert({ content: "复制成功" });
+        },
+      });
+      // #endif
+    },
     onJfbScroll(options) {
       console.log("event.onJfbScroll", options);
     },
@@ -167,6 +264,23 @@ export default {
       font-size: unit(36, rpx);
     }
 
+    &-delay {
+      display: flex;
+      align-items: center;
+      font-size: unit(32, rpx);
+      image {
+        width: 140rpx;
+        height: 140rpx;
+        margin-right: 56rpx;
+      }
+      &-info {
+        height: 140rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+      }
+    }
+
     &-order {
       &-header {
         display: flex;
@@ -177,6 +291,15 @@ export default {
         font-weight: bold;
         padding-bottom: unit(32, rpx);
         border-bottom: unit(2, rpx) solid #f2f2f2;
+        &-copy {
+          border-radius: unit(16, rpx);
+          border: unit(2, rpx) solid #999999;
+          color: #999999;
+          font-size: unit(20, rpx) !important;
+          padding: unit(8, rpx) unit(20, rpx);
+          flex-shrink: 0;
+          margin-left: unit(15, rpx);
+        }
       }
 
       &-item {

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue

@@ -112,7 +112,7 @@ export default {
     },
     handleToPay() {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${this.info.pay_order_id}&main_order_id=${this.order_id}&type=recharge`,
+        url: `${this.payPath}?order_id=${this.info.pay_order_id}&main_order_id=${this.order_id}&type=${this.info.source}`,
       });
     },
     handleToBtn(item) {