Browse Source

区分开发环境还是生产环境

bayi 2 years ago
parent
commit
6cea96c400
4 changed files with 33 additions and 15 deletions
  1. 13 11
      api/global.js
  2. 0 1
      pages/collection/index.js
  3. 6 1
      pages/index/index.js
  4. 14 2
      utils/request.js

+ 13 - 11
api/global.js

@@ -1,15 +1,17 @@
 import {
-    request
+  request
 } from "../utils/request";
 module.exports = {
-    //获取充值配置信息
-    getProducts: data => request('/v3/product', 'get', data),
-    // 购买vip
-    buyVip: data => request('/order', 'post', data, true),
-    // 购买次数
-    buyNum: data => request('/v3/pay', 'post', data),
-    // 获取任务配置
-    getTasks: data => request('/v3/task', 'get', data),
-    // 提交任务
-    submitTask: data => request('/v3/task', 'post', data),
+  //获取充值配置信息
+  getProducts: data => request('/v3/product', 'get', data),
+  // 购买vip
+  buyVip: data => request('/order', 'post', data, true),
+  // 购买次数
+  buyNum: data => request('/v3/pay', 'post', data),
+  // 获取任务配置
+  getTasks: data => request('/v3/task', 'get', data),
+  // 提交任务
+  submitTask: data => request('/v3/task', 'post', data),
+  // 获取轮播图列表
+  getBannerList: data => request(`/v3/column/${data}`, 'get', data),
 }

+ 0 - 1
pages/collection/index.js

@@ -10,7 +10,6 @@ Page({
   },
   async loadMore() {
     this.getData(getFavoritesList, {})
-    console.log(this.data.list);
   },
   onReachBottom() {
     this.loadMore()

+ 6 - 1
pages/index/index.js

@@ -2,6 +2,9 @@ const app = getApp()
 import {
   getHotrecommendList
 } from "~/api/works"
+import {
+  getBannerList
+} from '~/api/global'
 import reachBottom from '~/mixins/reachBottom'
 import {
   createStoreBindings
@@ -38,7 +41,7 @@ Page({
   onUnload() {
     this.storeBindings.destroyStoreBindings()
   },
-  getLocUserInfo() {
+  async getLocUserInfo() {
     this.storeBindings = createStoreBindings(this, {
       store,
       fields: {
@@ -46,6 +49,8 @@ Page({
       },
     })
     this.storeBindings.updateStoreBindings()
+    // let res = await getBannerList()
+    // console.log(res);
   },
   loadMore() {
     if (this.data.currentType == '1') {

+ 14 - 2
utils/request.js

@@ -1,6 +1,18 @@
-let baseUrl = 'https://reader-api.ai160.com/wx'
-let oldUrl = 'https://reader-api.ai160.com'
+let baseUrl = null
+let oldUrl = null
 
+const {
+  miniProgram: {
+    envVersion
+  }
+} = wx.getAccountInfoSync();
+if (envVersion == 'develop') {
+  baseUrl = 'https://reader-api.efunbox.cn/wx'
+  oldUrl = 'https://reader-api.efunbox.cn'
+} else {
+  baseUrl = 'https://reader-api.ai160.com/wx'
+  oldUrl = 'https://reader-api.ai160.com'
+}
 
 function request(url, method, data, oldBaseUrl = false) {
   let header = {