jufubao-base 1.0.159 → 1.0.160-beta1

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

@@ -58,8 +58,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/JfbBaseMergeUserCard/JfbBaseMergeUserCard.vue

@@ -32,8 +32,7 @@
                 class="get_code"
                 @click="sendMsgCode"
                 :style="{color: mainColor}"
-              >{{time ? time + '秒后获取':'获取验证码'}}
-              </view>
+              >{{time ? time + '秒后获取':'获取验证码'}}</view>
             </view>
           </xd-form-item>
         </xd-form>
@@ -62,7 +61,7 @@
   import XdFormInput from "@/components/XdFormInput/XdFormInput";
   import XdButton from "@/components/XdButton/XdButton";
   import XdFormCheckbox from "@/components/XdFormCheckbox/XdFormCheckbox"
-  
+
   export default {
     name: "JfbBaseMergeUserCard",
     components: {
@@ -89,10 +88,11 @@
       }
     },
     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) {
           let start = value.slice(0, value.length / 2);
@@ -135,13 +135,13 @@
               url: this.callback_url
             })
           }, 1500);
-          
+
         }).catch(error=>{
           this.$xdHideLoading();
           this.$xdLog.catch(error)
         })
       },
-      
+
       /**
        * @description 监听事件变化
        * @param container {object} 业务组件对象自己
@@ -149,7 +149,7 @@
       init(container) {
         this.callback_url = getContainerPropsValue(container, 'content.callback_url', {value: ''}).value;
       },
-  
+
       sendMsgCode() {
         if (this.time > 0) return;
         const {phone_number} = this.accountForm;
@@ -180,7 +180,7 @@
           this.$xdLog.catch(error)
         })
       },
-      
+
     }
   }
 
@@ -196,69 +196,70 @@
           font-size: unit(26, rpx) !important;
         }
       }
-    
+
       .xd-form-checkbox {
         /deep/ .checklist-box {
           margin: 0 !important;
         }
       }
-    
+
       .xd-form-checkbox {
         /deep/ .checklist-group {
           justify-content: center;
         }
       }
-    
+
       .xd-form-checkbox {
         /deep/ .checklist-text {
           margin-left: unit(20, rpx) !important;
         }
       }
-    
+
       .form-group {
         padding: unit(40, rpx) unit(70, rpx);
       }
-    
+
       .get_code {
         color: @xd-base-color;
         font-size: unit(24, rpx);
+        flex-shrink: 0;
       }
-    
+
       .panel-login-password {
         padding: unit(20, rpx) 0;
-  
+
         /deep/ .uni-forms-item__label {
           .label-text {
             font-size: unit(26, rpx);
             color: #A6A6A6;
           }
         }
-      
+
         /deep/ .uni-easyinput__placeholder-class {
           font-size: unit(26, rpx);
           color: #D4D4D4;
         }
-      
+
         .phone-login-type {
           display: flex;
           color: #808080;
           font-size: unit(32, rpx);
           padding: unit(20, rpx) unit(70, rpx);
           align-items: center;
-        
+
           ._item {
             margin: 0 unit(30, rpx);
             position: relative;
             line-height: 2;
-          
+
             &:first-child {
               margin-left: 0;
             }
-          
+
             &.active {
               color: #383838;
               font-size: unit(36, rpx);
-            
+
               text {
                 position: absolute;
                 height: unit(6, rpx);
@@ -271,15 +272,15 @@
             }
           }
         }
-      
+
         .forget_password {
           font-size: unit(24, rpx);
           color: #A6A6A6;
           text-align: right;
           margin: unit(20, rpx) unit(70, rpx) 0 0;
-        
+
         }
-      
+
         .not_login {
           position: fixed;
           width: 100%;
@@ -288,7 +289,7 @@
           font-size: unit(26, rpx);
           color: #FE7A63;
         }
-      
+
         &-form {
           margin-top: unit(40, rpx)
         }

package/src/components/JfbBaseMultipleExpress/JfbBaseMultipleExpress.vue

@@ -130,14 +130,13 @@ 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() {
     this.init(this.container);
-
-    //todo
   },
   methods: {
     onJfbLoad(options) {
@@ -207,8 +206,9 @@ export default {
       // #ifndef H5
       uni.setClipboardData({
         data: text,
+        showToast: false,
         success: () => {
-          this.$xdAlert({ content: "复制成功" });
+          //this.$xdAlert({ content: "复制成功" });
         },
       });
       // #endif

package/src/components/JfbBaseMy/JfbBaseMy.vue

@@ -112,12 +112,12 @@
         quick_url_list: [],
         add_url: '',
         bgColor: ''
-        //todo
       }
     },
     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/JfbBaseMySetting/JfbBaseMySetting.vue

@@ -86,9 +86,10 @@
       }
     },
     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() {
       this.init(this.container);
@@ -165,7 +166,8 @@
           this.$xdShowLoading({});
           store.dispatch('logout').then(res=>{
             this.$xdHideLoading();
-            this.jfbAuthorize.removeToken('card');
+            this.jfbAuthorize.removeAllToken();
+            this.jfbAuthorize.removeAllCardToken();
             this.jfbAuthorize.jumpToUserLogin(this, false);
           }).catch(err=>{
             console.error(err);

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,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() {