diff --git a/src/api/index.js b/src/api/index.js
index b1320c6..9dee423 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -23,17 +23,16 @@ export default {
 	editCompetition: `competition/competition/management/editCompetition`,
 	getCompetition: `competition/competition/management/getCompetition`,
 	queryRegistrationByCondition: `competition/competition/registration/queryRegistrationByCondition`,
-	enterpriseCertificationDetails: `users/enterprise/certification/enterpriseCertificationDetails`,
+	enterpriseCertificationDetails: `nakadai/enterprise/certification/enterpriseCertificationDetails`,
 
-	delCertification: `users/enterprise/certification/batchDeletion`,
-	findCertification: `users/enterprise/certification/findById`,
-	selectEnterpriseCertificationList: `users/enterprise/certification/selectEnterpriseCertificationList`,
-	informationAudit: `users/enterprise/certification/informationAudit`,
-	deletePlatformAuthenticationInformation: `users/users/autonym/deletePlatformAuthenticationInformation`,
-	updateCertification: `users/enterprise/certification/update`,
+	delCertification: `nakadai/enterprise/certification/batchDeletion`,
+	findCertification: `nakadai/enterprise/certification/findById`,
+	selectEnterpriseCertificationList: `nakadai/enterprise/certification/selectEnterpriseCertificationList`,
+	informationAudit: `nakadai/enterprise/certification/informationAudit`,
+	deletePlatformAuthenticationInformation: `nakadai/users/autonym/deletePlatformAuthenticationInformation`,
+	updateCertification: `nakadai/enterprise/certification/update`,
 	queryTeamInfo: `nakadai/kindergarten/platformTeamAccount/queryTeamInfo`,
 	updateTeamInfo: `nakadai/kindergarten/platformTeamAccount/updateTeamInfo`,
-	platformTeamAccountList: `nakadai/kindergarten/platformTeamAccount/platformTeamAccountList`,
 	
 	queryUserInfoList: `users/users/userAccount/queryUserInfoList`,
 	viewUserDetails: `users/users/userAccount/viewUserDetails`,
diff --git a/src/pages/activity/manage/matchSignup.vue b/src/pages/activity/manage/matchSignup.vue
index a4e865c..7ad3986 100644
--- a/src/pages/activity/manage/matchSignup.vue
+++ b/src/pages/activity/manage/matchSignup.vue
@@ -103,13 +103,13 @@ export default {
   },
   methods: {
     getData () {
-      this.$post(this.api.platformTeamAccountList, {
-        type: 1,
+      this.$post(this.api.queryRegistrationByCondition, {
         pageNum: this.page,
         pageSize: this.pageSize,
+        competitionId: this.id,
         keyWord: this.keyword,
-        platformId: 5,
-        classificationId: this.teamId
+        isDisable: this.isDisable,
+        teamOrder: this.teamOrder,
       }).then(({ data }) => {
         this.list = data.records;
         this.total = data.total;
diff --git a/src/pages/preschool/audit/index.vue b/src/pages/preschool/audit/index.vue
index 27f03bb..4372203 100644
--- a/src/pages/preschool/audit/index.vue
+++ b/src/pages/preschool/audit/index.vue
@@ -54,11 +54,25 @@
 
     <div class="btns">
       <el-button type="primary"
-                 @click="submit(2)">通过</el-button>
+                 @click="confirmSubmit(2)">通过</el-button>
       <el-button type="danger"
-                 @click="submit(3)">不通过</el-button>
+                 @click="confirmSubmit(3)">不通过</el-button>
       <el-button @click="$router.back()">返回</el-button>
     </div>
+
+    <el-dialog title="请填写审批意见"
+               :visible.sync="auditVisible"
+               width="450px">
+      <el-input type="textarea"
+                :rows="2"
+                v-model="remark" />
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="auditVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="submit(3)">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -70,7 +84,9 @@ export default {
     return {
       id: this.$route.query.id,
       form: {},
+      remark: '',
       submiting: false,
+      auditVisible: false
     };
   },
   mounted () {
@@ -92,12 +108,21 @@ export default {
         this.form = data
       }).catch(err => { })
     },
+    // 提交前判断
+    confirmSubmit (auditStatus) {
+      // 通过：直接提交，不通过：弹框填写意见
+      if (auditStatus === 2) {
+        this.submit(2)
+      } else {
+        this.auditVisible = true
+      }
+    },
     // 提交
     async submit (auditStatus) {
       if (this.submiting) return false
       this.submiting = true
       try {
-        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&id=${this.id}`).then(res => {
+        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&id=${this.id}&openId=${this.form.openId}&remark=${this.remark}`).then(res => {
           this.$router.back()
           Util.successMsg('审核成功！');
         })
diff --git a/src/pages/preschool/list/index.vue b/src/pages/preschool/list/index.vue
index 2664525..8ef4e7e 100644
--- a/src/pages/preschool/list/index.vue
+++ b/src/pages/preschool/list/index.vue
@@ -4,7 +4,7 @@
       <ul class="filter">
         <li>
           <label>省份</label>
-          <el-select v-model="form.provinces"
+          <el-select v-model="form.province"
                      clearable
                      placeholder="请选择省份"
                      @change="getCity"
@@ -19,7 +19,7 @@
           <el-select v-model="form.city"
                      clearable
                      placeholder="请选择城市"
-                     :disabled="form.provinces ? false : true"
+                     :disabled="form.province ? false : true"
                      @change="initData">
             <el-option v-for="(item, i) in cityList"
                        :key="i"
@@ -94,7 +94,7 @@
     <div class="relative">
       <el-tabs v-model="active"
                @tab-click="tabChange">
-        <el-tab-pane :label="'全部(' + total + ')'"
+        <el-tab-pane :label="'全部(' + all + ')'"
                      name="0"></el-tab-pane>
         <el-tab-pane :label="'待审核(' + status1 + ')'"
                      name="1"></el-tab-pane>
@@ -141,6 +141,10 @@
       <el-table-column prop="contactInformation"
                        label="手机号"
                        align="center"></el-table-column>
+      <el-table-column prop="organizationCreationTime"
+                       label="创建时间"
+                       width="150"
+                       align="center"></el-table-column>
       <el-table-column prop="submitTime"
                        label="提交时间"
                        width="150"
@@ -199,7 +203,7 @@ export default {
       form: {
         startCommitTime: '',
         endCommitTime: '',
-        provinces: '',
+        province: '',
         city: '',
         platformId: '',
         auditStatus: null,
@@ -247,6 +251,8 @@ export default {
       status2: 0,
       status3: 0,
       status4: 0,
+      all: 0,
+      isFirst: 1, // 第一次加载的标识
     };
   },
   watch: {
@@ -286,19 +292,23 @@ export default {
         pageSize: this.pageSize,
       }).then(({ data }) => {
         const list = data.records
-        if (list.length) {
-          this.status1 = list.filter(e => e.auditStatus === 1).length
-          this.status2 = list.filter(e => e.auditStatus === 2).length
-          this.status3 = list.filter(e => e.auditStatus === 3).length
-          this.status4 = list.filter(e => e.auditStatus === 4).length
-          this.list = data.records
-          this.total = data.total
-        }
+        this.isFirst && this.handleLen(list)
+        this.list = list
+        this.total = data.total
         this.loading = false
       }).catch(res => {
         this.loading = false
       })
     },
+    // 获取各个状态的总数
+    handleLen (list) {
+      this.isFirst = 0
+      this.status1 = list.filter(e => e.auditStatus === 1).length
+      this.status2 = list.filter(e => e.auditStatus === 2).length
+      this.status3 = list.filter(e => e.auditStatus === 3).length
+      this.status4 = list.filter(e => e.auditStatus === 4).length
+      this.all = list.length
+    },
     initData () {
       this.page = 1
       this.getData()
@@ -318,8 +328,8 @@ export default {
       this.initData()
     },
     getCityData () {
-      this.$get(this.api.queryCity, {
-        provinceId: this.provinceList.find(e => e.provinceName === this.form.provinces).provinceId
+      this.form.province && this.$get(this.api.queryCity, {
+        provinceId: this.provinceList.find(e => e.provinceName === this.form.province).provinceId
       }).then(res => {
         this.cityList = res.list
       }).catch(res => { })
diff --git a/src/pages/preschool/manage/auth.vue b/src/pages/preschool/manage/auth.vue
index 50aa143..6eb7dee 100644
--- a/src/pages/preschool/manage/auth.vue
+++ b/src/pages/preschool/manage/auth.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="page">
     <div class="action">
-      <span v-if="form.auditStatus !== ''"
+      <span v-if="form.auditStatus !== '' && !editing"
             class="status">{{ auditStatus.find(e => e.id === form.auditStatus).name }}</span>
       <el-button v-if="!editing"
                  @click="edit">编辑</el-button>
@@ -36,16 +36,33 @@
         </div>
       </el-form-item>
       <el-form-item label="营业执照">
-        <img v-if="form.businessLicensePicture"
-             class="pic"
-             :src="form.businessLicensePicture"
-             alt="">
+        <el-image v-if="form.businessLicensePicture"
+                  class="pic"
+                  :src="form.businessLicensePicture"
+                  :preview-src-list="[form.businessLicensePicture]" />
+
+        <Upload :limit="1"
+                :showFileList="false"
+                :on-remove="handleBusinessRemove"
+                @onSuccess="uploadBusinessSuccess">
+          <template slot="tip">
+            <p>请上传.jpg，.jpeg，.png格式的营业执照</p>
+          </template>
+        </Upload>
       </el-form-item>
       <el-form-item label="办学许可证件">
-        <img v-if="form.licenseForRunningSchool"
-             class="pic"
-             :src="form.licenseForRunningSchool"
-             alt="">
+        <el-image v-if="form.licenseForRunningSchool"
+                  class="pic"
+                  :src="form.licenseForRunningSchool"
+                  :preview-src-list="[form.licenseForRunningSchool]" />
+        <Upload :limit="1"
+                :showFileList="false"
+                :on-remove="handleSchoolRemove"
+                @onSuccess="uploadSchoolSuccess">
+          <template slot="tip">
+            <p>请上传.jpg，.jpeg，.png格式的办学许可证件</p>
+          </template>
+        </Upload>
       </el-form-item>
       <div class="aline"></div>
 
@@ -78,6 +95,7 @@
 import Util from "@/libs/util";
 import Setting from "@/setting";
 import Const from '@/const/user'
+import Upload from '@/components/upload';
 export default {
   data () {
     return {
@@ -104,6 +122,9 @@ export default {
       submiting: false,
     };
   },
+  components: {
+    Upload
+  },
   mounted () {
     this.$store.commit('user/setCrumbs', [
       {
@@ -127,6 +148,21 @@ export default {
     edit () {
       this.editing = true
     },
+    handleBusinessRemove () {
+      this.form.businessLicensePicture = ''
+    },
+    // 上传成功
+    uploadBusinessSuccess ({ url }) {
+      this.form.businessLicensePicture = url
+    },
+
+    handleSchoolRemove () {
+      this.form.licenseForRunningSchool = ''
+    },
+    // 上传成功
+    uploadSchoolSuccess ({ url }) {
+      this.form.licenseForRunningSchool = url
+    },
     // 提交
     async submit () {
       const { form } = this
diff --git a/src/pages/preschool/manage/basic.vue b/src/pages/preschool/manage/basic.vue
index 2938241..fa051ea 100644
--- a/src/pages/preschool/manage/basic.vue
+++ b/src/pages/preschool/manage/basic.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="page">
     <div class="action">
-      <el-button @click="edit">编辑</el-button>
+      <el-button v-if="!editing"
+                 type="primary"
+                 @click="edit">编辑</el-button>
     </div>
     <el-form label-width="170px"
              label-suffix=":"
@@ -14,7 +16,7 @@
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('logoUrl')"
+                   :on-remove="e => handleRemove('logoUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'logoUrl')">
@@ -35,6 +37,7 @@
       </el-form-item>
       <el-form-item label="幼儿园slogan">
         <el-input type="textarea"
+                  rows="4"
                   v-model="form.slogan" />
       </el-form-item>
       <el-form-item label="省份">
@@ -60,10 +63,12 @@
       </el-form-item>
       <el-form-item label="地址">
         <el-input type="textarea"
+                  rows="4"
                   v-model="form.address" />
       </el-form-item>
       <el-form-item label="幼儿园简介">
         <el-input type="textarea"
+                  rows="4"
                   v-model="form.briefIntroduction" />
         <Upload class="m-t-10"
                 :limit="3"
@@ -84,7 +89,7 @@
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('qrCodeOneUrl')"
+                   :on-remove="e => handleRemove('qrCodeOneUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'qrCodeOneUrl')">
@@ -101,13 +106,12 @@
       <el-form-item label="二维码二">
         <el-input v-model="form.qrCodeTwoName"
                   placeholder="请输入二维码描述" />
-
         <el-upload class="avatar-uploader m-t-10"
                    accept=".jpg,.png,.jpeg,.gif"
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('qrCodeTwoUrl')"
+                   :on-remove="e => handleRemove('qrCodeTwoUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'qrCodeTwoUrl')">
@@ -130,7 +134,7 @@
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('qrCodeThreeUrl')"
+                   :on-remove="e => handleRemove('qrCodeThreeUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'qrCodeThreeUrl')">
@@ -218,7 +222,6 @@ export default {
     getData () {
       this.$get(`${this.api.queryTeamInfo}?teamId=${this.teamId}`).then(res => {
         Object.assign(this.form, res.teamInfo)
-        console.log("🚀 ~ file: basic.vue:120 ~ this.$get ~ this.form:", this.form)
       }).catch(err => { })
     },
 
@@ -254,6 +257,7 @@ export default {
       return this.$confirm(`确定移除 ${file.name}？`);
     },
     handleRemove (field) {
+      console.log("🚀 ~ file: basic.vue:255 ~ handleRemove ~ field:", field)
       Oss.del(this.form[field])
       this.form[field] = ''
     },
diff --git a/src/pages/preschool/manage/member.vue b/src/pages/preschool/manage/member.vue
index 06b5620..2d42211 100644
--- a/src/pages/preschool/manage/member.vue
+++ b/src/pages/preschool/manage/member.vue
@@ -104,6 +104,15 @@ export default {
     }
   },
   mounted () {
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '幼儿园管理',
+        route: '/preschool'
+      },
+      {
+        name: '幼儿园成员'
+      },
+    ])
     this.initData()
   },
   methods: {
diff --git a/src/pages/supplier/audit/index.vue b/src/pages/supplier/audit/index.vue
index d01bfef..4372203 100644
--- a/src/pages/supplier/audit/index.vue
+++ b/src/pages/supplier/audit/index.vue
@@ -54,11 +54,25 @@
 
     <div class="btns">
       <el-button type="primary"
-                 @click="submit(2)">通过</el-button>
+                 @click="confirmSubmit(2)">通过</el-button>
       <el-button type="danger"
-                 @click="submit(3)">不通过</el-button>
+                 @click="confirmSubmit(3)">不通过</el-button>
       <el-button @click="$router.back()">返回</el-button>
     </div>
+
+    <el-dialog title="请填写审批意见"
+               :visible.sync="auditVisible"
+               width="450px">
+      <el-input type="textarea"
+                :rows="2"
+                v-model="remark" />
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="auditVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="submit(3)">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -68,9 +82,11 @@ import Setting from "@/setting";
 export default {
   data () {
     return {
-      id: this.$route.query.id || '',
+      id: this.$route.query.id,
       form: {},
+      remark: '',
       submiting: false,
+      auditVisible: false
     };
   },
   mounted () {
@@ -92,12 +108,21 @@ export default {
         this.form = data
       }).catch(err => { })
     },
+    // 提交前判断
+    confirmSubmit (auditStatus) {
+      // 通过：直接提交，不通过：弹框填写意见
+      if (auditStatus === 2) {
+        this.submit(2)
+      } else {
+        this.auditVisible = true
+      }
+    },
     // 提交
     async submit (auditStatus) {
       if (this.submiting) return false
       this.submiting = true
       try {
-        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&id=${this.id}`).then(res => {
+        await this.$post(`${this.api.informationAudit}?auditStatus=${auditStatus}&id=${this.id}&openId=${this.form.openId}&remark=${this.remark}`).then(res => {
           this.$router.back()
           Util.successMsg('审核成功！');
         })
diff --git a/src/pages/supplier/list/index.vue b/src/pages/supplier/list/index.vue
index e8efcb2..983f867 100644
--- a/src/pages/supplier/list/index.vue
+++ b/src/pages/supplier/list/index.vue
@@ -4,7 +4,7 @@
       <ul class="filter">
         <li>
           <label>省份</label>
-          <el-select v-model="form.provinces"
+          <el-select v-model="form.province"
                      clearable
                      placeholder="请选择省份"
                      @change="getCity"
@@ -19,7 +19,7 @@
           <el-select v-model="form.city"
                      clearable
                      placeholder="请选择城市"
-                     :disabled="form.provinces ? false : true"
+                     :disabled="form.province ? false : true"
                      @change="initData">
             <el-option v-for="(item, i) in cityList"
                        :key="i"
@@ -94,7 +94,7 @@
     <div class="relative">
       <el-tabs v-model="active"
                @tab-click="tabChange">
-        <el-tab-pane :label="'全部(' + total + ')'"
+        <el-tab-pane :label="'全部(' + all + ')'"
                      name="0"></el-tab-pane>
         <el-tab-pane :label="'待审核(' + status1 + ')'"
                      name="1"></el-tab-pane>
@@ -141,6 +141,10 @@
       <el-table-column prop="contactInformation"
                        label="手机号"
                        align="center"></el-table-column>
+      <el-table-column prop="organizationCreationTime"
+                       label="创建时间"
+                       width="150"
+                       align="center"></el-table-column>
       <el-table-column prop="submitTime"
                        label="提交时间"
                        width="150"
@@ -198,7 +202,7 @@ export default {
       form: {
         startCommitTime: '',
         endCommitTime: '',
-        provinces: '',
+        province: '',
         city: '',
         platformId: '',
         auditStatus: null,
@@ -246,6 +250,8 @@ export default {
       status2: 0,
       status3: 0,
       status4: 0,
+      all: 0,
+      isFirst: 1, // 第一次加载的标识
     };
   },
   watch: {
@@ -285,19 +291,23 @@ export default {
         pageSize: this.pageSize,
       }).then(({ data }) => {
         const list = data.records
-        if (list.length) {
-          this.status1 = list.filter(e => e.auditStatus === 1).length
-          this.status2 = list.filter(e => e.auditStatus === 2).length
-          this.status3 = list.filter(e => e.auditStatus === 3).length
-          this.status4 = list.filter(e => e.auditStatus === 4).length
-          this.list = data.records
-          this.total = data.total
-        }
+        this.isFirst && this.handleLen(list)
+        this.list = list
+        this.total = data.total
         this.loading = false
       }).catch(res => {
         this.loading = false
       })
     },
+    // 获取各个状态的总数
+    handleLen (list) {
+      this.isFirst = 0
+      this.status1 = list.filter(e => e.auditStatus === 1).length
+      this.status2 = list.filter(e => e.auditStatus === 2).length
+      this.status3 = list.filter(e => e.auditStatus === 3).length
+      this.status4 = list.filter(e => e.auditStatus === 4).length
+      this.all = list.length
+    },
     initData () {
       this.page = 1
       this.getData()
@@ -317,8 +327,8 @@ export default {
       this.initData()
     },
     getCityData () {
-      this.$get(this.api.queryCity, {
-        provinceId: this.provinceList.find(e => e.provinceName === this.form.provinces).provinceId
+      this.form.province && this.$get(this.api.queryCity, {
+        provinceId: this.provinceList.find(e => e.provinceName === this.form.province).provinceId
       }).then(res => {
         this.cityList = res.list
       }).catch(res => { })
diff --git a/src/pages/supplier/manage/auth.vue b/src/pages/supplier/manage/auth.vue
index 50aa143..be99d38 100644
--- a/src/pages/supplier/manage/auth.vue
+++ b/src/pages/supplier/manage/auth.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="page">
     <div class="action">
-      <span v-if="form.auditStatus !== ''"
+      <span v-if="form.auditStatus !== '' && !editing"
             class="status">{{ auditStatus.find(e => e.id === form.auditStatus).name }}</span>
       <el-button v-if="!editing"
                  @click="edit">编辑</el-button>
@@ -20,7 +20,7 @@
                      :value="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="幼儿园名称">
+      <el-form-item label="供应商名称">
         <div class="d-inline-block">
           <el-input v-model="form.companyName" />
         </div>
@@ -36,16 +36,19 @@
         </div>
       </el-form-item>
       <el-form-item label="营业执照">
-        <img v-if="form.businessLicensePicture"
-             class="pic"
-             :src="form.businessLicensePicture"
-             alt="">
-      </el-form-item>
-      <el-form-item label="办学许可证件">
-        <img v-if="form.licenseForRunningSchool"
-             class="pic"
-             :src="form.licenseForRunningSchool"
-             alt="">
+        <el-image v-if="form.businessLicensePicture"
+                  class="pic"
+                  :src="form.businessLicensePicture"
+                  :preview-src-list="[form.businessLicensePicture]" />
+
+        <Upload :limit="1"
+                :showFileList="false"
+                :on-remove="handleBusinessRemove"
+                @onSuccess="uploadBusinessSuccess">
+          <template slot="tip">
+            <p>请上传.jpg，.jpeg，.png格式的营业执照</p>
+          </template>
+        </Upload>
       </el-form-item>
       <div class="aline"></div>
 
@@ -78,6 +81,7 @@
 import Util from "@/libs/util";
 import Setting from "@/setting";
 import Const from '@/const/user'
+import Upload from '@/components/upload';
 export default {
   data () {
     return {
@@ -104,11 +108,14 @@ export default {
       submiting: false,
     };
   },
+  components: {
+    Upload
+  },
   mounted () {
     this.$store.commit('user/setCrumbs', [
       {
-        name: '幼儿园管理',
-        route: '/preschool'
+        name: '供应商管理',
+        route: '/supplier'
       },
       {
         name: '认证信息'
@@ -127,11 +134,18 @@ export default {
     edit () {
       this.editing = true
     },
+    handleBusinessRemove () {
+      this.form.businessLicensePicture = ''
+    },
+    // 上传成功
+    uploadBusinessSuccess ({ url }) {
+      this.form.businessLicensePicture = url
+    },
     // 提交
     async submit () {
       const { form } = this
       if (form.authenticationStatus === '') return Util.warningMsg('请选择认证状态')
-      if (!form.companyName) return Util.warningMsg('请输入幼儿园名称')
+      if (!form.companyName) return Util.warningMsg('请输入供应商名称')
       if (!form.creditCode) return Util.warningMsg('请输入统一社会信用代码')
       if (!form.legalPerson) return Util.warningMsg('请输入法人')
       if (this.submiting) return false
diff --git a/src/pages/supplier/manage/basic.vue b/src/pages/supplier/manage/basic.vue
index 89e9a3d..86b247d 100644
--- a/src/pages/supplier/manage/basic.vue
+++ b/src/pages/supplier/manage/basic.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="page">
     <div class="action">
-      <el-button @click="edit">编辑</el-button>
+      <el-button v-if="!editing"
+                 type="primary"
+                 @click="edit">编辑</el-button>
     </div>
     <el-form label-width="170px"
              label-suffix=":"
@@ -14,7 +16,7 @@
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('logoUrl')"
+                   :on-remove="e => handleRemove('logoUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'logoUrl')">
@@ -28,13 +30,14 @@
           </div>
         </el-upload>
       </el-form-item>
-      <el-form-item label="幼儿园名称">
+      <el-form-item label="供应商名称">
         <div class="d-inline-block">
           <el-input v-model="form.classificationName" />
         </div>
       </el-form-item>
-      <el-form-item label="幼儿园slogan">
+      <el-form-item label="供应商slogan">
         <el-input type="textarea"
+                  rows="4"
                   v-model="form.slogan" />
       </el-form-item>
       <el-form-item label="省份">
@@ -60,10 +63,12 @@
       </el-form-item>
       <el-form-item label="地址">
         <el-input type="textarea"
+                  rows="4"
                   v-model="form.address" />
       </el-form-item>
-      <el-form-item label="幼儿园简介">
+      <el-form-item label="供应商简介">
         <el-input type="textarea"
+                  rows="4"
                   v-model="form.briefIntroduction" />
         <Upload class="m-t-10"
                 :limit="3"
@@ -84,7 +89,7 @@
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('qrCodeOneUrl')"
+                   :on-remove="e => handleRemove('qrCodeOneUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'qrCodeOneUrl')">
@@ -107,7 +112,7 @@
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('qrCodeTwoUrl')"
+                   :on-remove="e => handleRemove('qrCodeTwoUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'qrCodeTwoUrl')">
@@ -130,7 +135,7 @@
                    :limit="1"
                    :on-exceed="handleExceed"
                    :before-remove="beforeRemove"
-                   :on-remove="handleRemove('qrCodeThreeUrl')"
+                   :on-remove="e => handleRemove('qrCodeThreeUrl')"
                    :on-error="uploadError"
                    action=""
                    :http-request="e => handleRequest(e, 'qrCodeThreeUrl')">
@@ -205,7 +210,7 @@ export default {
     this.$store.commit('user/setCrumbs', [
       {
         name: '供应商管理',
-        route: '/preschool'
+        route: '/supplier'
       },
       {
         name: '基本信息'
@@ -284,7 +289,7 @@ export default {
     // 提交
     async submit () {
       const { form } = this
-      if (!form.classificationName) return Util.warningMsg('请输入幼儿园名称')
+      if (!form.classificationName) return Util.warningMsg('请输入供应商名称')
       if (this.submiting) return false
       this.submiting = true
       try {
diff --git a/src/pages/supplier/manage/member.vue b/src/pages/supplier/manage/member.vue
index 14347a2..e8bdca1 100644
--- a/src/pages/supplier/manage/member.vue
+++ b/src/pages/supplier/manage/member.vue
@@ -104,6 +104,15 @@ export default {
     }
   },
   mounted () {
+    this.$store.commit('user/setCrumbs', [
+      {
+        name: '供应商管理',
+        route: '/supplier'
+      },
+      {
+        name: '供应商成员'
+      },
+    ])
     this.initData()
   },
   methods: {
diff --git a/src/pages/user/detail/index.vue b/src/pages/user/detail/index.vue
index caf1b01..c8cd199 100644
--- a/src/pages/user/detail/index.vue
+++ b/src/pages/user/detail/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="page">
+  <div>
     <p class="page-name mb">用户信息</p>
-    <div>
+    <div class="page m-b-20">
       <p class="l-title">账号信息</p>
       <el-form v-for="(item, i) in userAccountList"
                :key="i"
@@ -27,98 +27,98 @@
       </el-form>
     </div>
 
-    <div class="aline"></div>
-
-    <p class="l-title">实名认证信息（{{ form.authentication }}）</p>
-    <el-form ref="form"
-             class="input-form"
-             :model="form"
-             :rules="rules"
-             label-width="120px"
-             :disabled="isDetail">
-      <div class="item-line">
-        <el-form-item prop="userName"
-                      label="用户姓名">
-          <el-input v-model="form.userName"
-                    placeholder="请输入"></el-input>
-        </el-form-item>
-        <el-form-item prop="phone"
-                      label="手机号">
-          <el-input v-model="form.phone"
-                    placeholder="请输入手机号"
-                    maxlength="11"></el-input>
-        </el-form-item>
-      </div>
-
-      <div class="item-line">
-        <el-form-item label="证件类型"
-                      prop="documentType">
-          <el-select value="1"
-                     clearable
-                     placeholder="请选择证件类型">
-            <el-option label="身份证"
-                       value="1"></el-option>
-          </el-select>
-        </el-form-item>
+    <div class="page m-b-20">
+      <p class="l-title">实名认证信息（{{ form.authentication }}）</p>
+      <el-form ref="form"
+               class="input-form"
+               :model="form"
+               :rules="rules"
+               label-width="120px"
+               :disabled="isDetail">
+        <div class="item-line">
+          <el-form-item prop="userName"
+                        label="用户姓名">
+            <el-input v-model="form.userName"
+                      placeholder="请输入"></el-input>
+          </el-form-item>
+          <el-form-item prop="phone"
+                        label="手机号">
+            <el-input v-model="form.phone"
+                      placeholder="请输入手机号"
+                      maxlength="11"></el-input>
+          </el-form-item>
+        </div>
 
-        <el-form-item prop="idNumber"
-                      label="证件号码">
-          <el-input v-model="form.idNumber"
-                    placeholder="请输入证件号码"
-                    maxlength="18"></el-input>
-        </el-form-item>
-      </div>
-    </el-form>
+        <div class="item-line">
+          <el-form-item label="证件类型"
+                        prop="documentType">
+            <el-select value="1"
+                       clearable
+                       placeholder="请选择证件类型">
+              <el-option label="身份证"
+                         value="1"></el-option>
+            </el-select>
+          </el-form-item>
 
-    <div class="line m-b-20"></div>
+          <el-form-item prop="idNumber"
+                        label="证件号码">
+            <el-input v-model="form.idNumber"
+                      placeholder="请输入证件号码"
+                      maxlength="18"></el-input>
+          </el-form-item>
+        </div>
+      </el-form>
+    </div>
 
-    <p class="l-title">已绑定的平台和用户信息</p>
-    <el-table :data="platformList"
-              class="table"
-              stripe
-              header-align="center"
-              row-key="accountId">
-      <el-table-column type="index"
-                       width="100"
-                       label="序号"
-                       align="center"></el-table-column>
-      <el-table-column prop="organizationName"
-                       label="组织名称"
-                       align="center"></el-table-column>
-      <el-table-column prop="companyName"
-                       label="类型"
-                       align="center">
-        <template slot-scope="scope">
-          {{ platformSource.find(e => e.id == scope.row.platformId).name }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="creditCode"
-                       label="统一社会信用代码"
-                       align="center"></el-table-column>
-      <el-table-column prop="authentication"
-                       label="组织认证状态"
-                       align="center"></el-table-column>
-      <el-table-column prop="roleName"
-                       label="组织会员状态"
-                       align="center"></el-table-column>
-      <el-table-column label="操作"
-                       width="180"
-                       align="center">
-        <template slot-scope="scope">
-          <el-button type="text"
-                     @click="show(scope.row)">查看</el-button>
-          <el-button type="text"
-                     @click="del(scope.row)">移除</el-button>
-          <el-switch v-if="scope.row.openId!==1"
-                     v-model="scope.row.isEnable"
-                     :active-value="0"
-                     :inactive-value="1"
-                     style="margin: 0 10px 0 5px"
-                     :active-text="scope.row.isEnable ? '禁用' : '启用'"
-                     @change="switchUser($event,scope.row,scope.$index)"></el-switch>
-        </template>
-      </el-table-column>
-    </el-table>
+    <div class="page">
+      <p class="l-title">已绑定的平台和用户信息</p>
+      <el-table :data="platformList"
+                class="table"
+                stripe
+                header-align="center"
+                row-key="accountId">
+        <el-table-column type="index"
+                         width="100"
+                         label="序号"
+                         align="center"></el-table-column>
+        <el-table-column prop="organizationName"
+                         label="组织名称"
+                         align="center"></el-table-column>
+        <el-table-column prop="companyName"
+                         label="类型"
+                         align="center">
+          <template slot-scope="scope">
+            {{ platformSource.find(e => e.id == scope.row.platformId).name }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="creditCode"
+                         label="统一社会信用代码"
+                         align="center"></el-table-column>
+        <el-table-column prop="authentication"
+                         label="组织认证状态"
+                         align="center"></el-table-column>
+        <el-table-column prop="roleName"
+                         label="组织会员状态"
+                         align="center"></el-table-column>
+        <el-table-column label="操作"
+                         width="180"
+                         align="center">
+          <template slot-scope="scope">
+            <el-button type="text"
+                       @click="show(scope.row)">查看</el-button>
+            <el-button type="text"
+                       @click="del(scope.row)">移除</el-button>
+            <el-switch v-if="scope.row.openId!==1"
+                       v-model="scope.row.isEnable"
+                       :active-value="0"
+                       :inactive-value="1"
+                       style="margin: 0 10px 0 5px"
+                       :active-text="scope.row.isEnable ? '禁用' : '启用'"
+                       @change="switchUser($event,scope.row,scope.$index)"></el-switch>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
   </div>
 </template>
 
@@ -212,7 +212,7 @@ export default {
 <style lang="scss" scoped>
 .bb:not(:last-child) {
     margin-bottom: 20px;
-    border-bottom: 1px solid #f1f1f1;
+    border-bottom: 1px dashed #e3e3e3;
 }
 .l-title {
     margin-bottom: 15px;
diff --git a/src/styles/common.scss b/src/styles/common.scss
index ad89d41..17651d9 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -172,7 +172,7 @@
         width: auto;
     }
     .el-textarea {
-        width: 550px;
+        width: 700px;
     }
     .auto,
     .auto .el-input {