jufubao-base 1.0.157-beta5 → 1.0.157-beta7

package/src/components/JfbBaseEntry/JfbBaseEntry.vue

@@ -49,7 +49,7 @@
   import componentsMixins from "@/mixins/componentsMixins";
   import extsMixins from "@/mixins/extsMixins";
   import getServiceUrl from "@/common/getServiceUrl";
-  import {base64} from 'js-base64';
+  import {mapState} from "vuex";
   export default {
     name: "JfbBaseEntry",
     components: {
@@ -66,9 +66,11 @@
         paddingInput: 20,
         loadingList: true,
         margin: {},
+        entryType: '',
       }
     },
     computed: {
+      ...mapState(['brandInfo']),
       bodyStyle(){
         return {
           backgroundColor: this.bgcolor,
@@ -111,17 +113,67 @@
         this.rowNum = getContainerPropsValue(container, 'content.rowNum', 1);
         this.paddingInput = getContainerPropsValue(container, 'content.paddingInput', 20);
         this.margin = getContainerPropsValue(container, 'content.margin', {});
+        this.entryType = getContainerPropsValue(container, 'content.entryType', 'default');
+      },
+
+      getCardPath(custom_redirect_data = {}){
+        //#ifdef H5
+        return null;
+        //#endif
+        //#ifdef MP-WEIXIN
+        const dir = custom_redirect_data.dir;
+        const actDir = this.projectAttr['deploy_dir'];
+        if(custom_redirect_data.appType === 'wxmp') {
+          if(dir === actDir) {
+            return {
+              cardPath:  custom_redirect_data.path,
+              cardSelf: 'wxmp',
+            };
+          }
+          else return null;
+        }
+        else if(custom_redirect_data.appType === 'h5'){
+          return {
+            cardPath: custom_redirect_data.site_url,
+            cardSelf: 'h5',
+          };
+        }
+        else return null;
+        //#endif
       },
       getEntrySetting(){
         this.$xdShowLoading({});
         jfbRootExec("getEntrySetting", {
           vm: this,
-          data: {}
+          data: {
+            group_id:this.entryType || 'default'
+          }
         }).then(res => {
           this.loadingList = false;
           this.$xdHideLoading();
-          this.entryList = res.list.map(item => {
-            const {dir, path, host} = item['redirect_data'];
+          let isH5FilterEntryList = [];
+          let isMpFilterEntryList = [];
+          this.entryList = res.list.filter(item=>{
+            //#ifdef H5
+            //在H5平台应用中不可跳转到微信小程序应用
+            if(item.redirect_data.appType === 'wxmp'){
+              isH5FilterEntryList.push(item)
+            }
+            return item.redirect_data.appType !== 'wxmp';
+            //#endif
+
+            //#ifdef MP-WEIXIN
+            const dir = item['redirect_data'].dir;
+            const actDir = this.projectAttr['deploy_dir'];
+            if(item.redirect_data.appType === 'wxmp') {
+              if(dir !== actDir) isMpFilterEntryList.push(item)
+              return dir === actDir;
+            }
+            return true
+            //#endif
+          }).map(item => {
+            const {dir, path, host,appType} = item['redirect_data'];
+            if(appType === undefined) item.redirect_data.appType = 'h5';
             item['image_url'] = getServiceUrl(item.image_url);
             item['image_url2'] = item.image_url2 ? getServiceUrl(item.image_url2) : "";
             item['image_url3'] = item.image_url3 ? getServiceUrl(item.image_url3) : "";
@@ -139,24 +191,35 @@
             let jumpUrl = path;
 
             //域名相同并且应用路径不相同时候处理
-            if(host === this.projectAttr.host
-              && this.projectAttr['deploy_dir'] !== dir
-            ){
+            if(host === this.projectAttr.host && this.projectAttr['deploy_dir'] !== dir){
               jumpUrl = `//${host}/${dir}${path}`;
               //#ifdef MP-WEIXIN
               jumpUrl = `https:${jumpUrl}`;
               //#endif
             }
 
-            if(item['redirect_data']['fixed_business_code'] === '') {
-              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
-            }
-            else{
-              item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}`
+            //获取自定义卡券登录地址(微信小程序跳转到H5平台起作用)
+            let cardPathStr = '';
+            //#ifdef MP-WEIXIN
+            if(item.redirect_data.appType === 'h5') {
+              const custom_redirect_data = this.$xdUniHelper.checkVarType(item['custom_redirect_data']) === 'object'?item['custom_redirect_data']:{};
+              const cardPathObject = this.getCardPath(custom_redirect_data);
+              if(cardPathObject !== null) {
+                const {cardPath, cardSelf} =cardPathObject
+                if(cardPath) cardPathStr = `&card-login=${encodeURIComponent(cardPath)}&cardSelf=${cardSelf}`
+              }
             }
+            //#endif
+            item['redirect_data']['path'] = `${jumpUrl}?x-common=${nsp}&vs=${new Date().getTime()}${cardPathStr}`
             return item;
           });
-          console.log( this.entryList)
+          //#ifdef MP-WEIXIN
+          console.warn(`微信小程序端被过滤的入口列表：${JSON.stringify(isMpFilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
+          //#endif
+          //#ifdef H5
+          console.warn(`H5端被过滤的入口列表：${JSON.stringify(isH5FilterEntryList.map(item=> `${item.redirect_data.appType}:${item.entry_name}:${item.redirect_data['frontPath']}`),null,2)}`)
+          //#endif
+          console.warn(`福利入口链接列表:${JSON.stringify(this.entryList.map(item=> `${item.redirect_data.appType}:${item.redirect_data['path']}`),null,2)}`);
           if(res.list.length === 1) this.toLink(this.entryList[0]);
           if(res.list.length === 0) {
             this.$xdAlert({content: '当前票券暂无支持服务'})

package/src/components/JfbBaseLogin/JfbBaseLogin.vue

@@ -90,7 +90,7 @@
         </view>
         <view style="margin-top: 40rpx">
           <xd-form
-            label-width="130"
+            label-width="150"
             label-align="right"
             content-align="left"
             :border="true"
@@ -695,7 +695,7 @@ export default {
           content: "请阅读并勾选读用户协议与隐私协议",
           cancel: false,
           confirmText: "我知道了",
-          $vm: this,
+          styles: this.styles,
         });
         return;
       }

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -27,7 +27,7 @@
           >
         </view>
         <xd-form
-          label-width="130"
+          label-width="170"
           label-align="right"
           content-align="left"
           :border="true"

package/src/components/JfbBaseLoginSetPwd/JfbBaseLoginSetPwd.vue

@@ -25,7 +25,7 @@
           <view style="font-size:26rpx;color:#999;margin-top:20rpx;">请输入{{pwd_type_text}}并牢记</view>
         </view>
         <xd-form
-          label-width="130"
+          label-width="170"
           label-align="right"
           content-align="left"
           :border="true"
@@ -77,8 +77,8 @@
   import XdForm from "@/components/XdForm/XdForm";
   import XdFormInput from "@/components/XdFormInput/XdFormInput";
   import XdButton from "@/components/XdButton/XdButton";
-  
-  
+
+
   export default {
     name: "JfbBaseLoginSetPwd",
     components: {

package/src/components/JfbBaseNotice/Attr.js

@@ -261,8 +261,6 @@ export default {
           {"label": "滚动显示", "value": '2'},
           {"label": "弹窗显示", "value": '3'},
         ],
-        inline:false,
-        notice:'预览模式点击使用“<span style="color:red">弹窗显示</span>”会重新触发页面刷新，可点击弹出遮罩层进行关闭功能'
       },
       {
         label: '是否隐藏弹框(仅预览模式生效):',

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -235,7 +235,13 @@
           this.speedKey = Date.now()
         }, 400)
 
-      }
+      },
+      is_hide_dailog(value){
+        if(value === 'N') {
+          storage.remove(this.containerId);
+          this.onJfbLoad();
+        }
+      },
     },
     computed:{
       marginUi() {
@@ -281,13 +287,6 @@
         return this.num > 1
       },
 
-      is_hide_dailog(value){
-        if(value === 'N') {
-          storage.remove(this.containerId);
-          this.onJfbLoad();
-        }
-      },
-
     },
     created() {
       this.backgroundColor = Color(this.warningColor).alpha(0.2).toString();
@@ -334,7 +333,7 @@
         console.log('this.time', this.time * 60 + '分钟');
         storage.set(this.containerId, 1, this.time);
         this.$xdConfirm({
-          $vm: this,
+          styles: this.styles,
           title: this.title || this.ajaxTitle,
           content: this.content,
           isHtml: true,

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -1252,7 +1252,7 @@ export default {
         });
       } else {
         this.$xdConfirm({
-          $vm: this,
+          styles: this.styles,
           content: "是否取消订单",
           success: (action) => {
             if (action.confirm) {

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -389,7 +389,7 @@ export default {
 
     cancelUnPayOrder(main_order_id) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "是否取消订单?",
         success: (res) => {
           if (res.confirm) {

package/src/components/JfbBasePoster/JfbBasePoster.vue

@@ -15,7 +15,6 @@
     <!-- #endif -->
     <view class="jfb-base-poster__body" v-if="noData">
       <view class="x-line"></view>
-
       <view class="jfb-base-poster-cont" :style="getBodyStyle">
         <!--一分屏-->
         <template v-if="posterType === '1'">
@@ -50,6 +49,7 @@
             }"
           >
             <xd-swiper-dot
+              :style="{width: getOneWidth + 'rpx', height: getOneHeight + 'rpx'}"
               v-if="pageSwiperShow"
               :current="current"
               :info="info"
@@ -57,6 +57,24 @@
               :mode="mode"
               :dots-styles="dotStyleData"
             >
+              <!--#ifdef MP-WEIXIN-->
+              <swiper
+                class="swiper xd-swiper-content"
+                :style="{width: getOneWidth + 'rpx', height: getOneHeight + 'rpx'}"
+                :indicator-dots="false"
+                :autoplay="carouselTime>0"
+                :interval="carouselTime"
+                :duration="500"
+                :current="current"
+                circular
+                @animationfinish="handleAnimationfinish"
+              >
+                <swiper-item v-for="(item,index) in info" :key="index" @click.stop="handleClick(item,index)">
+                  <image :style="{width: getOneWidth + 'rpx', height: getOneHeight + 'rpx'}" :src="item['image_url']" mode="aspectFill"></image>
+                </swiper-item>
+              </swiper>
+              <!--#endif-->
+              <!--#ifdef H5-->
               <xd-swiper
                 :indicator-dots="false"
                 :list="info"
@@ -71,6 +89,7 @@
                   <image :src="item['image_url']" mode="aspectFill"></image>
                 </template>
               </xd-swiper>
+              <!--#endif-->
             </xd-swiper-dot>
             <view v-if="isPreview" class="carousel-mask"></view>
           </view>
@@ -78,6 +97,7 @@
         <!--一分屏-->
         <!--多分屏-->
         <more-screen
+          style="width: 100%; height: 100%"
           v-if="posterType !== '1'"
           :config="getConfig"
           :content="info"
@@ -158,11 +178,11 @@
           backgroundSize: '100%',
           backgroundRepeat: 'no-repeat',
         }
-        return {
-          ...image,
+        image = Object.assign({},image,{
           margin: this.margin,
           padding: this.outPadding
-        }
+        })
+        return this.styleObjectToString(image)
       },
       getOneWidth(){
         let margin = this.checkValue(this.mS.left, 0) +  this.checkValue(this.mS.right, 0);
@@ -332,9 +352,9 @@
       },
     },
     created() {
-      this.init(this.container);
       this.isPreview = this.$configProject.isPreview;
       this.pageSwiperShow = this.$root.$isShow;
+      this.init(this.container);
     },
 
     destroyed() {
@@ -345,6 +365,63 @@
     },
 
     methods: {
+      /**
+       * @description 过滤不可以用
+       * 当前项目未H5时,过滤所有小程序应用
+       * 当前项目未小程序时,过滤所有非当前小程序应用
+       * 站外地址直接返回
+       * 站内地址未选值直接返回
+       * 预览模式全过
+       */
+      filterItem(list){
+        let content = list.filter(item=>{
+          //预览模式
+          if( this.$configProject.isPreview) return true;
+
+          //非内部应用
+          if(item.redirect_type !== 'INN') return true
+
+          //没有配置链接
+          if(!item.redirect_data) return true;
+
+          //内部应用
+          else {
+            let redirect_data;
+            try {
+              redirect_data = JSON.parse(item.redirect_data);
+              if(!item['app_type']) item['app_type']= 'h5';
+
+              //#ifdef H5
+              return item['app_type'] !== 'wxmp';
+              //#endif
+
+              //#ifdef MP-WEIXIN
+              let actDir = this.$parent.projectAttr.deploy_dir;
+              let dir = this.getPathDir(redirect_data.page);
+              if(item['app_type'] === 'wxmp'){
+                return actDir === dir;
+              }
+              else if(item['app_type'] === 'h5') return true;
+              else return true
+              //#endif
+            }
+            catch (e) {
+              return true
+            }
+          }
+        });
+        console.warn(`PostersList:${JSON.stringify(content.map(item=>`${item.app_type}:${item.content_name}:${item.redirect_data}`), null,2)}`)
+        return content;
+
+      },
+
+      getPathDir(pathDir){
+        if(pathDir.indexOf('@site_domain@/') === 0) {
+          return pathDir.replace('@site_domain@/','').split('/')[0]
+        }
+        return ''
+      },
+
       getTestData(){
         let temp = [];
         for (let i = 0; i< this.useNumber; i++) {
@@ -382,52 +459,70 @@
           this.current = e.detail.current;
         }
       },
+
       handleClick(item) {
+        if(!item.redirect_data) {
+          console.warn(`未配置链接地址: ${item.redirect_data}`);
+          console.error(`未配置链接地址: ${item.redirect_data}`);
+          return
+        }
+
         //内部链接跳转地址
         if (item.redirect_type === 'INN') {
           try {
             let url = JSON.parse(item.redirect_data);
             let params = '';
-            if (item['redirect_params']) params = `?${item['redirect_params']}`;
-            this.$xdUniHelper.navigateTo({
-              url: url.page + params
-            })
+            if(url.page) {
+              if (item['redirect_params']) params = `?${item['redirect_params']}`;
+              this.$xdUniHelper.navigateTo({url: url.page + params})
+            }
+            else {
+              console.error(`应用链接配置错误: ${url.page}`)
+            }
           } catch (e) {
-            console.error(e)
+            console.error(`应用链接配置错误: ${item.redirect_data}`)
           }
         }
 
         //外部链接
         if (item.redirect_type === 'URL') {
           let reg = /^(http:\/\/|https:\/\/|\/\/)+.+$/;
+          let spReg = /(-apiuri\/v)/;
           //#ifdef MP-WEIXIN
           try {
             let url = JSON.parse(item.redirect_data);
-            if (reg.test(url.url) && this.$configProject.extras.webview) {
+            if (reg.test(url.url) || spReg.test(url.url)) {
               console.warn(`广告跳转外站: ${url.url}`)
-              this.$xdUniHelper.navigateTo({
-                url: `${this.$configProject.extras.webview}?seatUrl=${Base64.encodeURI(url.url)}`
-              });
+              this.$xdUniHelper.navigateTo(url);
             } else {
-              throw Error('地址错误')
+              console.error(`广告跳转外站配置错误: ${url.url}`)
             }
           } catch (e) {
-            console.error(e)
+            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
           }
           //#endif
           //#ifdef H5
           try {
             let url = JSON.parse(item.redirect_data);
             console.warn(`广告跳转外站: ${url.url}`);
-            this.$xdUniHelper.navigateTo(url)
+            this.$xdUniHelper.redirectTo(url, false)
           } catch (e) {
-            console.error(e)
+            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
           }
           //#endif
 
         }
+
+        //无跳转地址
+        if(item.redirect_type === 'EMP') {
+          console.warn(`无跳转地址`);
+        }
       },
+
+
       handleImage(list){
+        list = this.filterItem(list);
+
       	return list.map((item,index) => {
           return {
             ...item,
@@ -463,6 +558,11 @@
         this.isCarousel = getContainerPropsValue(container, 'content.isCarousel', 1);
         this.radius = getContainerPropsValue(container, 'content.radius', 0);
         this.padding = getContainerPropsValue(container, 'content.padding', 0);
+
+        //静态图，一分屏并且间距为0设置
+        if(this.isCarousel === 1 && this.posterType === '1' &&  this.padding === 0) {
+          this.padding = 20;
+        }
         this.rows = getContainerPropsValue(container, 'content.rows', 1);
         if(this.posterType === '1' && this.isCarousel === 2) this.isSupport = getContainerPropsValue(container, 'content.isSupport', 'Y');
         this.mS = getContainerPropsValue(container, 'content.margin', {});