jufubao-base 1.0.218 → 1.0.220-beta1

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -0,0 +1,284 @@
+<template>
+  <view
+    class="jfb-base-notice-dialog"
+    @click="handleEditxSelect"
+    :class="{ editx: isEditx && active }"
+  >
+    <!--#ifdef H5-->
+    <view
+      class="jfb-base-notice-dialog__edit"
+      :class="{ editx: isEditx && active }"
+      v-if="isEditx && active"
+    >
+      <view class="jfb-base-notice-dialog__edit-icon" @click="delEdit"
+        >删除</view
+      >
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-notice-dialog__body">
+      <view v-if="isShow && contentList && contentList.length" class="jfb-base-notice-dialog__body_dialog">
+        <view
+          class="jfb-base-notice-dialog__body_dialog_mask"
+          @click.stop="handleMaskHide"
+        ></view>
+        <view class="jfb-base-notice-dialog__body_dialog_content">
+          <xd-font-icon
+            @click.stop="handleClose"
+            v-if="close_position === 'right'"
+            class="close-top"
+            icon="iconguanbi_xian"
+            color="#fff"
+            size="64"
+          ></xd-font-icon>
+          <image
+            @click="handleToLink"
+            mode="widthFix"
+            :src="currentImage"
+          ></image>
+          <xd-font-icon
+            @click.stop="handleClose"
+            v-if="close_position === 'bottom'"
+            class="close-bottom"
+            icon="iconguanbi_xian"
+            color="#fff"
+            size="64"
+          ></xd-font-icon>
+        </view>
+      </view>
+      <view
+        :style="{ background: backgroundColor, color: warningColor }"
+        class="jfb-base-notice-dialog__body-pop"
+        v-if="isPreview"
+        >弹框方便编辑(占位)，在线上此模块不显</view
+      >
+    </view>
+  </view>
+</template>
+
+<script>
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseNoticeDialogMixin from "./JfbBaseNoticeDialogMixin";
+import { getContainerPropsValue } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+import getServiceUrl from "@/common/getServiceUrl";
+import storage from "@/common/storage";
+const Color = require("color");
+export default {
+  name: "JfbBaseNoticeDialog",
+  components: {
+    XdFontIcon,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseNoticeDialogMixin],
+  data() {
+    return {
+      isShow: true,
+      backgroundColor: "",
+      isPreview: false, //是否预览
+      is_hide_dailog: "N",
+      time: 3, //小时
+      close_position: "",
+      type: "",
+      currentImage: "",
+      currentLinkUrl: "",
+      currentIndex: 0,
+      contentList: [],
+      number: ''
+    };
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
+    },
+    is_hide_dailog(value) {
+      if (value === "N") {
+        storage.remove(this.containerId);
+      }
+      this.onJfbLoad();
+    },
+  },
+  created() {
+    this.isPreview = this.$configProject.isPreview;
+    this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
+    this.init(this.container);
+
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      //预览模式
+      if (this.isPreview) {
+        if (this.is_hide_dailog === "N") {
+          this.getContent();
+        } else {
+          this.isShow = false;
+        }
+        return;
+      } else {
+        if (!storage.get(this.containerId)) this.getContent();
+      }
+    },
+    getContent() {
+      jfbRootExec("getListNoticeDialogContent", {
+        vm: this,
+        data: {
+          page_id: this.pageAttr["page_id"], //页面ID
+          container_id: this.containerId, //组件ID
+          page_size: this.number, //数量
+        },
+      })
+        .then((res) => {
+          console.log(res.list, "res.list");
+
+          //弹窗显示
+          if (res.list.length > 0) {
+            this.contentList = res.list.map((item) => {
+              return JSON.parse(item.content);
+            });
+            this.currentImage = getServiceUrl(
+              this.contentList[0].image_url,
+              "size3"
+            );
+            this.currentLinkUrl = this.getLinkUrl(
+              this.contentList[0].redirect_data
+            );
+            this.currentIndex = 0;
+
+            this.handlePop();
+          }
+        })
+        .catch((error) => {
+          console.error(error);
+        });
+    },
+    getLinkUrl(data) {
+      data = JSON.parse(data);
+      return `${data.page}?${data.redirect_params}`;
+    },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      this.time = Number(getContainerPropsValue(container, "content.time", 3));
+      this.is_hide_dailog = getContainerPropsValue(
+        container,
+        "content.is_hide_dailog",
+        "N"
+      );
+      this.close_position = getContainerPropsValue(
+        container,
+        "content.close_position",
+        "right"
+      );
+      this.type = getContainerPropsValue(container, "content.type", "pop");
+      this.number = getContainerPropsValue(container, "content.number", 1);
+    },
+    handlePop() {
+      console.warn(`this.time${this.time * 60 + "分钟"}`);
+      storage.set(this.containerId, 1, this.time);
+      this.isShow = true;
+    },
+    handleMaskHide() {
+      if (this.isPreview) return;
+      this.isShow = false;
+    },
+    handleClose() {
+      //切换下一张，没有下一张，关闭
+      if (this.currentIndex === this.contentList.length - 1) {
+        this.isShow = false;
+        return;
+      }
+      this.currentIndex = this.currentIndex + 1;
+      this.currentLinkUrl = this.getLinkUrl(
+        this.contentList[this.currentIndex].redirect_data
+      );
+      this.currentImage = getServiceUrl(
+        this.contentList[this.currentIndex].image_url,
+        "size3"
+      );
+    },
+    handleToLink() {
+      if (this.isPreview) return;
+      this.$xdUniHelper.navigateTo({
+        url: this.currentLinkUrl,
+      });
+    },
+    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);
+    },
+  },
+};
+</script>
+
+<style scoped lang="less">
+@import "./JfbBaseNoticeDialogLess.less";
+
+.jfb-base-notice-dialog {
+  &__body {
+    &-pop {
+      min-height: 100rpx;
+      text-align: center;
+      vertical-align: middle;
+      color: #666;
+      font-size: unit(24, rpx);
+      line-height: 100rpx;
+    }
+    &_dialog {
+      position: fixed;
+      top: 0;
+      left: 0;
+      bottom: 0;
+      right: 0;
+      z-index: 3000;
+      &_mask {
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background: rgba(0, 0, 0, 0.6);
+      }
+      &_content {
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        display: flex;
+        flex-direction: column;
+        & > image {
+          width: 730rpx;
+        }
+        .close-top {
+          position: relative;
+          right: -40%;
+          margin-bottom: 20rpx;
+        }
+        .close-bottom {
+          margin-top: 68rpx;
+        }
+      }
+    }
+  }
+}
+</style>

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialogLess.less

