jufubao-base 1.0.182-beta1 → 1.0.184-beta1

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

@@ -56,7 +56,6 @@
     mixins: [componentsMixins,extsMixins,JfbBasePosterTypeMixin],
     data() {
       return {
-        hideMask: true,
         params: {},
 				//Swiper 配置
         posterPosition: null,

package/src/components/JfbBaseRechargeOrder/Api.js

@@ -22,5 +22,16 @@ module.exports = [
     },
     isConsole: true,
     disabled: true,
+  }, {
+    mapFnName: 'getDelayOrderList',
+    title: '获取卡延期订单列表',
+    path: '/card/v1/card-delay/list-order',
+    isRule: false,
+    params: {
+      page_size: ['page_size', 'Number', true],
+      page_token: ['page_token', 'Number', true]
+    },
+    isConsole: true,
+    disabled: true,
   },
 ];

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -16,8 +16,15 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-recharge-order__body">
-      <view v-if="loadingList" :style="{ padding: outMargin }" class="skeleton-wrap">
-        <view v-for="i in 3" :key="i" class="jfb-base-recharge-order__body-order"
+      <view
+        v-if="loadingList"
+        :style="{ padding: outMargin }"
+        class="skeleton-wrap"
+      >
+        <view
+          v-for="i in 3"
+          :key="i"
+          class="jfb-base-recharge-order__body-order"
           :style="{
             background: backgroundColor,
             border: borderBox,
@@ -42,7 +49,10 @@
         </view>
       </view>
       <template v-else>
-        <view v-if="orderList&&orderList.length>0" :style="{ padding: outMargin }">
+        <view
+          v-if="orderList && orderList.length > 0"
+          :style="{ padding: outMargin }"
+        >
           <view
             v-for="(item, index) in orderList"
             :key="index"
@@ -57,7 +67,7 @@
             }"
           >
             <view class="jfb-base-recharge-order__body-order-header">
-              充值订单
+              {{ type === "recharge" ? "充值订单" : "延期订单" }}
             </view>
             <view class="jfb-base-recharge-order__body-order-middle">
               <view
@@ -72,13 +82,21 @@
               <view>交易日期：{{ item.created_time }} </view>
             </view>
             <view
-              style="margin-top: 32rpx; display: flex; justify-content: space-between"
+              style="
+                margin-top: 32rpx;
+                display: flex;
+                justify-content: space-between;
+              "
             >
-            <view style="display: flex; align-items: center;font-size: 24rpx;"
-                >合计：<xd-unit :fontSize="24" iconSize="0.24" :price="item.total_amount"></xd-unit
+              <view style="display: flex; align-items: center; font-size: 24rpx"
+                >合计：<xd-unit
+                  :fontSize="24"
+                  iconSize="0.24"
+                  :price="item.total_amount"
+                ></xd-unit
               ></view>
               <xd-button
-              v-if="item.pay_status !== '3000'"
+                v-if="item.pay_status !== '3000'"
                 width="200rpx"
                 style="margin: 0"
                 size="mini"
@@ -92,7 +110,6 @@
           </view>
         </view>
       </template>
-
     </view>
   </view>
 </template>
@@ -147,12 +164,13 @@ export default {
         right: 0,
         bottom: 0,
       },
