jufubao-base 1.0.243-beta201 → 1.0.243

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -438,6 +438,7 @@ export default {
       showLogo: "Y", //是否显示logo
       customLogoUrl: {}, //自定义logo地址
       loginMenuMargin: {},
+      share_code: "",
     };
   },
   computed: {
@@ -604,6 +605,14 @@ export default {
     },
 
     onJfbLoad(options) {
+      if(options['x-share']){
+        let decodeParams = Base64.decode(options['x-share']);
+        try{
+          let commonParams = JSON.parse(decodeParams);
+          this.share_code = commonParams.share_code;
+        }catch(e){}
+      }
+
       this.$xdLog.setProject('JfbBaseLogin', 'JfbBaseLogin.onJfbLoad.start')
       this.redirect_url = options.redirect_url ? Base64.decode(options.redirect_url): '';
       this.isDebugPreview = options['x-test'] === 'jfb-tiyan';
@@ -779,6 +788,7 @@ export default {
             data: {
               third_auth_code: loginRes.code,
               provider_id: this.quickLogin.provider_id,
+              share_code: this.share_code
             },
           })
             .then((res) => {
@@ -991,6 +1001,7 @@ export default {
         data: {
           raw_data,
           provider_id,
+          share_code: this.share_code,
         },
       })
         .then(() => {
@@ -1043,6 +1054,7 @@ export default {
             provider_id: this.phoneLogin.provider_id,
             phone_number,
             verification_code,
+            share_code: this.share_code,
           },
         })
           .then((res) => {

package/src/components/JfbBaseNoticeDialog/Api.js

@@ -8,7 +8,7 @@ module.exports = [
   {
     mapFnName: 'getListNoticeDialogContent', //自定义方法名字（必选）
     title: '获取内容',
-    path: '/cms/v1/news-content',
+    path: '/cms/v1/ad-content',
     isRule: false,
     params: {
       scene: ['使用场景', 'String', '选填'],

package/src/components/JfbBaseNoticeDialog/Attr.js

@@ -247,6 +247,32 @@ export default {
           { label: '弹框', value: 'pop' },
         ]
       },
+      {
+        label: '展示位置:',
+        ele: 'xd-radio',
+        valueKey: 'systemType',
+        groupKey:'content',
+        value: data['systemType'] || 'fuli',
+        placeholder: '请选择展示位置',
+        className: 'input60',
+        list: [
+          { label: '福利系统', value: 'fuli' },
+          { label: 'plus系统', value: 'plus' },
+        ]
+      },
+      data['systemType']==='plus'&&{
+        label: '展示方式:',
+        ele: 'xd-radio',
+        valueKey: 'showGroup',
+        groupKey:'content',
+        value: data['showGroup'] || 'all',
+        placeholder: '请选择展示方式',
+        className: 'input60',
+        list: [
+          { label: '全部用户', value: 'all' },
+          { label: '仅会员', value: 'vip' },
+        ]
+      },
       {
         label: '是否隐藏弹框(仅预览模式生效):',
         ele: 'xd-radio',

package/src/components/JfbBaseNoticeDialog/JfbBaseNoticeDialog.vue

@@ -73,7 +73,7 @@ export default {
   mixins: [componentsMixins, extsMixins, JfbBaseNoticeDialogMixin],
   data() {
     return {
-      isShow: true,
+      isShow: false,
       backgroundColor: "",
       isPreview: false, //是否预览
       is_hide_dailog: "N",
@@ -84,7 +84,9 @@ export default {
       currentLinkUrl: "",
       currentIndex: 0,
       contentList: [],
-      number: ''
+      number: '',
+      systemType: '',
+      showGroup: ''
     };
   },
   watch: {
@@ -134,19 +136,28 @@ export default {
 
           //弹窗显示
           if (res.list.length > 0) {
-            this.contentList = res.list.map((item) => {
-              return JSON.parse(item.content);
-            });
+            this.contentList = res.list
             this.currentImage = getServiceUrl(
               this.contentList[0].image_url,
-              "size3"
-            );
-            this.currentLinkUrl = this.getLinkUrl(
-              this.contentList[0].redirect_data
+              "size8"
             );
+            if(this.contentList[0].redirect_data){
+              this.currentLinkUrl = this.getLinkUrl(
+                this.contentList[0].redirect_data
+              );
+            }
             this.currentIndex = 0;
-
-            this.handlePop();
+            if(this.systemType === 'fuli'){
+              this.handlePop();
+            } else {
+              if(this.showGroup==='all') {
+                this.handlePop();
+              }else {        
+                if(this.getTokenForKey('user_level')&&this.getTokenForKey('user_level')==='VIP') {
+                  this.handlePop();
+                }
+              }
+            }
           }
         })
         .catch((error) => {
@@ -175,6 +186,16 @@ export default {
       );
       this.type = getContainerPropsValue(container, "content.type", "pop");
       this.number = getContainerPropsValue(container, "content.number", 1);
+      this.systemType = getContainerPropsValue(
+        container,
+        "content.systemType",
+        "fuli"
+      );
+      this.showGroup = getContainerPropsValue(
+        container,
+        "content.showGroup",
+        "all"
+      );
     },
     handlePop() {
       console.warn(`this.time${this.time * 60 + "分钟"}`);
@@ -192,12 +213,14 @@ export default {
         return;
       }
       this.currentIndex = this.currentIndex + 1;
-      this.currentLinkUrl = this.getLinkUrl(
-        this.contentList[this.currentIndex].redirect_data
-      );
+      if(this.contentList[this.currentIndex].redirect_data) {
+        this.currentLinkUrl = this.getLinkUrl(
+          this.contentList[this.currentIndex].redirect_data
+        );
+      }
       this.currentImage = getServiceUrl(
         this.contentList[this.currentIndex].image_url,
-        "size3"
+        "size8"
       );
     },
     handleToLink() {

package/src/components/JfbBaseNoticeGroup/Api.js

@@ -0,0 +1,23 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Notice
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getNoticeNewsContent', //自定义方法名字（必选）
+    title: '获取内容',
+    path: '/cms/v1/news-content',
+    isRule: false,
+    params: {
+      scene: ['使用场景', 'String', '选填'],
+      container_id: ['插件ID', 'String', '必填'],
+      page_id: ['页面ID', 'String', '必填'],
+      page_size: ['记录条数', 'Number', '必填', 1],
+      code: ['业务线id', 'String', '选填'],
+    },
+    isConsole: true,
+    disabled: true,
+  },
+];

package/src/components/JfbBaseNoticeGroup/Attr.js

@@ -0,0 +1,237 @@
+'use strict';
+
+/**
+ * @description 当表单组件中有联动操作时候，使用方法进行返回
+ */
+export default {
+  style: [],
+  content: (data) => {
+    return [
+      {
+        label: '公告内容:',
+        ele: 'xd-site-news',
+        valueKey: 'notice',
+        groupKey: 'content',
+        value: data.notice || null,
+        className: 'input70',
+        setting: {
+          config: {
+            sort: true,
+            maxlen: 100,
+            action: 'aliyun',
+            size: 5,
+            tipsformet: '上传文件格式：@imageType@，不超过@size@MB.',
+            uploadType: 'aliyun',
+            type: ['jpg', 'png', 'jpeg']
+          },
+        },
+        handleCustom({ action, data }) {
+          if (data && data.params) {
+            //当一个插件中出现使用内容分类时候需要设置code值，在页面引用时候容器id + code进行拼接
+            //data.params = Object.assign({}, data.params, {code: 'g_test_id'});
+          }
+
+          //获取返回参数(场景类型名称为必填)
+          //获取返回参数(场景类型名称为必填)
+          let loading = { close() { } }
+
+          //获取显示内容
+          if (action === 'screen') {
+            XdBus.getParentApi('getOptionsSettingList')({ setting_id: 'edtix_bucket_content_tip' })
+              .then(res => {
+                loading.close();
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+              });
+
+          }
+
+          //获取返回参数(广告位高度必选项)
+          if (action === 'getNewsInfo') {
+            XdBus.getParentApi('cmsGetPublishEditxContent')(data.params)
+              .then(res => {
+                loading.close()
+                data.cb({ list: res.list, selectId: res.selected })
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+
+          //获取产品业务线列表
+          if (action === 'namespace') {
+            XdBus.getParentApi('getOptionsNamespaces')({})
+              .then(res => {
+                loading.close()
+                data.cb(res['list'])
+              })
+              .catch(error => {
+                loading.close()
+                console.error(error);
+              });
+          }
+
+          //使用内容分类
+          if (action === 'cmsPublishEditxContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('cmsPublishEditxContent')(data.params)
+              .then(res => {
+                console.log('cmsPublishEditxContent', res)
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置列表
+          if (action === 'getListPostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('getListNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //位置创建
+          if (action === 'addPostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('addNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置编辑
+          if (action === 'editPostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('updateNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //位置删除
+          if (action === 'deleltePostion') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('deleteNewsPosition')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //获取广告位内容列表
+          if (action === 'getListContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('getListNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //广告内容创建
+          if (action === 'addContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('addNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容编辑
+          if (action === 'editContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('updateNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //广告内容删除
+          if (action === 'deleteContent') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('deleteNewsContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(true)
+              })
+              .catch(error => {
+                console.error(error);
+                loading.close();
+                data.cb(false)
+              });
+          }
+
+          //内容发布
+          if (action === 'publish') {
+            loading = XdBus.getParentApi('loading')({});
+            console.log('publish', data.params)
+            XdBus.getParentApi('cmsPublishContent')(data.params)
+              .then(res => {
+                loading.close();
+                data.cb(res)
+              })
+              .catch(error => {
+                loading.close();
+                console.error(error);
+              });
+          }
+
+          //通知页面进行刷新
+          if (action === 'update') {
+            loading = XdBus.getParentApi('loading')({});
+            XdBus.getParentApi('getXdBusUpdateView')('onUpdateView', {});
+            loading.close()
+          }
+        },
+      }
+    ].filter(i => i)
+  },
+  advanced: [],
+};

package/src/components/JfbBaseNoticeGroup/JfbBaseNoticeGroup.vue

@@ -0,0 +1,174 @@
+<template>
+  <view class="jfb-base-notice-group" @click="handleEditxSelect" :class="{ editx : isEditx && active }">
+    <!--#ifdef H5-->
+    <view class="jfb-base-notice-group__edit" :class="{ editx : isEditx && active }" v-if="isEditx && active">
+      <view class="jfb-base-notice-group__edit-icon" @click="delEdit">删除</view>
+    </view>
+    <!-- #endif -->
+    <view class="jfb-base-notice-group__body">
+      <view v-if="contentList.length>0">
+        <view @click="handleTo(item)" v-for="(item,index) in contentList" :key="index"
+          class="jfb-base-notice-group__body-item">
+          <view>
+            {{item.title}}
+          </view>
+          <XdFontIcon size="25" color="#2C2C2C" icon="iconxiangyou_xian"></XdFontIcon>
+        </view>
+      </view>
+      <view class="logout-btn">
+        <xd-button type="primary" width="600rpx" @click="handleLogout">退出登录</xd-button>
+      </view>
+      <view class="version">当前版本: {{version}}</view>
+    </view>
+  </view>
+</template>
+
+<script>
+  import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
+  import { jfbRootExec } from "@/utils/xd.event";
+  import JfbBaseNoticeGroupMixin from "./JfbBaseNoticeGroupMixin";
+  import { getContainerPropsValue } from "@/utils/xd.base";
+  import componentsMixins from "@/mixins/componentsMixins";
+  import XdButton from "@/components/XdButton/XdButton";
+  import extsMixins from "@/mixins/extsMixins";
+  import { mapState } from 'vuex';
+  import store from "@/store";
+  export default {
+    name: "JfbBaseNoticeGroup",
+    components: {
+      XdFontIcon,
+      XdButton
+    },
+    computed: {
+      ...mapState(['jfbAuthorize']),
+    },
+    mixins: [
+      componentsMixins, extsMixins, JfbBaseNoticeGroupMixin
+    ],
+    data() {
+      return {
+        contentList: [],
+        version: ''
+      }
+    },
+    watch: {
+      container(value, oldValue) {
+        if (JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) {
+          this.init(value);
+          this.onJfbLoad()
+        }
+      },
+    },
+    created() {
+      this.init(this.container);
+    },
+    methods: {
+      onJfbLoad(options) {
+        this.version = this.projectAttr.headers['X-Version']
+        if (this.$configProject['isPreview']) {
+          this.version = 'v11.21.12'
+        }
+        this.getContent()
+      },
+      /**
+       * @description 监听事件变化
+       * @param container {object} 业务组件对象自己
+       */
+      init(container) { },
+      getContent() {
+        jfbRootExec("getNoticeNewsContent", {
+          vm: this,
+          data: {
+            page_id: this.pageAttr["page_id"], //页面ID
+            container_id: this.containerId, //组件ID
+            page_size: 200,
+          },
+        })
+          .then((res) => {
+            console.log(res, 'aiaiaaiia');
+            this.contentList = res.list
+          })
+          .catch((error) => {
+            console.error(error);
+          });
+      },
+      handleTo(item) {
+        let params = `page_id=${this.pageAttr["page_id"]}`;
+        params = `${params}&container_id=${this.containerId}&content_id=${item.content_id}`;
+        this.$xdUniHelper.navigateTo({
+          url: `/pages/content/content?${params}`
+        })
+      },
+      async handleLogout() {
+        // #ifdef H5
+        if (this.$configProject.isPreview) return;
+        // #endif
+
+        if (this.jfbAuthorize !== null) {
+          this.$xdShowLoading({});
+          store.dispatch('logout').then(res => {
+            this.$xdHideLoading();
+            this.jfbAuthorize.removeAllToken();
+            this.jfbAuthorize.removeAllCardToken();
+            this.jfbAuthorize.jumpToUserLogin(this, false);
+          }).catch(err => {
+            console.error(err);
+          })
+        }
+      },
+      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 "./JfbBaseNoticeGroupLess.less";
+
+  .jfb-base-notice-group {
+    &__body {
+      &-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 32rpx 46rpx;
+        background: #fff;
+        border-radius: 18rpx;
+        font-size: 25rpx;
+        color: #333;
+        margin: 20rpx;
+      }
+    }
+
+    .logout-btn {
+      margin: 60rpx auto;
+    }
+
+    .version {
+      color: #999999;
+      font-size: 24rpx;
+      text-align: center;
+    }
+  }
+</style>

package/src/components/{JfbBaseAfterSalesDetail/JfbBaseAfterSalesDetailLess.less → JfbBaseNoticeGroup/JfbBaseNoticeGroupLess.less}

@@ -12,7 +12,7 @@
 }
 
 //start
-.jfb-base-after-sales-detail {
+.jfb-base-notice-group {
   box-sizing: border-box;
 
   &__body{
@@ -70,7 +70,7 @@
 
 
 /**notPreview**/
-.jfb-base-after-sales-detail {
+.jfb-base-notice-group {
   //&:before {
     //content: " ";
     //display: table;

package/src/components/{JfbBaseAfterSalesDetail/JfbBaseAfterSalesDetailMixin.js → JfbBaseNoticeGroup/JfbBaseNoticeGroupMixin.js}

@@ -16,7 +16,7 @@ export default {
       //@EndAttrData
       
       // #endif
-      cssRoot: 'jfb-base-after-sales-detail'
+      cssRoot: 'jfb-base-notice-group'
     }
   },
   created() {

package/src/components/JfbBaseNoticeGroup/Mock.js

@@ -0,0 +1,13 @@
+'use strict';
+
+module.exports = {
+  
+  getNoticeByIdFilmSquate:{},
+  
+  updateNoticeFilmPaiqiDate:{},
+  
+  removeNoticeFilmAddress:{},
+  
+  addNoticeFilmcart:{},
+  
+}

package/src/components/JfbBaseOpenVip/Api.js

@@ -0,0 +1,39 @@
+'use strict';
+/**
+ * @description  接口配置，
+ * 在设置方法名字当时候，别忘记加上【模块名字】：Open
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getOpenBaseUserInfo',
+    title: '获取用户信息',
+    path: '/passport/v1/user/get',
+    params: {},
+    isRule: false,
+    isConsole: true,
+    disabled: true,
+  },
+  {
+    mapFnName: "getVipList",
+    title: "会员中心 - 会员卡列表",
+    path: "/member/v1/vip-card",
+    isRule: false,
+    params: {
+      namespace: ['业务线', 'String', true],
+      is_show_exchange_code: ['是否展示 兑换码 ', 'Y/N，默认N', false],
+    },
+    isConsole: true,
+    disabled: true
+  },
+  {
+    mapFnName: "getVipMoneySaving",
+    title: "获取会员省钱金额",
+    path: '/member/v1/money-saving-record/total-amount',
+    isRule: false,
+    params: {
+    },
+    isConsole: true,
+    disabled: true
+  }
+];