Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

pages/person/editcompany/index.js

@@ -95,6 +95,17 @@ Page({
    */
   onShow: function () {
 
+    //获取用户信息
+    http.getData(apis.userInfo, 'GET', {
+      token: wx.getStorageSync('access_token')
+    }, (res) => {
+      if (res.errcode === 0) {
+        this.setData({
+          userInfo: res.data
+        });
+      }
+    }, true);
+
   },
 
   /**
@@ -275,6 +286,7 @@ Page({
               name: values.region_name
             })
           });
+
           arrs.splice(2, 1, area);
           this.setData({
             multiArray: arrs

pages/person/editcompany/index.wxml

@@ -20,7 +20,7 @@
         <view class="hr"></view>
         <view class="list row verCenter bothSide bor">
             <view class="l">所有地区</view>
-            <view class="sel row rowCenter verCenter">
+            <view class="sel row rowCenter verCenter" wx:if="{{multiArray.length > 0}}">
                 <view>
                     <picker class="t1" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}" range-key="name">
                         {{multiArray[0][multiIndex[0]].name}}，{{multiArray[1][multiIndex[1]].name}}，{{multiArray[2][multiIndex[2]].name}}