Merge branch 'master' into minus

ghsApp/src/pagesClient/member/detail.vue

@@ -70,7 +70,7 @@
                 <view style="margin-bottom:20upx;color:#333333">{{userInfo.superInfo && userInfo.superInfo.name ? userInfo.superInfo.name : ''}} {{userInfo.mobile}}</view>
                 <view>
                   <text v-if="!$util.isEmpty(userInfo.city)" style="margin-right:15upx;">{{userInfo.city}}</text>
-                  {{userInfo.dist}}{{userInfo.address}}{{userInfo.floor}}
+                  {{userInfo.dist}}{{userInfo.address}}{{userInfo.floor}}<block v-if="userInfo.fullAddress!=userInfo.showAddress && userInfo.showAddress!=''">({{ userInfo.showAddress }})</block>
                   <i class="iconfont iconbianji" style="font-size:25upx;margin-left:20upx;"></i>
                 </view>
             </view>

ghsApp/src/pagesClient/member/modify.vue

@@ -53,10 +53,7 @@ export default {
 				floor: '',
 				showAddress:''
 			},
-			region: {
-				lat: 0,
-				long: 0
-			},
+			region:{lat:'',long:''},
 			regionData: [],
 			cityPickerValueDefault: [0, 0]
 		}
@@ -88,13 +85,13 @@ export default {
 			this.form.city = e.cityName
 			this.form.address = ''
 			this.form.showAddress = ''
-			this.region.lat = 0
-			this.region.long = 0
+			this.region.lat = ''
+			this.region.long = ''
 		},
 		confirmFn() {
 			let that = this
-			this.region.long = 10
-			this.region.long = 11
+			this.region.long = ''
+			this.region.long = ''
 			this.form.showAddress = this.form.city+this.form.address+this.form.floor
 			that.$util.confirmModal({content:'确认修改？'},() => {
 				this.form.id = this.option.id ? this.option.id : 0