jufubao-base 1.0.243-beta2 → 1.0.243-beta201

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -155,7 +155,16 @@
                 v-if="item.buttons.length"
               >
                 <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) => {
@@ -426,6 +444,18 @@ 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'){
+        //普通退款
+        if(item.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}`,
+          });
+        }
       }
     },
 

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/JfbBasePay.vue

@@ -302,11 +302,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 +368,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 +442,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 +468,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 +479,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/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -395,11 +395,9 @@ export default {
       if (this.jfbTimeer > 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;
       }
@@ -436,22 +434,8 @@ export default {
     doLoginForm() {
       const { provider_id } = this;
       const { phone_number, verification_code, user_name } = this.accountForm;
-      if (!phone_number || !verification_code) {
-        return this.$xdAlert({
-          content: '手机号跟验证码不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
-      }
-      if(this.isCollectUsername && !user_name){
-        return this.$xdAlert({
-          content: '用户名不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
-      }
+      if (!phone_number || !verification_code) return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
+      if(this.isCollectUsername && !user_name) return uni.showToast({ title: "用户名不能为空", icon: "none" });
 
       this.$xdShowLoading({})
       jfbRootExec("phoneCollect", {

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -133,16 +133,27 @@
         >暂不登录，去逛逛</view> -->
       </view>
       <xd-dialog :show.sync="showDialog"
-        title="系统提示"
         :showClose="false"
-        :btnRadius="60"
-        maskAutoClose>
+        maskAutoClose
+        :showTitle="false">
         <view class="p_dialog_content">
-          <view class="cont_text">检测到短信发送异常<br/>您是否跳过当前步骤</view>
+          <view class="">
+            <xd-font-icon icon="iconmingchengtubiao" :size="48" color="#666"></xd-font-icon>
+          </view>
+          <view class="cont_text">检测到短信发送异常<br/>是否跳过手机号收集？</view>
         </view>
-        <view slot="btn" class="btn_foot">
-          <xd-button width="240rpx" type="info" @click="p_loginNotJump">取消</xd-button>
-          <xd-button width="240rpx" type="primary" @click="p_loginJumpPhone">跳过</xd-button>
+        <view slot="btn" class="btn_foot" style="background-color: #DDD;">
+          <view class="btn_item not_jump_btn" :style="{
+            backgroundColor: '#FFF',
+          }"
+          @click="p_loginNotJump"
+          >不跳过</view>
+          <view class="btn_item" :style="{
+            backgroundColor: mainColor,
+            color: '#FFF'
+          }"
+          @click="p_loginJumpPhone"
+          >跳过</view>
         </view>
       </xd-dialog>
     </view>
@@ -497,11 +508,9 @@ export default {
       if (this.jfbTimeer > 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;
       }
@@ -574,20 +583,10 @@ export default {
       const { auth_code, provider_id } = this;
       const { phone_number, verification_code, user_name } = this.accountForm;
       if (!phone_number || !verification_code){
-        return this.$xdAlert({
-          content: '手机号跟验证码不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
+        return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
       }
       if(this.isCollectUsername && !user_name){
-        return this.$xdAlert({
-          content: '用户名不能为空',
-          time: 2500,
-          isClose: false,
-          zIndex: 5000
-        });
+        return uni.showToast({ title: "用户名不能为空", icon: "none" });
       }
       this.$xdShowLoading({});
       jfbRootExec("phoneLogin", {
@@ -654,12 +653,12 @@ export default {
     ::v-deep .xd-dailog__body{
       overflow: hidden;
     }
-    // ::v-deep .xd-dailog__body-content{
-    //   padding: 0;
-    //   overflow: hidden;
-    // }
+    ::v-deep .xd-dailog__body-content{
+      padding: 0;
+      overflow: hidden;
+    }
     .p_dialog_content{
-      padding: 20rpx 0rpx;
+      padding: 100rpx 0rpx;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -667,7 +666,7 @@ export default {
         text-align: left;
         margin-left: 12rpx;
         font-size: 32rpx;
-        color: #999999;
+        color: #333;
       }
     }
     .btn_foot{

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

@@ -528,14 +528,10 @@
       async toBindCardTicket(){
         console.log(this.form, 'this.form')
         const { card_password, card_number, valid_code } = this.form;
-        if(!valid_code){
-          return this.$xdAlert({
-            content: '请输入验证码',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
-          });
-        }
+        if(!valid_code) return uni.showToast({
+          title: '请输入验证码',
+          icon: "none"
+        })
         this.$xdShowLoading({});
 
         this.checkValidToken().then(() => {
@@ -560,11 +556,9 @@
         const { code } = this.form;
 
         if(!code) {
-          this.$xdAlert({
-            content: '请输入电子码',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
+          uni.showToast({
+            title: '请输入电子码',
+            icon: "none"
           });
           return ""
         };
@@ -592,11 +586,10 @@
             if(res.is_valid){
               r();
             }else{
-              this.$xdAlert({
-                content: '验证码错误',
-                time: 2500,
-                isClose: false,
-                zIndex: 5000
+              uni.showToast({
+                title: '验证码错误',
+                duration: 2000,
+                icon: "none"
               });
               this.switchValidToken();
               j();

package/src/components/JfbBaseWalletItem/JfbBaseWalletItem.vue

@@ -303,11 +303,9 @@ export default {
         },
         fail: function () {
           // 复制失败，提示用户
-          this.$xdAlert({
-            content: '复制失败',
-            time: 2500,
-            isClose: false,
-            zIndex: 5000
+          uni.showToast({
+            title: "复制失败",
+            icon: "none",
           });
         },
       });