jufubao-base 1.0.279-beta101 → 1.0.279-beta103

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.279-beta101",
+  "version": "1.0.279-beta103",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",

package/src/components/JfbBaseCard/JfbBaseCard.vue

@@ -652,6 +652,12 @@ export default {
 
       //登录成功调整地址优先级
       this.inCallback = inCallback || this.allEntryPath || this.settings.index;
+
+      //检查是否为小程序环境
+      //#ifdef H5
+      if(this.jfbAuthorize.checkIsH5ToMpEnv(this, this.inCallback ,'card')) return;
+      // #endif
+
       this.getContent();
 
       this.getCardList(options);

package/src/components/JfbBaseCardEntry/JfbBaseCardEntry.vue

@@ -825,6 +825,12 @@ export default {
 
       //登录成功调整地址优先级
       this.inCallback = inCallback || this.allEntryPath || this.settings.index;
+
+      //检查是否为小程序环境
+      //#ifdef H5
+      if(this.jfbAuthorize.checkIsH5ToMpEnv(this, this.inCallback ,'card')) return;
+      // #endif
+
       this.getContent();
       if(this.tabIndex===1) {
         this.getCardList(options);

package/src/components/JfbBaseCardV2/JfbBaseCardV2.vue

@@ -233,6 +233,12 @@
         }
         this.inCallback = inCallback || this.settings.index;
 
+        //检查是否为小程序环境
+        //#ifdef H5
+        if(this.jfbAuthorize.checkIsH5ToMpEnv(this, this.inCallback ,'card')) return;
+        // #endif
+
+
         this.getList();
       },
 

package/src/components/JfbBaseCardV3/JfbBaseCardV3.vue

@@ -131,6 +131,12 @@
         }
         this.inCallback = inCallback || this.settings.index;
 
+        //检查是否为小程序环境
+        //#ifdef H5
+        if(this.jfbAuthorize.checkIsH5ToMpEnv(this, this.inCallback ,'card')) return;
+        // #endif
+
+
         this.getList();
       },
 

package/src/components/JfbBaseChangeCompany/Api.js

@@ -7,51 +7,11 @@
 module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Change
-    mapFnName: 'getChangeByIdFilmSquate',
+    mapFnName: 'getChangeCompanyItem',
     title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    path: '/saas/v1/company/item',
     isRule: false,
-    params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Change
-    mapFnName: 'updateChangeFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Change
-    mapFnName: 'removeChangeFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Change
-    mapFnName: 'addChangeFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
+    params: {},
     isConsole: true,
     disabled: true,
   },

package/src/components/JfbBaseChangeCompany/Attr.js

@@ -1,48 +1,18 @@
 'use strict';
-
+import Style from './cusAttr/style'
+import Advanced from './cusAttr/advanced'
+import Content from './cusAttr/content'
 /**
  * @description 当表单组件中有联动操作时候，使用方法进行返回
  */
 export default {
   style: [],
-  content: (data) => {
+  content: (data, gValue, gColor, oldData) => {
     return [
-      {
-        label: '背景颜色:',
-        ele: 'xd-color',
-        valueKey: 'bgColor',
-        value: data.bgColor || '',
-        placeholder: '请输入占位框背景颜色',
-        groupKey:'content',
-      },
-      {
-        label: '选中路径:',
-        groupKey:'advanced',
-        className: 'input100',
-        ele: 'xd-select-pages-path',
-        valueKey: 'select-pages-path',
-        value: data['select-pages-path'] || null,
-        setting: {
-          router: XdBus.getParentApi('getPagesTree')
-        },
-      },
-      data.bgColor && {
-        label: '高度:',
-        ele: 'el-input',
-        groupKey:'style',
-        type: 'number',
-        valueKey: 'height',
-        value: data.height || 100,
-        placeholder: '请输入占位框高度，单位像素，默认：10px',
-        className: 'input60',
-      },
-      {
-        label: '', //label
-        groupKey:'advanced',
-        ele: 'slot', //package 名称
-        slot: 'is_reference',
-      },
-    ].filter(i=>i)
+      ...Style(data, gValue, gColor, oldData),
+      ...Advanced(data, gValue, gColor, oldData),
+      ...Content(data, gValue, gColor, oldData),
+    ].filter(i => i)
   },
   advanced: [],
 };

package/src/components/JfbBaseChangeCompany/JfbBaseChangeCompany.vue

@@ -2,110 +2,200 @@
   <view
     class="jfb-base-change-company"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-change-company__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-change-company__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-change-company__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
     <view class="jfb-base-change-company__body">
