jufubao-base 1.0.116-beta3 → 1.0.116-beta5

package/src/components/JfbBaseSaasHome/Attr.js

@@ -8,99 +8,28 @@ export default {
   content: (data) => {
     return [
       {
-        label: '背景颜色:', //label
-        ele: 'xd-color', //package 名称
-        valueKey: 'bgcolor', //form[valueKey]
-        value: data.bgcolor || '', //v-model
-        placeholder: '请输入占位框背景颜色',
-        classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-        rules: [
-          {
-            required: true,
-            message: '请输入占位框背景颜色',
-            trigger: 'blur'
-          },
-        ]
-      },
-      {
-        label: '选中路径:', //label
+        label: '新闻列表地址:', //label
         ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'select-pages-path', //form[valueKey]
-        value: data['select-pages-path'] || {},
+        valueKey: 'newsListUrl', //form[valueKey]
+        placeholder: '请选择新闻列表地址',
+        value: null,
         setting: {
-          router: XdBus.getParentApi('getPagesTree')
+          router: XdBus.getParentApi('getPagesTree'),
         },
         inline: false,
       },
-      data.bgcolor && {
-        label: '高度:', //label
-        ele: 'el-input', //package 名称
-        type: 'number',
-        valueKey: 'height', //form[valueKey]
-        value: data.height || 100, //v-model
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-        rules: [
-          {
-            required: true,
-            message: '请输入占位框高度',
-            trigger: 'blur'
-          },
-        ]
-      },
       {
-        label: '', //label
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
+        label: '新闻详情地址:', //label
+        ele: 'xd-select-pages-path', //package 名称
+        valueKey: 'newsDetailUrl', //form[valueKey]
+        placeholder: '请选择新闻详情地址',
+        value: null,
+        setting: {
+          router: XdBus.getParentApi('getPagesTree'),
+        },
+        inline: false,
       },
     ].filter(i=>i)
   },
-  advanced: [
-    {
-      label: '背景颜色:', //label
-      ele: 'xd-color', //package 名称
-      valueKey: 'bgcolor', //form[valueKey]
-      value: '', //v-model
-      placeholder: '请输入占位框背景颜色',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入占位框背景颜色',
-          trigger: 'blur'
-        },
-      ]
-    },
-    {
-      label: '选中路径:', //label
-      ele: 'xd-select-pages-path', //package 名称
-      valueKey: 'select-pages-path', //form[valueKey]
-      value: null,
-      setting: {
-        router: XdBus.getParentApi('getPagesTree')
-      },
-      inline: false,
-    },
-    {
-      label: '高度:', //label
-      ele: 'el-input', //package 名称
-      type: 'number',
-      valueKey: 'height', //form[valueKey]
-      value: null, //v-model
-      placeholder: '请输入占位框高度，单位像素，默认：10px',
-      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-      rules: [
-        {
-          required: true,
-          message: '请输入占位框高度',
-          trigger: 'blur'
-        },
-      ]
-    },
-    {
-      label: '', //label
-      ele: 'slot', //package 名称
-      slot: 'is_reference',
-    },
-  ],
+  advanced: [],
 };

package/src/components/JfbBaseSaasHome/JfbBaseSaasHome.vue

@@ -19,61 +19,53 @@
           <view>企业名称</view>
           <xd-font-icon icon="iconxia_down" :size="24" style="margin-left: 16rpx;"></xd-font-icon>
         </view> -->
-        
-      </view>
-      <view class="banner">
-        <swiper class="swiper" circular>
-          <swiper-item v-for="i in 3" :key="i">
-            <view class="swiper-item">{{ i }}</view>
-          </swiper-item>
-        </swiper>
       </view>
-      <view class="category">
-        <view class="cate_item">
-          <view class="cate_img"></view>
-          <view class="cate_name">员工调研</view>
-        </view>
-        <view class="cate_item">
-          <view class="cate_img"></view>
-          <view class="cate_name">福利商城</view>
-        </view>
-        <view class="cate_item">
-          <view class="cate_img"></view>
-          <view class="cate_name">学习资料</view>
+      <template v-for="(comp, i) in componentList">
+        <view class="banner" v-if="comp.container_key === 'banner'" :key="i">
+          <swiper class="swiper" circular>
+            <swiper-item v-for="(item,i) in bannerList" :key="i">
+              <view class="swiper-item" @click="toBannerLink(item)">
+                <image :src="item.thumb" />
+              </view>
+            </swiper-item>
+          </swiper>
         </view>