@@ -0,0 +1,79 @@
+/**
+* @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-notice-dialog {
+  box-sizing: border-box;
+
+  &__body{
+      position: relative;
+      overflow: hidden;
+      z-index: 2
+  }
+
+  &.editx,&.editx:hover {
+    position: relative;
+    min-height: unit(100, rpx);
+    z-index: 3;
+    &::after {
+      border: 2rpx dashed blue;
+      content: " ";
+      position: absolute;
+      top:0;
+      left:0;
+      bottom:0;
+      right:0;
+      z-index: 4;
+      cursor: pointer;
+    }
+
+  }
+
+
+  &__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-notice-dialog {
+  //&:before {
+    //content: " ";
+    //display: table;
+  //}
+}
+/**endNotPreview**/

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialogMixin.js

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

package/src/components/JfbBaseNoticeDialog/Mock.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  
+}

package/src/components/JfbBasePhoneLogin/Api.js

@@ -38,4 +38,29 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: "checkSendStatus",
+    path: "/common/v1/valid_code/sms/check-send-status",
+    title: "校验验证码发送状态",
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      biz_name: ['业务名称', 'String', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "loginJumpPhone",
+    path: "/passport/v1/user/login-jump-phone",
+    title: "授权登录（跳过手机号验证码）",
+    isRule: false,
+    data: {
+      phone_number: ['手机号', 'String', '必选'],
+      provider_id: ['登录方式id', 'Number', '必选'],
+      auth_code: ['临时授权码', 'String', '否'],
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -41,6 +41,7 @@
             '--placeholder-font-color': placeholderFont.color,
             '--placeholder-font-weight': placeholderFont.fontWeight,
             'margin-top': '40rpx',
+            '--main-color': mainColor,
           }"
         >
           <xd-form-item
@@ -131,6 +132,30 @@
           @click="toNotLoginHome"
         >暂不登录，去逛逛</view> -->
       </view>
+      <xd-dialog :show.sync="showDialog"
+        :showClose="false"
+        maskAutoClose
+        :showTitle="false">
+        <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>
+        <view slot="btn" class="btn_foot" style="background-color: #DDD;">
+          <view class="btn_item" :style="{
+            backgroundColor: '#FFF',
+          }"
+          @click="p_loginNotJump"
+          >不跳过</view>
+          <view class="btn_item" :style="{
+            backgroundColor: mainColor,
+            color: '#FFF'
+          }"
+          @click="p_loginJumpPhone"
+          >跳过</view>
+        </view>
+      </xd-dialog>
     </view>
   </view>
 </template>
