jufubao-base 1.0.279-beta101 → 1.0.279-beta102

package/src/components/JfbBaseChoseCompany/Api.js

@@ -7,52 +7,27 @@
 module.exports = [
   {
     //设置方法名字当别忘记加上【模块名字】：Chose
-    mapFnName: 'getChoseByIdFilmSquate',
-    title: '获取电影广场列表',
-    path: '/api/account/film/list-film-square',
+    mapFnName: 'getChoseCompanyList',
+    title: '获取公司列表',
+    path: '/saas/v1/company-by-user-id/items',
     isRule: false,
     params: {
-      last_key: ['当前页', 'Number', '必选'],
-      page_size: ['每页数量', 'Number', '必选'],
     },
     isConsole: true,
     disabled: true,
   },
   {
     //设置方法名字当别忘记加上【模块名字】：Chose
-    mapFnName: 'updateChoseFilmPaiqiDate',
-    title: '更新排期',
-    path: '/api/account/film/paiqi-date',
+    mapFnName: 'switchChoseCompany',
+    title: '选择公司列表',
+    path: '/passport/v1/user/switch-customer',
     isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-      cinema_id: ['影院id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Chose
-    mapFnName: 'removeChoseFilmAddress',
-    title: '删除我的配送地址',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
+    data: {
+      customer_id: ['用户选择的客户ID', 'String', '必选'],
+      is_need_register_saas_user: ['是否需要同步到SAAS', 'Boolean', '必选'],
+      company_source_from: ['公司来源', 'String', '必选'],
     },
     isConsole: true,
     disabled: true,
-  },
-  {
-    //设置方法名字当别忘记加上【模块名字】：Chose
-    mapFnName: 'addChoseFilmcart',
-    title: '添加购物车',
-    path: '/api/account/film/paiqi-date',
-    isRule: false,
-    params: {
-      film_id: ['电影id', 'Number', '必选'],
-    },
-    isConsole: true,
-    disabled: true,
-  },
+  }
 ];

package/src/components/JfbBaseChoseCompany/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/JfbBaseChoseCompany/JfbBaseChoseCompany.vue

@@ -2,110 +2,343 @@
   <view
     class="jfb-base-chose-company"
     @click="handleEditxSelect"
-    :class="{ editx : isEditx && active }"
+    :class="{ editx: isEditx && active }"
   >
     <!--#ifdef H5-->
     <view
       class="jfb-base-chose-company__edit"
-      :class="{ editx : isEditx && active }"
+      :class="{ editx: isEditx && active }"
       v-if="isEditx && active"
     >
-      <view class="jfb-base-chose-company__edit-icon" @click="delEdit">删除</view>
+      <view class="jfb-base-chose-company__edit-icon" @click="delEdit"
+        >删除</view
+      >
     </view>
     <!-- #endif -->
-    <view class="jfb-base-chose-company__body">
-      <view>测试插件( {{containerId}} )</view>
+    <view
+      class="jfb-base-chose-company__body"
+      :style="{ minHeight: layoutInfo.bodyMinHeightRpx + 'rpx' }"
+    >
+      <view :style="[contentPaddingCompStyle]">
+        <view class="jfb-base-chose-company__body-title">企业信息（1家）</view>
+        <view class="jfb-base-chose-company__body-notice">{{ title }}</view>
+        <view :style="{ '--main-color': mainColor }">
+          <view
+            v-for="(item, index) in companyList"
+            :key="index"
+            @click="handleChoseCompany(item)"
+            :style="[listPaddingCompStyle]"
+            :class="[
+              'jfb-base-chose-company__body-company',
+              item.is_select ? 'active' : '',
+            ]"
+          >
+            <view
+              v-if="item.is_select"
+              class="jfb-base-chose-company__body-company-active"
+              :style="{
+                background: mainColor,
+                borderRadius: `0 ${listRadius}rpx 0 30rpx`,
+              }"
+            >
+              <XdFontIcon
+                size="20"
+                icon="iconduigou-xian"
+                color="#fff"
+              ></XdFontIcon>
+            </view>
+            {{ item.company_name }}
+          </view></view
+        >
+      </view>
+      <view :style="[addCoMpStyle]" class="jfb-base-chose-company__body-add"
+        >{{ addTitle
+        }}<view @click="handleToAdd" style="color: red"
+          >去添加<XdFontIcon
+            size="28"
+            icon="iconxiangyou_xian"
+          ></XdFontIcon></view
+      ></view>
     </view>
   </view>
 </template>
 
 <script>