-      <view>测试插件( {{containerId}} )</view>
+      <view
+        @click="handleToChangeCompany"
+        :style="[contWrapStyle]"
+        class="jfb-base-change-company__body-wrap"
+      >
+        <view class="jfb-base-change-company__body-wrap-left">
+          <XdFontIcon size="28" icon="iconxingzhuangjiehe"></XdFontIcon>
+          <view
+            :style="{
+              margin: companyPosition === 'left' ? '0 0 0 16rpx' : '0 auto',
+            }"
+            class="jfb-base-change-company__body-wrap-left-name"
+            >{{ company_name||'请选择企业' }}</view
+          >
+        </view>
+        <XdFontIcon size="28" icon="iconxiangyou_xian"></XdFontIcon>
+      </view>
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseChangeCompanyMixin from "./JfbBaseChangeCompanyMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseChangeCompany",
-    components: {
-      XdFontIcon
-    },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseChangeCompanyMixin
-    ],
-    data() {
-      return {
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseChangeCompanyMixin from "./JfbBaseChangeCompanyMixin";
+import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+import store from "@/store";
 
-        //todo
-      }
+export default {
+  name: "JfbBaseChangeCompany",
+  components: {
+    XdFontIcon,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseChangeCompanyMixin],
+  data() {
+    return {
+      companyPosition: "",
+      contentPadding: {},
+      backgroundColor: "",
+      fontStyle: {},
+      changeCompanyPath: "",
+      company_name: ''
+    };
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+  },
+  computed: {
+    contWrapStyle() {
+      return {
+        padding: this.getMarginAndPadding(this.contentPadding),
+        backgroundColor: this.backgroundColor,
+        color: this.fontStyle.color,
+      };
     },
-    created() {
-      this.init(this.container);
+  },
+  created() {
+    this.init(this.container);
 
-      //todo
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      jfbRootExec("getChangeCompanyItem", {
+        vm: this,
+        data: {},
+      }).then((res) => {
+        this.company_name = res.company_name
+      });
     },
-    methods: {
-      onJfbLoad(options) {
-
-        // jfbRootExec('baiduUserLogin', {
-
-        //   vm: this,//   data: {
-
-        //     account: 'gaoshiyong',//     password: '123456789',//     type: 3,//     ...options
-
-        //   }
-
-        // }).then().catch()
-      },
-      /**
-       * @description 监听事件变化
-       * @param container {object} 业务组件对象自己
-       */
-      init(container) {
-
-        //this.bgcolor = getContainerPropsValue(container, 'content.bgcolor', '#fff');
-
-        //this.height = getContainerPropsValue(container, 'content.height', 10);
-      },
-      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)
-      },
-    }
-  }
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      //content
+      this.companyPosition = gCPVal(container, "companyPosition", "left", {});
+      //style
+      this.contentPadding = gCPVal(
+        container,
+        "contentPadding",
+        { top: 24, bottom: 24, left: 48, right: 48 },
+        {
+          sKey: "contentPaddingStatus",
+          fields: ["contentPadding"],
+          isPMR: true,
+        }
+      );
+      this.backgroundColor = gCPVal(container, "backgroundColor", "", {
+        sKey: "backgroundStyleStatus",
+        fields: ["backgroundColor"],
+      });
+      this.fontStyle = gCPVal(
+        container,
+        "fontStyle",
+        [
+          {
+            color: "#333",
+          },
+        ],
+        { sKey: "fontStyleStatus", fields: ["fontStyle"], isMerge: true }
+      );
+      console.log(this.fontStyle, "this.fontStyle");
 
