up

src/components/Page.vue

@@ -14,8 +14,9 @@
 <template>
     <el-pagination
     @current-change="getData"
-    background :page-size='20'
+    background :page-size='page_size?page_size:20'
     @size-change="handleSizeChange"
+    :current-page="current"
     :page-sizes="[1,20, 30, 40, 50,60,70,80,90,100]"
     layout="sizes,total,prev, pager, next"
     :total="total">
@@ -30,6 +31,8 @@ export default {
     },
     props: {
         total:'',
+        page_size:'',
+        current:''
     },
     methods:{
         getData(type){
@@ -44,6 +47,9 @@ export default {
         handleSizeChange(val){
             this.$emit('pageChange',val)
         }
+    },
+    created(){
+        console.log(this.page_size)
     }
 }
 </script>

src/views/company/Add.vue

@@ -108,7 +108,7 @@
                             <i v-if="form.faceimg" @click="form.faceimg=''" class="el-icon-delete"></i>
                             <i class="el-icon-upload"></i>
                             <img v-if="form.faceimg" width="100%" height="100%" :src="form.faceimg" alt="">
-                            <input @change="upload('faceimg')" id='faceimg' type="file">
+                            <input accept="image/png,image/jpg"  @change="upload('faceimg')" id='faceimg' type="file">
                         </div>
                         <span style="color:red">建议尺寸：1125*728</span>
                     </el-form-item>
@@ -117,7 +117,7 @@
                             <i v-if="form.safecolor_img" @click="form.safecolor_img=''" class="el-icon-delete"></i>
                             <i class="el-icon-upload"></i>
                             <img v-if="form.safecolor_img" width="100%" height="100%" :src="form.safecolor_img" alt="">
-                            <input @change="upload('safecolor_img')" id='safecolor_img' type="file">
+                            <input accept="image/png,image/jpg"  @change="upload('safecolor_img')" id='safecolor_img' type="file">
                         </div>
                     </el-form-item>
                     <el-form-item label="企业地址">

src/views/company/Company.vue

@@ -81,7 +81,7 @@
                 </template>
                 </el-table-column>
         </el-table>
-        <Page  ref="pageButton"  :total='total' @pageChange='gopage'/>
+        <Page  ref="pageButton" :current='form.page' :page_size='form.page_size' :total='total' @pageChange='gopage'/>
     </section>
 </template>
 <script>
@@ -104,19 +104,19 @@ export default {
   },
   methods:{
         gopage(size){
+            console.log(size)
             if(size){
                 this.form.page_size=size
             }
             this.form.page=this.$refs.pageButton.page
+            console.log(this.$refs.pageButton.page)
             this.getData()
         },
         detail(id){
-            this.$router.push({ path: '/company/detail', query: {  id: id,page:this.form.page } });
+            this.$router.push({ path: '/company/detail', query: {  id: id,page:this.form.page,page_size:this.form.page_size  } });
         },
         getData(){
-            let page = this.$route.query.page;
-            this.form.page = page;
-            var parm=this.form;
+            var parm=this.form;        
             this.loading=true
             this.$api.getEnterpriseList(parm).then(res=>{
                 this.list=res.data.data.list;
@@ -160,6 +160,11 @@ export default {
 		},
   },
   created(){
+      let page = this.$route.query.page,page_size = this.$route.query.page_size;
+        if(page){
+            this.form.page = Number(page);
+            this.form.page_size = Number(page_size);
+        }
       this.getData()
       this.$api.getInfo().then(res=>{
 		this.info=res.data.data

src/views/company/Detail.vue

@@ -155,7 +155,7 @@ export default {
   },
   methods:{
     close(){
-        this.$router.push({ path: '/company', query: { page:this.$route.query.page } });
+        this.$router.push({ path: '/company', query: { page:this.$route.query.page,page_size:this.$route.query.page_size } });
     },
     onBaiduMapReady(e) {
         const that = this