jufubao-base 1.0.253-beta1 → 1.0.254-beta1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.253-beta1",
+  "version": "1.0.254-beta1",
   "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/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/JfbBaseConsumpCode/JfbBaseConsumpCode.vue

@@ -195,7 +195,8 @@
         jwxSDK: null,
         refresh: true, //onshow是否刷新数据
         showLocationDialog: false,
-        cityPath: ''
+        cityPath: '',
+        resource_shop_id: ''
       }
     },
     watch: {
@@ -252,7 +253,7 @@
       // #endif
     },
     methods: {
-      async onJfbLoad(options) {
+      async onJfbLoad(options) {        
         this.xnamespace = this.projectAttr.business_code
         this.getUserInfo()
         this.options = options
@@ -281,6 +282,7 @@
           }).then(res => {
             if (res && res.list.length > 0) {
               this.shop_id = res.list[0].shop_id;
+              this.resource_shop_id = res.list[0].resource_shop_id;
               this.shopName = res.list[0].resource_shop_name;
               this.showMask = true;
               this.showDialog = true;
@@ -291,6 +293,7 @@
           })
         } else {
           this.shop_id = this.options.shop_id;
+          this.resource_shop_id = this.options.resource_shop_id;
           this.p_getAsyncStep();
         }
       },
@@ -372,12 +375,16 @@
       p_getQuickPayQRCode() {
         return new Promise((resolve, reject) => {
           this.$xdShowLoading({});
+          let data = {
+            shop_id: this.shop_id,
+            temp_order_id: this.temp_order_id,
+            business_code: this.xnamespace,
+            resource_shop_id: this.resource_shop_id
+          }
+          if(data.resource_shop_id) delete data.shop_id
           jfbRootExec("getConsumpCode", {
             vm: this,
-            data: {
-              shop_id: this.shop_id,
-              temp_order_id: this.temp_order_id,
-            }
+            data: data
           }).then(res => {
             this.$xdHideLoading();
             this.plusDiscount = res.plus_discount

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/JfbBaseNoticeDialog/Attr.js

@@ -271,6 +271,7 @@ export default {
         list: [
           { label: '全部用户', value: 'all' },
           { label: '仅会员', value: 'vip' },
+          { label: '非会员', value: 'notvip' },
         ]
       },
       {

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -152,10 +152,14 @@ export default {
             } else {
               if(this.showGroup==='all') {
                 this.handlePop();
-              }else {        
+              } else if(this.showGroup==='vip') {        
                 if(this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP') {
                   this.handlePop();
                 }
+              } else if(this.showGroup==='notvip'){
+                if(!this.getTokenForKey('user_level')) {
+                  this.handlePop();
+                }
               }
             }
           }

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
           });
         },
       });