jufubao-base 1.0.119-beta2 → 1.0.119-beta21

package/src/components/JfbBaseCardSweepInfo/JfbBaseCardSweepInfo.vue

@@ -115,6 +115,8 @@ export default {
       pa: "", //二维码
       //页面跳转地址
       backUrl: "",
+
+      inCallbackUrlOrg:'',//是否带有回调地址
     };
   },
   watch: {
@@ -131,7 +133,7 @@ export default {
   },
   created() {
     this.init(this.container);
-   
+
   },
   methods: {
     handleToLink(path) {
@@ -149,19 +151,22 @@ export default {
                 //#ifdef H5
                 let base = this.jfbAuthorize.getBasePath(this);
                 let url = `${location.origin}${base}${this.backUrl}`;
+                url = this.getUrlCallback(url)
                 this.$xdLog.setARMSInfo({url}, 'static_qr_card_bind');
+
                 setTimeout(()=>{
                   window.location.href = url;
                 },50);
                 // #endif
-  
+
                 //#ifndef H5
+                let wPath = this.getUrlCallback(this.backUrl)
                 this.$xdUniHelper.redirectTo({
-                  url: this.backUrl,
+                  url:wPath,
                 });
                 // #endif
-  
-               
+
+
               },
             });
           })
@@ -173,6 +178,9 @@ export default {
     },
     onJfbLoad(options) {
       this.pa = options.pa;
+      if(options.inCallback) {
+        this.inCallbackUrlOrg = options.inCallback;
+      }
       //正式环境判断参数错误
       if(!this.$configProject.isPreview) {
         if(!this.pa) {

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -150,7 +150,9 @@
           bottom: 0,
           right: 0
         },
-        loadingCardList: true
+        loadingCardList: true,
+
+        inCallbackUrlOrg:'',//是否带有回调地址
       }
     },
     watch: {
@@ -177,6 +179,9 @@
           this.$storage.set("inCallback", inCallback);
           try{
             inCallback = Base64.decode(inCallback);
+            if(options.inCallback) {
+              this.inCallbackUrlOrg = options.inCallback;
+            }
           }catch (e){
             inCallback = null;
           }
@@ -242,8 +247,9 @@
           });
       },
       toBindCard(){
+        let path = this.getUrlCallback(this.cardBindPath)
         this.$xdUniHelper.navigateTo({
-          url: this.cardBindPath
+          url:path
         })
       },
       toOrderList(){

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -72,6 +72,8 @@
         detailUrl: "",
         login_name:'',
         loadingCardList: true,
+
+        inCallbackUrlOrg:'',//是否带有回调地址
       }
     },
     watch: {
@@ -86,8 +88,6 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
@@ -97,6 +97,9 @@
           this.$storage.set("inCallback", inCallback);
           try{
             inCallback = Base64.decode(inCallback);
+            if(options.inCallback) {
+              this.inCallbackUrlOrg = options.inCallback;
+            }
           }catch (e){
             inCallback = null;
           }
@@ -127,12 +130,13 @@
       init(container) {
         this.cardBindPath = getContainerPropsValue(container, "content.cardBindPath", {value: ""}).value;
         this.changeUrl = getContainerPropsValue(container, "content.changeUrl", {value: ""}).value;
-        this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
+        this.detailUrl = getContainerPropsValue(container, "content.detailUrl", {value: ""}).value;
         this.login_name = getContainerPropsValue(container, "content.login_name", "登录");
       },
       toBindCard(){
+        let path = this.getUrlCallback(this.cardBindPath)
         this.$xdUniHelper.navigateTo({
-          url: this.cardBindPath
+          url: path
         })
       },
       toDetail(item) {

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -14,95 +14,110 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-con-phone__body" v-if="done">
-      <view
-        v-if="has_times==='Y'"
-        class="jfb-base-con-phone__body-wrap"
-        :style="{
-          height: layoutInfo.bodyMinHeightRpx + 'rpx',
-          backgroundImage: `url(${background})`,
-          backgroundSize: '100% 100%',
-        }"
-      >
-        <view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
-          <view>
-            <input
-              v-model="phoneNumber"
-              placeholder="请输入手机号"
-              type="text"
-            />
-          </view>
-          <view
-            class="jfb-base-con-phone__body-wrap-input-code"
-            style="margin-bottom: 54rpx"
-          >
-            <input
-              v-model="valid_code"
-              placeholder="请输入验证码"
-              type="text"
-            />
-            <XdButton
-              :disabled="disabled"
-              class="jfb-base-con-phone__body-wrap-input-code-btn"
-              type="primary"
-              :bg-color="mainColor"
-              size="small"
-              @click="handleSendCode"
-              >{{ message }}</XdButton
+      <view v-if="has_times === 'Y'">
+        <view
+          class="jfb-base-con-phone__body-wrap"
+          :style="{
+            height: topHeight + 'rpx',
+            width: topWidth + 'rpx',
+            backgroundImage: `url(${background})`,
+            backgroundSize: '100% 100%',
+          }"
+        >
+          <view v-if="showCode" class="jfb-base-con-phone__body-wrap-input">
+            <view>
+              <input
+                @input="filterSpaces"
+                v-model="phoneNumber"
+                placeholder="请输入手机号"
+                type="text"
+              />
+            </view>
+            <view
+              class="jfb-base-con-phone__body-wrap-input-code"
+              style="margin-bottom: 54rpx"
             >
