jufubao-base 1.0.243-beta2 → 1.0.243-beta202

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -152,10 +152,19 @@
               </view>
               <view
                 class="jfb-base-order-list__body-order-item-pay"
-                v-if="item.buttons.length"
+                v-if="isShowFooter(item.buttons)"
               >
                 <view v-for="(btn,index) in item.buttons" :key="btn.key">
+                  <template v-if="btn.action === 'apply_refund'">
+                    <xd-button
+                      v-if="showApplyAfter === 'Y'"
+                      type="default"
+                      size="mini"
+                      @click="handleBtnEvent(btn.action, item)"
+                    >{{ btn.text }}</xd-button>
+                  </template>
                   <xd-button
+                    v-else
                     :type="getBtnType(btn.action)"
                     size="mini"
                     @click="handleBtnEvent(btn.action, item)"
@@ -182,6 +191,7 @@
                 :mainColor="mainColor"
                 :isShowOrderNo="isShowOrderNo"
                 :brandTextColor="brandTextColor"
+                :showApplyAfter="showApplyAfter"
                 :item="item"
                 @handleBtnEvent="action => handleBtnEvent(action, item)"
               ></xd-tfk-order-item>
@@ -243,6 +253,8 @@ export default {
       initStatus: false,
       loadingList: true,
 
+      showApplyAfter: "",
+
       //基础
       radius: 0,
       backgroundColor: "",
@@ -271,6 +283,9 @@ export default {
       layout_style: "old",
       isShowOrderNo: "Y",
 
+      refundPath: "",
+      refundFastPath: "",
+
       noticeBgc:'',
     };
   },
@@ -332,6 +347,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.showApplyAfter = getContainerPropsValue(container, "content.showApplyAfter", "N");
       this.margin = getContainerPropsValue(container, "content.margin", {top: 0, left: 0, right: 0, bottom: 0,});
       this.radius = getContainerPropsValue(container, "content.radius", 0);
       this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", "#f8f8f8");
@@ -360,6 +376,8 @@ export default {
 
       this.detailPath = getContainerPropsValue(container, "content.detailPath", { value: "" }).value;
       this.payPath = getContainerPropsValue(container, "content.payPath", {value: "",}).value;
+      this.refundPath = getContainerPropsValue(container, "content.refundPath", {value: "",}).value;
+      this.refundFastPath = getContainerPropsValue(container, "content.refundFastPath", {value: "",}).value;
       this.layout_style = getContainerPropsValue(container, "content.layout_style", "old");
       this.isShowOrderNo = getContainerPropsValue(container, "content.isShowOrderNo", "Y");
       this.tabList = getContainerPropsValue(container, "content.orderTypeList", []).map((item) => {
@@ -403,7 +421,10 @@ export default {
         },
       });
     },