@@ -147,6 +172,7 @@ 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 XdDialog from "@/components/XdDailog/XdDailog";
 //#ifdef H5
 import cookie from "@/common/cookie";
 //#endif
@@ -164,6 +190,7 @@ export default {
     XdFormInput,
     XdButton,
     XdFormCheckbox,
+    XdDialog
   },
   mixins: [componentsMixins, extsMixins, JfbBasePhoneLoginMixin],
   data() {
@@ -179,6 +206,7 @@ export default {
       provider_id: "",
       callback_url: "",
       isCollectUsername: false,
+      showDialog: false,
 
       inputStyle: "linear", //输入框样式 linear:线性  face: 面性
       formBorderColor: "#F9F9F9", //
@@ -493,6 +521,7 @@ export default {
         },
       })
         .then((res) => {
+          this.p_checkSendStatus(phone_number);
           this.$xdHideLoading();
           this.jfbTimeer = 120;
           this.interval = setInterval(() => {
@@ -507,6 +536,44 @@ export default {
           this.$xdLog.catch(error);
         });
     },
+    p_checkSendStatus(phone_number){
+      jfbRootExec("checkSendStatus", {
+        vm: this,
+        data: {
+          phone_number
+        }
+      }).then(res => {
+        if(res.data && res.data.is_jump === 'Y'){
+          this.showDialog = true;
+        }
+      })
+    },
+    p_loginNotJump(){
+      this.showDialog = false;
+    },
+    p_loginJumpPhone(){
+      const { auth_code, provider_id } = this;
+      const { phone_number } = this.accountForm;
+      this.$xdShowLoading({});
+      jfbRootExec("loginJumpPhone", {
+        vm: this,
+        data: {
+          auth_code,
+          provider_id,
+          phone_number,
+        }
+      }).then(res => {
+        this.$xdHideLoading();
+        let { callback_url } = this;
+        if (callback_url) callback_url = decodeURIComponent(callback_url);
+        this.$xdUniHelper.redirectTo({
+          url: callback_url || this.settings.index,
+        });
+      }).catch((error) => {
+        this.$xdHideLoading();
+        this.$xdLog.catch(error);
+      });
+    },
     doLoginForm() {
       const { auth_code, provider_id } = this;
       const { phone_number, verification_code, user_name } = this.accountForm;
@@ -564,6 +631,35 @@ export default {
 
 .jfb-base-phone-login {
   &__body {
+    ::v-deep .xd-dailog__body-content{
+      padding: 2rpx;
+      overflow: hidden;
+    }
+    .p_dialog_content{
+      padding: 100rpx 0rpx;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      .cont_text{
+        text-align: left;
+        margin-left: 12rpx;
+        font-size: 32rpx;
+        color: #333;
+      }
+    }
+    .btn_foot{
+      width: 100%;
+      display: flex;
+      .btn_item{
+        flex: 1;
+        border: 1px solid #E5E5E5;
+        height: 96rpx;
+        line-height: 96rpx;
+        text-align: center;
+        font-size: 32rpx;
+      }
+    }
+  
       // #ifdef H5
     .form-item {
       ::v-deep &.uni-forms-item {

package/src/components/JfbBaseTfkCardLogin/Attr.js

@@ -336,6 +336,29 @@ export default {
         ],
         hidden: data.previewCurrent !== 'card'
       },
+      {
+        label: "无票券时是否展示购买新卡入口:",
+        ele: "xd-radio",
+        valueKey: "isShowBuy",
+        value: data.isShowBuy || "N",
+        list: [
+          { label: "展示", value: "Y" },
+          { label: "隐藏", value: "N" }
+        ],
+        groupKey: "content",
+      },
+      {
+        label: '购买新卡文案:',
+        ele: 'el-input',
+        type: 'text',
+        valueKey: 'buy_name',
+        groupKey:'content',
+        value: data.buy_name || '',
+        placeholder: '请输入购买新卡文案',
+        className: 'input80',
+        inline: false,
+        notice: '当未设置文案时，页面默认展示为"<span style="color:red">购买新卡</span>"，建议不超过<span style="color:red">4</span>个汉字'
+      },
       {
         ele: "title",
         label: "我的优惠券内容配置",
@@ -1114,6 +1137,18 @@ export default {
         },
         inline: false,
       },
+      {
+        label: '购买新卡地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'buy_new_url',
+        groupKey:'advanced',
+        placeholder: '请选择购买新卡地址',
+        value: data.buy_new_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
     ].filter(i=>i)
   },
   advanced: [],

package/src/components/JfbBaseTfkCardLogin/JfbBaseTfkCardLogin.vue

@@ -104,7 +104,9 @@
             </view>
             <view v-else class="empty_data">
               <image :src="emptyBg"></image>
-              暂无票券
+              <view style="display:flex;align-items: center;justify-content: center;">
+                暂无票券 <view v-if="isShowBuy==='Y'" class="buy_new" @click="toBuyNew" :style="{color: mainColor}"><view>{{buy_name}}</view> <xd-font-icon size="20" icon="iconxiangyou_xian"></xd-font-icon></view>
+              </view>
             </view>
           </view>
         </template>
@@ -245,6 +247,9 @@
         cardBtnMinWidth: 100,
         menuShowType: "text",
         cardFontColor: "",
+        buy_new_url: '',
+        isShowBuy: "",
+        buy_name: ""
       }
     },
     computed: {
@@ -587,6 +592,9 @@
         this.noticePadding = getContainerPropsValue(value, "content.noticePadding", {top: 20, left: 20, right: 20, bottom: 20});
         this.noticeFont = getContainerPropsValue(value, "content.noticeFont", {});
         this.noticeMoreFont = getContainerPropsValue(value, "content.noticeMoreFont", {});
+        this.isShowBuy = getContainerPropsValue(value, "content.isShowBuy", "N");
+        this.buy_name = getContainerPropsValue(value, "content.buy_name", "购买新卡");
+        this.buy_new_url = getContainerPropsValue(value,"content.buy_new_url",{value: ""}).value;
 
         console.log(this.cardShadow, 'cardShadow')
         if(this.bindCardTextStyle && !this.bindCardTextStyle.color){
@@ -716,6 +724,11 @@
           url: this.disabledPath
         })
       },
+      toBuyNew() {
+        this.$xdUniHelper.navigateTo({
+          url: `${this.buy_new_url}`,
+        });
+      },
       onJfbScroll(options) {
         // console.log('event.onJfbScroll', options)
       },
@@ -886,6 +899,13 @@
           flex-direction: column;
           align-items: center;
           justify-content: center;
+          .buy_new {
+            display: flex;
+            margin-left: 8rpx;
+            & > view:first-child {
+              margin-right: 8rpx;
+            }
+          }
           & > image {
             width: unit(460,rpx);
             height: unit(400,rpx);