-        <view class="cate_item">
-          <view class="cate_img"></view>
-          <view class="cate_name">更多期待</view>
+
+        <view class="category" v-if="comp.container_key === 'menus'" :key="i">
+          <view class="cate_item" v-for="(cate, ii) in comp.config.items" :key="ii">
+            <view class="cate_img"><image :src="cate.menu_icon"/></view>
+            <view class="cate_name">{{ cate.menu_title }}</view>
+          </view>
         </view>
-      </view>
 
-      <view class="notice">
-        公告：薄如蝉翼的金华火腿，每一口都是时间的味道
-      </view>
+        <view class="notice" v-if="comp.container_key === 'notice'" :key="i">
+          公告：薄如蝉翼的金华火腿，每一口都是时间的味道
+        </view>
 
-      <view class="news_wrap">
-        <view class="news_group">
-          <view class="group_header">
-            <view class="group_title">企业新闻</view>
-            <view class="group_more">
-              查看更多
-              <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="i in 3" :key="i">
-              <view class="news_cont">
-                <view class="news_tit">企业公告的信息，如果没有则不展示该模块直接展示企业新闻</view>
-                <view class="news_date">2022.10.08   12:00</view>
+        <view class="news_wrap" v-if="comp.container_key === 'news'" :key="i">
+          <view class="news_group">
+            <view class="group_header">
+              <view class="group_title">{{ comp.config.name }}</view>
+              <view class="group_more" @click="toNewsList">
+                查看更多
+                <xd-font-icon icon="iconxiangyou_xian" :size="24" style="margin-left: 16rpx;"></xd-font-icon>
               </view>
-              <view class="news_img">
-
+            </view>
+            <view class="group_body">
+              <view class="news_item" v-for="(news, i) in newsList" :key="i" @click="toNewsDetail">
+                <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>
 
+      </template>
     </view>
   </view>
 </template>
@@ -85,6 +77,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: "JfbBaseSaasHome",
     components: {
@@ -95,8 +88,14 @@
     ],
     data() {
       return {
+        componentList: [], //组件列表
+        bannerList: [],
+        newsList: [],
+        noticeList: [],
 
-        //todo
+        //面板
+        newsListUrl: "",  //新闻列表url
+        newsDetailUrl: "",  //新闻详情url
       }
     },
     watch: {
@@ -111,29 +110,80 @@
     },
     methods: {
       onJfbLoad(options) {
+        jfbRootExec("getHomeConfig", {
+          vm: this,
+          data: {}
+        }).then(res => {
+          let componentList = JSON.parse(res.index_config);
+          console.log(componentList);
+          this.componentList = componentList.filter(item => item.status === 'Y');
 
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
+          this.componentList.forEach((item,i) => {
+            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;
+                  });
+                })
+                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;
+                  });
+                })
+                break;
+              case "notice":
+                this.p_getNewsList("notice", "news").then(res => {
+                  this.noticeList = res.list;
+                })
+                break;
+            }
+          })
+        })
       },
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
       init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
