Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-website

src/layout/supermarket/listcontext.vue

@@ -1,6 +1,7 @@
 <template>
   <div id="rightcont">
     <el-col class="zhengce">
+      <el-col :span="24" class="btn"><el-button type="primary" size="mini" @click="back()">返回</el-button></el-col>
       <el-col :span="24" class="topTitle">
         {{ columnName }}
       </el-col>
@@ -51,6 +52,9 @@ export default {
       console.log(currentPage);
       this.$emit('handleCurrentChange', { skip: (currentPage - 1) * this.pageSize, limit: this.pageSize, currentPage });
     },
+    back() {
+      history.back(-1);
+    },
   },
 };
 </script>
@@ -110,4 +114,7 @@ li {
   padding: 11px 0;
   text-align: center;
 }
+.btn {
+  text-align: right;
+}
 </style>