jufubao-base 1.0.181-beta9 → 1.0.182-beta1

package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue

@@ -0,0 +1,246 @@
+<template>
+  <view class="xd-tfk-order-item">
+    <view class="o_header">
+      <view class="h_l">
+        <xd-font-icon
+          v-if="item.biz_code_icon"
+          :icon="item.biz_code_icon"
+          :size="item['biz_code_icon_size']"
+        ></xd-font-icon>
+        <view :class="{ marginLeft: item.biz_code_icon }" style="margin-left: 20rpx;">{{item.biz_code_name }}</view>
+      </view>
+      <view v-if="isShowOrderNo==='N'" class="o_status" :style="{
+        color:item.status.status_type !== 'error' ? mainColor : '#999999',
+      }">{{ item.status.status_name }}</view>
+    </view>
+    <view class="o_title" v-if="isShowOrderNo==='Y'">
+      <view class="o_number">订单编号:{{ item.main_order_id }}</view>
+      <view class="o_status" :style="{
+        color:item.status.status_type !== 'error' ? mainColor : '#999999',
+      }">{{ item.status.status_name }}</view>
+    </view>
+    <view class="prod_list">
+      <!-- 单个商品展示商品信息 -->
+      <template v-if="item.products.length == 1">
+        <view class="one_prod" v-for="Sitem in item.products" :key="Sitem.key">
+          <view class="prod_img">
+            <image :src="Sitem.product_thumb" style="background: #ffffff" mode="aspectFill"></image>
+          </view>
+          <view class="prod_info">
+            <view class="prod_name">{{ Sitem.product_name }}</view>
+            <view v-if="Sitem.brand_name" class="prod_brand" :style="{color: brandTextColor}">{{ Sitem.brand_name }}</view>
+            <view v-if="Sitem.product_sku_name" class="prod_sku">规格：{{ Sitem.product_sku_name }}</view>
+            <view class="prod_price">
+              <view>￥448</view>
+              <view class="info-price">
+                <text>x</text>
+                <text>{{ Sitem.product_num }}</text>
+              </view>
+            </view>
+          </view>
+        </view>
+      </template>
+
+      <!-- 多个商品展示更多商品信息 -->
+      <view v-if="item.products.length > 1" class="more_prod">
+        <view class="img_list">
+          <view class="prod_img" v-for="prod in item.products" :key="prod.key">
+            <image :src="prod.product_thumb" style="background: #ffffff" mode="aspectFit"></image>
+          </view>
+        </view>
+        <view class="right_arrow">
+          <xd-font-icon icon='iconxiangyou_xian' :size="26" color="#bdc0c5"></xd-font-icon>
+        </view>
+      </view>
+    </view>
+    <view class="prod_total">
+      <view></view>
+      <view style="display: flex;align-items: center;">
+        共{{item.products.length}}件商品 实付
+        <xd-unit
+          :isOld="false"
+          :price="item.total_amount"
+          :color="mainColor"
+          :fontSize="28"></xd-unit>
+      </view>
+    </view>
+    <view v-if="item.buttons.length" class="prod_footer">
+      <view style="flex: 1;"></view>
+      <view class="btn" 
+        v-for="(btn,index) in item.buttons" :key="btn.key"
+        @click="handleBtnEvent(btn.action, item)"
+      >{{btn.text}}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon"
+  import XdUnit from "@/components/XdUnit/XdUnit"
+  export default{
+    name:"XdTfkOrderItem",
+    components: {
+      XdFontIcon,
+      XdUnit,
+    },
+    props:{
+      item: Object,
+      mainColor: String,
+      isShowOrderNo: {
+        type: String,
+      },
+      brandTextColor: String
+    },
+    data(){
+      return{
+      }
+    },
+    methods:{
+      handleBtnEvent(action){
+        this.$emit('handleBtnEvent', action)
+      },
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+  .xd-tfk-order-item{
+    padding-left: 30rpx;
+    overflow: hidden;
+    .o_header{
+      height: 90rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px solid #EDEDED;
+      padding-right: 30rpx;
+      color: #333333;
+      font-size: 28rpx;
+
+      .h_l{
+        display: flex;
+        align-items: center;
+      }
+    }
+    .o_title{
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-right: 30rpx;
+      color: #333333;
+      font-size: 24rpx;
+      border-bottom: 1px solid #EDEDED;
+    }
+    .one_prod{
+      display: flex;
+      align-items: center;
+      width: 100%;
+      padding: 30rpx 30rpx 30rpx 0;
+      box-sizing: border-box;
+      .prod_img{
+        width: 140rpx;
+        height: 140rpx;
+        background-color: #f5f5f9;
+        image{
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .prod_info{
+        flex: 1;
+        padding-left: 30rpx;
+        .prod_name{
+          color: #2e2f30;
+          font-size: 30rpx;
+        }
+        .prod_brand{
+          font-size: 24rpx;
+          margin-top: 8rpx;
+        }
+        .prod_sku{
+          color: #797d82;
+          font-size: 24rpx;
+          margin-top: 8rpx;
+        }
+      }
+      .prod_price{
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        color: rgb(46, 47, 48);
+        font-size: 30rpx;
+        margin-top: 12rpx;
+        .info-price{
+          display: flex;
+          color: #bdc0c5;
+          font-size: 26rpx;
+        }
+      }
+    }
+    .prod_list{
+      position: relative;
+      .right_arrow{
+        position: absolute;
+        right: 0px;
+        height: 100%;
+        width: 60rpx;
+        top: 0;
+        background: #FFF;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+    .more_prod{
+      display: flex;
+      flex-wrap: nowrap;
+      overflow: auto;
+      padding: 30rpx 30rpx 30rpx 0;
+      width: 100%;
+      .img_list{
+        display: flex;
+        flex-wrap: nowrap;
+        padding-right: 60rpx;
+      }
+      .prod_img{
+        width: 140rpx;
+        height: 140rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        image{
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+    .prod_total{
+      height: 80rpx;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-right: 30rpx;
+      border-top: 1px solid #EDEDED;
+      color: #2e2f30;
+      font-size: 26rpx;
+    }
+    .prod_footer{
+      padding: 16rpx 30rpx 16rpx 0;
+      display: flex;
+      align-items: center;
+      border-top: 1px solid #EDEDED;
+      .btn{
+        width: 170rpx;
+        height: 66rpx;
+        border: 1px solid #EDEDED;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-left: 20rpx;
+        color: #2e2f30;
+        font-size: 24rpx;
+      }
+    }
+  }
+</style>

package/src/components/JfbBasePay/Attr.js

@@ -16,18 +16,6 @@ export default {
         placeholder: '请选择支付成功路径',
         value: data.pay_success_path || null,
         groupKey:'advanced',
-        setting: {
-          router: XdBus.getParentApi('getPag©esTree'),
-        },
-        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'),
         },

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -100,7 +100,7 @@
       <view class="remain_pay" v-if="payInfo.channel_amount > 0">
         <view style="border-bottom: 2rpx solid #eee;" class="column-group">
           <view class="column-item" style="padding: 30rpx 60rpx">
-            <view class="column_label">仍需扣点<text class="label_sub">（可使用多张票券点数）</text></view>
+            <view class="column_label">仍需支付<text class="label_sub">（可使用多张票券支付）</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
@@ -112,9 +112,9 @@
           </view>
         </view>
         <view class="remain_header">
-          <view>选择以下补差方式</view>
+          <view>选择以下支付方式</view>
           <view class="flex align-center text-primary">
-            <view class="margin-right">继续补差</view>
+            <view class="margin-right">继续支付</view>
             <xd-unit
               :price="payInfo.channel_amount"
               :is-show-icon="false"
@@ -150,7 +150,7 @@
           type="primary"
           radius="50rpx"
           @click="doThirdPay"
-        >确认</xd-button>
+        >确认支付</xd-button>
       </view>
     </view>
   </view>
@@ -222,12 +222,12 @@ export default {
     },
   },
   computed: {
-    prod_bottom() { 
+    prod_bottom() {
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
     getSuccessUrl(){
       let url = this.paySuccessPath;
-      if(this.type === 'recharge'||this.type==='delay') {
+      if(this.type === 'recharge') {
         url = this.rechargeSuccessPath || url;
       }
       return url
@@ -252,8 +252,8 @@ export default {
       this.p_getPayOrderDetail();
       this.p_getListUserPayChannel();
 
-      //充值延期不进行检查订单状态
-      if((this.type !== 'recharge'&&this.type!=='delay')) {
+      //充值不进行检查订单状态
+      if(this.type !== 'recharge') {
         this.p_getBaseOrderDetail();
       }
     },
@@ -361,7 +361,7 @@ export default {
     async doThirdPay() {
       if (this.$configProject.isPreview) return;
 
-      if((this.type !== 'recharge'&&this.type!=='delay')) {
+      if(this.type !== 'recharge') {
         await this.p_getBaseOrderDetail();
       }
       const {channel_provider_id, order_id, payInfo} = this;
@@ -416,15 +416,9 @@ export default {
               },
             })
               .then((res) => {
-                if(this.type) {
-                  this.$xdUniHelper.redirectTo({
-                    url: this.getSuccessUrl + `?order_id=${this.main_order_id}&type=${this.type}`
-                  });
-                } else {
-                  this.$xdUniHelper.redirectTo({
-                    url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
-                  });
-                }
+                this.$xdUniHelper.redirectTo({
+                  url: this.getSuccessUrl + `?order_id=${this.main_order_id}`
+                });
               })
               .catch(error=>{
                 this.$xdLog.setARMSCustomError('update_loading_fail', {options: this.options, error});

package/src/components/JfbBasePosterType/JfbBasePosterType.vue

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

package/src/components/JfbBaseRechargeOrder/Api.js

@@ -22,16 +22,5 @@ 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,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,
-  },
 ];