jufubao-base 1.0.243-beta2 → 1.0.243-beta201

package/src/components/JfbBaseAfterSalesList/Mock.js

@@ -0,0 +1,362 @@
+"use strict";
+
+module.exports = {
+  getAfterServiceOrderList: {
+    list: [
+      {
+        main_order_id: "m751032915998359578",
+        service_order_id: "so762621229997408268",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1740020734,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 60038026,
+            product_name: "卡密取卡测试商品-兑换码",
+            product_sku_id: "0",
+            product_sku_name: "",
+            product_num: 1,
+            sale_price: 1001,
+            thumb: "//sandbox-img.jufubao.cn/uploads/20250219/144b27ad32143856af7cd56b5561c382.jpg",
+            after_count: 1,
+            refund_amount: 1001,
+            gift_id: 0,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "蛋糕(勿改)",
+        business_icon: "",
+        business_code: "cake",
+        after_order_id: "a751035152917192705",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "m740577429104705537",
+        service_order_id: "so762621221919117325",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1737527447,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 60031268,
+            product_name: "礼包-商品3",
+            product_sku_id: "0",
+            product_sku_name: "",
+            product_num: 1,
+            sale_price: 9270,
+            thumb: "//sandbox-img.jufubao.cn/uploads/20241226/ea3e20a74abb9a47b1707d020a3c4b10.jpeg",
+            after_count: 1,
+            refund_amount: 9270,
+            gift_id: 1775541,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "礼包(勿改)",
+        business_icon: "",
+        business_code: "gift",
+        after_order_id: "a740577550684426240",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "m740573565349609473",
+        service_order_id: "so762621221768749060",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1737526543,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 60031268,
+            product_name: "礼包-商品3",
+            product_sku_id: "0",
+            product_sku_name: "",
+            product_num: 1,
+            sale_price: 9270,
+            thumb: "/uploads/20241226/ea3e20a74abb9a47b1707d020a3c4b10.jpeg",
+            after_count: 1,
+            refund_amount: 9270,
+            gift_id: 1775541,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "礼包(勿改)",
+        business_icon: "",
+        business_code: "gift",
+        after_order_id: "a740573757845233664",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "m738480254887477249",
+        service_order_id: "so762621219337035799",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1737027483,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 60031268,
+            product_name: "礼包-商品3",
+            product_sku_id: "0",
+            product_sku_name: "",
+            product_num: 1,
+            sale_price: 9270,
+            thumb: "//sandbox-img.jufubao.cn/uploads/20241226/ea3e20a74abb9a47b1707d020a3c4b10.jpeg",
+            after_count: 1,
+            refund_amount: 9270,
+            gift_id: 1775541,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "礼包(勿改)",
+        business_icon: "",
+        business_code: "gift",
+        after_order_id: "a738480549507104768",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "m738110635274223617",
+        service_order_id: "so762621217958711311",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1736939406,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 452,
+            product_name: "【热销超百万】辣堡藤椒堡任选2件套MT23",
+            product_sku_id: "086a90b11b9d4084aed343f1e5da3363",
+            product_sku_name: "【热销超百万】辣堡藤椒堡任选2件套MT23",
+            product_num: 1,
+            sale_price: 1790,
+            thumb: "//sandbox-img.jufubao.cn/other/meituan-200_200.png",
+            after_count: 1,
+            refund_amount: 2059,
+            gift_id: 0,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "蛋糕(勿改)",
+        business_icon: "",
+        business_code: "cake",
+        after_order_id: "a738111130461335553",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "m738089357565837313",
+        service_order_id: "so762621217799405579",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1736937818,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 451,
+            product_name: "那爷火锅海鲜大排档单人餐",
+            product_sku_id: "1603e3c907b199602c5d1ab129b06250",
+            product_sku_name: "那爷火锅海鲜大排档单人餐",
+            product_num: 1,
+            sale_price: 3990,
+            thumb: "/other/meituan-200_200.png",
+            after_count: 1,
+            refund_amount: 4589,
+            gift_id: 0,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "蛋糕(勿改)",
+        business_icon: "",
+        business_code: "cake",
+        after_order_id: "a738104468956561409",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "c737312647604871168",
+        service_order_id: "so762621216906330120",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1736749455,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 54,
+            product_name: "蛋糕自定义（使用中）",
+            product_sku_id: "0",
+            product_sku_name: "",
+            product_num: 1,
+            sale_price: 100,
+            thumb: "",
+            after_count: 1,
+            refund_amount: 400,
+            gift_id: 0,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "蛋糕(勿改)",
+        business_icon: "",
+        business_code: "cake",
+        after_order_id: "a737314416675721217",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "c737271378876567553",
+        service_order_id: "so762621216344469518",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1736739204,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 262,
+            product_name: "幸福西饼、goodlike品牌",
+            product_sku_id: "0",
+            product_sku_name: "",
+            product_num: 1,
+            sale_price: 200,
+            thumb: "",
+            after_count: 1,
+            refund_amount: 500,
+            gift_id: 0,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "蛋糕(勿改)",
+        business_icon: "",
+        business_code: "cake",
+        after_order_id: "a737271421289738241",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      },
+      {
+        main_order_id: "m733291561033744385",
+        service_order_id: "so762621205763829773",
+        customer_feedback: "",
+        sub_order_id: "",
+        after_sale_method: "refund_and_good",
+        after_sale_method_name: "退款",
+        refund_voucher: "",
+        after_sale_type: "",
+        after_sale_type_name: "",
+        created_time: 1735792178,
+        refund_goods_data: "",
+        product_list: [
+          {
+            product_id: 60031266,
+            product_name: "礼包-商品1",
+            product_sku_id: "0",
+            product_sku_name: "",
+            product_num: 1,
+            sale_price: 19999,
+            thumb: "/uploads/20241226/cfbc3bbb57583a3beac3dc9f70b26ef6.jpeg",
+            after_count: 1,
+            refund_amount: 19999,
+            gift_id: 1775549,
+            brand_id: 0,
+            brand_name: ""
+          }
+        ],
+        refund_settlement: [],
+        new_product_list: [],
+        business_name: "礼包(勿改)",
+        business_icon: "",
+        business_code: "gift",
+        after_order_id: "a733299305361567744",
+        progress: [],
+        express_info: null,
+        is_show_delete_btn: "Y",
+        is_show_cancel_btn: "N"
+      }
+    ],
+    next_page_token: "3",
+    total_size: 905,
+    request_id: "448a3876e113db4e"
+  }
+};

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

