jufubao-base 1.0.158 → 1.0.159-beta2

package/src/components/JfbBaseHeader/JfbBaseHeader.vue

@@ -144,8 +144,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/JfbBaseLogin/JfbBaseLogin.vue

@@ -61,7 +61,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>
@@ -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"
@@ -145,7 +145,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>
@@ -305,8 +305,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) {
@@ -695,7 +696,7 @@ export default {
           content: "请阅读并勾选读用户协议与隐私协议",
           cancel: false,
           confirmText: "我知道了",
-          $vm: this,
+          styles: this.styles,
         });
         return;
       }
@@ -1011,5 +1012,14 @@ export default {
   }
 }
 
+/* #ifdef MP-WEIXIN */
+.text-content {
+  & > text {
+    font-size: 26rpx;
+  }
+}
+/* #endif */
+
+
 
 </style>

package/src/components/JfbBaseLoginForgetPwd/JfbBaseLoginForgetPwd.vue

@@ -13,21 +13,17 @@
       :class="{ editx: isEditx && active }"
       v-if="isEditx && active && !noBorder"
     >
-      <view class="jfb-base-login-forget-pwd__edit-icon" @click="delEdit"
-        >删除</view
-      >
+      <view class="jfb-base-login-forget-pwd__edit-icon" @click="delEdit">删除</view>
     </view>
     <!-- #endif -->
     <view class="jfb-base-login-forget-pwd__body">
       <view class="panel-forget-password">
         <view class="form-group" style="padding-top: 60rpx;padding-bottom: 40rpx;">
           <view style="font-size: 36rpx;color: #333;">请输入手机号</view>
-          <view style="font-size: 26rpx; color: #999; margin-top: 20rpx"
-            >为了您的账号安全，请先验证手机号</view
-          >
+          <view style="font-size: 26rpx; color: #999; margin-top: 20rpx">为了您的账号安全，请先验证手机号</view>
         </view>
         <xd-form
-          label-width="130"
+          label-width="170"
           label-align="right"
           content-align="left"
           :border="true"
@@ -117,8 +113,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)
     },
     "resetForm.verification_code"(value) {
       if (value && value.length >= 8 && value.length % 2 === 0) {
@@ -231,6 +228,7 @@ export default {
       color: @xd-base-color;
       font-size: 24rpx;
       margin-right: unit(20,rpx);
+      flex-shrink: 0;
     }
     .panel-forget-password {
       /deep/ .uni-forms-item__label {

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: {
@@ -99,7 +99,6 @@
         },
         success_url: "",
         pwd_type: "", //设置密码 1， 重设密码 2
-        //todo
       }
     },
     computed: {
@@ -108,8 +107,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/JfbBaseMapOverlay/JfbBaseMapOverlay.vue

@@ -20,7 +20,7 @@
         <iframe frameborder="0" v-if="iframe" :src="iframe" class="jfb-base-map-overlay__body-iframe"></iframe>
         <xd-baidu-overlay v-else :defaultOverlays="overlays" :level="11"></xd-baidu-overlay>
       </template>
-      
+
       <!-- #endif -->
       <!-- #ifdef MP -->
       <xd-map-overlay :defaultOverlays="overlays" :level="11"></xd-map-overlay>
@@ -76,8 +76,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() {
@@ -111,7 +112,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;
@@ -203,7 +217,7 @@
       onJfbBack(options) {
 			  this.$xdUniHelper.navigateBack()
       },
-      
+
     }
   }
 
@@ -215,7 +229,7 @@
   .jfb-base-map-overlay {
     &__body{
       width: 750rpx;
-      
+
       &-iframe {
         height: 100%;
         width: 100%;

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: '是否隐藏弹框(仅预览模式生效):',