jufubao-base 1.0.158 → 1.0.159-beta1

package/src/components/JfbBaseFastLink/JfbBaseFastLink.vue

@@ -185,24 +185,33 @@
         this.margin = getContainerPropsValue(container, 'content.margin', {top: 0, left: 0, right: 0, bottom: 0});
         this.subColor = getContainerPropsValue(container, 'content.textSubColor', '#000');
         this.fontSubSize = getContainerPropsValue(container, 'content.fontSubSize', 24);
-        this.listNave = this.list.map(item=>{
-          const {appValue,path} = item.path
-          if(appValue === undefined && path === undefined) {
-            return { name: item.name, path: item.path.value, icon: item.icon, size: item.size}
-          }
-          else{
-            const {dir,fixed_business_code} = item.path;
-            let bus = fixed_business_code? Base64.encodeURI(JSON.stringify({business_code: fixed_business_code})):'';
-            if(bus) bus = `?x-common=${bus}`;
-            let jumpUrl = '';
-            //#ifdef H5
-            if(dir) jumpUrl = `//${window.location.host}/${dir}${path}`;
-            else jumpUrl = path;
-            //#endif
-            jumpUrl = `${jumpUrl}${bus}`;
-            return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
-          }
-        })
+        if(this.is_layout === 'fixed') {
+          this.listNave = this.list.map(item=>{
+            debugger
+            const {appValue,path,host} = item.path
+            if(appValue === undefined && path === undefined) {
+              return { name: item.name, path: item.path.value, icon: item.icon, size: item.size}
+            }
+            else{
+              const {dir,fixed_business_code} = item.path;
+              let bus = fixed_business_code? Base64.encodeURI(JSON.stringify({business_code: fixed_business_code})):'';
+              if(bus) bus = `?x-common=${bus}`;
+
+              let jumpUrl = path;
+
+              //域名相同并且应用路径不相同时候处理
+              if(this.projectAttr['deploy_dir'] !== dir){
+                jumpUrl = `//${host}/${dir}${path}`;
+                //#ifdef MP-WEIXIN
+                jumpUrl = `https:${jumpUrl}`;
+                //#endif
+              }
+              return { name: item.name, path: jumpUrl, icon: item.icon, size: item.size }
+            }
+          });
+          console.log(this.listNave,this.list);
+          debugger
+        }
 
       },
     }

package/src/components/JfbBaseFastLink/XdFastNav.vue

@@ -10,7 +10,7 @@
     <view class="xd-fast-nave__body">
       <view class="xd-fast-nave__body-close" v-if="close" @click="close=false">
         <xd-font-icon icon="iconjiantou_zuo" color="#fff" size="30"></xd-font-icon>
-        <view>{{fastName}}</view>
+        <view v-if="0">{{fastName}}</view>
       </view>
       <view class="xd-fast-nave__body-open" v-else @click="close=true">
         <xd-font-icon icon="iconjiantou_you" color="#fff" size="30"></xd-font-icon>
@@ -23,7 +23,7 @@
           :key="index"
           @click="handleClick(item)"
         >
-          <view>
+          <view v-if="item.icon">
             <xd-font-icon v-if="item.icon" :icon="item.icon" size="34"  :color="color"></xd-font-icon>
           </view>
           <view :style="{color: color}">{{item.name}}</view>

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/JfbBaseMapOverlay/JfbBaseMapOverlay.vue

