jufubao-base 1.0.119-beta9 → 1.0.120

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.119-beta9",
+  "version": "1.0.120",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -48,7 +48,6 @@
     "@vue/shared": "^3.0.0",
     "color": "^3.1.3",
     "core-js": "^2.6.5",
-    "dingtalk-jsapi": "^3.0.31",
     "flyio": "^0.6.2",
     "gxd-commands-bussiness": "^1.0.12",
     "gxd-uni-library-editx": "1.0.17-beta2",
@@ -57,10 +56,10 @@
     "path-to-regexp": "^6.2.1",
     "qs": "^6.9.6",
     "regenerator-runtime": "^0.12.1",
-    "vconsole": "^3.15.0",
     "vue": "^2.6.10",
     "vue-clipboard2": "^0.3.1",
-    "vuex": "^3.2.0"
+    "vuex": "^3.2.0",
+    "vconsole": "^3.15.0"
   },
   "repository": {
     "type": "git",

package/src/components/JfbBaseConPhone/JfbBaseConPhone.vue

@@ -15,7 +15,7 @@
     <!-- #endif -->
     <view class="jfb-base-con-phone__body" v-if="done">
       <view
-        v-if="has_times==='Y'"
+        v-if="has_times === 'Y'"
         class="jfb-base-con-phone__body-wrap"
         :style="{
           height: layoutInfo.bodyMinHeightRpx + 'rpx',
@@ -156,14 +156,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,
@@ -207,12 +207,23 @@ export default {
     },
     filterSpaces(event) {
       // 使用replace方法去除用户输入的空格
-      let value = event.target.value.replace(/\s+/g, '');
+      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,
@@ -257,6 +268,13 @@ export default {
         });
         return;
       }
