jufubao-base 1.0.181-beta1 → 1.0.181

package/src/components/JfbBaseRechargeOrder/JfbBaseRechargeOrder.vue

@@ -16,15 +16,8 @@
     </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,
@@ -49,10 +42,7 @@
         </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"
@@ -67,7 +57,7 @@
             }"
           >
             <view class="jfb-base-recharge-order__body-order-header">
-              {{ type === "recharge" ? "充值订单" : "延期订单" }}
+              充值订单
             </view>
             <view class="jfb-base-recharge-order__body-order-middle">
               <view
@@ -82,21 +72,13 @@
               <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"
@@ -110,6 +92,7 @@
           </view>
         </view>
       </template>
+
     </view>
   </view>
 </template>
@@ -164,13 +147,12 @@ 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: {
@@ -179,7 +161,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")
@@ -197,7 +179,6 @@ export default {
   },
   methods: {
     onJfbLoad(options) {
-      this.type = options.type || "recharge";
       this.getList();
     },
     /**
@@ -260,8 +241,7 @@ export default {
       }).value;
     },
     getList() {
-      let fnName = this.type === "recharge" ? "getRechargeOrderList" : "getDelayOrderList";
-      jfbRootExec(fnName, {
+      jfbRootExec("getRechargeOrderList", {
         vm: this,
         data: {
           page_size: this.page_size,
@@ -284,7 +264,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) => {
@@ -293,12 +273,12 @@ export default {
     },
     handleToPay(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}`,
+        url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.order_id}&type=recharge`,
       });
     },
     handleToDetail(item) {
       this.$xdUniHelper.navigateTo({
-        url: `${this.detailPath}?id=${item.order_id}&type=${this.type}`,
+        url: `${this.detailPath}?id=${item.order_id}`,
       });
     },
 
@@ -310,8 +290,9 @@ export default {
     },
 
     onJfbBack(options) {
-      this.$xdUniHelper.navigateBack();
+      this.$xdUniHelper.navigateBack()
     },
+
   },
 };
 </script>
@@ -325,7 +306,7 @@ export default {
     &-order {
       padding: unit(32, rpx);
       &:last-child {
-        margin-bottom: 0 !important;
+        margin-bottom: 0!important;
       }
 
       &-header {
@@ -335,7 +316,7 @@ export default {
         padding-bottom: unit(24, rpx);
 
         & > view {
-          .skeleton-wrap & {
+          .skeleton-wrap &{
             .skeleton-item(200rpx, 32rpx);
           }
         }
@@ -343,12 +324,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);
           }
         }
@@ -356,19 +337,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,15 +22,4 @@ 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,52 +10,25 @@
       :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="type === '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 v-if="info!==null" class="jfb-base-recharge-order-detail__body">
       <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.5"
+          :iocnSize="0.50"
         ></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
-            class="jfb-base-recharge-order-detail__body-order-header-copy"
-            @click="copy(info.order_id)"
-            >复制单号</view
-          >
+          <view> 充值订单编号：{{ info.order_id }} </view>
         </view>
         <view class="jfb-base-recharge-order-detail__body-order-item">
           <view>充值券号：{{ info.card_number }} </view>
@@ -65,39 +38,13 @@
         </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>
@@ -106,23 +53,6 @@
           <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>
@@ -146,13 +76,12 @@ 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() {
@@ -161,7 +90,6 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.order_id = options.id || options.order_id;
-      this.type = options.type || "recharge";
       this.getDetial();
     },
     /**
@@ -173,56 +101,25 @@ export default {
       //this.height = getContainerPropsValue(container, 'content.height', 10);
     },
     getDetial() {
-      let fnName =
-        this.type === "recharge"
-          ? "getRechargeOrderDetail"
-          : "getDelayOrderDetail";
-      jfbRootExec(fnName, {
+      jfbRootExec("getRechargeOrderDetail", {
         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);
     },
@@ -270,23 +167,6 @@ 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;
@@ -297,15 +177,6 @@ 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,15 +22,4 @@ 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,7 +66,6 @@ export default {
       maxTime: 5, //最长轮询2的N次方（秒）
       date: 2, //时间底数
       time: 1, //时间幂指数
-      type: 'recharge', //延期：delay，充值：recharge
     };
   },
   watch: {
@@ -81,7 +80,6 @@ export default {
   methods: {
     onJfbLoad(options) {
       this.order_id = options.id || options.order_id;
-      this.type = options.type || 'recharge';
       this.getStatus();
     },
     /**
@@ -99,8 +97,7 @@ export default {
       }).value;
     },
     getStatus() {
-      let fnName = this.type === 'recharge' ? 'getRechargeOrderDetail' : 'getDelayOrderDetail';
-      jfbRootExec(fnName, {
+      jfbRootExec("getRechargeOrderDetail", {
         vm: this,
         data: {
           order_id: this.order_id,
@@ -115,13 +112,13 @@ export default {
     },
     handleToPay() {
       this.$xdUniHelper.navigateTo({
-        url: `${this.payPath}?order_id=${this.info.pay_order_id}&main_order_id=${this.order_id}`,
+        url: `${this.payPath}?order_id=${this.info.pay_order_id}&main_order_id=${this.order_id}&type=recharge`,
       });
     },
     handleToBtn(item) {
       if (item.type === "detail") {
         this.$xdUniHelper.navigateTo({
-          url: `${this.detailPath}?id=${this.order_id}&type=${this.type}`,
+          url: `${this.detailPath}?id=${this.order_id}`,
         });
       } else if (item.type === "pay") {
         this.handleToPay()