+        this.newsListUrl = getContainerPropsValue(container, 'content.newsListUrl', {value: ""}).value;
+        this.newsDetailUrl = getContainerPropsValue(container, 'content.newsDetailUrl', {value: ""}).value;
+      },
+      p_getNewsList(position_id, scene){
+        return jfbRootExec("getNewsList", {
+          vm: this,
+          data: {
+            position_id: position_id,
+            scene: scene,
+            page_size: 10,
+            page_token: 1
+          }
+        })
+      },
+      toNewsList(){
+        this.$xdUniHelper.navigateTo({
+          url: `${this.newsListUrl}`,
+        });
+      },
+      toNewsDetail(){
+        this.$xdUniHelper.navigateTo({
+          url: `${this.newsDetailUrl}`,
+        });
+      },
+      toBannerLink(item){
+        this.$xdUniHelper.navigateTo({
+          url: `${item.jump_url}`,
+        });
       },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -146,6 +196,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack();
       },
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)
@@ -163,6 +214,7 @@
 
   .jfb-base-saas-home {
     &__body{
+      background: #F5F9FA;
       .top_wrap{
         .comp_name{
           padding: 24rpx 36rpx;
@@ -181,6 +233,10 @@
           .swiper-item{
             height: 300rpx;
             background-color: red;
+            image{
+              width: 100%;
+              height: 100%;
+            }
           }
         }
         
@@ -194,13 +250,17 @@
           .cate_img{
             width: 100rpx;
             height: 100rpx;
-            background-color: #DDD;
+            image{
+              width: 100%;
+              height: 100%;
+            }
           }
           .cate_name{
             font-size: 24rpx;
             color: #333333;
             font-weight: 400;
             margin-top: 16rpx;
+            text-align: center;
           }
         }
       }
@@ -263,6 +323,13 @@
               .news_tit{
                 font-size: 28rpx;
                 color: #333333;
+                height: 96rpx;
+                line-height: 48rpx;;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                -webkit-line-clamp: 2;
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
               }
               .news_date{
                 color: #999999;
@@ -276,6 +343,10 @@
               height: 120rpx;
               background-color: #333333;
               margin-left: 60rpx;
+              image{
+                width: 100%;
+                height: 100%;
+              }
             }
           }
         }

package/src/components/JfbBaseSaasLogin/Api.js

@@ -23,4 +23,17 @@ module.exports = [
     isConsole: true,
     disabled: true,
   },
+  {
+    mapFnName: 'sassLogin',
+    title: '登录',
+    path: '/saas/v1/login/check-sms',
+    isRule: false,
+    data: {
+      biz_name: ['biz_name', 'String', true],
+      phone_number: ['手机号', 'String', '必选'],
+      valid_code: ['valid_code', 'String', '必选']
+    },
+    isConsole: true,
+    disabled: true,
+  }
 ];

package/src/components/JfbBaseSaasLogin/Attr.js

@@ -18,17 +18,17 @@ export default {
         },
         inline: false,
       },
-      {
-        label: '忘记密码跳转地址:', //label
-        ele: 'xd-select-pages-path', //package 名称
-        valueKey: 'forget_pwd_url', //form[valueKey]
-        placeholder: '请选择跳转地址',
-        value: null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree'),
-        },
-        inline: false,
-      },
+      // {
+      //   label: '忘记密码跳转地址:', //label
+      //   ele: 'xd-select-pages-path', //package 名称
+      //   valueKey: 'forget_pwd_url', //form[valueKey]
+      //   placeholder: '请选择跳转地址',
+      //   value: null,
+      //   setting: {
+      //     router: XdBus.getParentApi('getPagesTree'),
+      //   },
+      //   inline: false,
+      // },
     ].filter(i=>i)
   },
   advanced: [

package/src/components/JfbBaseSaasLogin/JfbBaseSaasLogin.vue

@@ -94,6 +94,16 @@
         >忘记密码</view> -->
       </view>
       <view class="not_login">暂不登录，去逛逛</view>
+      <xd-dailog :show.sync="dialogShow" title="">
+        <view class="dia_title">您在多个企业任职<br/>请选择本次要访问的企业</view>
+        <view class="company_list">
+          <view class="company_item" v-for="(item, i) in companyList" :key="i" @click="toHome(item)">
+            <view class="_name">{{ item.company_name }}</view>
+            <xd-font-icon icon="iconxiangyou_xian" :size="30"></xd-font-icon>
+          </view>
+        </view>
+        <view slot="btn"></view>
+      </xd-dailog>
     </view>
   </view>
 </template>
@@ -105,6 +115,7 @@
   import XdFormInput from "@/components/XdFormInput/XdFormInput";
   import XdForm from "@/components/XdForm/XdForm";
   import XdFormItem from "@/components/XdFormItem/XdFormItem";
+  import XdDailog from "@/components/XdDailog/XdDailog"
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseSaasLoginMixin from "./JfbBaseSaasLoginMixin";
   import { getContainerPropsValue } from "@/utils/xd.base";
@@ -119,6 +130,7 @@
       XdFormInput,
       XdForm,
       XdFormItem,
+      XdDailog
     },
     mixins: [
       componentsMixins, extsMixins, JfbBaseSaasLoginMixin
@@ -138,6 +150,8 @@
         time: 0,
         panel_2_checked: "",
         redirect_url: "", //401回跳地址
+        dialogShow: false,
+        companyList: [],
 
         //面板
         callback_url: "", //面板配置登录完跳转地址
@@ -165,7 +179,7 @@
         this.forget_pwd_url = getContainerPropsValue(container, "content.forget_pwd_url", {value: ''}).value;
       },
       doLoginForm() {
-        const { phone_number, password } = this.accountForm;
+        const { phone_number, password, verification_code } = this.accountForm;
         let err_tip = "";
         if (!phone_number) err_tip = "手机号不能为空";
         else if (!verification_code) err_tip = "验证码不能为空";
@@ -177,24 +191,42 @@
         }
 
         this.$xdShowLoading({})