-          </view>
-          <XdButton
-            type="primary"
-            :bg-color="mainColor"
-            width="360rpx"
-            radius="20rpx"
-            size="small"
-            :disabled="!phoneNumber || !valid_code"
-            @click="handleConfirm"
-            >确认领取</XdButton
-          >
-        </view>
-        <view v-else class="jfb-base-con-phone__body-wrap-input">
-          <view class="jfb-base-con-phone__body-wrap-input-phone">
-            <view class="jfb-base-con-phone__body-wrap-input-phone-change">
-              <view>当前登录手机号</view>
+              <input
+                v-model="valid_code"
+                placeholder="请输入验证码"
+                type="text"
+              />
               <XdButton
-                style="margin: 0"
+                :disabled="disabled"
+                class="jfb-base-con-phone__body-wrap-input-code-btn"
                 type="primary"
                 :bg-color="mainColor"
                 size="small"
-                @click="showCode = true"
-                >切换手机号</XdButton
+                @click="handleSendCode"
+                >{{ message }}</XdButton
               >
             </view>
-            <view>{{ showOhoneNumber }}</view>
+            <XdButton
+              type="primary"
+              :bg-color="mainColor"
+              width="360rpx"
+              radius="20rpx"
+              size="small"
+              :disabled="!phoneNumber || !valid_code"
+              @click="handleConfirm"
+              >确认领取</XdButton
+            >
+          </view>
+          <view v-else class="jfb-base-con-phone__body-wrap-input">
+            <view class="jfb-base-con-phone__body-wrap-input-phone">
+              <view class="jfb-base-con-phone__body-wrap-input-phone-change">
+                <view>当前登录手机号</view>
+                <XdButton
+                  style="margin: 0"
+                  type="primary"
+                  :bg-color="mainColor"
+                  size="small"
+                  @click="showCode = true"
+                  >切换手机号</XdButton
+                >
+              </view>
+              <view>{{ showOhoneNumber }}</view>
+            </view>
+            <XdButton
+              type="primary"
+              :bg-color="mainColor"
+              width="360rpx"
+              radius="20rpx"
+              size="small"
+              @click="handleConfirm"
+              >直接领取</XdButton
+            >
           </view>
-          <XdButton
-            type="primary"
-            :bg-color="mainColor"
-            width="360rpx"
-            radius="20rpx"
-            size="small"
-            @click="handleConfirm"
-            >直接领取</XdButton
-          >
         </view>
-        <view v-if="showBtn === 'Y'" class="jfb-base-con-phone__body-wrap-btn">
-          <XdButton
-            size="small"
-            type="primary"
-            :bg-color="mainColor"
-            radius="20rpx"
-            @click="handleTo(btnOneUrl)"
-            >{{ btnOneName }}</XdButton
-          >
-          <XdButton
-            size="small"
-            type="primary"
-            :bg-color="mainColor"
-            radius="20rpx"
-            @click="handleTo(btnTwoUrl)"
-            >{{ btnTwoName }}</XdButton
+        <view
+          :style="{
+            height: bottomHeight + 'rpx',
+            width: bottomWidth + 'rpx',
+            backgroundImage: `url(${used_background})`,
+            backgroundSize: '100% 100%',
+          }"
+        >
+          <view
+            v-if="showBtn === 'Y'"
+            class="jfb-base-con-phone__body-wrap-btn"
           >
+            <XdButton
+              size="small"
+              type="primary"
+              :bg-color="mainColor"
+              radius="20rpx"
+              @click="handleTo(btnOneUrl)"
+              >{{ btnOneName }}</XdButton
+            >
+            <XdButton
+              size="small"
+              type="primary"
+              :bg-color="mainColor"
+              radius="20rpx"
+              @click="handleTo(btnTwoUrl)"
+              >{{ btnTwoName }}</XdButton
+            >
+          </view>
         </view>
       </view>
       <view
@@ -124,7 +139,7 @@ import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import XdButton from "@/components/XdButton/XdButton";
 import { jfbRootExec } from "@/utils/xd.event";
 import JfbBaseConPhoneMixin from "./JfbBaseConPhoneMixin";
