jufubao-base 1.0.119-beta2 → 1.0.119-beta3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.119-beta2",
+  "version": "1.0.119-beta3",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -48,6 +48,7 @@
     "@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",
@@ -56,10 +57,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",
-    "vconsole": "^3.15.0"
+    "vuex": "^3.2.0"
   },
   "repository": {
     "type": "git",

package/src/components/JfbBaseSaasBlessDetail/JfbBaseSaasBlessDetail.vue

@@ -13,13 +13,23 @@
       <view class="jfb-base-saas-bless-detail__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
-    <view class="jfb-base-saas-bless-detail__body">
+    <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">
-          <view class="dear">亲爱的张珊珊：</view>
-          <view class="desc">同事好比亲兄弟，一个单位共努力，加班加点在一起，齐心协力拼业绩，新年春节悄然到身旁，祝福送你好兄弟，合家欢乐福相伴，年年有余好运随，新年春节快乐哟！</view>
-          <view class="salute">某某公司致上</view>
+        <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>
@@ -42,8 +52,8 @@
         <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">节日福利已经放入您的账户</view>
-          <view class="sign_ticket">祝福券 X1张</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>
@@ -82,6 +92,8 @@
         dialogSuccess: false,
         sign_image_url: "",
         bless_id: "",
+        blessData: {},
+        blessConfig: null,
 
         //面板
         useTicketUrl: "",   //使用券跳转地址
@@ -100,6 +112,18 @@
     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 监听事件变化
@@ -108,6 +132,7 @@
       init(container) {
 
       },
+
       showSign(){
         this.dialogShow = true;
       },
@@ -233,20 +258,21 @@
   .jfb-base-saas-bless-detail {
     &__body{
       box-sizing: border-box;
+      background-size: 100% auto;
+      position: relative;
       .bless_detail{
-        padding: 350rpx 48rpx;
 
         .bless_box{
-          width: 600rpx;
-          height: 720rpx;
-          border: 1px solid #DDD;
           margin: 0 auto;
-          background-color: #FFF2CD;
           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;
           }

package/src/components/JfbBaseSaasBlessDialog/JfbBaseSaasBlessDialog.vue

@@ -17,23 +17,24 @@
       <view class="dialog_wrap" v-if="isShow">
         <view class="dialog_mask"></view>
         <view class="dialog_content">
-          <view class="dialog_num">
-            <text>1/4</text>
+          <view v-if="showIndicator" class="dialog_num">
+            <text>{{currentIndex + 1}}/{{ list.length }}</text>
           </view>
           <view class="dialog_main">
-            <view class="_left" @click="handleChange('left')">
+            <view v-if="showIndicator" class="_left" @click="handleChange('left')">
               <xd-font-icon icon="iconxiangzuo_xian"></xd-font-icon>
             </view>
-            <view class="_cont">
-              <image class="dialog_image" :src="currentImage"></image>
-              <view class="pop_tip">聚福宝节日祝福券  1张</view>
+            <view class="_cont" v-if="currCover && currCover.bless_cover_config">
+              <image class="dialog_image" :src="currCover.bless_cover_config.material_image.path"></image>
+              <view class="pop_tip">{{currCover.bless_type_name}}  {{ currCover.bless_card_number }}张</view>
               <view class="bless_wrap">
-                <view class="bless_name">亲爱的张珊珊：</view>
-                <view class="bless_cont">您收到了一份为您定制的专属祝福，快去查看并使用吧！</view>
+                <view class="bless_name">{{currCover.bless_cover_config.material_nickname}}</view>
+                <view class="bless_cont">{{currCover.bless_cover_config.material_content}}</view>
+                <!-- <view class="bless_comp">{{ currCover.bless_cover_config.material_end }}</view> -->
               </view>
               <xd-button class="btn_image" type="primary" @click="handleToDetail">去看看</xd-button>
             </view>
-            <view class="_right" @click="handleChange('right')">
+            <view v-if="showIndicator" class="_right" @click="handleChange('right')">
               <xd-font-icon icon="iconxiangyou_xian"></xd-font-icon>
             </view>
           </view>
@@ -62,6 +63,7 @@
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseSaasBlessDialogMixin from "./JfbBaseSaasBlessDialogMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
+  import getServiceUrl from '@/common/getServiceUrl'
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   export default {
@@ -76,7 +78,7 @@
     data() {
       return {
         isPreview: false, //是否预览
-        isShow: true,
+        isShow: false,
         currentImage: "",
         currentIndex: 0,
         list: [],
@@ -91,21 +93,23 @@
         this.init(value)
       }
     },
+    computed: {
+      currCover(){
+        if(this.currentIndex < 0) return this.list[0];
+        if(this.currentIndex > this.list.length - 1) return this.list[this.list.length - 1];
+        return this.list[this.currentIndex]
+      },
+      showIndicator(){
+        return this.list.length > 1
+      }
+    },
     created() {
       this.isPreview = this.$configProject.isPreview;
       this.init(this.container);
     },
     methods: {
       onJfbLoad(options) {
-        jfbRootExec("getBlessList", {
-          vm: this,
-          data: {
-            page_size: 10,
-            page_token: '1'
-          }
-        }).then(res => {
-          this.list = res.list;
-        })
+        
       },
       /**
        * @description 监听事件变化
@@ -114,13 +118,37 @@
       init(container) {
         this.type = getContainerPropsValue(container, "content.type", 1);
         this.isHide = getContainerPropsValue(container, "content.isHide", false);
+        this.blessDetailUrl = getContainerPropsValue(container, 'content.blessDetailUrl', {value: "/main/saas/blessDetail"}).value;
         if (this.isPreview) {
           this.isShow = !this.isHide;
         }
       },
+      getList(){
+        jfbRootExec("getBlessList", {
+          vm: this,
+          data: {
+            page_size: 10,
+            page_token: '1'
+          }
+        }).then(res => {
+          this.handleBlessList(res);
+        })
+      },
+      handleBlessList(res){
+        if(res.list.length > 0) this.isShow = true;
+        this.list = res.list.map(item => {
+          try{
+            item['bless_cover_config'] = JSON.parse(item.bless_cover_config);
+          }catch(err){
+            item['bless_cover_config'] = {};
+          }
+          return item;
+        });
+      },
       handleToDetail(){
+        const { bless_id } = this.currCover;
         this.$xdUniHelper.navigateTo({
-          url: `${this.blessDetailUrl}?bless_id=${1}`,
+          url: `${this.blessDetailUrl}?bless_id=${bless_id}`,
         });
       },
       handleClose(){
@@ -154,7 +182,10 @@
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)
       },
-      onJfbCustomEvent(options) {
+      onJfbCustomEvent({action, data}) {
+        if(action === '@showBaseBlessDialog'){
+          this.getList();
+        }
         console.log('event.onJfbReachBottom', options)
       },
     }
@@ -236,7 +267,6 @@
               .dialog_image {
                 width: 100%;
                 height: 328rpx;
-                background: red;
               }
               .pop_tip{
                 width: 100%;
@@ -249,6 +279,8 @@
               }
               .bless_wrap{
                 padding: 48rpx 32rpx;
+                width: 100%;
+                box-sizing: border-box;
                 .bless_name{
                   font-size: 36rpx;
                   color: #333333;
@@ -260,6 +292,9 @@
                   font-weight: 400;
                   margin-top: 32rpx;
                 }
+                .bless_comp{
+                  text-align: right;
+                }
               }
               .btn_image{
                 width: unit(448, rpx);

package/src/components/JfbBaseSaasBlessReceive/JfbBaseSaasBlessReceive.vue

@@ -17,13 +17,15 @@
       <view class="receive_list">
         <view class="receive_item" v-for="(item, i) in blessData" :key="i">
           <view class="head">{{item.bless_type_name}}</view>
-          <view class="card"></view>
+          <view class="card">
+            <image :src="item.cover_url"/>
+          </view>
           <view class="receive_cont">
             <view class="card_name">{{ item.bless_name }}</view>
-            <view class="card_num">× 1张</view>
+            <view class="card_num">× {{ item.bless_card_number }}张</view>
           </view>
           <view class="receive_time">
-            <view class="_time">2022.10.01    23:45</view>
+            <view class="_time">{{ item.release_time }}</view>
             <view>
               <xd-button v-if="item.receive_status === 'N'" size="small" type="primary" @click="toSignUrl(item)">立即签收</xd-button>
               <xd-button v-else size="small" type="default" @click="toSignUrl(item)">再次查看</xd-button>
@@ -43,6 +45,7 @@
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
+  import getServiceUrl from '@/common/getServiceUrl'
   export default {
     name: "JfbBaseSaasBlessReceive",
     components: {
@@ -80,7 +83,7 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.blessSignUrl = getContainerPropsValue(container, 'content.blessSignUrl', {value: ""}).value;
+        this.blessSignUrl = getContainerPropsValue(container, 'content.blessSignUrl', {value: "/main/saas/blessDetail"}).value;
       },
       toSignUrl(item){
         this.$xdUniHelper.navigateTo({
@@ -96,7 +99,18 @@
           }
         }).then(res => {
           this.$xdHideLoading();
-          this.blessData = res.list;
+          this.blessData = res.list.map(item => {
+            try{
+              let cover = JSON.parse(item.bless_cover_config)
+              item['cover_url'] = getServiceUrl(cover.material_image.url);
+            }catch(err){
+              item['cover_url'] = ""
+            }
+            item['release_time'] = this.$xdUniHelper.getDate(
+              item["release_time"] * 1000
+            ).fullTime;
+            return item;
+          });
         })
       },
       onJfbScroll(options) {
@@ -148,8 +162,12 @@
           .card{
             height: 300rpx;
             border-radius: 16rpx;
-            background-color: red;
             margin-top: 24rpx;
+            overflow: hidden;
+            image{
+              width: 100%;
+              height: 100%;
+            }
           }
           .receive_cont{
             display: flex;

package/src/components/JfbBaseSaasHome/JfbBaseSaasHome.vue

@@ -21,7 +21,7 @@
         </view> -->
       </view>
       <template v-for="(comp, i) in componentList">
-        <view class="banner" v-if="comp.container_key === 'banner'" :key="i">
+        <view class="banner" v-if="comp.container_key === 'banner' && bannerList.length" :key="i">
           <swiper class="swiper" circular>
             <swiper-item v-for="(item,i) in bannerList" :key="i">
               <view class="swiper-item" @click="toBannerLink(item)">
@@ -38,21 +38,50 @@
           </view>
         </view>
 
-        <view class="notice" v-if="comp.container_key === 'notice'" :key="i">
-          公告：薄如蝉翼的金华火腿，每一口都是时间的味道
+        <view class="notice" v-if="comp.container_key === 'notice' && noticeList.length" :key="i">
+          <!-- 公告：薄如蝉翼的金华火腿，每一口都是时间的味道 -->
+          <swiper vertical style="height: 40rpx;" autoplay>
+            <swiper-item v-for="(item,i) in noticeList" :key="i">
+              <view style="height: 40rpx;line-height: 40rpx;">{{ item.title }}</view>
+            </swiper-item>
+          </swiper>
         </view>
+        <!-- <xd-notice-bar single scrollable></xd-notice-bar> -->
 
-        <view class="news_wrap" v-if="comp.container_key === 'news'" :key="i">
+        <view class="news_wrap" v-if="comp.container_key === 'news' && newsList.length" :key="i">
           <view class="news_group">
             <view class="group_header">
               <view class="group_title">{{ comp.config.name }}</view>
-              <view class="group_more" @click="toNewsList">
+              <view class="group_more" @click="toNewsList('news')">
                 查看更多
                 <xd-font-icon icon="iconxiangyou_xian" :size="24" style="margin-left: 16rpx;"></xd-font-icon>
               </view>
             </view>
             <view class="group_body">
-              <view class="news_item" v-for="(news, i) in newsList" :key="i" @click="toNewsDetail">
+              <view class="news_item" v-for="(news, i) in newsList" :key="i" @click="toNewsDetail(news.id)">
+                <view class="news_cont">
+                  <view class="news_tit">{{ news.title }}</view>
+                  <view class="news_date">{{ news.created_time }}</view>
+                </view>
+                <view class="news_img">
+                  <image :src="news.thumb" />
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="news_wrap" v-if="comp.container_key === 'study' && studyList.length" :key="i">
+          <view class="news_group">
+            <view class="group_header">
+              <view class="group_title">{{ comp.config.name }}</view>
+              <view class="group_more" @click="toNewsList('study')">
+                查看更多
+                <xd-font-icon icon="iconxiangyou_xian" :size="24" style="margin-left: 16rpx;"></xd-font-icon>
+              </view>
+            </view>
+            <view class="group_body">
+              <view class="news_item" v-for="(news, i) in studyList" :key="i" @click="toNewsDetail(news.id)">
                 <view class="news_cont">
                   <view class="news_tit">{{ news.title }}</view>
                   <view class="news_date">{{ news.created_time }}</view>
@@ -72,16 +101,18 @@
 
 <script>
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
+  import { jfbRootExec, jfbRootFnExec } from "@/utils/xd.event";
   import JfbBaseSaasHomeMixin from "./JfbBaseSaasHomeMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
+  import XdNoticeBar from "@/components/XdNoticeBar/XdNoticeBar"
   export default {
     name: "JfbBaseSaasHome",
     components: {
-      XdFontIcon
+      XdFontIcon,
+      XdNoticeBar
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseSaasHomeMixin
@@ -92,6 +123,7 @@
         bannerList: [],
         newsList: [],
         noticeList: [],
+        studyList: [],
 
         //面板
         newsListUrl: "",  //新闻列表url
@@ -122,21 +154,12 @@
             switch (item.container_key) {
               case "banner":
                 this.p_getNewsList("banner", "ad").then(res => {
-                  this.bannerList = res.list.map(ban => {
-                    ban['thumb'] = ban.thumb ? getServiceUrl(ban.thumb) : ""
-                    return ban;
-                  });
+                  this.bannerList = this.handleMapList(res.list);
                 })
                 break;
               case "news":
                 this.p_getNewsList("news", "news").then(res => {
-                  this.newsList = res.list.map(news => {
-                    news.created_time = this.$xdUniHelper.getDate(
-                      news["created_time"] * 1000
-                    ).fullTime;
-                    news.thumb = news.thumb ? getServiceUrl(news.thumb) : ""
-                    return news;
-                  });
+                  this.newsList = this.handleMapList(res.list);
                 })
                 break;
               case "notice":
@@ -144,6 +167,16 @@
                   this.noticeList = res.list;
                 })
                 break;
+              case "study":
+                this.p_getNewsList("study", "news").then(res => {
+                  this.studyList = this.handleMapList(res.list);
+                })
+                break;
+              case "is_pop":
+                if(item.status === 'Y'){
+                  jfbRootFnExec(this, 'onCustomEvent')("@showBaseBlessDialog", {})
+                }
+                break;
             }
           })
         })
@@ -153,8 +186,21 @@
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-        this.newsListUrl = getContainerPropsValue(container, 'content.newsListUrl', {value: ""}).value;
-        this.newsDetailUrl = getContainerPropsValue(container, 'content.newsDetailUrl', {value: ""}).value;
+        this.newsListUrl = getContainerPropsValue(container, 'content.newsListUrl', {value: "/main/saas/newsList"}).value;
+        this.newsDetailUrl = getContainerPropsValue(container, 'content.newsDetailUrl', {value: "/main/saas/newsDetail"}).value;
+      },
+      handleMapList(list){
+        return list.map(news => {
+          if(news.created_time){
+            news.created_time = this.$xdUniHelper.getDate(
+              news["created_time"] * 1000
+            ).fullTime;
+          }
+          if(news.thumb){
+            news.thumb = news.thumb ? getServiceUrl(news.thumb) : ""
+          }
+          return news;
+        })
       },
       p_getNewsList(position_id, scene){
         return jfbRootExec("getNewsList", {
@@ -167,14 +213,14 @@
           }
         })
       },
-      toNewsList(){
+      toNewsList(position_id){
         this.$xdUniHelper.navigateTo({
-          url: `${this.newsListUrl}`,
+          url: `${this.newsListUrl}?position_id=${position_id}`,
         });
       },
-      toNewsDetail(){
+      toNewsDetail(id){
         this.$xdUniHelper.navigateTo({
-          url: `${this.newsDetailUrl}`,
+          url: `${this.newsDetailUrl}?id=${id}`,
         });
       },
       toBannerLink(item){

package/src/components/JfbBaseSaasLogin/Api.js

@@ -11,6 +11,65 @@
  * @type {*[]}
  */
 module.exports = [
+  {
+    mapFnName: "getPlatform",
+    title: "登入 - 获取当前平台：根据header头判断",
+    path: "/saas/v1/login/platforms",
+    isRule: false,
+    data: {
+      sub_company_id: ['子公司ID', 'String', true],
+      callback_url: ['成功后回调URL', 'String', true],
+      phone_number_login_url: ['手机号登陆URL', 'String', true],
+      error_callback_url: ['错误回调URL', 'String', true],
+      phone_auth_callback_url: ['手机认证回调URL', 'String', true]
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "loginDing",
+    title: "钉钉登入 - code登陆：返回临时code",
+    path: "/saas/v1/login/dd/code-login",
+    isRule: false,
+    data: {
+      sub_company_id: ['子公司ID', 'String', true],
+      code: ['钉钉code', 'String', true],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+ 
+  {
+    mapFnName: "loginWxEnter",
+    title: "企业微信登入 - code登陆：重定向passport、错误页、手机授权页",
+    path: "/saas/v1/login/qw/code-login",
+    isRule: false,
+    data: {
+      sub_company_id: ['子公司ID', 'String', true],
+      code: ['钉钉code', 'String', true],
+      callback_url: ['成功后回调URL', 'String', true],
+      phone_number_login_url: ['手机号登陆URL', 'String', true],
+      error_callback_url: ['错误回调URL', 'String', true],
+      phone_auth_callback_url: ['手机认证回调URL', 'String', true]
+    },
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "passportSaasLogin",
+    title: "saas用户登录",
+    path: "/passport-pb/v1/user/login-saas",
+    isRule: false,
+    params: {
+      access_token: ['access_token', 'String', true],
+      redirect_url: ['跳转地址', 'String', true],
+      phone_number: ['手机号', 'String', true],
+      valid_code: ['手机验证码', 'String', true],
+      biz_name: ['验证码校验参数', 'String', true]
+    },
+    isConsole: true,
+    disabled: true,
+  },
   {
     mapFnName: 'sendMsg',
     title: '发送验证码',
@@ -24,9 +83,9 @@ module.exports = [
     disabled: true,
   },
   {
-    mapFnName: 'sassLogin',
+    mapFnName: 'sassPhoneLogin',
     title: '登录',
-    path: '/saas/v1/login/check-sms',
+    path: '/saas/v1/login/jfb/check-sms',
     isRule: false,
     data: {
       biz_name: ['biz_name', 'String', true],

package/src/components/JfbBaseSaasLogin/Attr.js

@@ -12,7 +12,29 @@ export default {
         ele: 'xd-select-pages-path', //package 名称
         valueKey: 'callback_url', //form[valueKey]
         placeholder: '请选择登录成功跳转地址',
-        value: null,
+        value: data.callback_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '手机认证跳转地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'phone_auth_callback_url',
+        placeholder: '请选择手机认证跳转地址',
+        value: data.phone_auth_callback_url || null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
+      },
+      {
+        label: '错误跳转地址:',
+        ele: 'xd-select-pages-path',
+        valueKey: 'error_callback_url',
+        placeholder: '请选择错误跳转地址',
+        value: data.error_callback_url || null,
         setting: {
           router: XdBus.getParentApi('getPagesTree'),
         },