bug fix

app.js

 import fetch from '/utils/http'
 const $api = require('/config/api.js').$api
 
-const HttpSever = require('./utils/http.js').HttpSever;
-const $api = require('./config/api.js').$api;
-
 App({
   onLaunch: function() {
     let _self = this
       }
     })
 
-    HttpSever.Ajax({
+    fetch({
       url: $api.dict.list.url,
       method: $api.dict.list.method,
     }).then((data) => {

utils/http.js

 import { apiCode } from '../config/code'
 
-<<<<<<< HEAD
-$HttpSever.prototype = {
-  /**
-   *  通用请求方法
-   * 
-   * @param {any} [config={}] 
-   * @returns 
-   */
-  Ajax(config = {}) {
-    return new Promise((resolve, reject) => {
-      wx.request({
-        url: config.url,
-        method: config.method,
-        data: {
-          ...config.data
-        },
-        success(res) {
-          if (res.statusCode && res.statusCode === apiCode.common.successCode) {
-            resolve(res.data)
-          } else {
-            resolve(res.data.message + "失败")
-          }
-        },
-        error(msg) {
-          reject(msg)
-=======
 export default (config = {}) => {
   return new Promise((resolve, reject) => {
     wx.request({
         ...config.data
       },
       success(res) {
-        console.log(res, apiCode)
         if (res.statusCode && res.statusCode === apiCode.success) {
           resolve(res.data)
         } else {
           resolve(res.data.message + "失败")
->>>>>>> 02bbb13da6392818f573d7fc66c72524bffeb347
         }
       },
       error(msg) {