-import { getContainerPropsValue } from "@/utils/xd.base";
+import { getContainerPropsValue, getImageInfo } from "@/utils/xd.base";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { mapState } from "vuex";
@@ -155,14 +170,14 @@ export default {
       btnTwoUrl: "",
       message: "发送验证码",
       countdownTimer: null,
-      timeRemaining: 60,
+      timeRemaining: 120,
       disabled: false,
-      background:"",
+      background: "",
       method: "entry",
       options: {},
       activity_id: "",
       done: false,
-      has_times: 'N',
+      has_times: "N",
       errmessage: "",
       showOhoneNumber: "", //仅用于展示
       order_num: null,
@@ -170,6 +185,12 @@ export default {
       date: 2, //时间底数
       time: 0, //时间幂指数
       timeer: null,
+      topHeight: "",
+      topWidth: "750",
+      used_background: "",
+      bottomHeight: "",
+      bottomWidth: "750",
+      showBtn: "N",
     };
   },
   watch: {
@@ -204,6 +225,25 @@ export default {
         : "phone";
       await this.getList();
     },
+    filterSpaces(event) {
+      // 使用replace方法去除用户输入的空格
+      let value = event.target.value.replace(/\s+/g, "");
+      // 更新数据以移除空格
+      this.phoneNumber = value;
+      // 将处理后的值反映到视图
+      event.target.value = value;
+    },
+    validatePhoneNumber(phoneNumber) {
+      // 定义手机号正则表达式
+      const regex = /^1[3-9]\d{9}$/;
+
+      // 检查输入的手机号是否符合格式
+      if (phoneNumber.match(regex)) {
+        return true;
+      } else {
+        return false;
+      }
+    },
     getList() {
       jfbRootExec("getCouponPhoneList", {
         vm: this,
@@ -214,7 +254,7 @@ export default {
           activity_id: this.activity_id,
         },
       })
-        .then((res) => {
+        .then(async (res) => {
           console.log(res, "res");
           this.has_times = res.has_times;
           this.showBtn = res.phone_button;
@@ -222,7 +262,15 @@ export default {
           this.btnTwoName = res.button_name_two;
           this.btnOneUrl = res.button_url_one;
           this.btnTwoUrl = res.button_url_two;
+          let image = await getImageInfo(getServiceUrl(res.background));
+          let image1 = await getImageInfo(getServiceUrl(res.used_background));
+          console.log({ ...image }, "imageimage");
+          this.topHeight = image.imgHeight / this.$rpxNum;
+          this.topWidth = '100%';
+          this.bottomHeight = image1.imgHeight / this.$rpxNum;
+          this.bottomWidth = '100%';
           this.background = getServiceUrl(res.background);
+          this.used_background = getServiceUrl(res.used_background);
           this.errmessage = res.message;
           this.done = true;
         })
@@ -248,6 +296,13 @@ export default {
         });
         return;
       }
+      if (!this.validatePhoneNumber(this.phoneNumber)) {
+        uni.showToast({
+          title: "手机号格式不正确",
+          icon: "none",
+        });
+        return;
+      }
       // 发送验证码的异步操作
       uni.showToast({
         title: "发送中",
@@ -265,7 +320,7 @@ export default {
     },
     startCountdown() {
       // 设置剩余时间
-      this.timeRemaining = 60;
+      this.timeRemaining = 120;
       // 设置定时器，每秒执行一次
       this.countdownTimer = setInterval(() => {
         // 每秒减少1
@@ -281,7 +336,7 @@ export default {
           // 清除定时器
           clearInterval(this.countdownTimer);
           // 重新设置时间
-          this.timeRemaining = 60;
+          this.timeRemaining = 120;
         }
       }, 1000);
     },
@@ -424,13 +479,15 @@ export default {
     }
     &-wrap {
       display: flex;
-      justify-content: center;
+      justify-content: flex-end;
       align-items: center;
       flex-direction: column;
       &-input {
         border-radius: 40rpx;
         background: rgba(255, 255, 255, 0.5);
         padding: 70rpx 60rpx;
+        position: relative;
+        bottom: 120rpx;
         input {
           margin-bottom: 26rpx;
           font-size: 28rpx;
@@ -477,8 +534,8 @@ export default {
         display: flex;
         justify-content: space-around;
         align-items: center;
-        width: 100%;
-        margin-top: 64rpx;
+        width: 750rpx;
+        padding-top: 40rpx;
       }
     }
   }

package/src/components/JfbBaseMySetting/Api.js

@@ -12,7 +12,7 @@
  */
 module.exports = [
   {
-    mapFnName: 'getUserInfo',
+    mapFnName: 'getBaseUserInfo',
     title: '获取用户信息',
     path: '/passport/v1/user/get',
     params: {},
@@ -21,7 +21,7 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'getCardUserSetting',
+    mapFnName: 'getBaseCardUserSetting',
     title: '获取用户卡券配置',
     path: '/card/v1/card-bind/get-card-user-setting',
     params: {},

package/src/components/JfbBaseMySetting/Attr.js

@@ -8,10 +8,11 @@ export default {
   content: (data) => {
     return [
       {
-        label: '绑定手机号地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'bind_phone_url', //form[valueKey]
-        value: data['bind_phone_url'] || {},
+        label: '绑定手机号地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'bind_phone_url',
+        value: data['bind_phone_url'] || null,
+        //groupKey:'advanced',
         setting: {
           router: XdBus.getParentApi('getPagesTree')
         },

package/src/components/JfbBaseMySetting/JfbBaseMySetting.vue

@@ -22,6 +22,7 @@
           style="margin-bottom: 8rpx;"
           @click="handleToShowSwitch"
         >
+
           <view v-if="!showSwitch">去配置</view>
           <view v-else class="switch_wrap">
             <view :style="{
@@ -91,8 +92,6 @@
     },
     created() {
       this.init(this.container);
-
-      //todo
     },
     methods: {
       onJfbLoad(options) {
@@ -131,7 +130,7 @@
         })
       },
       p_getUserInfo(){
-        jfbRootExec("getUserInfo", {
+        jfbRootExec("getBaseUserInfo", {
           vm: this,
           data: {
 
@@ -146,7 +145,7 @@
         })
       },
       getCardConfig(){
-        jfbRootExec("getCardUserSetting", {
+        jfbRootExec("getBaseCardUserSetting", {
           vm: this,
           data: {}
         }).then(res => {
@@ -173,27 +172,6 @@
           })
         }
       },
-      onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
-      },
-      onJfbReachBottom(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-      onJfbShow(options) {
-        console.log('event.onJfbShow', options)
-      },
-      onJfbHide(options) {
-        console.log('event.onJfbHide', options)
-      },
-      onJfbBack(options) {
-        console.log('event.onJfbBack', options)
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
     }
   }
 

package/src/components/JfbBaseMySetting/Mock.js

@@ -1,5 +1,6 @@
 'use strict';
 
 module.exports = {
-  aaaa: {}
+  getBaseUserInfo: {"user_name":"","user_code":"pK60goP5om","nickname":"braveboy","real_name":"","head_url":"https:\/\/thirdwx.qlogo.cn\/mmopen\/vi_32\/DYAIOgq83epC3zrUbrbh1n7JAiaws8JKK0zk6Q91FNH10ticgWoVENlwnZPfdyxTicEqBnjnwd7RzJmQwicfQG0D1A\/132","province_code":"","city_code":"","province_name":"","city_name":"","sex":"","sex_name":"未知","birthday_date":"","phone_number":"151****8397","show_user_name":"braveboy","request_id":"863a1276dc972043"},
+  getBaseCardUserSetting:{"user_id":0,"is_entity_card_invalid":"","request_id":"8ddfd81488f33522"}
 }

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -363,6 +363,7 @@ export default {
           });
         });
     },
+
     //第三方支付
     async doThirdPay() {
       if (this.$configProject.isPreview) return;
@@ -387,12 +388,16 @@ export default {
         channel_provider_id,
         login_providers: login_providers.join(","),
       };
-      // #ifdef H5
-      if (!(!this.$configProject.isPreview && (isWechat() || isWechatTools()))){
+
+      //设置支付成功页面地址
+      if (!this.$configProject.isPreview){
+        data['pay_success_url'] = '';
+        // #ifdef H5
         data['pay_success_url'] = `${window.location.protocol}//${window.location.host}/${this.projectAttr.deploy_dir}`;
+        // #endif
         data['pay_success_url'] += this.getSuccessUrl + `?order_id=${this.main_order_id}`;
       }
-      // #endif
+
 
 
       jfbRootExec("setThirdPlace", {

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -93,6 +93,7 @@
 <script>
 import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
 import { jfbRootExec } from "@/utils/xd.event";
+import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 import componentsMixins from "@/mixins/componentsMixins";
 import extsMixins from "@/mixins/extsMixins";
 import { getContainerPropsValue } from "@/utils/xd.base";
@@ -101,7 +102,6 @@ import XdForm from "@/components/XdForm/XdForm";
 import XdFormInput from "@/components/XdFormInput/XdFormInput";
 import XdButton from "@/components/XdButton/XdButton";
 import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
-import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 
 export default {
   name: "JfbBasePhoneCollect",