feature goods_list already

server/controllers/goods.js

 const GOODS_URI = require("../config.js").GOODS_URI;
 const req = require("../utils/request").httpReq;
 
-<<<<<<< HEAD
 /**
-=======
-/** 
->>>>>>> cac0749 (update: update some message)
  * 示例
  *  exports.方法名 = async ctx => {
  *    const url = `${设置好的域名}/向服务端发送的请求地址`;

src/pages/Goods/List/index.vue

@@ -343,7 +343,7 @@ export default {
     handleCurrentChange (e) {
       this.currentPage = e;
       // 获取信息
-      this.getList();
+      this.getCommodityList();
     },
 
     // 去往详情页