@@ -111,7 +111,20 @@
         }).then(res => {
           //iframe
           if(res['is_ifream'] === 'Y') {
+            // #ifdef MP
+            if(!res.url){
+              return uni.showToast({
+                title: 'URL不存在',
+                duration: 2000
+              });
+            }
+            this.$xdUniHelper.redirectTo({
+              url: url,
+            })
+            // #endif
+            // #ifdef H5
             this.iframe = res.url
+            // #endif
           }
           else{
             this.overlays = res.data;

package/src/components/JfbBaseMapOverlay/XdMapOverlay.vue

@@ -6,6 +6,7 @@
 </template>
 
 <script>
+  import { mapState } from 'vuex'
 	export default {
 		name: "XdMapOverlay",
 		props: {
@@ -70,6 +71,12 @@
 				}
 			},
 		},
+    computed: {
+      ...mapState({
+        stateCity: state => state.cityLocation.city,
+        stateLocation: state => state.cityLocation.location || {},
+      })
+    },
 		data() {
 			return {
 				uiLevel: 15,
@@ -92,43 +99,51 @@
 		created() {
 			this.uiLevel = this.level;
 			console.log("this.defaultOverlays", this.defaultOverlays)
-			this.defaultOverlays.forEach(item => {
-				if (item.type === 'Polygon') {
-					this.polygons.push({
-						// fillColor: "#00FF00",
-						// strokeColor: "#FF0000",
-						points: item.value.map(point => ({
-							longitude: point[0],
-							latitude: point[1]
-						})),
-						...this.stroke,
-					});
-					let allX = item.value.map(p => p[0]);
-					let allY = item.value.map(p => p[1]);
-					let centerX = (Math.max(...allX) + Math.min(...allX)) / 2;
-					let centerY = (Math.max(...allY) + Math.min(...allY)) / 2;
-					this.uiCenter = {
-						longitude: centerX,
-						latitude: centerY
-					}
-					console.log("uiCenter", centerX, centerY)
-				} else if (item.type === 'Circle') {
-					this.circles.push({
-						fillColor: "#00FF00",
-						strokeColor: "#FF0000",
-						longitude: item.value[0][0],
-						latitude: item.value[0][1],
-						radius: item.r
-					})
-					if (!this.uiCenter) {
-						this.uiCenter = {
-							longitude: item.value[0][0],
-							latitude: item.value[0][1]
-						}
-					}
-					console.log('uiCenter', item.value[0][0], item.value[0][1])
-				}
-			})
+      if(this.defaultOverlays.length){
+        this.defaultOverlays.forEach(item => {
+          if (item.type === 'Polygon') {
+            this.polygons.push({
+              // fillColor: "#00FF00",
+              // strokeColor: "#FF0000",
+              points: item.value.map(point => ({
+                longitude: point[0],
+                latitude: point[1]
+              })),
+              ...this.stroke,
+            });
+            let allX = item.value.map(p => p[0]);
+            let allY = item.value.map(p => p[1]);
+            let centerX = (Math.max(...allX) + Math.min(...allX)) / 2;
+            let centerY = (Math.max(...allY) + Math.min(...allY)) / 2;
+            this.uiCenter = {
+              longitude: centerX,
+              latitude: centerY
+            }
+            console.log("uiCenter", centerX, centerY)
+          } else if (item.type === 'Circle') {
+            this.circles.push({
+              fillColor: "#00FF00",
+              strokeColor: "#FF0000",
+              longitude: item.value[0][0],
+              latitude: item.value[0][1],
+              radius: item.r
+            })
+            if (!this.uiCenter) {
+              this.uiCenter = {
+                longitude: item.value[0][0],
+                latitude: item.value[0][1]
+              }
+            }
+            console.log('uiCenter', item.value[0][0], item.value[0][1])
+          }
+        })
+      }else{
+        if(this.stateLocation.longitude && this.stateLocation.latitude){
+          this.uiCenter = this.stateLocation;
+          this.markers = [this.stateLocation];
+        }
+      }
+			
 		}
 	}
 </script>

package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpress.vue

@@ -207,8 +207,9 @@ export default {
       // #ifndef H5
       uni.setClipboardData({
         data: text,
+        showToast: false,
         success: () => {
-          this.$xdAlert({ content: "复制成功" });
+          //this.$xdAlert({ content: "复制成功" });
         },
       });
       // #endif

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

@@ -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,6 +219,8 @@
 
         backgroundColor: '',
         is_hide_dailog:'N',
+
+        isMp:false
       }
     },
     watch: {
@@ -235,7 +244,13 @@
           this.speedKey = Date.now()
         }, 400)
 
-      }
+      },
+      is_hide_dailog(value){
+        if(value === 'N') {
+          storage.remove(this.containerId);
+          this.onJfbLoad();
+        }
+      },
     },
     computed:{
       marginUi() {
@@ -281,18 +296,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 +335,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 +350,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 +534,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/JfbBaseOrderDetail/JfbBaseOrderDetail.vue

@@ -1195,7 +1195,7 @@ export default {
       uni.setClipboardData({
         data: text,
         success: () => {
-          this.$xdAlert({ content: "复制成功" });
+          //this.$xdAlert({ content: "复制成功" });
         },
       });
       // #endif
@@ -1254,7 +1254,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) {