+      //advanced
+      this.changeCompanyPath = getContainerPropsValue(
+        container,
+        "content.changeCompanyPath",
+        { value: "" }
+      ).value;
+    },
+    handleToChangeCompany() {
+      let redirect_url = "";
+      //是否需要设置返回地址
+      if (store.state.configProject.platform === "mp.weixin")
+        redirect_url = this["$xdUniHelper"].parseURL().source;
+      if (store.state.configProject.platform === "h5")
+        redirect_url = this.$route.fullPath;
+      this.$xdUniHelper.navigateTo({
+        url: `${this.changeCompanyPath}?redirect_url=${Base64.encodeURI(redirect_url)}`,
+      });
+    },
+    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 "./JfbBaseChangeCompanyLess.less";
-
-  .jfb-base-change-company {
-    &__body{
+@import "./JfbBaseChangeCompanyLess.less";
 
+.jfb-base-change-company {
+  &__body {
+    &-wrap {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      &-left {
+        display: flex;
+        align-items: center;
+        flex: 1;
+        &-name {
+          margin-left: 16rpx;
+          font-size: 28rpx;
+          text-overflow: -o-ellipsis-lastline;
+          overflow: hidden; //溢出内容隐藏
+          text-overflow: ellipsis; //文本溢出部分用省略号表示
+          display: -webkit-box; //特别显示模式
+          -webkit-line-clamp: 1; //行数
+          line-clamp: 2;
+          -webkit-box-orient: vertical; //盒子中内容竖直排列
+          width: 80%;
+          word-break: break-all;
+        }
+      }
     }
   }
+}
 </style>

package/src/components/JfbBaseChangeCompany/Mock.js

@@ -2,12 +2,6 @@
 
 module.exports = {
   
-  getChangeByIdFilmSquate:{},
-  
-  updateChangeFilmPaiqiDate:{},
-  
-  removeChangeFilmAddress:{},
-  
-  addChangeFilmcart:{},
+  getChangeCompanyItem: { "company_name": "公司体验平台", "request_id": "e3507345b2d924d5" },
   
 }

package/src/components/JfbBaseChangeCompany/cusAttr/advanced.js

@@ -0,0 +1,24 @@
+'use strict';
+import {
+  dataVal,
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    {
+      label: '切换企业',
+      ele: 'xd-select-pages-path',
+      labelInline: true,
+      valueKey: 'changeCompanyPath',
+      placeholder: '请选择切换企业跳转地址',
+      value: dataVal({ data, key: 'changeCompanyPath', dValue: null, gValue }),
+      groupKey: 'advanced',
+      className: 'input100',
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+  ]
+}

package/src/components/JfbBaseChangeCompany/cusAttr/content.js

@@ -0,0 +1,27 @@
+'use strict';
+import {
+  dataVal,
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey: 'content',
+    },
+    {
+      label: '企业展示位置',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'companyPosition',
+      value: dataVal({ data, key: 'companyPosition', dValue: 'left' }),
+      labelInline: true,
+      list: [
+        { label: '居左', value: 'left' },
+        { label: '居中', value: 'center' },
+      ]
+    },
+  ]
+}

package/src/components/JfbBaseChangeCompany/cusAttr/style.js

@@ -0,0 +1,127 @@
+'use strict';
+import {
+  dataVal,
+  statusDataVal,
+  statusShow
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    {
+      ele: 'title',
+      label: '内容区',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '内边距',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'contentPaddingStatus',
+      value: statusDataVal({ data, key: 'contentPaddingStatus', fields: ['contentPadding'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      groupKey: 'style',
+      ele: 'xd-margin-padding',
+      valueKey: 'contentPadding',
+      value: dataVal({
+        data,
+        key: 'contentPadding',
+        dValue: {top:24,bottom:24,left:48,right:48},
+        gValue,
+        isPM: true,
+      }),
+      setting: {
+        type: 'padding',
+        bottom: false,
+        top: false,
+      },
+      placeholder: '请填充设置',
+      hidden: !statusShow({ data, key: 'contentPaddingStatus', fields: ['contentPadding'], gValue }),
+    },
+    { ele: 'group_end' },
+    {
+      ele: 'title',
+      label: '企业样式',
+      size: 'small',
+      groupKey: 'style',
+    },
+    {
+      label: '背景',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'backgroundStyleStatus',
+      value: statusDataVal({ data, key: 'backgroundStyleStatus', fields: ['backgroundColor'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '背景颜色',
+      ele: 'xd-color',
+      labelInline: true,
+      valueKey: 'backgroundColor',
+      value: dataVal({ data, key: 'backgroundColor', dValue: '', gValue }),
+      hidden: !statusShow({ data, key: 'backgroundStyleStatus', fields: ['backgroundColor'], gValue }),
+      placeholder: '请选择背景颜色',
+      className: 'input80',
+      groupKey: 'style',
+      setting: {
+        showAlpha: true
+      },
+    },
+    { ele: 'group_end' },
+    {
+      label: '文字颜色',
+      ele: 'xd-radio',
+      groupKey: 'style',
+      valueKey: 'fontStyleStatus',
+      value: statusDataVal({ data, key: 'fontStyleStatus', fields: ['fontColor'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'xd-text-and-bgc',
+      groupKey: 'style',
+      valueKey: 'fontStyle',
+      value: dataVal({ data, key: 'fontStyle', dValue: {}, gValue }),
+      hidden: !statusShow({ data, key: 'fontStyleStatus', fields: ['fontStyle'], gValue }),
+      setting: {
+        fontSize: false,
+        weight: false,
+        bgColor: false,
+        selected: false,
+        default: {
+          color: '#333',
+        },
+        isBorder: false,
+      },
+      handleCustom({ action, data }) {
+        XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_style_font_size' })
+          .then(res => {
+            data.cb(res.list)
+          })
+          .catch(error => {
+            console.error(error);
+            data.cb([])
+          });
+      },
+    },
+    { ele: 'group_end' },
+  ]
+}