-
+    isShowFooter(buttons){
+      if(this.showApplyAfter === 'Y') return buttons.length > 0;
+      else return buttons.filter(item => item.action !== 'apply_refund').length > 0;
+    },
     handleBtnEvent(action, item) {
       if (action === "cancel_unpaid") {
         //取消订单
@@ -426,6 +447,32 @@ export default {
         this.$xdUniHelper.navigateTo({
           url: `${this.payPath}?order_id=${item.pay_order_id}&main_order_id=${item.main_order_id}`,
         });
+      } else if( action === 'apply_refund'){
+
+        this.$xdShowLoading({});
+        jfbRootExec("getSupportQuickRefund", {
+          vm: this,
+          data: {
+            main_order_id: item.main_order_id
+          }
+        }).then(res => {
+          this.$xdHideLoading();
+          //普通退款
+          if(res.is_support_quick_refund !== "Y"){
+            this.$xdUniHelper.navigateTo({
+              url: `${this.refundPath}?order_id=${item.main_order_id}`,
+            });
+          }else{
+            //极速退款
+            this.$xdUniHelper.navigateTo({
+              url: `${this.refundFastPath}?order_id=${item.main_order_id}`,
+            });
+          }
+        }).catch(err => {
+          this.$xdHideLoading();
+        })
+
+        
       }
     },
 
@@ -439,6 +486,7 @@ export default {
           tab,
           page_size: this.page_size,
           page_token: this.page_token,
+          is_show_after_btn: this.showApplyAfter === 'Y' ? 1 : 0
         },
       })
         .then((res) => {

package/src/components/JfbBaseOrderList/Mock.js

@@ -25,7 +25,7 @@ module.exports = {
         "product_thumb": "\/\/sandbox-img.jufubao.cn\/uploads\/20230506\/40018e35f8d9b3bcc2f180cfe073ce28.png",
         "sale_price": 2678
       }],
-      "buttons": [{"text": "支付", "action": "pay"}, {"text": "取消订单", "action": "cancel_unpaid"}]
+      "buttons": [{"text": "支付", "action": "pay"}, {"text": "取消订单", "action": "cancel_unpaid"}, { "text": "申请退款", "action": "apply_refund"}]
     },
       {
       "main_order_id": "m513033785675509760",

package/src/components/JfbBaseOrderList/XdTfkOrderItem.vue

@@ -83,10 +83,21 @@
     </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>
+      <template v-for="(btn,index) in item.buttons">
+        <template v-if="btn.action === 'apply_refund'">
+          <view class="btn"
+            v-if="showApplyAfter === 'Y'"
+            :key="btn.key"
+            @click="handleBtnEvent(btn.action, item)"
+          >{{btn.text}}</view>
+        </template>
+        <view class="btn"
+          v-else
+          :key="btn.key"
+          @click="handleBtnEvent(btn.action, item)"
+        >{{btn.text}}</view>
+      </template>
+     
     </view>
   </view>
 </template>
@@ -106,7 +117,8 @@
       isShowOrderNo: {
         type: String,
       },
-      brandTextColor: String
+      brandTextColor: String,
+      showApplyAfter: String
     },
     data(){
       return{

package/src/components/JfbBasePay/Attr.js

@@ -8,6 +8,58 @@ export default {
   advanced: [],
   content: data=>{
     return [
+      {
+        label: "仍需扣点文案:",
+        ele: "el-input",
+        valueKey: "text1",
+        value: data.text1 || "仍需扣点",
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "（可使用多张票券点数）是否展示",
+        ele: 'xd-radio',
+        valueKey: "showText2",
+        value: data.showText2 || 'Y',
+        groupKey: "content",
+        inline: true,
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" },
+        ],
+      },
+      data.showText2 === 'Y' && {
+        label: "（可使用多张票券点数）文案:",
+        ele: "el-input",
+        valueKey: "text2",
+        value: data.text2 || '（可使用多张票券点数）',
+        placeholder: '（可使用多张票券点数）',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "选择以下补差方式文案:",
+        ele: "el-input",
+        valueKey: "text3",
+        value: data.text3 || '选择以下补差方式',
+        groupKey: "content",
+        inline: false,
+        className: "input80",
+      },
+      {
+        label: "是否展示继续补差",
+        ele: "xd-radio",
+        valueKey: "showContinuePay",
+        value: data.showContinuePay || 'Y',
+        groupKey: "content",
+        inline: true,
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "不展示", value: "N" },
+        ],
+      },
       ...styleForm.getForm(data),
       {
         label: '支付成功跳转路径:', //label

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">{{text1}}<text v-if="showText2==='Y'" class="label_sub">{{ text2 }}</text></view>
             <view class="column_value text-primary">
               <xd-unit
                 :price="payInfo.channel_amount"
@@ -112,8 +112,8 @@
           </view>
         </view>
         <view class="remain_header">
-          <view>选择以下补差方式</view>
-          <view class="flex align-center text-primary">
+          <view>{{ text3 }}</view>
+          <view v-if="showContinuePay==='Y'" class="flex align-center text-primary">
             <view class="margin-right">继续补差</view>
             <xd-unit
               :price="payInfo.channel_amount"
@@ -146,11 +146,14 @@
       <view class="bottom_btn-mask"></view>
       <view v-if="is_can_pay==='Y'" class="bottom_btn" :style="prod_bottom">
         <xd-button
-          width="360rpx"
+          width="480rpx"
           type="primary"
           radius="50rpx"
           @click="doThirdPay"
-        >确认</xd-button>
+        >
+          确认支付 
+          ￥{{ $xdUniHelper.divisionFloatNumber(payInfo.channel_amount, 100) }}
+        </xd-button>
       </view>
     </view>
   </view>
@@ -174,6 +177,7 @@ import {isWechat,isWechatTools} from "@/utils/xd.base";
 import color from "color";
 const Color = require('color');
 let styleForm = new StyleForm({bgColor: '#fafafa'}, getContainerPropsValue, 'pay', true);
+import { mapState } from "vuex";
 
 export default {
   name: "JfbBasePay",
@@ -212,7 +216,12 @@ export default {
       rechargeSuccessPath: "", //充值成功
       ...styleForm.getDataItem(),
       borderColor:'rgba(0,0,0,0)',
-      options:{}
+      options:{},
+      text1: "",
+      text2: "",
+      text3: "",
+      showText2: "Y",
+      showContinuePay: "",
     };
   },
   watch: {
@@ -222,6 +231,9 @@ export default {
     },
   },
   computed: {
+    ...mapState({
+      siteInfo: state => state.siteInfo,
+    }),
     prod_bottom() { 
       return this.fixedStyle({ height: 0, zIndex: 111 });
     },
@@ -262,6 +274,11 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.text1 = getContainerPropsValue(container, 'content.text1', "仍需扣点");
+      this.text2 = getContainerPropsValue(container, 'content.text2', "（可使用多张票券点数）");
+      this.text3 = getContainerPropsValue(container, 'content.text3', "选择以下补差方式");
+      this.showText2 = getContainerPropsValue(container, 'content.showText2', "Y");
+      this.showContinuePay = getContainerPropsValue(container, 'content.showContinuePay', 'Y');
       this.paySuccessPath = getContainerPropsValue(
         container,
         "content.pay_success_path",
@@ -302,11 +319,10 @@ export default {
           this.is_can_pay = is_can_pay;
           this.can_pay_message = can_pay_message;
           if(is_can_pay !== "Y"){
-            this.$xdAlert({
-              content: can_pay_message,
-              time: 2500,
-              isClose: false,
-              zIndex: 5000
+            uni.showToast({
+              title: can_pay_message,
+              icon: 'none',
+              duration: 3000
             });
             reject();
             // this.$xdNavigateBack()
@@ -369,11 +385,9 @@ export default {
       let {login_providers = []} = this.projectAttr;
       console.log(this.projectAttr)
       if (+payInfo.channel_amount > 0 && !this.channel_provider_id) {
-        this.$xdAlert({
-          content: '请选择支付方式',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        uni.showToast({
+          title: "请选择支付方式",
+          icon: "none",
         });
         return false;
       }
@@ -445,32 +459,23 @@ export default {
         success: (res) => {
           this.$xdLog.setARMSInfo({options:this.options, res}, 'pay_success');
           console.log("pay success", res);
-          this.$xdAlert({
-            content: '支付成功',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
+          uni.showToast({
+            title: "支付成功",
           });
           cb(res);
         },
         cancel: () => {
           this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
-          this.$xdAlert({
-            content: '取消支付',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
+          uni.showToast({
+            title: "取消支付",
           });
         },
         fail: (error) => {
           if (typeof error === 'string') error = {error: error}
           if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
           this.$xdLog.setARMSError(error)
-          this.$xdAlert({
-            content: '支付失败',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
+          uni.showToast({
+            title: "支付失败",
           });
         },
       });
@@ -480,11 +485,9 @@ export default {
         ...paySignData,
         success: (res) => {
           this.$xdLog.setARMSInfo({options: this.options, res}, 'pay_success');
-          this.$xdAlert({
-            content: '支付成功',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
+          uni.showToast({
+            title: "支付成功",
+            icon: "none",
           });
           cb(res);
         },
@@ -493,11 +496,9 @@ export default {
             options: this.options,
             error: JSON.stringify(err)
           });
-          this.$xdAlert({
-            content: '支付失败',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
+          uni.showToast({
+            title: "支付失败",
+            icon: "none",
           });
         },
       });

package/src/components/JfbBasePay/Mock.js

@@ -24,15 +24,6 @@ module.exports = {
         "card_use_price": 10000,
         "use_card_point": "5000"
       },
-      {
-        "card_number": "101001000005195",
-        "card_type_name": "聚福宝福卡测试蛋糕",
-        "end_time": 1679034403,
-        "card_point": 5000,
-        "is_bind_card": true,
-        "card_use_price": 10000,
-        "use_card_point": "5000"
-      },
     ],
   },
   getBaseOrderStatus:{},

package/src/components/JfbBasePersonalData/Api.js

@@ -0,0 +1,26 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Personal
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getBasePersonInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: 'setBasePersonInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/update-user-info',
+    data: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  }
+];

package/src/components/JfbBasePersonalData/Attr.js

@@ -0,0 +1,13 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+    ].filter(i=>i)
+  },
+  advanced: [],
+};