jufubao-base 1.0.242 → 1.0.243-beta1001

package/src/components/JfbBaseHeaderColumn/JfbBaseHeaderColumn.vue

@@ -66,6 +66,9 @@
                 :key="showLocationKey"
               ></xd-city-show-api>
             </view>
+            <view v-if="showScan==='Y'" class="scan_in" @click.stop="handleScanClick">
+              <xd-font-icon :size="32" :color="scanIconColor" icon="iconsaoma1"></xd-font-icon>
+            </view>
             <xd-font-icon v-if="searchIconPosition==='left'" :icon="icon" :color="iconColor" size="32"/>
             <input
               v-if="useSearch==='Y'"
@@ -84,6 +87,9 @@
               @click.stop="doSearch"
             >{{searchBtnText || '搜索'}}</view>
           </view>
+          <view v-if="showQrcode==='Y'" class="qr_code" @click.stop="handleQrCodeClick">
+            <xd-font-icon :size="qrcodeSize" icon="iconerweima" :color="qrCodeColor"></xd-font-icon>
+          </view>
           <view v-if="showSearchBtn==='Y' && searchBtnPosition==='out'"
             class="search_btn_out"
             :style="[searchBtnStyle]"
@@ -212,6 +218,13 @@
         searchBoxRadius: 30,
         bottomBorder: "",
         inputBorder: "",
+        showQrcode: "",
+        qrcodeSize: 32,
+        qrcodePath: "",
+        qrCodeColor: "",
+        showScan: "",
+        scanIconColor: "",
+        scanPath: "",
       }
     },
     watch: {
@@ -243,8 +256,11 @@
         this.useSearch = getContainerPropsValue(container, "content.useSearch", "Y");
         this.searchPagePath = getContainerPropsValue(container, "content.searchPagePath", {value:""}).value;
         this.choseCityPath = getContainerPropsValue(container, "content.choseCityPath", {value:""}).value;
-
-
+        this.showQrcode = getContainerPropsValue(container, "content.showQrcode", "");
+        this.qrcodeSize = getContainerPropsValue(container, "content.qrcodeSize", 32);
+        this.qrCodeColor = getContainerPropsValue(container, "content.qrCodeColor", "#333");
+        this.showScan = getContainerPropsValue(container, "content.showScan", "");
+        this.scanIconColor = getContainerPropsValue(container, "content.scanIconColor", "#333");
         //基础
         this.backgroundColor = getContainerPropsValue(container, "content.backgroundColor", '#fff');
         this.icon = getContainerPropsValue(container, "content.icon", 'iconsousuo_mian');
@@ -282,6 +298,8 @@
         this.showQuickEntry = getContainerPropsValue(container, 'content.showQuickEntry', "N");
         this.quickEntryType = getContainerPropsValue(container, 'content.quickEntryType', "");
         this.quickEntryPath = getContainerPropsValue(container, 'content.quickEntryPath', {value:""}).value;
+        this.qrcodePath = getContainerPropsValue(container, 'content.qrcodePath', {value:""}).value;
+        this.scanPath = getContainerPropsValue(container, 'content.scanPath', {value:""}).value;
 
         let name , logo, platform_logo;
         if (this.projectAttr['site_name']) name = this.projectAttr['site_name'];
@@ -320,6 +338,16 @@
           })
         }
       },
+      handleQrCodeClick(){
+        this.$xdUniHelper.navigateTo({
+          url: this.qrcodePath
+        })
+      },
+      handleScanClick(){
+        this.$xdUniHelper.navigateTo({
+          url: this.scanPath
+        })
+      },
 
       /***
        * @description 定位完成事件
@@ -477,6 +505,20 @@
               padding: 0;
             }
           }
+          .scan_in{
+            position: relative;
+            padding-right: 28rpx;
+            margin-right: 20rpx;
+            &::before{
+              content: " ";
+              position: absolute;
+              width: 2rpx;
+              height: 100%;
+              background-color: #CCCCCC;
+              right: -0rpx;
+              top: 0rpx;
+            }
+          }
           .search_input{
             flex: 1;
             text-align: left;
@@ -510,6 +552,10 @@
           align-items: center;
           justify-content: center;
         }
+
+        .qr_code{
+          margin-left: 16rpx;
+        }
       }
     }
   }

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -50,6 +50,7 @@
             v-if="hasAuthLogin"
             :disabled="!panelIsChecked"
             type="primary"
+            open-type="getUserInfo"
             :radius="btnRadius + 'rpx'"
             @click="doWxMpLogin"
             >
@@ -438,6 +439,7 @@ export default {
       showLogo: "Y", //是否显示logo
       customLogoUrl: {}, //自定义logo地址
       loginMenuMargin: {},
+      share_code: "",
     };
   },
   computed: {
@@ -604,6 +606,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';
@@ -768,17 +778,24 @@ export default {
         });
     },
 
-    doWxMpLogin() {
+    // #ifdef MP-WEIXIN
+    doWxMpLogin({detail}) {
       this.$xdShowLoading({});
       uni.login({
         provider: "weixin",
         success: (loginRes) => {
-          console.log("doWxMpLogin", loginRes);
+          let raw_data = {
+            encryptedData:detail.encryptedData,
+            iv:detail.iv,
+            signature: detail.signature
+          }
           jfbRootExec("loginThirdLogin", {
             vm: this,
             data: {
               third_auth_code: loginRes.code,
               provider_id: this.quickLogin.provider_id,
+              share_code: this.share_code,
+              raw_data
             },
           })
             .then((res) => {
@@ -832,7 +849,7 @@ export default {
         },
       });
     },
-
+    // #endif
     /**
      * @description h5获取登录方式
      */
@@ -980,6 +997,7 @@ export default {
 
     },
 
+    // #ifdef MP-WEIXIN
     //小程序授权登录
     getuserinfo(e) {
       //获取用户信息
@@ -991,6 +1009,7 @@ export default {
         data: {
           raw_data,
           provider_id,
+          share_code: this.share_code,
         },
       })
         .then(() => {
@@ -1000,6 +1019,7 @@ export default {
       //首页地址
       //确认授权登录信息 => 跳转回调地址 cbUrl
     },
+    // #endif
 
     //账号登录 -> 跳转第二步
     doLoginAccount() {
@@ -1043,6 +1063,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: [],
+};