Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/org/README.md

+### neditor使用：
+
+1、引入资源
+
+1.1 在static\neditor
+
+1.2 在根目录下index.html下
+
+```
+<script src="https://cdn.bootcss.com/jquery/3.4.1/jquery.min.js"></script>
+<script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.config.js"></script>
+<script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.all.min.js"></script>
+<script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.service.js"></script>
+<script src="<%= htmlWebpackPlugin.options.path %>/neditor/i18n/zh-cn/zh-cn.js"></script>
+<script src="<%= htmlWebpackPlugin.options.path %>/neditor/neditor.parse.min.js"></script>
+```
+
+2、自定义components，在src下新建Neditor/index.vue，具体见src\components\Neditor\index.vue
+
+3、使用
+
+3.1、引入自定义components：
+
+`import Neditor from '@/components/Neditor'`
+
+3.2、注册：
+
+```
+components: {
+    Neditor,
+    ......
+},
+```
+3.3
+
+```
+<el-form-item label="机构介绍:" prop="org_introduction">
+    <keep-alive><!--网上说用百度ueditor时，要用keep-alive-->
+         <neditor ref="neditor"   id="editor"  v-bind:r_content="form.org_introduction"> </neditor> <!--这里是Neditor-->
+    </keep-alive>
+</el-form-item>
+```
+3.4
+4.
+提交时，需要获取富文本里的内容：
+
+`this.form.org_introduction = this.$refs.neditor.content;`

src/xt_pages/org/orginfo.vue

             <el-form-item label="机构名称:" prop="org_name">
                 <el-input v-model="form.org_name" placeholder="机构名称" ></el-input>
             </el-form-item>
-            <!-- <el-form-item label="商家简称:" prop="org_short_name">
-                <el-input v-model="form.org_short_name" placeholder="商家简称" ></el-input>
-            </el-form-item> -->
+            <el-form-item label="联系人姓名:" prop="contact_name">
+                <el-input v-model="form.contact_name" placeholder="联系人姓名" ></el-input>
+            </el-form-item>
             <el-form-item label="机构介绍:" prop="org_introduction">
                 <!-- <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}" placeholder="机构介绍" v-model="form.org_introduction">  </el-input> -->
                 <keep-alive>
         illnessOptions:[],
         form:{
             org_name:'',
-            org_short_name:'',
+            contact_name:'',
             org_introduction:'',
             org_logo:'',
             province:'',
                 var res = response.data;
                 if (res.state === 1) {
                     this.form.org_name = res.data.orginfo.org_name;
-                    this.form.org_short_name = res.data.orginfo.org_short_name;
+                    this.form.contact_name = res.data.orginfo.contact_name;
                     this.form.org_introduction = res.data.orginfo.org_introduction;
                     this.form.org_logo = res.data.orginfo.org_logo;
                     this.form.province = res.data.orginfo.province;
             EditOrgInfo(this.form).then(response=>{
                 var res = response.data;
                 if(res.state==1) {
-                    this.$store.dispatch("ModifyOrgInfo", { org_name: this.form.org_name, org_short_name: this.form.org_name })
+                    this.$store.dispatch("ModifyOrgInfo", { org_name: this.form.org_name, contact_name: this.form.org_name })
                     
                     this.$message.success("修改成功");
                 }else {