jufubao-base 1.0.159-beta8 → 1.0.159

package/src/components/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -397,7 +397,9 @@
                   </view>
                   <view
                     class="jfb-base-order-detail__body-num-info-copy"
-                    @click="copy(item.password)">复制</view>
+                    @click="copy(item.password)"
+                    >复制</view
+                  >
                   <view
                     v-if="item.code_end_time"
                     class="jfb-base-order-detail__body-cashier-code"
@@ -432,7 +434,9 @@
                       color: mainColor,
                       background: bgColor,
                     }"
-                  >{{ item.code_end_time }}</view>
+                  >
+                    {{ item.code_end_time }}
+                  </view>
                 </view>
               </view>
 
@@ -456,7 +460,9 @@
                       color: mainColor,
                       background: bgColor,
                     }"
-                  >{{ item.code_end_time }}</view>
+                  >
+                    {{ item.code_end_time }}
+                  </view>
                 </view>
               </view>
 
@@ -486,7 +492,9 @@
                     color: mainColor,
                     background: bgColor,
                   }"
-                >{{ item.code_end_time }}</view>
+                >
+                  {{ item.code_end_time }}
+                </view>
               </view>
             </view>
           </view>
@@ -534,7 +542,9 @@
           <view class="jfb-base-order-detail__body-shop-name">
             {{ info.shop.shop_name }}
           </view>
-          <view class="jfb-base-order-detail__body-shop-address">地址： {{ info.shop.shop_address }}</view>
+          <view class="jfb-base-order-detail__body-shop-address"
+            >地址： {{ info.shop.shop_address }}
+          </view>
         </view>
         <view
           :style="{
@@ -564,7 +574,8 @@
               v-if="item.type === 'copy'"
               class="jfb-base-order-detail__body-order-copy"
               @click="copy(item.value)"
-            >复制</view>
+            >复制</view
+            >
           </view>
         </view>
         <view
@@ -648,7 +659,9 @@
             v-for="(item, index) in info.contacts"
             :key="index"
           >
-            <view class="jfb-base-order-detail__body-link-title">{{item.title }}</view>
+            <view class="jfb-base-order-detail__body-link-title">{{
+              item.title
+            }}</view>
             <view v-for="(Sitem, Sindex) in item.data" :key="Sindex">
               <view class="jfb-base-order-detail__body-link-item">
                 <view v-html="Sitem.label"></view>
@@ -728,17 +741,14 @@
               radius="40rpx"
               :bg-color="mainColor"
               @click="handleAction(item)"
-            >{{ item.text }}</xd-button>
+            >
+              {{ item.text }}
+            </xd-button>
           </view>
         </view>
       </view>
     </view>
-    <xd-dailog
-      :show.sync="showCode"
-      :cancel="false"
-      :confirm="false"
-      title="提示"
-    >
+    <xd-dailog :show.sync="showCode" :cancel="false" :confirm="false" title="">
       <view
         :style="{
           display: 'flex',
@@ -760,7 +770,9 @@
           </image>
         </view>
       </view>
-      <view v-if="dialogPassword" class="dialog_password">{{ dialogPassword }}</view>
+      <view v-if="dialogPassword" class="dialog_password">
+        {{ dialogPassword }}
+      </view>
     </xd-dailog>
   </view>
 </template>
