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

pages/person/company/index.wxml

@@ -18,7 +18,7 @@
                 </view>
                 </view>
             </view>
             </view>
         </view>
         </view>
-        <view class="column" data-url="/pages/person/editcompany/index" bind:tap="toUrl">
+        <view class="column" data-url="/pages/person/editcompany/index?type=edit" bind:tap="toUrl">
             <text class="icon iconfont iconiconxiantiaoshouji22"></text>
             <text class="icon iconfont iconiconxiantiaoshouji22"></text>
             <text class="edit">编辑</text>
             <text class="edit">编辑</text>
         </view>
         </view>

pages/person/editcompany/index.js

@@ -12,13 +12,15 @@ Page({
    * 页面的初始数据
    * 页面的初始数据
    */
    */
   data: {
   data: {
+    userInfo: {},
     status: true,
     status: true,
     avatar: '',
     avatar: '',
     multiArray: [],
     multiArray: [],
     multiIndex: [4, 0, 0],
     multiIndex: [4, 0, 0],
     province_id: 6,
     province_id: 6,
     city_id: 76,
     city_id: 76,
-    district_id: 696
+    district_id: 696,
+    type: ''
   },
   },
 
 
   /**
   /**
@@ -28,6 +30,10 @@ Page({
 
 
     var arr = [];
     var arr = [];
 
 
+    this.setData({
+      type: options.type
+    });
+
     //设置默认省市区
     //设置默认省市区
     http.getData(apis.regionPcd, 'GET', null, (res) => {
     http.getData(apis.regionPcd, 'GET', null, (res) => {
       if (res.errcode === 0) {
       if (res.errcode === 0) {

pages/person/editcompany/index.wxml

@@ -15,7 +15,7 @@
             </block>
             </block>
         </view>
         </view>
         <view class="txt">
         <view class="txt">
-            <textarea name='com_desc' bindblur="bindTextAreaBlur" auto-height placeholder="请输入企业简介" class="tarea" placeholder-class="textarea-placeholder" />
+            <textarea name='com_desc' bindblur="bindTextAreaBlur" value="{{userInfo.com_desc}}" auto-height placeholder="请输入企业简介" class="tarea" placeholder-class="textarea-placeholder" />
         </view>
         </view>
         <view class="hr"></view>
         <view class="hr"></view>
         <view class="list row verCenter bothSide bor">
         <view class="list row verCenter bothSide bor">