jufubao-base 1.0.158 → 1.0.159-beta2

package/src/components/JfbBaseNotice/JfbBaseNotice.vue

@@ -51,7 +51,14 @@
                     </view>
                   </swiper-item>
                 </swiper>
-                <xd-notice-bar v-else :key="speedKey" scrollable :speed="speed" background-color="rgba(0,0,0,0)">
+                <xd-notice-bar
+                  :class="{isMp:isMp}"
+                  v-else
+                  :key="speedKey"
+                  scrollable
+                  :speed="speed"
+                  background-color="rgba(0,0,0,0)"
+                >
                   <view
                     v-for="item in contentList"
                     class="jfb-base-notice__body-scroll-content"
@@ -212,13 +219,17 @@
 
         backgroundColor: '',
         is_hide_dailog:'N',
+
+        isMp:false
       }
     },
     watch: {
-      container(value,oloValue) {
-        if(JSON.stringify(value) === JSON.stringify(oloValue)) return;
-        this.init(this.container);
-        if (this.$configProject['isPreview']) this.onJfbLoad()
+      container(value,oldValue) {
+        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+        if (this.$configProject['isPreview']) {
+          this.init(value) ;
+          this.onJfbLoad()
+        }
       },
       num(){
         if (this.$configProject['isPreview']) this.onJfbLoad()
@@ -235,7 +246,13 @@
           this.speedKey = Date.now()
         }, 400)
 
-      }
+      },
+      is_hide_dailog(value){
+        if(value === 'N') {
+          storage.remove(this.containerId);
+          this.onJfbLoad();
+        }
+      },
     },
     computed:{
       marginUi() {
@@ -281,18 +298,14 @@
         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();
       this.isPreview = this.$configProject['isPreview'];
       this.init(this.container);
+      //#ifdef MP-WEIXIN
+      this.isMp = true;
+      //#endif
     },
     methods: {
 
@@ -324,7 +337,12 @@
 
         if(this.style === '2') {
           this.num = getContainerPropsValue(container, 'content.num', 1);
+          //#ifdef H5
           this.speed = Number(getContainerPropsValue(container, 'content.speed', 30));
+          //#endif
+          //#ifdef MP-WEIXIN
+          this.speed = Number(getContainerPropsValue(container, 'content.speed', 30))/2.5;
+          //#endif
         }
         else this.num = 1;
         this.is_hide_dailog = getContainerPropsValue(container, 'content.is_hide_dailog', 'N');
@@ -334,7 +352,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,
@@ -518,6 +536,10 @@
         overflow-y: auto;
         margin: unit(40, rpx) unit(10, rpx) unit(20, rpx);
       }
+
     }
   }
+  .isMp {
+    width: 100%;
+  }
 </style>

package/src/components/JfbBaseNotice/XdNoticeBar.vue

@@ -1,5 +1,10 @@
 <template>
-  <view v-if="show" class="uni-noticebar"  @click="onClick">
+  <view
+    v-if="show"
+    class="uni-noticebar"
+    @click="onClick"
+    :class="{isMp:isMp}"
+  >
     <!-- #ifdef MP-ALIPAY -->
     <view
       v-if="showClose === true || showClose === 'true'"
@@ -222,6 +227,8 @@
 
         uiColor: '', //文字颜色
         uiBackgroundColor: '', //背景颜色
+
+        isMp: false,
       }
     },
 
@@ -238,6 +245,10 @@
       })
       // #endif
 
+      //#ifdef MP-WEIXIN
+      this.isMp = true;
+      //#endif
+
       this.$nextTick(() => {
         this.initSize()
       })
@@ -290,6 +301,7 @@
                 this.animationDuration = `${item.width / this.speed}s`
               }
               if(item.key === 'box') {
+
                 this.boxWidth = item.width;
                 this.animationDelay = `0.5s`
               }
@@ -516,4 +528,8 @@
       transform: translate3d(-100%, 0, 0);
     }
   }
+
+  .isMp {
+    width: 100%;
+  }
 </style>

package/src/components/JfbBaseNoticeBottom/JfbBaseNoticeBottom.vue

@@ -38,8 +38,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)
       }
     },
     created() {

package/src/components/JfbBaseNoticeTop/JfbBaseNoticeTop.vue

@@ -39,8 +39,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)
       }
     },
     created() {

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -858,8 +858,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
     viewStatus(n, o) {
       if (this.isPreview) {
@@ -1195,7 +1196,7 @@ export default {
       uni.setClipboardData({
         data: text,
         success: () => {
-          this.$xdAlert({ content: "复制成功" });
+          //this.$xdAlert({ content: "复制成功" });
         },
       });
       // #endif
@@ -1254,7 +1255,7 @@ export default {
         });
       } else {
         this.$xdConfirm({
-          $vm: this,
+          styles: this.styles,
           content: "是否取消订单",
           success: (action) => {
             if (action.confirm) {

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -285,8 +285,9 @@ export default {
     },
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   created() {
@@ -389,7 +390,7 @@ export default {
 
     cancelUnPayOrder(main_order_id) {
       this.$xdConfirm({
-        $vm: this,
+        styles: this.styles,
         content: "是否取消订单?",
         success: (res) => {
           if (res.confirm) {

package/src/components/JfbBasePay/JfbBasePay.vue

@@ -216,8 +216,9 @@ export default {
     };
   },
   watch: {
-    container(value) {
-      this.init(value);
+    container(value,oldValue) {
+      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
+      if (this.$configProject['isPreview']) this.init(value)
     },
   },
   computed: {

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -13,9 +13,7 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-base-phone-collect__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-phone-collect__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-phone-collect__body">
@@ -57,7 +55,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>
@@ -125,7 +123,6 @@ export default {
       interval: null,
       provider_id: "",
       callback_url: "",
-      //todo
     };
   },
   computed: {
@@ -134,8 +131,9 @@ export default {
     },
   },
   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) {
@@ -330,4 +328,11 @@ export default {
 .align-center {
   align-items: center;
 }
+/* #ifdef MP-WEIXIN */
+.text-content {
+  & > text {
+    font-size: 26rpx;
+  }
+}
+/* #endif */
 </style>

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>
@@ -133,8 +131,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 +166,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 +361,11 @@
   .align-center{
     align-items: center;
   }
+  /* #ifdef MP-WEIXIN */
+  .text-content {
+    & > 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', {});