-        jfbRootExec("accountLogin", {
+        jfbRootExec("sassLogin", {
           vm: this,
           data: {
-            // provider_id: this.pwdLogin.provider_id,
-            account_name: phone_number,
-            password: password,
+            biz_name: "login",
+            phone_number: phone_number,
+            valid_code: verification_code,
           },
         })
           .then((res) => {
             this.$xdHideLoading()
             // this.jfbAuthorize.setAllToken(res);
-            this.toHomeAfterLogin();
+            // this.toHomeAfterLogin();
+            if(res.list.length === 0){
+              uni.showToast({
+                title: '该用户没有所属企业',
+                duration: 2000
+              });
+            }
+            else if(res.list.length > 1){
+              this.companyList = res.list;
+              this.dialogShow = true;
+            }else{
+              this.toHome(res.list[0])
+            }
           })
           .catch(error => {
             this.$xdHideLoading()
             this.$xdLog.catch(error)
           });
       },
+      toHome(item){
+        this.$xdUniHelper.redirectTo({
+          url: `/apply/main/saas/home?company_id=${item.company_id}`
+        });
+        // this.toHomeAfterLogin();
+      },
       toHomeAfterLogin() {
         let { redirect_url, callback_url } = this;
         if (redirect_url) redirect_url = redirect_url;
@@ -248,7 +280,7 @@
         });
       },
       onJfbScroll(options) {
-        console.log('event.onJfbScroll', options)
+        
       },
       onJfbReachBottom(options) {
         console.log('event.onJfbReachBottom', options)
@@ -261,6 +293,7 @@
       },
       onJfbBack(options) {
         console.log('event.onJfbBack', options)
+        this.$xdUniHelper.navigateBack();
       },
       onJfbUpdate(...data) {
         console.log('event.onJfbUpdate', data)
@@ -281,6 +314,30 @@
     box-sizing: border-box;
     &__body{
       position: relative;
+      .dia_title{
+        color: #333333;
+        font-size: 32rpx;
+        font-weight: 500;
+        margin: 60rpx 0;
+      }
+      .company_list{
+        .company_item{
+          display: flex;
+          justify-content: space-between;
+          background: #FE7A63;
+          border-radius: 60rpx;
+          padding: 20rpx 48rpx;
+          color: #FFFFFF;
+          margin: 20rpx 0;
+          ._name{
+            flex: 1;
+            width: 100rpx;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+          }
+        }
+      }
       .not_login{
         position: absolute;
         bottom: 200rpx;

package/src/components/JfbBaseSaasNewsDetail/Api.js

@@ -12,47 +12,14 @@
  */
 module.exports = [
   {
-    mapFnName: 'getByIdFilmSquate', //自定义方法名字（必选）
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getNewsDetail',
+    title: '获取新闻详情',
+    path: '/saas/v1/content_ad_news/item',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'updateFilmPaiqiDate', //自定义方法名字（必选）
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'removeFilmAddress', //自定义方法名字（必选）
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    mapFnName: 'addFilmcart',  //自定义方法名字（必选）
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+      id: ['id', 'String', true],
+      position_id: ['位置ID', 'String', '必选'],
+      scene: ['场景ad,news', 'String', '必选']
     },
     isConsole: true,
     disabled: true,