@@ -157,12 +157,10 @@
       },
       handleBindCard(){
         if(!this.cardForm.valid_code){
-          this.$xdAlert({
-            content: '请输入验证码',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
-          });
+          uni.showToast({
+            title: "请输入验证码",
+            icon: "none"
+          })
           return;
         }
         jfbRootExec("pwdCardBind", {

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -265,12 +265,10 @@ export default {
             this.dialogShow = false;
             this.handleConfirm();
           }else{
-            this.$xdAlert({
-              content: '签名不能为空',
-              time: 2500,
-              isClose: false,
-              zIndex: 5000
-            });
+            uni.showToast({
+              title: "签名不能为空",
+              icon: "none"
+            })
           }
         }
       })
@@ -412,20 +410,16 @@ export default {
     },
     handleSendCode() {
       if (this.phoneNumber.length < 11) {
-        this.$xdAlert({
-          content: '请输入11位手机号',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        uni.showToast({
+          title: "请输入11位手机号",
+          icon: "none",
         });
         return;
       }
       if (!this.validatePhoneNumber(this.phoneNumber)) {
-        this.$xdAlert({
-          content: '手机号格式不正确',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        uni.showToast({
+          title: "手机号格式不正确",
+          icon: "none",
         });
         return;
       }

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -890,11 +890,9 @@ export default {
       if (this.time > 0) return;
       const { phone_number } = this.accountForm;
       if (!/^1[3-9]\d{9}$/.test(phone_number)) {
-        this.$xdAlert({
-          content: '请填写正确的手机号',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        uni.showToast({
+          title: "请填写正确的手机号",
+          icon: "none",
         });
         return false;
       }
@@ -1030,11 +1028,9 @@ export default {
       else if (accountLoginType === "pwd" && !password)
         err_tip = "密码不能为空";
       if (err_tip) {
-        return this.$xdAlert({
-          content: err_tip,
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        return uni.showToast({
+          title: err_tip,
+          icon: "none",
         });
       }
 

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -154,11 +154,9 @@ export default {
       if (this.time > 0) return;
       const { phone_number } = this.resetForm;
       if (!/^1[3-9]\d{9}$/.test(phone_number)) {
-        this.$xdAlert({
-          content: '请填写正确的手机号',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        uni.showToast({
+          title: "请填写正确的手机号",
+          icon: "none",
         });
         return false;
       }
@@ -187,11 +185,9 @@ export default {
     toResetPassword() {
       const { verification_code, phone_number } = this.resetForm;
       if (!verification_code || !phone_number) {
-        return this.$xdAlert({
-          content: '填写手机号跟验证码',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
+        return uni.showToast({
+          title: "填写手机号跟验证码",
+          icon: "none",
         });
       }
       jfbRootExec("verifyPhoneCode", {

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -138,22 +138,8 @@
       },
       doSetPassword(){
         const { password, confirm_password } = this.resetForm;
-        if(!password || !confirm_password){
-          return this.$xdAlert({
-            content: '请输入密码',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
-          });
-        }
-        if(password !== confirm_password){
-          return this.$xdAlert({
-            content: '密码不一致',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
-          });
-        }
+        if(!password || !confirm_password) return uni.showToast({title: "请输入密码",icon: 'none'});
+        if(password !== confirm_password) return uni.showToast({title: "密码不一致",icon: 'none'});
 
         let typeFn = "resetPwd"
         if(this.pwd_type == 1) typeFn = "setPwd"

package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlay.vue

@@ -114,11 +114,9 @@
           if(res['is_ifream'] === 'Y') {
             // #ifdef MP
             if(!res.url){
-              return this.$xdAlert({
-                content: 'URL不存在',
-                time: 2500,
-                isClose: false,
-                zIndex: 5000
+              return uni.showToast({
+                title: 'URL不存在',
+                duration: 2000
               });
             }
             this.$xdUniHelper.redirectTo({

package/src/components/JfbBaseOrderDetail/Attr.js

@@ -5,6 +5,18 @@ export default {
   advanced: [],
   content: (data)=>{
     return [
+      {
+        label: "申请售后:",
+        ele: 'xd-radio',
+        valueKey: "showApplyAfter",
+        value: data.showApplyAfter || 'N',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ],
+        groupKey:'content',
+        labelInline: true,
+      },
       {
         label: '业务类型预览（只是预览模式生效）',
         ele: "xd-select-list",
@@ -646,6 +658,30 @@ export default {
           { label: '隐藏', value: '0' },
         ]
       },
+      {
+        label: '售后服务页面路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'refundPath',
+        groupKey:'advanced',
+        placeholder: '请选择普通售后服务路径',
+        value: data['refundPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '极速退款页面路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'refundFastPath',
+        groupKey:'advanced',
+        placeholder: '请选择极速退款页面路径',
+        value: data['refundFastPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
 }

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -865,6 +865,8 @@ export default {
       dialogPassword: "",
       dialogCode: null,
 
+      showApplyAfter: "",
+
       //基础
       radius: 0,
       backgroundColor: "",
@@ -900,6 +902,8 @@ export default {
       is_show_all_detail: '',
       showPreviewCode: true,
       is_show_product: "",
+      refundPath: "",
+      refundFastPath: "",
       btnTextSize: 20,
     };
   },
@@ -1195,10 +1199,13 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.showApplyAfter = getContainerPropsValue(container, "content.showApplyAfter", "");
+
       this.bgColor = this.$colorChange(this.mainColor).alpha(0.1).toString();
       this.brandPath = getContainerPropsValue(container, "content.brandPath", {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.packageListPath = getContainerPropsValue(container, "content.packageListPath", { value: "" }).value;
       this.webViewPath = getContainerPropsValue(container, "content.webViewPath", {value: "",}).value;
@@ -1380,6 +1387,19 @@ export default {
           },
         });
       }
+      else if(item.action === 'apply_refund'){
+        //普通退款
+        if(this.info.is_support_quick_refund !== "Y"){
+          this.$xdUniHelper.navigateTo({
+            url: `${this.refundPath}?order_id=${this.main_order_id}`,
+          });
+        }else{
+          //极速退款
+          this.$xdUniHelper.navigateTo({
+            url: `${this.refundFastPath}?order_id=${this.main_order_id}`,
+          });
+        }
+      }
       else {
         console.error(`item.action=${item.action}, 此action不可用`)
       }

package/src/components/JfbBaseOrderList/Attr.js

@@ -4,6 +4,18 @@ export default {
   style: [],
   content: (data)=>{
     return [
+      {
+        label: "申请售后:",
+        ele: 'xd-radio',
+        valueKey: "showApplyAfter",
+        value: data.showApplyAfter || 'N',
+        list: [
+          {label: '展示', value: 'Y'},
+          {label: '隐藏', value: 'N'},
+        ],
+        groupKey:'content',
+        labelInline: true,
+      },
       {
         label: "布局样式配置",
         ele: "xd-radio",
@@ -264,6 +276,30 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '售后服务页面路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'refundPath',
+        groupKey:'advanced',
+        placeholder: '请选择普通售后服务路径',
+        value: data['refundPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '极速退款页面路径:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'refundFastPath',
+        groupKey:'advanced',
+        placeholder: '请选择极速退款页面路径',
+        value: data['refundFastPath'] || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],