+      type: "recharge",
     };
   },
   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);
     },
   },
   computed: {
@@ -161,7 +179,7 @@ export default {
       str = `${str} ${this.checkValue(this.margin.right, 20)}rpx`;
       str = `${str} ${this.checkValue(this.margin.bottom, 20)}rpx`;
       str = `${str} ${this.checkValue(this.margin.left, 20)}rpx`;
-      return str
+      return str;
     },
     shadowBox() {
       if (this.is_shadow === "Y")
@@ -179,6 +197,7 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
+      this.type = options.type || "recharge";
       this.getList();
     },
     /**
@@ -241,7 +260,8 @@ export default {
       }).value;
     },
     getList() {
-      jfbRootExec("getRechargeOrderList", {
+      let fnName = this.type === "recharge" ? "getRechargeOrderList" : "getDelayOrderList";
+      jfbRootExec(fnName, {
         vm: this,
         data: {
           page_size: this.page_size,
@@ -264,7 +284,7 @@ export default {
             }
             return item;
           });
-          this.hasNext = res.next_page_token !== '';
+          this.hasNext = res.next_page_token !== "";
           this.next_page_token = res.next_page_token;
         })
         .catch((err) => {
@@ -273,12 +293,12 @@ 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}`,
       });
     },
     handleToDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.detailPath}?id=${item.order_id}`,
+        url: `${this.detailPath}?id=${item.order_id}&type=${this.type}`,
       });
     },
 
@@ -290,9 +310,8 @@ export default {
     },
 
     onJfbBack(options) {
-      this.$xdUniHelper.navigateBack()
+      this.$xdUniHelper.navigateBack();
     },
-
   },
 };
 </script>
@@ -306,7 +325,7 @@ export default {
     &-order {
       padding: unit(32, rpx);
       &:last-child {
-        margin-bottom: 0!important;
+        margin-bottom: 0 !important;
       }
 
       &-header {
@@ -316,7 +335,7 @@ export default {
         padding-bottom: unit(24, rpx);
 
         & > view {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(200rpx, 32rpx);
           }
         }
@@ -324,12 +343,12 @@ export default {
 
       &-middle {
         & > view:first-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(400rpx, 32rpx);
           }
         }
         & > view:last-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(100rpx, 32rpx);
           }
         }
@@ -337,19 +356,19 @@ export default {
 
       &-bottom {
         border-bottom: unit(2, rpx) solid #f2f2f2;
-        padding-bottom: unit(32,rpx);
+        padding-bottom: unit(32, rpx);
 
         & > view:first-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(400rpx, 32rpx);
           }
         }
       }
       &-bbb {
-        padding: unit(32,rpx) 0 0;
+        padding: unit(32, rpx) 0 0;
 
         & > view:first-child {
-          .skeleton-wrap &{
+          .skeleton-wrap & {
             .skeleton-item(100%, 32rpx);
           }
         }

package/src/components/JfbBaseRechargeOrderDetail/Api.js

@@ -22,4 +22,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getDelayOrderDetail',
+    title: '获取卡延期订单详情',
+    path: '/card/v1/card-recharge/get-order',
+    isRule: false,
+    params: {
+      order_id: ['订单id', 'Number', true],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

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="type === 'delay'"
+        class="jfb-base-recharge-order-detail__body-delay jfb-base-recharge-order-detail__body-card"
+      >
+        <image
+          src="https://img3.jufubao.cn/uploads/20240911/f013c774b2ae205e13d1e9cad062b5db.jpg?ver=1726047927908"
+        ></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="type === 'recharge'"
       >
         <view>充值点数</view>
         <xd-unit
           :price="info.card_point"
           :fontSize="80"
-          :iocnSize="0.50"
+          :iocnSize="0.5"
         ></xd-unit>
       </view>
       <view
+        v-if="type === '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="type === '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="type === '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="type === '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>
@@ -76,12 +146,13 @@ export default {
     return {
       order_id: "",
       info: null,
+      type: "recharge", //延期：delay，充值：recharge
     };
   },
   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() {
@@ -90,6 +161,7 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.order_id = options.id || options.order_id;
+      this.type = options.type || "recharge";
       this.getDetial();
     },
     /**
@@ -101,25 +173,56 @@ export default {
       //this.height = getContainerPropsValue(container, 'content.height', 10);
     },
     getDetial() {
-      jfbRootExec("getRechargeOrderDetail", {
+      let fnName =
+        this.type === "recharge"
+          ? "getRechargeOrderDetail"
+          : "getDelayOrderDetail";
+      jfbRootExec(fnName, {
         vm: this,
         data: {
           order_id: this.order_id,
         },
       })
         .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 +270,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: center;
+      }
+    }
+
     &-order {
       &-header {
         display: flex;
@@ -177,6 +297,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/Api.js

@@ -22,4 +22,15 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'getDelayOrderDetail',
+    title: '获取卡延期订单详情',
+    path: '/card/v1/card-delay/get-order',
+    isRule: false,
+    params: {
+      order_id: ['订单id', 'Number', true],
+    },
+    isConsole: true,
+    disabled: true,
+  },
 ];

package/src/components/JfbBaseRechargeSuccess/Attr.js

@@ -8,7 +8,7 @@ export default {
   content: (data) => {
     return [
       {
-        label: '充值成功去订单详情地址:',
+        label: '卡券操作成功去订单详情地址:',
         ele: 'xd-select-pages-path',
         valueKey: 'detailPath',
         groupKey:'advanced',

package/src/components/JfbBaseRechargeSuccess/JfbBaseRechargeSuccess.vue

@@ -66,6 +66,7 @@ export default {
       maxTime: 5, //最长轮询2的N次方（秒）
       date: 2, //时间底数
       time: 1, //时间幂指数
+      type: 'recharge', //延期：delay，充值：recharge
     };
   },
   watch: {
@@ -80,6 +81,7 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.order_id = options.id || options.order_id;
+      this.type = options.type || 'recharge';
       this.getStatus();
     },
     /**
@@ -97,7 +99,8 @@ export default {
       }).value;
     },
     getStatus() {
-      jfbRootExec("getRechargeOrderDetail", {
+      let fnName = this.type === 'recharge' ? 'getRechargeOrderDetail' : 'getDelayOrderDetail';
+      jfbRootExec(fnName, {
         vm: this,
         data: {
           order_id: this.order_id,
@@ -112,13 +115,13 @@ 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}`,
       });
     },
     handleToBtn(item) {
       if (item.type === "detail") {
         this.$xdUniHelper.navigateTo({
-          url: `${this.detailPath}?id=${this.order_id}`,
+          url: `${this.detailPath}?id=${this.order_id}&type=${this.type}`,
         });
       } else if (item.type === "pay") {
         this.handleToPay()

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -167,7 +167,6 @@
     ],
     data() {
       return {
-        // hideMask: true,
         menuType: "card", // card, coupon
         loadingList: true,
         cardList: [],

package/src/components/JfbBaseAddress/XdTfkItem.vue

@@ -1,117 +0,0 @@
-<template>
-  <view class="xd-tfk-item" @click="handleSelectAddress">
-    <view class="item_top">
-      <view class="user_info">
-        {{ item.name }} <text style="margin-left: 20rpx;">{{ item.phone }}</text>
-        <view v-if="item.is_valid === 'N'"
-          style="position: absolute; right: 40rpx;top: 0;"
-        >
-          <xd-font-icon
-            size="32"
-            :color="dangerColor"
-            icon="iconmingchengtubiao"
-          ></xd-font-icon>
-        </view>
-      </view>
-      <view class="user_adr">{{item.province_name}}{{item.city_name}}{{item.area_name}}{{item.street_name}}{{ item.address_detail }} {{ item.house_number }}</view>
-    </view>
-    <view class="item_bottom">
-      <view class="is_default" @click.native.stop="setDefault">
-        <xd-radio :value="item.is_default === 'Y'" :width="52" :height="52" :iconSize="20"></xd-radio>
-        <view v-if="item.is_default === 'Y'">默认地址</view>
-        <view v-else>设为默认</view>
-      </view>
-      <view class="item_opera">
-        <view class="o_i" style="margin-right: 30rpx;" @click.native.stop="handleEdit">
-          <xd-font-icon class="icon" :icon="edit_icon" :size="26"></xd-font-icon> 编辑
-        </view>
-        <view class="o_i" @click.native.stop="handleDel">
-          <xd-font-icon class="icon" :icon="delete_icon" :size="26"></xd-font-icon> 删除
-        </view>
-      </view>
-    </view>
-  </view>
-</template>
-<script>
-  import XdRadio from "@/components/XdRadio/XdRadio"
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
-  export default{
-    name:"XdTfkItem",
-    components: {
-      XdRadio,
-      XdFontIcon,
-    },
-    props:{
-      edit_icon: String,
-      delete_icon: String,
-      item: Object,
-      dangerColor: String,
-    },
-    data(){
-      return{
-      }
-    },
-    created(){
-    },
-    methods:{
-      handleSelectAddress(){
-        this.$emit("selectAddress")
-      },
-      handleEdit(){
-        this.$emit("editAddress", this.item)
-      },
-      handleDel(){
-        this.$emit("delAddress", this.item)
-      },
-      setDefault(){
-        this.$emit("setDefault", this.item)
-      }
-    },
-  }
-</script>
-<style lang="less" scoped>
-  .xd-tfk-item{
-    .item_top{
-      padding: 30rpx;
-    }
-    .user_info{
-      color: #191a1b;
-      font-size: 30rpx;
-      position: relative;
-    }
-    .user_adr{
-      color: #797d82;
-      font-size: 26rpx;
-      margin-top: 6rpx;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-    }
-    .item_bottom{
-      display: flex;
-      justify-content: space-between;
-      padding: 20rpx;
-      border-top: 1px solid #ededed;
-    }
-    .item_opera{
-      display: flex;
-      color: #797d82;
-      align-items: center;
-      .o_i{
-        display: flex;
-        align-items: center;
-        font-size: 26rpx;
-
-        .icon{
-          margin-right: 10rpx;
-        }
-      }
-    }
-    .is_default{
-      display: flex;
-      align-items: center;
-      font-size: 26rpx;
-      color: #797d82;
-    }
-  }
-</style>