jufubao-base 1.0.252 → 1.0.253

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.252",
+  "version": "1.0.253",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCardBindV2/JfbBaseCardBindV2.vue

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

package/src/components/JfbBaseCardDetailEntry/Attr.js

@@ -26,6 +26,17 @@ export default {
           });
       },
     },
+    {
+      label: "是否展示主业务线",
+      ele: "xd-radio",
+      valueKey: "isShowBuss",
+      groupKey:'content',
+      value: 'N',
+      list: [
+        {label: "展示", value: "Y"},
+        {label: "隐藏", value: "N"},
+      ]
+    },
     {
       label: '票券解绑成功回跳地址:',
       ele: 'xd-select-pages-path',

package/src/components/JfbBaseCardDetailEntry/JfbBaseCardDetailEntry.vue

@@ -51,14 +51,12 @@
           <view class="card_sec">券号：{{ info.card_number }}</view>
           <view class="card_sec">有效期：{{ info.end_time }}</view>
           <view class="card_sec">
-            余额：{{ info.card_point }}{{ info.unit }}
-            <text v-if="info.other_card_point && info.card_point_type === 2"
+            <text>{{isShowBuss==='Y'?info.main_business_code_name:''}}余额：{{ info.card_point }}{{ info.unit }}</text>
+            <text
+              v-if="info.other_card_point && info.card_point_type === 2"
               style="font-size: 24rpx;margin-left: 20rpx;"
             >(购买其他物品可抵：{{info.other_card_point}} {{ info.unit }})</text>
           </view>
-          <!-- <view class="card_other" v-if="info.other_card_point && info.card_point_type === 2">
-            <text>购买其他物品可抵：</text><text>{{info.other_card_point}} {{ info.unit }}</text>
-          </view> -->
         </view>
       </view>
       <view
@@ -145,6 +143,7 @@ export default {
     return {
       userInfo: null, //用户信息（暂时不可用）
       entryGroupId: '',//加载入口数据组别
+      isShowBuss:'N',//是否展示主营业务线
 
       info: null,
       timeStr: "",
@@ -225,6 +224,7 @@ export default {
      * @param container {object} 业务组件对象自己
      */
     init(container) {
+      this.isShowBuss = getContainerPropsValue(container, 'content.isShowBuss', 'N')
       this.backUrl = getContainerPropsValue(container,  "content.back_url", { value: "" }).value;
       this.shift_url = getContainerPropsValue(container,  "content.shift_url", { value: "" }).value;
       this.give_url = getContainerPropsValue(container,  "content.give_url", { value: "" }).value;
@@ -574,7 +574,7 @@ export default {
       border-radius: 24rpx;
       padding: 24rpx;
 
-      
+
       &-title{
         display: flex;
         font-size: 32rpx;

package/src/components/JfbBaseCardEntry/Attr.js

@@ -61,11 +61,11 @@ export default {
             //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
             //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
           }
-  
+
           //获取返回参数(场景类型名称为必填)
           //获取返回参数(场景类型名称为必填)
           let loading = { close(){}}
-  
+
           //获取显示内容
           if (action === 'screen') {
             XdBus.getParentApi('getOptionsSettingList')({setting_id: 'edtix_bucket_content_tip'})
@@ -77,9 +77,9 @@ export default {
                 console.error(error);
                 loading.close();
               });
-  
+
           }
-  
+
           //获取返回参数(广告位高度必选项)
           if (action === 'getNewsInfo') {
             XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
@@ -92,7 +92,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //获取产品业务线列表
           if (action === 'namespace') {
             XdBus.getParentApi('getOptionsNamespaces')({})
@@ -105,7 +105,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //使用内容分类
           if (action === 'cmsPublishEditxContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -120,7 +120,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置列表
           if (action === 'getListPostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -134,7 +134,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //位置创建
           if (action === 'addPostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -149,7 +149,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置编辑
           if (action === 'editPostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -164,7 +164,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //位置删除
           if (action === 'deleltePostion') {
             loading = XdBus.getParentApi('loading')({});
@@ -179,7 +179,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //获取广告位内容列表
           if (action === 'getListContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -193,7 +193,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //广告内容创建
           if (action === 'addContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -208,7 +208,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容编辑
           if (action === 'editContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -223,7 +223,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //广告内容删除
           if (action === 'deleteContent') {
             loading = XdBus.getParentApi('loading')({});
@@ -238,7 +238,7 @@ export default {
                 data.cb(false)
               });
           }
-  
+
           //内容发布
           if (action === 'publish') {
             loading = XdBus.getParentApi('loading')({});
@@ -253,7 +253,7 @@ export default {
                 console.error(error);
               });
           }
-  
+
           //通知页面进行刷新
           if (action === 'update') {
             loading = XdBus.getParentApi('loading')({});
@@ -276,6 +276,17 @@ export default {
         inline: false,
         notice: '当未设置文案时候，前台页面显示为"<span style="color:red">已登录</span>"，建议不超过<span style="color:red">4</span>个汉字'
       },
+      {
+        label: "是否展示主业务线",
+        ele: "xd-radio",
+        valueKey: "isShowBuss",
+        groupKey:'content',
+        value: data['isShowBuss'] || "N",
+        list: [
+          {label: "展示", value: "Y"},
+          {label: "隐藏", value: "N"},
+        ]
+      },
       {
         label: "是否展示核销二维码",
         ele: "xd-radio",

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -211,7 +211,7 @@
                       <text>{{item.end_time}}</text>
                     </view>
                     <view class="card-list__yue">
-                      <text>余额：</text>
+                      <text>{{isShowBuss==='Y'?item.main_business_code_name:''}}余额：</text>
                       <text>{{item.card_point}} {{ item.unit }}</text>
                     </view>
                     <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
@@ -388,7 +388,7 @@
               <text>{{item.end_time}}</text>
             </view>
             <view class="card-list__yue">
-              <text>余额：</text>
+              <text>{{item.main_business_code_name}}余额：</text>
               <text>{{item.card_point}} {{ item.unit }}</text>
             </view>
             <view class="card-list__other" v-if="item.other_card_point && item.card_point_type === 2">
@@ -511,6 +511,7 @@ export default {
       inCallbackUrlOrg:'',//是否带有回调地址
       isChange:'N',
       isTransfering:'N',
+      isShowBuss:'N',
 
       //提示文案
       noticeBackgroundColor: "",
@@ -619,6 +620,7 @@ export default {
       this.cardLayout = getContainerPropsValue(container,"content.cardLayout","1");
       this.changeUrl = getContainerPropsValue(container,"content.change_url",{value: ""}).value;
       this.disabledUrl = getContainerPropsValue(container,"content.disabled_url",{value: ""}).value;
+      this.isShowBuss = getContainerPropsValue(container,'content.isShowBuss', 'N')
       this.bindUrl = getContainerPropsValue(container,"content.bind_url",{value: ""}).value;
       this.detailUrl = getContainerPropsValue(container,"content.detail_url",{value: ""}).value;
       this.confirmUrl = getContainerPropsValue(container,"content.confirm_url",{value: ""}).value;

package/src/components/JfbBaseCardEntry/Mock.js

@@ -3,6 +3,25 @@
 module.exports = {
   getListEntryCardBind: {
     "list": [
+      {"card_number":"101001000006820",
+        "card_point":4989,
+        "card_type":"59",
+        "card_type_name":"多余额福卡2",
+        "unit":"点",
+        "end_time":"2024-09-09",
+        "is_valid":"Y",
+        "main_business_code_name":"电影(勿改)、蛋糕(勿改)",
+        "other_card_point":3991,
+        "is_exchange":"N",
+        "card_point_type":2,
+        "business_codes":["cake","market","movie"],
+        "is_login":"N",
+        "consume_type":"1",
+        "card_use_rule":"可凭本票券到电影(勿改)、商城(对应百货)(勿改)、蛋糕(勿改)使用",
+        "is_transfering":"N",
+        "show_name":"多余额福卡2",
+        "is_show_baseinfo":"N","is_gift":"N"
+      },
       {
         "card_number": "101001000008422",
         "card_point": 100000,
@@ -16,7 +35,7 @@ module.exports = {
         "is_exchange": "N",
         "is_transfering":"Y",
         "card_point_type": 1,
-        "is_login":'Y',
+        "is_login":'N',
         "is_gift":"Y",
         "business_codes": ["health"]
       }, {

package/src/components/JfbBaseCardGive/JfbBaseCardGive.vue

@@ -27,9 +27,7 @@
           <view class="card_info">
             <view class="card_type">券号：{{ info.card_number }}</view>
             <view class="card_sec">有效期：{{ info.end_time }}</view>
-            <view class="card_sec"
-              >余额：{{ info.card_point }}{{ info.unit }}</view
-            >
+            <view class="card_sec">余额：{{ info.card_point }}{{ info.unit }}</view>
             <view
               class="card_other"
               v-if="info.other_card_point && info.card_point_type === 2"
@@ -136,7 +134,7 @@
             <xd-button @click="toSeeShareImg" width="260rpx" type="primary" size="small"
               >查看分享图片</xd-button>
           </view>
-          
+
           <!-- #endif -->
         </view>
       </xd-dailog>

package/src/components/JfbBaseCardInfoEntry/Attr.js

@@ -26,30 +26,6 @@ export default {
           });
       },
     },
-    {
-      label: '票券绑定成功回跳地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'back_url',
-      groupKey:'advanced',
-      placeholder: '请选择票券绑定成功回跳地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
-    {
-      label: '我的票券跳转地址:',
-      ele: 'xd-select-pages-path',
-      valueKey: 'my_card_url',
-      groupKey:'advanced',
-      placeholder: '请选择我的票券跳转地址',
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree'),
-      },
-      inline: false,
-    },
     {
       label: '票券号码框自定义文案:',
       ele: 'el-input',
@@ -80,6 +56,41 @@ export default {
         {label: "是", value: "Y"},
         {label: "否", value: "N"},
       ]
-    }
+    },
+    {
+      label: "是否展示主业务线",
+      ele: "xd-radio",
+      valueKey: "isShowBuss",
+      groupKey:'content',
+      value: 'N',
+      list: [
+        {label: "展示", value: "Y"},
+        {label: "隐藏", value: "N"},
+      ]
+    },
+    {
+      label: '票券绑定成功回跳地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'back_url',
+      groupKey:'advanced',
+      placeholder: '请选择票券绑定成功回跳地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+    {
+      label: '我的票券跳转地址:',
+      ele: 'xd-select-pages-path',
+      valueKey: 'my_card_url',
+      groupKey:'advanced',
+      placeholder: '请选择我的票券跳转地址',
+      value: null,
+      setting: {
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
   ],
 };

package/src/components/JfbBaseCardInfoEntry/JfbBaseCardInfoEntry.vue

@@ -85,7 +85,7 @@
               <text>{{info.end_time}}</text>
             </view>
             <view class="card-list__yue" v-if="isShowBalance">
-              <text>余额：</text>
+              <text>{{isShowBuss==='Y'?info.main_business_code_name:''}}余额：</text>
               <text>{{info.card_point}} {{ info.unit }}</text>
             </view>
             <view class="card-list__other" v-if="info.is_bind_show_other_point === 'Y' && info.other_card_point && info.card_point_type === 2">
@@ -158,6 +158,7 @@ export default {
       card_pwd_placeholder: "",
       showInfo: false,
       entryGroupId: '',//加载入口数据组别
+      isShowBuss:'N',//是否展示主营业务线
 
       qrcode: "", //二维码
       showForm: true,
@@ -242,7 +243,8 @@ export default {
             this.handlerAfterBindCard(res);
           })
           .catch();
-      } else {
+      }
+      else {
         jfbRootExec("pwdCardBindEntry", {
           vm: this,
           data: {
@@ -313,6 +315,7 @@ export default {
       this.card_pwd_placeholder = getContainerPropsValue(container, "content.card_pwd_placeholder", "请输入密码");
       this.my_card_url = getContainerPropsValue(container, 'content.my_card_url', { value: "" }).value;
       this.is_show_balance = getContainerPropsValue(container, 'content.is_show_balance', "N");
+      this.isShowBuss = getContainerPropsValue(container, 'content.isShowBuss', 'N')
       //'wechat_mini_program|default'
       this.entryGroupId = getContainerPropsValue(container,"content.entryGroupId","default");
     },

package/src/components/JfbBaseConDialog/JfbBaseConDialog.vue

@@ -312,8 +312,7 @@ export default {
         if(res.receive_method !== "batch") {
           if(res.can_take === "Y" && res.has_times === "Y" && list.length > 0){
           if (this.isPreview) {
-            console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
-            this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+            this.isShow = getContainerPropsValue(this.container, "content.is_show_dailog", 'Y') === 'N';
             }else this.isShow = true;
           }else{
             this.handleCardBindClose();
@@ -324,8 +323,8 @@ export default {
           } else {
             if(res.can_take === "Y"){
             if (this.isPreview) {
-              console.log(getContainerPropsValue(value, "content.is_show_dailog", 'Y'))
-              this.isShow = getContainerPropsValue(value, "content.is_show_dailog", 'Y') === 'N';
+              console.log(getContainerPropsValue(this.container, "content.is_show_dailog", 'Y'))
+              this.isShow = getContainerPropsValue(this.container, "content.is_show_dailog", 'Y') === 'N';
               }else this.isShow = true;
             }else{
               this.handleCardBindClose();
@@ -374,7 +373,7 @@ export default {
           });
           setTimeout(()=>{
             this.getDialogList();
-          },2000)          
+          },2000)
           return;
         }
         this.order_num = res.tmp_order_number;

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

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

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

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

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

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

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -138,8 +138,22 @@
       },
       doSetPassword(){
         const { password, confirm_password } = this.resetForm;
-        if(!password || !confirm_password) return uni.showToast({title: "请输入密码",icon: 'none'});
-        if(password !== confirm_password) return uni.showToast({title: "密码不一致",icon: 'none'});
+        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
+          });
+        }
 
         let typeFn = "resetPwd"
         if(this.pwd_type == 1) typeFn = "setPwd"

package/src/components/JfbBaseMapOverlay/JfbBaseMapOverlay.vue

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

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -319,10 +319,11 @@ export default {
           this.is_can_pay = is_can_pay;
           this.can_pay_message = can_pay_message;
           if(is_can_pay !== "Y"){
-            uni.showToast({
-              title: can_pay_message,
-              icon: 'none',
-              duration: 3000
+            this.$xdAlert({
+              content: can_pay_message,
+              time: 2500,
+              isClose: false,
+              zIndex: 5000
             });
             reject();
             // this.$xdNavigateBack()
@@ -385,9 +386,11 @@ export default {
       let {login_providers = []} = this.projectAttr;
       console.log(this.projectAttr)
       if (+payInfo.channel_amount > 0 && !this.channel_provider_id) {
-        uni.showToast({
-          title: "请选择支付方式",
-          icon: "none",
+        this.$xdAlert({
+          content: '请选择支付方式',
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
         });
         return false;
       }
@@ -459,23 +462,32 @@ export default {
         success: (res) => {
           this.$xdLog.setARMSInfo({options:this.options, res}, 'pay_success');
           console.log("pay success", res);
-          uni.showToast({
-            title: "支付成功",
+          this.$xdAlert({
+            content: '支付成功',
+            time: 2500,
+            isClose: false,
+            zIndex: 5000
           });
           cb(res);
         },
         cancel: () => {
           this.$xdLog.setARMSInfo(this.options, 'cancel_pay');
-          uni.showToast({
-            title: "取消支付",
+          this.$xdAlert({
+            content: '取消支付',
+            time: 2500,
+            isClose: false,
+            zIndex: 5000
           });
         },
         fail: (error) => {
           if (typeof error === 'string') error = {error: error}
           if (window['jwxJfbSDKParams']) error = Object.assign(error, paySignData, window['jwxJfbSDKParams'])
           this.$xdLog.setARMSError(error)
-          uni.showToast({
-            title: "支付失败",
+          this.$xdAlert({
+            content: '支付失败',
+            time: 2500,
+            isClose: false,
+            zIndex: 5000
           });
         },
       });
@@ -485,9 +497,11 @@ export default {
         ...paySignData,
         success: (res) => {
           this.$xdLog.setARMSInfo({options: this.options, res}, 'pay_success');
-          uni.showToast({
-            title: "支付成功",
-            icon: "none",
+          this.$xdAlert({
+            content: '支付成功',
+            time: 2500,
+            isClose: false,
+            zIndex: 5000
           });
           cb(res);
         },
@@ -496,9 +510,11 @@ export default {
             options: this.options,
             error: JSON.stringify(err)
           });
-          uni.showToast({
-            title: "支付失败",
-            icon: "none",
+          this.$xdAlert({
+            content: '支付失败',
+            time: 2500,
+            isClose: false,
+            zIndex: 5000
           });
         },
       });

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

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

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -133,27 +133,16 @@
         >暂不登录，去逛逛</view> -->
       </view>
       <xd-dialog :show.sync="showDialog"
+        title="系统提示"
         :showClose="false"
-        maskAutoClose
-        :showTitle="false">
+        :btnRadius="60"
+        maskAutoClose>
         <view class="p_dialog_content">
-          <view class="">
-            <xd-font-icon icon="iconmingchengtubiao" :size="48" color="#666"></xd-font-icon>
-          </view>
-          <view class="cont_text">检测到短信发送异常<br/>是否跳过手机号收集？</view>
+          <view class="cont_text">检测到短信发送异常<br/>您是否跳过当前步骤</view>
         </view>
-        <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 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>
       </xd-dialog>
     </view>
@@ -516,9 +505,11 @@ export default {
       if (this.jfbTimeer > 0) return;
       const { phone_number } = this.accountForm;
       if (!/^1[3-9]\d{9}$/.test(phone_number)) {
-        uni.showToast({
-          title: "请填写正确的手机号",
-          icon: "none",
+        this.$xdAlert({
+          content: '请填写正确的手机号',
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
         });
         return false;
       }
@@ -592,10 +583,20 @@ export default {
       const { auth_code, provider_id } = this;
       const { phone_number, verification_code, user_name } = this.accountForm;
       if (!phone_number || !verification_code){
-        return uni.showToast({ title: "手机号跟验证码不能为空", icon: "none" });
+        return this.$xdAlert({
+          content: '手机号跟验证码不能为空',
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
+        });
       }
       if(this.isCollectUsername && !user_name){
-        return uni.showToast({ title: "用户名不能为空", icon: "none" });
+        return this.$xdAlert({
+          content: '用户名不能为空',
+          time: 2500,
+          isClose: false,
+          zIndex: 5000
+        });
       }
       this.$xdShowLoading({});
       jfbRootExec("phoneLogin", {
@@ -663,12 +664,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: 100rpx 0rpx;
+      padding: 20rpx 0rpx;
       display: flex;
       align-items: center;
       justify-content: center;
@@ -676,7 +677,7 @@ export default {
         text-align: left;
         margin-left: 12rpx;
         font-size: 32rpx;
-        color: #333;
+        color: #999999;
       }
     }
     .btn_foot{

package/src/components/JfbBaseTfkCardBind/JfbBaseTfkCardBind.vue

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

package/src/components/JfbBaseWalletItem/JfbBaseWalletItem.vue

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