-  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
-  import { jfbRootExec } from "@/utils/xd.event";
-  import JfbBaseChoseCompanyMixin from "./JfbBaseChoseCompanyMixin";
-  import { getContainerPropsValue } from "@/utils/xd.base";
-  import componentsMixins from "@/mixins/componentsMixins";
-  import extsMixins from "@/mixins/extsMixins";
-  export default {
-    name: "JfbBaseChoseCompany",
-    components: {
-      XdFontIcon
+import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+import { jfbRootExec } from "@/utils/xd.event";
+import JfbBaseChoseCompanyMixin from "./JfbBaseChoseCompanyMixin";
+import { getContainerPropsValue, gCPVal } from "@/utils/xd.base";
+import componentsMixins from "@/mixins/componentsMixins";
+import extsMixins from "@/mixins/extsMixins";
+import { mapState } from "vuex";
+export default {
+  name: "JfbBaseChoseCompany",
+  components: {
+    XdFontIcon,
+  },
+  mixins: [componentsMixins, extsMixins, JfbBaseChoseCompanyMixin],
+  data() {
+    return {
+      title: "",
+      addTitle: "",
+      contentPadding: {},
+      listPadding: {},
+      listRadius: "",
+      listSpacing: "",
+      listBorder: 0,
+      listShadow: "0 0 0 rgba(0,0,0,0)",
+      listFontStyle: {},
+      addBackground: "",
+      addFontStyle: {},
+      addCompanyPath: "",
+      companyList: [],
+      redirect_url: "",
+    };
+  },
+  watch: {
+    container(value, oldValue) {
+      if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject["isPreview"]) this.init(value);
+    },
+  },
+  computed: {
+    ...mapState(["brandInfo", "jfbAuthorize"]),
+    contentPaddingCompStyle() {
+      return {
+        padding: this.getMarginAndPadding(this.contentPadding, 0),
+      };
     },
-    mixins: [
-      componentsMixins, extsMixins, JfbBaseChoseCompanyMixin
-    ],
-    data() {
+    listPaddingCompStyle() {
       return {
+        padding: this.getMarginAndPadding(this.listPadding, 0),
+        marginTop: this.listSpacing + "rpx",
+        borderRadius: this.listRadius + "rpx",
+        border: this.listBorder,
+        boxShadow: this.listShadow,
+        color: this.listFontStyle.color,
+      };
+    },
+    addCoMpStyle() {
+      return {
+        background: this.addBackground,
+        color: this.addFontStyle.color,
+      };
+    },
+  },
+  created() {
+    this.init(this.container);
 
-        //todo
+    //todo
+  },
+  methods: {
+    onJfbLoad(options) {
+      if (options.redirect_url) {
+        this.redirect_url = Base64.decode(options.redirect_url);
       }
+      jfbRootExec("getChoseCompanyList", {
+        vm: this,
+        data: {},
+      }).then((res) => {
+        console.log(res, "resgetChoseCompanyList");
+        this.companyList = res.list;
+      });
     },
-    watch: {
-      container(value, oldValue) {
-        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
-      },
+    /**
+     * @description 监听事件变化
+     * @param container {object} 业务组件对象自己
+     */
+    init(container) {
+      //content
+      this.title = gCPVal(
+        container,
+        "title",
+        "切换企业将进入对应企业搭建的平台，频道、商品、品牌等可能存在差异",
+        {
+          sKey: "titleStatus",
+          fields: ["title"],
+        }
+      );
+      this.addTitle = gCPVal(container, "addTitle", "无此企业？", {
+        sKey: "addTitleStatus",
+        fields: ["addTitle"],
+      });
+      //style
+      this.contentPadding = gCPVal(
+        container,
+        "contentPadding",
+        { top: 36, bottom: 0, left: 20, right: 20 },
+        {
+          sKey: "contentPaddingStatus",
+          isPMR: true,
+          fields: ["contentPadding"],
+        }
+      );
+      this.listPadding = gCPVal(
+        container,
+        "listPadding",
+        { top: 40, bottom: 40, left: 32, right: 32 },
+        {
+          sKey: "listPaddingStatus",
+          isPMR: true,
+          fields: ["listPadding"],
+        }
+      );
+      this.listSpacing = gCPVal(container, "listSpacing", "24", {
+        sKey: "listSpacingStatus",
+        fields: ["listSpacing"],
+      });
+      this.listRadius =
+        gCPVal(container, "listRadius", [8], {
+          sKey: "listRadiusStatus",
+          fields: ["listRadius"],
+        }) || 0;
+      this.listBorder = gCPVal(
+        container,
+        "listBorder",
+        [{ color: "#ccc", width: 2, style: "solid" }],
+        {
+          isBorder: true,
+          bsOld: ["is_border", "is_border_w", "is_border_c"],
+        }
+      );
+      this.listShadow = gCPVal(
+        container,
+        "listShadow",
+        [{ width: 0, color: "rgba(0,0,0,0)" }, "none"],
+        { isShadow: true, bsOld: ["is_shadow", "is_shadow_w", "is_shadow_bg"] }
+      );
+      this.listFontStyle = gCPVal(
+        container,
+        "listFontStyle",
+        [
+          {
+            color: "#333",
+          },
+        ],
+        {
+          sKey: "listFontStyleStatus",
+          fields: ["listFontStyle"],
+          isMerge: true,
+        }
+      );
+      this.addBackground = gCPVal(container, "addBackground", "#F8F8F8", {
+        sKey: "addBackgroundStatus",
+        fields: ["addBackground"],
+      });
+      this.addFontStyle = gCPVal(
+        container,
+        "addFontStyle",
+        [
+          {
+            color: "#999999",
+          },
+        ],
+        { sKey: "addFontStyleStatus", fields: ["addFontStyle"], isMerge: true }
+      );
+      //advanced
+      this.addCompanyPath = getContainerPropsValue(
+        container,
+        "content.addCompanyPath",
+        { value: "" }
+      ).value;
     },
-    created() {
-      this.init(this.container);
+    handleChoseCompany(item) {
+      jfbRootExec("switchChoseCompany", {
+        vm: this,
+        data: {
+          customer_id: item.company_id,
+          is_need_register_saas_user: item.is_need_register_saas_user,
+          company_source_from: item.company_source_from,
+        },
+      }).then((res) => {
+        //#ifdef MP-WEIXIN
+        if (this.jfbAuthorize !== null) {
+          this.jfbAuthorize.setAllToken(res);
+        }
+        //#endif
 
-      //todo
+        if (this.redirect_url) {
+          this.$xdUniHelper.redirectTo({
+            url: this.redirect_url,
+          });
+        } else {
+          this.$xdUniHelper.redirectTo({
+            url: this.settings.index,
+          });
+        }
+      });
     },
-    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)
-      },
-    }
-  }
-
+    handleToAdd() {
+      this.$xdUniHelper.navigateTo({
+        url: this.addCompanyPath,
+      });
+    },
+    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 "./JfbBaseChoseCompanyLess.less";
-
-  .jfb-base-chose-company {
-    &__body{
+@import "./JfbBaseChoseCompanyLess.less";
 
+.jfb-base-chose-company {
+  &__body {
+    color: #333;
+    &-title {
+      font-weight: 500;
+      font-size: 36rpx;
+    }
+    &-notice {
+      color: #666666;
+      margin-top: 8rpx;
+      font-size: 28rpx;
+    }
+    &-company {
+      font-size: 32rpx;
+      font-weight: 500;
+      position: relative;
+      &-active {
+        position: absolute;
+        top: 0;
+        right: 0;
+        padding: 18rpx 16rpx;
+      }
+    }
+    &-add {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      padding: 24rpx 0;
+      margin-top: 360rpx;
+      font-size: 28rpx;
+      & > view {
+        display: flex;
+        align-items: center;
+      }
+    }
+    .active {
+      border-color: var(--main-color) !important;
     }
   }
+}
 </style>

package/src/components/JfbBaseChoseCompany/Mock.js

@@ -2,12 +2,8 @@
 
 module.exports = {
   
-  getChoseByIdFilmSquate:{},
+  getChoseCompanyList: { "list": [{ "company_id": "101683", "company_name": "广州向阳中学(测试)", "company_logo": "", "company_source_from": "S", "is_need_register_saas_user": false, "is_select": false }], "request_id": "748f6396ea2a1cac" },
   
-  updateChoseFilmPaiqiDate:{},
-  
-  removeChoseFilmAddress:{},
-  
-  addChoseFilmcart:{},
+  switchChoseCompany: { "access_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiIxNjEtMTc5MjhjYzM3Nzg4YmUwMiIsImlhdCI6MTc1Njc3NzEyOC4yMDQ4MDEsImV4cCI6MTc1Njc4NDMyOC4yMDQ4MDEsInVzZXJfaWQiOiI1MDAwMDM0IiwidXNlcl9zaWduIjoiMjYxN2Q2N2ExNDM5OTRlOWJjMjU1ODViMmI0OGFhMzciLCJ1c2VyX3NpZ25fZXhwaXJlIjoiMTc1Njc4NDM4OCIsImNsaWVudF9pcCI6IjEwMS43Mi4xODcuNzQiLCJwbGF0Zm9ybSI6InNhYXM6MTAxNjgzOjoiLCJjdXN0b21lcl9pZCI6IjEwMTY4MyJ9.jQVEYQZ9x6GiRMY0Jg0V6grg4x40UDQAd9-1VkGB9Eo", "csrf_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiIxNjEtMTc5MjhjYzM3Nzg4YmUwMiIsImlhdCI6MTc1Njc3NzEyOC4yMDQ5OSwiZXhwIjoxNzU2Nzg0MzI4LjIwNDk5LCJjc3JmX3VzZXJfaWQiOjUwMDAwMzQsImNsaWVudF9pcCI6IjEwMS43Mi4xODcuNzQiLCJjdXN0b21lcl9pZCI6IjEwMTY4MyJ9.rJtEvKouJpDeJDmufoc5edn63Bmfx8ZIPXTmi09e6K0", "refresh_token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiIxNjEtMTc5MjhjYzM3Nzg4YmUwMiIsImlhdCI6MTc1Njc3NzEyOC4yMDQ5NTgsImV4cCI6MTc1ODA3MzEyOC4yMDQ5NTgsInJlZnJlc2hfdXNlcl9pZCI6NTAwMDAzNCwiY2xpZW50X2lwIjoiMTAxLjcyLjE4Ny43NCIsInBsYXRmb3JtIjoic2FhczoxMDE2ODM6OiIsImN1c3RvbWVyX2lkIjoiMTAxNjgzIn0.FkSrW7on6AnhgUMGF3rGwtpbe59OqOu-3jk2k0YC6_o", "access_token_expire_in": "7200", "csrf_token_expire_in": "7200", "refresh_token_expire_in": "1296000", "user_id": 5000034, "platform": "saas:101683::", "phone_number": "17703167945", "request_id": "39be2208ca0bba15" },
   
 }

package/src/components/JfbBaseChoseCompany/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: 'addCompanyPath',
+      placeholder: '请选择切换企业跳转地址',
+      value: dataVal({ data, key: 'addCompanyPath', dValue: null, gValue }),
+      groupKey: 'advanced',
+      className: 'input100',
+      setting: {
+        mode: 'new',
+        router: XdBus.getParentApi('getPagesTree'),
+      },
+      inline: false,
+    },
+  ]
+}

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

@@ -0,0 +1,69 @@
+'use strict';
+import {
+  dataVal,
+  statusDataVal,
+  statusShow
+} from "@/utils/AttrTools";
+
+export default (data, gValue, gColor, oldData) => {
+  return [
+    {
+      ele: 'title',
+      label: '基础',
+      size: 'small',
+      groupKey: 'content',
+    },
+    {
+      label: '选择企业',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'titleStatus',
+      value: statusDataVal({ data, key: 'titleStatus', fields: ['title'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'el-input',
+      type: 'text',
+      valueKey: 'title',
+      labelInline: true,
+      value: dataVal({ data, key: 'title', dValue: '', gValue }),
+      hidden: !statusShow({ data, key: 'titleStatus', fields: ['title'], gValue }),
+      groupKey: 'content',
+      placeholder: '请输入提示内容',
+      className: 'input80',
+    },
+    { ele: 'group_end' },
+    {
+      label: '添加企业',
+      ele: 'xd-radio',
+      groupKey: 'content',
+      valueKey: 'addTitleStatus',
+      value: statusDataVal({ data, key: 'addTitleStatus', fields: ['addTitle'], gValue }),
+      labelInline: true,
+      list: [
+        { label: '默认', value: 'D' },
+        { label: '自定义', value: 'C' },
+      ]
+    },
+    { ele: 'group_start' },
+    {
+      label: '',
+      ele: 'el-input',
+      type: 'text',
+      valueKey: 'addTitle',
+      labelInline: true,
+      value: dataVal({ data, key: 'addTitle', dValue: '', gValue }),
+      hidden: !statusShow({ data, key: 'addTitleStatus', fields: ['addTitle'], gValue }),
+      groupKey: 'content',
+      placeholder: '请输入提示内容',
+      className: 'input80',
+    },
+    { ele: 'group_end' },
+  ]
+}