+      if (!this.validatePhoneNumber(this.phoneNumber)) {
+        uni.showToast({
+          title: "手机号格式不正确",
+          icon: "none",
+        });
+        return;
+      }
       // 发送验证码的异步操作
       uni.showToast({
         title: "发送中",
@@ -274,7 +292,7 @@ export default {
     },
     startCountdown() {
       // 设置剩余时间
-      this.timeRemaining = 60;
+      this.timeRemaining = 120;
       // 设置定时器，每秒执行一次
       this.countdownTimer = setInterval(() => {
         // 每秒减少1
@@ -290,7 +308,7 @@ export default {
           // 清除定时器
           clearInterval(this.countdownTimer);
           // 重新设置时间
-          this.timeRemaining = 60;
+          this.timeRemaining = 120;
         }
       }, 1000);
     },

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",

package/src/components/JfbBaseSaasBlessDetail/Api.js

@@ -1,72 +0,0 @@
-'use strict';
-
-/**
- * @description API模型
- * 建议：Ffff=>模块  Xxxx=>自定义名字
- * 获取单记录(getByIdFfffXxxx)
- * 获取列表记录(getByListFfffXxxx)
- * 添加列表记录(addFfffXxxxx)
- * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
- * 更新列表记录(updateFfffXxxxx)
- * @type {*[]}
- */
-module.exports = [
-  {
-    mapFnName: 'getBlessDetail',
-    title: '祝福 - 详情',
-    path: '/saas/v1/bless/item/:bless_id',
-    isRule: false,
-    params: {
-      bless_id: ['bless_id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'doSignBless',
-    title: '祝福 - 签收',
-    path: '/saas/v1/bless/confirm-sign/:bless_id',
-    isRule: false,
-    data: {
-      bless_id: ['bless_id', 'Number', '必选'],
-      sign_image_url: ['签名图片url', 'String', '必选']
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: "noSignBless",
-    title: "祝福 - 签收 - 免签名",
-    path: "/saas/v1/bless/sign/:bless_id",
-    isRule: false,
-    data: {
-      bless_id: ['bless_id', 'Number', '必选'],
-      sign_image_url: ['签名图片url', 'String', '必选']
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: "getOssSign",
-    title: "获取上传参数",
-    path: "/common-user/v1/h5-oss/sign",
-    isRule: false,
-    data: {
-
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: "doOssUpload",
-    title: "开启oss上传",
-    path: "/common-user/v1/h5-oss/upload",
-    isRule: false,
-    data: {
-      file_name: ['file_name', 'String', true],
-      file: ['file', 'file', true]
-    },
-    isConsole: true,
-    disabled: true,
-  }
-];

package/src/components/JfbBaseSaasBlessDetail/Attr.js

@@ -1,24 +0,0 @@
-'use strict';
-
-/**
- * @description 当表单组件中有联动操作时候，使用方法进行返回
- */
-export default {
-  style: [],
-  content: (data) => {
-    return [
-      {
-        label: '使用祝福券跳转地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'useTicketUrl', //form[valueKey]
-        placeholder: '请选择使用祝福券跳转地址',
-        value: data.useTicketUrl || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
-    ].filter(i=>i)
-  },
-  advanced: [],
-};

package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetail.vue

@@ -1,352 +0,0 @@
-<template>
-  <view
-    class="jfb-base-saas-bless-detail"
-    @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
-  >
-    <!--#ifdef H5-->
-    <view
-      class="jfb-base-saas-bless-detail__edit"
-      :class="{ editx : isEditx && active }"
-      v-if="isEditx && active"
-    >
-      <view class="jfb-base-saas-bless-detail__edit-icon" @click="delEdit">删除</view>
-    </view>
-    <!-- #endif -->
-    <view class="jfb-base-saas-bless-detail__body" :style="{
-      minHeight: layoutInfo.bodyMinHeightRpx + 'rpx',
-      backgroundImage: `url(${blessConfig && blessConfig.material_image.path})`
-    }">
-      <view class="bless_detail">
-        <view class="bless_box" v-if="blessConfig" :style="{
-          paddingTop: blessConfig.material_margin.top + 'rpx',
-          paddingLeft: blessConfig.material_margin.left + 'rpx',
-          paddingRight: blessConfig.material_margin.right + 'rpx',
-          paddingBottom: blessConfig.material_margin.bottom + 'rpx',
-          color: blessConfig.material_color
-        }">
-          <view class="dear">{{ blessConfig.material_nickname }}</view>
-          <view class="desc">{{ blessConfig.material_content }}</view>
-          <view class="salute">{{ blessConfig.material_end }}</view>
-          <xd-button class="sign_btn"
-            v-if="blessData.receive_status === 'N'"
-            style="width: 250rpx;" type="primary"
-            @click="showSign"
-          >去签收</xd-button>
-        </view>
-      </view>
-      <xd-dailog :show.sync="dialogShow" title="" class="my_dialog">
-        <view class="dialog_head">
-          <view class="h_main">请签名</view>
-          <view class="h_sub">请务必由本人签收，字迹工整</view>
-        </view>
-        <view class="sign_box">
-          <xd-signature  ref="signatureRef"></xd-signature>
-        </view>
-        <view slot="btn" class="btn_wrap">
-          <xd-button style="width: 220rpx;" @click="clearSign">重写</xd-button>
-          <xd-button style="width: 220rpx;margin-left: 60rpx;" type="primary" @click="submitSign">确定</xd-button>
-        </view>
-      </xd-dailog>
-      <xd-dailog :show.sync="dialogSuccess" title="" class="success_dialog">
-        <view class="dialog_main">
-          <xd-font-icon icon="iconchenggong" :size="90" :color="mainColor"></xd-font-icon>
-          <view class="sign_tit">签收成功</view>
-          <view class="sign_cont">{{blessData.bless_type_name}}已经放入您的账户</view>
-          <view class="sign_ticket">{{blessData.bless_name}} X{{blessData.bless_card_number}}张</view>
-        </view>
-        <view slot="btn">
-          <xd-button style="width: 280rpx;" type="primary" @click="toUseTicket">去使用</xd-button>
-        </view>
-      </xd-dailog>
-    </view>
-  </view>
-</template>
-
-<script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import XdButton from "@/components/XdButton/XdButton";
-  import XdDailog from "@/components/XdDailog/XdDailog"
-  import XdSignature from "@/components/XdSignature/XdSignature"
-  import XdUpload from "@/components/XdUpload/XdUpload"
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseSaasBlessDetailMixin from "./JfbBaseSaasBlessDetailMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseSaasBlessDetail",
-    components: {
-      XdFontIcon,
-      XdButton,
-      XdDailog,
-      XdSignature,
-      XdUpload
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseSaasBlessDetailMixin
-    ],
-    data() {
-      return {
-        dialogShow: false,
-        dialogSuccess: false,
-        sign_image_url: "",
-        bless_id: "",
-        blessData: {},
-        blessConfig: null,
-
-        //面板
-        useTicketUrl: "",   //使用券跳转地址
-      }
-    },
-    watch: {
-      container(value) {
-        this.init(value)
-      }
-    },
-    created() {
-      this.init(this.container);
-
-      //todo
-    },
-    methods: {
-      onJfbLoad(options) {
-        this.bless_id = options.bless_id;
-
-        jfbRootExec("getBlessDetail", {
-          vm: this,
-          data: {
-            bless_id: this.bless_id
-          }
-        }).then(res => {
-          try{
-            this.blessData = res;
-            this.blessConfig = JSON.parse(res.bless_detail_config)
-          }catch(err){}
-        })
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-
-      },
-
-      showSign(){
-        if(this.blessData.signature_method === 'N'){
-          jfbRootExec("noSignBless", {
-            vm: this,
-            data: {
-              bless_id: this.bless_id,
-            }
-          }).then(res => {
-            this.dialogSuccess = true;
-          })
-        }else{
-          this.dialogShow = true;
-        }
-      },
-      clearSign(){
-        this.$refs.signatureRef.clear()
-      },
-      toUseTicket(){
-        this.$xdUniHelper.navigateTo({
-          url: `${this.useTicketUrl}`,
-        });
-      },
-      submitSign(){
-        this.$refs.signatureRef.canvasToTempFilePath({
-            success: async (res) => {
-              console.log(res);
-              let url = res.tempFilePath
-              if(!res.isEmpty){
-                //上传签名图片
-                await this.doSubmitSign(url);
-                //提交签名
-                await this.p_doSignBless();
-                this.dialogShow = false;
-                this.dialogSuccess = true;
-              }
-            }
-        })
-      },
-      p_doSignBless(){
-        return new Promise((resolve, reject) => {
-          jfbRootExec("doSignBless", {
-            vm: this,
-            data: {
-              bless_id: this.bless_id,
-              sign_image_url: this.sign_image_url
-            }
-          }).then(res => {
-            resolve(res);
-          }).catch(err => {
-            reject(err);
-          })
-        })
-        
-      },
-      doSubmitSign(url){
-        let fileName = "sign.png";
-        let file = this.base64ToFile(url,fileName);
-
-        return new Promise((resolve,reject) => {
-          jfbRootExec("getOssSign", {
-            vm: this,
-            data: { name: fileName }
-          }).then(res => {
-            console.log(res);
-            let OSSAccessKeyId = res['id']
-            let cdnUrl = res['cdn_url']
-            delete res['id']
-            delete res['cdn_url']
-
-            uni.uploadFile({
-              url: res.action,
-              file: file,
-              name: 'file',
-              formData: {
-                ...res,
-                OSSAccessKeyId: OSSAccessKeyId,
-                name: fileName,
-                cdnUrl: cdnUrl,
-                success_action_status: 200
-              },
-              success: (res) => {
-                this.sign_image_url = cdnUrl;
-                resolve(cdnUrl);
-              }
-            })
-          }).catch(err => {
-            reject();
-          })
-        })
-
-        // this.dialogSuccess = true;
-      },
-      base64ToFile(base64String, filename){
-        var arr = base64String.split(',');
-        var mime = arr[0].match(/:(.*?);/)[1];
-        var bstr = atob(arr[1]);
-        var n = bstr.length;
-        var u8arr = new Uint8Array(n);
-        while(n--) {
-          u8arr[n] = bstr.charCodeAt(n);
-        }
-        return new File([u8arr], filename, {type:mime});
-      },
-      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)
-        this.$xdUniHelper.navigateBack();
-      },
-      onJfbUpdate(...data) {
-        console.log('event.onJfbUpdate', data)
-      },
-      onJfbCustomEvent(options) {
-        console.log('event.onJfbReachBottom', options)
-      },
-    }
-  }
-
-</script>
-
-<style scoped lang="less">
-  @import "./JfbBaseSaasBlessDetailLess.less";
-
-  .jfb-base-saas-bless-detail {
-    &__body{
-      box-sizing: border-box;
-      background-size: 100% auto;
-      position: relative;
-      .bless_detail{
-
-        .bless_box{
-          margin: 0 auto;
-          box-sizing: border-box;
-          padding: 100rpx 80rpx;
-          color: #FA2300;
-          font-size: 32rpx;
-          font-weight: 400;
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 100%;
-          .dear{
-            font-weight: 500;
-          }
-          .desc{
-            margin: 50rpx 0;
-          }
-          .salute{
-            text-align: right;
-          }
-          .sign_btn{
-            margin-top: 32rpx;
-          }
-        }
-      }
-      .my_dialog{
-        /deep/ .xd-dailog__body-content-box{
-          padding: 0;
-        }
-        .dialog_head{
-          display: flex;
-          align-items: center;
-          justify-content: space-between;
-          padding: 48rpx 0;
-          
-          .h_main{
-            font-size: 36rpx;
-            color: #333333;
-            font-weight: 500;
-          }
-          .h_sub{
-            font-size: 24rpx;
-            color: #808080;
-            font-weight: 400;
-          }
-        }
-        .sign_box{
-          width: 600rpx;
-          height: 460rpx;
-          background-color: #F2F2F2;
-        }
-        .btn_wrap{
-          display: flex;
-        }
-      }
-      .success_dialog{
-        .dialog_main{
-          padding: 140rpx 0 100rpx;
-          .sign_tit{
-            color: #FE7A63;
-            margin-top: 28rpx;
-            font-size: 40rpx;
-          }
-          .sign_cont{
-            font-size: 32rpx;
-            color: #333333;
-            margin-top: 40rpx;
-          }
-          .sign_ticket{
-            font-size: 32rpx;
-            color: #FE7A63;
-          }
-        }
-      }
-    }
-  }
-</style>

package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetailLess.less

@@ -1,80 +0,0 @@
-/**
-* @desc 获取绝对路径完整地址
-* @param @path
-**/
-//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
-@basePath: 'business/';
-@doMain: '//sandbox-img.jufubao.cn/';
-
-.getBusinessImageUrl(@path, @size: 'size8') {
-  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
-  background-image: url(@url);
-}
-
-//start
-.jfb-base-saas-bless-detail {
-  border: 1px dashed rgba(0, 0, 0, 0);
-  box-sizing: border-box;
-  min-height: unit(50, rpx);
-
-  &__body{
-      position: relative;
-      overflow: hidden;
-      z-index: 2
-  }
-
-  &.editx {
-    position: relative;
-    border: 1px dashed blue;
-    box-sizing: border-box;
-    z-index: 3
-
-  }
-
-  &:hover {
-    border: 1px dashed blue;
-  }
-
-  &.noBorder {
-    border-color: rgba(0,0,0,0);
-    border-width: 0;
-  }
-
-
-  &__edit {
-    cursor: pointer;
-    position: absolute;
-    right: unit(0, rpx);
-    top: unit(-52, rpx);
-    height: unit(50, rpx);
-    line-height: unit(50, rpx);
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    background: rgba(0, 0, 0, .6);
-    border-radius: unit(10, rpx);
-    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
-    color: #fff;
-    font-size: unit(22, rpx);
-
-    &-icon{
-      padding: 0 unit(20, rpx);
-    }
-
-    &.editx {
-      box-sizing: border-box;
-
-    }
-  }
-}
-//end
-
-
-/**notPreview**/
-.jfb-base-saas-bless-detail {
-  &:before {
-    content: " ";
-    display: table;
-  }
-}
-/**endNotPreview**/

package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetailMixin.js

@@ -1,30 +0,0 @@
-'use strict';
-
-
-//@AttrImport
-import Attr from "./Attr";
-//@EndAttrImport
-
-
-export default {
-  data() {
-    return {
-      //#ifdef H5
-      
-      //@AttrData
-      Attr:{}, //对外开发编辑属性
-      //@EndAttrData
-      
-      // #endif
-      cssRoot: 'jfb-base-saas-bless-detail'
-    }
-  },
-  created() {
-    
-    //@AttrDataCreated
-    this.Attr = this.$xdUniHelper.customClone(Attr);
-    //@EndAttrDataCreated
-    
-
-  },
-}