jufubao-base 1.0.158 → 1.0.159-beta10

package/src/components/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -17,9 +17,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-phone-login__body">
-      <view
-        class="panel-login-password"
-      >
+      <view class="panel-login-password">
         <xd-form label-width="128"
           style="margin-top: 40rpx;"
           label-align="right"
@@ -61,7 +59,7 @@
             :localdata="[{value: 1, text: '登录即同意《隐私政策》《用户服务协议》'}]"
           >
             <template slot="a1">
-              <view>
+              <view class="text-content">
                 <text>请阅读并同意</text>
                 <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
                 <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
@@ -102,6 +100,10 @@
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
 
   export default {
+    // #ifdef MP-WEIXIN
+    options: { styleIsolation: 'shared' },
+    // #endif
+
     name: "JfbBasePhoneLogin",
     components: {
       XdFontIcon,
@@ -133,8 +135,9 @@
       }
     },
     watch: {
-      container(value) {
-        this.init(value)
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) this.init(value)
       },
       "accountForm.verification_code"(value) {
         if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -167,7 +170,7 @@
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(value) {
+      init(container) {
         //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
         //this.height = getContainerPropsValue(value, 'content.height', 10);
       },
@@ -362,4 +365,17 @@
   .align-center{
     align-items: center;
   }
+  /* #ifdef MP-WEIXIN */
+  /deep/ .xd-form-checkbox .checklist-group {
+    justify-content: center;
+    display: flex;
+    align-items: center;
+  }
+  .text-content {
+    width: 100%;
+    & > text {
+      font-size: 26rpx;
+    }
+  }
+  /* #endif */
 </style>

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', {});

package/src/components/JfbBasePoster/MoreScreen.vue

@@ -33,8 +33,45 @@
 				field="content_name"
 				:mode="config.mode"
 				:dots-styles="config.dotStyleData"
-				:style="{height:(getHeight + 46 * $rpxNum) + 'px'}"
+				:style="{height:(getHeight + 46 * $rpxNum) + 'px', width:'100%'}"
 			>
+        <!--#ifdef MP-WEIXIN-->
+        <swiper
+          class="swiper xd-swiper-content"
+          :style="{width: '100%', height: getHeight + 'px'}"
+          :indicator-dots="false"
+          :autoplay="config.carouselTime>0"
+          :interval="config.carouselTime"
+          :duration="500"
+          :current="current"
+          circular
+          @animationfinish="handleAnimationfinish"
+        >
+          <swiper-item v-for="(item,index) in list" :key="index">
+            <view
+              class="sreen__box-list"
+              :class="{s3:config.cell === 3,s4:config.cell === 4}"
+              :style="{  height: getHeight + 'px' }"
+            >
+              <view
+                v-for="(it, indext) in item"
+                :key="it['content_id']"
+                @click="handleClick(it)"
+                :style="{
+                  borderRadius: config.radius  + 'rpx',
+                  width: config.width + 'px',
+                  height: config.height + 'px',
+                  marginRight: (indext+1) % config.cell === 0 ? 0: config.padding + 'rpx',
+                  marginTop: indext < config.cell ? 0 : config.padding + 'rpx',
+                }"
+              >
+                <image :style="{ width: width + 'px', height: height + 'px'}" :src="it.image_url" mode="widthFix"></image>
+              </view>
+            </view>
+          </swiper-item>
+        </swiper>
+        <!--#endif-->
+        <!--#ifdef H5-->
 				<xd-swiper
 					:indicator-dots="false"
 					:interval="config.carouselTime"
@@ -45,31 +82,32 @@
 					@onClickItem="handleClick"
 					@animationfinish="handleAnimationfinish"
 				>
-					<template slot-scope="{ item, index}">
-						<view
-							class="sreen__box-list"
+          <template slot-scope="{ item, index}">
+            <view
+              class="sreen__box-list"
               :class="{s3:config.cell === 3,s4:config.cell === 4}"
-							:style="{
-								height: getHeight + 'px'
-							}"
-						>
-							<view
-								v-for="(it, indext) in item"
-								:key="it['content_id']"
-								:style="{
-								borderRadius: config.radius  + 'rpx',
-								width: config.width + 'px',
-					      height: config.height + 'px',
-								marginRight: (indext+1) % config.cell === 0 ? 0: config.padding + 'rpx',
-								marginTop: indext < config.cell ? 0 : config.padding + 'rpx',
-							}"
-								@click="handleClick(it)"
-							>
-								<image :style="{ width: width + 'px', height: height + 'px'}" :src="it.image_url" mode="widthFix"></image>
-							</view>
-						</view>
-					</template>
+              :style="{
+                height: getHeight + 'px'
+              }"
+            >
+              <view
+                v-for="(it, indext) in item"
+                :key="it['content_id']"
+                :style="{
+                  borderRadius: config.radius  + 'rpx',
+                  width: config.width + 'px',
+                  height: config.height + 'px',
+                  marginRight: (indext+1) % config.cell === 0 ? 0: config.padding + 'rpx',
+                  marginTop: indext < config.cell ? 0 : config.padding + 'rpx',
+                }"
+                @click="handleClick(it)"
+              >
+                <image :style="{ width: width + 'px', height: height + 'px'}" :src="it.image_url" mode="widthFix"></image>
+              </view>
+            </view>
+          </template>
 				</xd-swiper>
