Merge branch 'master' into dev_master

pages/user/address/add/index.js

@@ -167,6 +167,8 @@ Page({
         return item.pid == city[e.detail.value].id;
       })
     } else {
+        //区级滚动时不用重置数据
+        return
       const cityName = data.multiArray[1][data.multiIndex[1]];
       let cityId = '';
       try {
@@ -181,6 +183,7 @@ Page({
         return item.pid == cityId;
       })
     }
+    console.log(this.data.multiArray, area)
     provinceList = province.map(item => {
       return item.name
     })

pages/user/user.wxml

@@ -128,8 +128,9 @@
   </view>
 
   <view class="bottom-intro">
-    <view>主办方:苏州市文旅融合发展中心</view>
-    <view>备案号:苏ICP备19064944号-3X@君到苏州</view>
+    <view>主办方：苏州市文化广电和旅游局</view>
+    <view>承办方：苏州市文旅融合发展中心</view>
+    <view>备案号：苏ICP备19064944号-3X@君到苏州</view>
   </view>
 </view>
 <view class="mask" wx:if="{{showModel}}">