@@ -846,9 +858,8 @@ export default {
     };
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value) {
+      this.init(value);
     },
     viewStatus(n, o) {
       if (this.isPreview) {
@@ -1184,7 +1195,7 @@ export default {
       uni.setClipboardData({
         data: text,
         success: () => {
-          //this.$xdAlert({ content: "复制成功" });
+          this.$xdAlert({ content: "复制成功" });
         },
       });
       // #endif
@@ -1243,7 +1254,7 @@ export default {
         });
       } else {
         this.$xdConfirm({
-          styles: this.styles,
+          $vm: this,
           content: "是否取消订单",
           success: (action) => {
             if (action.confirm) {

package/src/components/JfbBaseOrderList/JfbBaseOrderList.vue

@@ -136,7 +136,7 @@
                 class="order-list-icon"
                 :style="{ bottom: item['isOpen'] ? '-30rpx' : '-54rpx' }"
                 v-if="item.products.length > showLen"
-                @click.stop="switchOpen(item)"
+                @click.stop="item['isOpen'] = !item['isOpen']"
               >
                 <view :style="{ background: backgroundColor }">
                   <xd-font-icon
@@ -285,9 +285,8 @@ export default {
     },
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value) {
+      this.init(value);
     },
   },
   created() {
@@ -388,13 +387,9 @@ export default {
       console.log("this.tabList", this.tabList);
     },
 
-    switchOpen(item){
-      item['isOpen'] = !item['isOpen']
-    },
-
     cancelUnPayOrder(main_order_id) {
       this.$xdConfirm({
-        styles: this.styles,
+        $vm: this,
         content: "是否取消订单?",
         success: (res) => {
           if (res.confirm) {

package/src/components/JfbBasePay/JfbBasePay.vue

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

package/src/components/JfbBasePhoneCollect/JfbBasePhoneCollect.vue

@@ -13,7 +13,9 @@
       :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">
@@ -55,7 +57,7 @@
             :localdata="[{ value: 1, text: '登录即同意《隐私政策》《用户服务协议》' },]"
           >
             <template slot="a1">
-              <view class="text-content">
+              <view>
                 <text>请阅读并同意</text>
                 <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
                 <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
@@ -102,10 +104,6 @@ import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox";
 import JfbBasePhoneCollectMixin from "./JfbBasePhoneCollectMixin";
 
 export default {
-  // #ifdef MP-WEIXIN
-  options: { styleIsolation: 'shared' },
-  // #endif
-
   name: "JfbBasePhoneCollect",
   components: {
     XdFontIcon,
@@ -127,6 +125,7 @@ export default {
       interval: null,
       provider_id: "",
       callback_url: "",
+      //todo
     };
   },
   computed: {
@@ -135,9 +134,8 @@ export default {
     },
   },
   watch: {
-    container(value,oldValue) {
-      if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-      if (this.$configProject['isPreview']) this.init(value)
+    container(value) {
+      this.init(value);
     },
     "accountForm.verification_code"(value) {
       if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -332,17 +330,4 @@ export default {
 .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/JfbBasePhoneLogin/JfbBasePhoneLogin.vue

@@ -17,7 +17,9 @@
     </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"
@@ -59,7 +61,7 @@
             :localdata="[{value: 1, text: '登录即同意《隐私政策》《用户服务协议》'}]"
           >
             <template slot="a1">
-              <view class="text-content">
+              <view>
                 <text>请阅读并同意</text>
                 <text @click.stop="handlePrivacy('privacy_privacy')" :style="{color: mainColor}">《隐私政策》</text>
                 <text @click.stop="handlePrivacy('privacy_service')" :style="{color: mainColor}">《用户服务协议》</text>
@@ -100,10 +102,6 @@
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
 
   export default {
-    // #ifdef MP-WEIXIN
-    options: { styleIsolation: 'shared' },
-    // #endif
-
     name: "JfbBasePhoneLogin",
     components: {
       XdFontIcon,
@@ -135,9 +133,8 @@
       }
     },
     watch: {
-      container(value,oldValue) {
-        if(JSON.stringify(value) === JSON.stringify(oldValue)) return;
-        if (this.$configProject['isPreview']) this.init(value)
+      container(value) {
+        this.init(value)
       },
       "accountForm.verification_code"(value) {
         if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -170,7 +167,7 @@
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
        */
-      init(container) {
+      init(value) {
         //this.bgcolor = getContainerPropsValue(value, 'content.bgcolor', '#fff');
         //this.height = getContainerPropsValue(value, 'content.height', 10);
       },
@@ -365,17 +362,4 @@
   .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,6 +15,7 @@
     <!-- #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'">
@@ -49,7 +50,6 @@
             }"
           >
             <xd-swiper-dot
-              :style="{width: getOneWidth + 'rpx', height: getOneHeight + 'rpx'}"
               v-if="pageSwiperShow"
               :current="current"
               :info="info"
@@ -57,24 +57,6 @@
               :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"
@@ -89,7 +71,6 @@
                   <image :src="item['image_url']" mode="aspectFill"></image>
                 </template>
               </xd-swiper>
-              <!--#endif-->
             </xd-swiper-dot>
             <view v-if="isPreview" class="carousel-mask"></view>
           </view>
@@ -97,7 +78,6 @@
         <!--一分屏-->
         <!--多分屏-->
         <more-screen
-          style="width: 100%; height: 100%"
           v-if="posterType !== '1'"
           :config="getConfig"
           :content="info"
@@ -178,11 +158,11 @@
           backgroundSize: '100%',
           backgroundRepeat: 'no-repeat',
         }
-        image = Object.assign({},image,{
+        return {
+          ...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);
@@ -352,9 +332,9 @@
       },
     },
     created() {
+      this.init(this.container);
       this.isPreview = this.$configProject.isPreview;
       this.pageSwiperShow = this.$root.$isShow;
-      this.init(this.container);
     },
 
     destroyed() {
@@ -365,63 +345,6 @@
     },
 
     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++) {
@@ -459,70 +382,52 @@
           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(url.page) {
-              if (item['redirect_params']) params = `?${item['redirect_params']}`;
-              this.$xdUniHelper.navigateTo({url: url.page + params})
-            }
-            else {
-              console.error(`应用链接配置错误: ${url.page}`)
-            }
+            if (item['redirect_params']) params = `?${item['redirect_params']}`;
+            this.$xdUniHelper.navigateTo({
+              url: url.page + params
+            })
           } catch (e) {
-            console.error(`应用链接配置错误: ${item.redirect_data}`)
+            console.error(e)
           }
         }
 
         //外部链接
         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) || spReg.test(url.url)) {
+            if (reg.test(url.url) && this.$configProject.extras.webview) {
               console.warn(`广告跳转外站: ${url.url}`)
-              this.$xdUniHelper.navigateTo(url);
+              this.$xdUniHelper.navigateTo({
+                url: `${this.$configProject.extras.webview}?seatUrl=${Base64.encodeURI(url.url)}`
+              });
             } else {
-              console.error(`广告跳转外站配置错误: ${url.url}`)
+              throw Error('地址错误')
             }
           } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+            console.error(e)
           }
           //#endif
           //#ifdef H5
           try {
             let url = JSON.parse(item.redirect_data);
             console.warn(`广告跳转外站: ${url.url}`);
-            this.$xdUniHelper.redirectTo(url, false)
+            this.$xdUniHelper.navigateTo(url)
           } catch (e) {
-            console.error(`广告跳转外站配置错误: ${item.redirect_data}`)
+            console.error(e)
           }
           //#endif
 
         }
-
-        //无跳转地址
-        if(item.redirect_type === 'EMP') {
-          console.warn(`无跳转地址`);
-        }
       },
-
-
       handleImage(list){
-        list = this.filterItem(list);
-
       	return list.map((item,index) => {
           return {
             ...item,
@@ -558,11 +463,6 @@
         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', {});