+        <!--#endif-->
 			</xd-swiper-dot>
 		</view>
 		<view v-if="isPreview" class="carousel-mask"></view>
@@ -133,6 +171,64 @@
       handleAnimationfinish(e) {
         this.current = e.detail.current;
       },
+
+      /**
+       * @description 过滤不可以用
+       * 当前项目未H5时,过滤所有小程序应用
+       * 当前项目未小程序时,过滤所有非当前小程序应用
+       * 站外地址直接返回
+       * 站内地址未选值直接返回
+       * 预览模式全过
+       */
+      filterItem(){
+        let content = this.content.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 ''
+      },
+
       init() {
         if (this.timer) clearTimeout(this.timer);
         this.timer = setTimeout(() => {
@@ -140,6 +236,9 @@
           this.height = Number(this.config.height);
           this.padding = Number(this.config.padding);
 
+          //过滤不可以用
+          const content = this.filterItem();
+
           //静态图显示
           if(this.config.isCarousel === 1) {
             this.list = this.content
@@ -156,50 +255,64 @@
 					}
         }, 100)
       },
+
       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(`无跳转地址`);
+        }
       },
     }
   }
@@ -209,6 +322,7 @@
 	.sreen {
 		width: calc(100% + 4px); /**防止宽度不够问**/
 		position: relative;
+    height: 100%;
 
 		& .carousel-mask {
 			position: absolute;
@@ -226,6 +340,7 @@
 			flex-wrap: wrap;
 			overflow: hidden;
 			width: calc(100% + 20px); /**防止宽度不够问**/
+      height: 100%;
 
 			& > view {
 				display: flex;
@@ -238,6 +353,8 @@
 		}
 
 		&__box.carousel {
+      width: 100%;
+      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;
@@ -247,6 +364,7 @@
 
 		& .sreen__box-list {
 			width: calc(100% + 20px); /**防止宽度不够问**/
+      height: 100%;
 			display: flex;
 			justify-content: flex-start;
 			align-items: flex-start;

package/src/components/JfbBasePosterBigSmall/Attr.js

@@ -50,7 +50,6 @@ export default {
         value: params.height || 500,
         className: 'input40',
         placeholder: '请广告位内容间距设置',
-        disabled:xiugai,
         notice: '广告位选取内容后，将无法修改，单位：像素，默认: <span style="color:red">500</span>像素',
         inline: false,
       },
@@ -60,7 +59,6 @@ export default {
         groupKey:'style',
         valueKey: 'margin',
         value: params.margin || null,
-        disabled: xiugai,
         setting: { type: 'margin'},
         placeholder: '请设置广告位边距设置',
         notice: '广告位选取内容后，将无法修改，单位：像素',
@@ -72,10 +70,9 @@ export default {
         type: 'number',
         valueKey: 'msMargin',
         groupKey:'style',
-        value: params.msMargin || 10,
+        value: params.msMargin,
         className: 'input40',
         placeholder: '请广告位内容间距设置',
-        disabled: xiugai,
         notice: '广告位选取内容后，将无法修改，单位：像素，默认: <span style="color:red">10</span>像素',
         inline: false,
       },