Merge branch 'dev' of cloud.wodcloud.com:apaas/apaas-v3-ui into dev

src/pages/authority/organization/organizationedit.vue

@@ -195,7 +195,12 @@ export default {
             date: data.create_date,
             fileList: data.picture_path,
           };
-          this.imgList = data.picture_path.split(";");
+          if(data.picture_path){
+            this.imgList = data.picture_path.split(";");
+          }else{
+            this.imgList = []
+          }
+          console.log(this.imgList);
         })
         .catch((response) => {});
     },

src/pages/workbench/fwgl/serviceEdit.vue

@@ -5,7 +5,7 @@
       <span>服务编辑</span>
     </p>
     <div class="info_contain">
-      <div class="edit_change">
+      <div class="edit_change" v-if="now_user==2">
         <div class="edit_change_box" @click="now_edit=0" :style="now_edit==0?{backgroundColor:'#e56600',color:'#ffffff'}:{}">
           <img v-if="now_edit==0" src="@/assets/imgs/nav_ic_xinxi_sel.png" alt="">
           <img v-if="now_edit!==0" src="@/assets/imgs/nav_ic_xinxi_nor.png" alt=""> 基本信息编辑</div>