Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_vue_store

src/global.less

@@ -366,4 +366,11 @@ iframe {
 
 span.ant-radio+* {
   color: rgba(0, 0, 0, .5)
-}
+}
+
+.edui-editor {
+  width: 800px!important;
+  .edui-editor-iframeholder {
+    width: 100%!important;
+  }
+}

src/views/manage/user/modules/EditForm.vue

@@ -17,6 +17,7 @@
         </a-form-item>
         <a-form-item label="用户名" :labelCol="labelCol" :wrapperCol="wrapperCol" extra="后台登录用户名">
           <a-input
+            disabled
             v-decorator="['user_name', { rules: [{ required: true, min: 4, message: '请输入至少4个字符' }] }]"
           />
         </a-form-item>

src/views/shop/Index.vue

@@ -46,15 +46,9 @@
       <span slot="shop_label" slot-scope="text, item" style="white-space: pre-line;">
         {{ item.shop_label }}
       </span>
-      <span slot="company_name" slot-scope="text, item" style="white-space: pre-line;">
-        {{ item.company_name }}
-      </span>
       <span slot="is_select_mechant" slot-scope="text, item">
         {{ item.is_select_mechant ? '是' : '否' }}
       </span>
-      <span slot="is_show_license" slot-scope="text, item">
-        {{ item.is_show_license ? '是' : '否' }}
-      </span>
       <span slot="action" slot-scope="text, item">
         <template>
           <a v-action:edit style="margin-right: 8px" @click="handleEdit(item)">编辑</a>
@@ -123,26 +117,6 @@ export default {
           title: '评分',
           dataIndex: 'score'
         },
-        {
-          title: '公司名称',
-          width: '150px',
-          dataIndex: 'company_name',
-          scopedSlots: { customRender: 'company_name' }
-        },
-        {
-          title: '法人名字',
-          dataIndex: 'legal_person'
-        },
-        {
-          title: '手机号',
-          dataIndex: 'phone',
-          width: '120px'
-        },
-        {
-          title: '是否展示营业执照',
-          dataIndex: 'is_show_license',
-          scopedSlots: { customRender: 'is_show_license' }
-        },
         {
           title: '累计金额',
           dataIndex: 'total_amount'