修改

App.vue

@@ -21,7 +21,7 @@
 								key: 'openid',
 								success: function(res) {},
 								fail: async function(err) {
-									const aee = await that.$api('/login/app', 'GET', {
+									const aee = await that.$app('/wechat/api/login/app', 'GET', {
 										js_code: res.code,
 										config: that.$config.wx_projectkey
 									})

common/api.js

@@ -36,6 +36,30 @@ export const requestBase = async (uri, method = 'GET', data, type) => {
 		});
 	});
 };
+export const requestApp = async (uri, method = 'GET', data, type) => {
+	let baseUrl = `https://broadcast.waityou24.cn${uri}`;
+	let header = {};
+	const token = uni.getStorageSync('token');
+	if (token) header.token = token;
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: baseUrl,
+			method: method || 'GET',
+			data: data || {},
+			header,
+			success: (res) => {
+				resolve(res.data);
+			},
+			fail: (err) => {
+				uni.showToast({
+					title: '请求接口失败',
+					icon: 'fail',
+				});
+				reject(err.data);
+			},
+		});
+	});
+};
 export const requestFile = (uri, method, data, type) => {
 	let baseUrl = getDomain(uri, method, type);
 	return new Promise((resolve, reject) => {

main.js

@@ -9,10 +9,12 @@ import weappJwt from '@/common/weapp-jwt.js';
 Vue.prototype.$jwt = weappJwt;
 // requset请求
 import {
-	requestBase,
+	requestBase,
+	requestApp,
 	requestFile
 } from '@/common/api.js';
-Vue.prototype.$api = requestBase;
+Vue.prototype.$api = requestBase;
+Vue.prototype.$app = requestApp;
 Vue.prototype.$apifile = requestFile;
 // 配置文件
 import config from '@/config.js';

pages/index/index.vue

@@ -13,7 +13,7 @@
 				logoUrl: ''
 			};
 		},
-		onLoad: async function() {
+		onShow: async function() {
 			const that = this;
 			await that.searchConfig();
 			await that.searchOpenid();
@@ -39,16 +39,18 @@
 				const that = this;
 				try {
 					const res = uni.getStorageSync('openid');
-					const aee = await that.$api(`/login/app/${res}`, 'POST', {})
-					if (aee.errcode == '0') {
-						uni.reLaunch({
-							url: `/pages/home/index`
-						})
-					} else {
-						uni.showToast({
-							title: aee.errmsg,
-							icon: 'none'
-						})
+					if (res) {
+						const aee = await that.$api(`/login/wxapp/${res}`, 'POST', {})
+						if (aee.errcode == '0') {
+							uni.reLaunch({
+								url: `/pages/home/index`
+							})
+						} else {
+							uni.showToast({
+								title: aee.errmsg,
+								icon: 'none'
+							})
+						}
 					}
 				} catch (e) {
 					uni.showToast({

unpackage/dist/dev/mp-weixin/common/main.js

@@ -30,6 +30,7 @@ _vue.default.prototype.$jwt = _weappJwt.default;
 // requset请求
 
 _vue.default.prototype.$api = _api.requestBase;
+_vue.default.prototype.$app = _api.requestApp;
 _vue.default.prototype.$apifile = _api.requestFile;
 // 配置文件
 
@@ -143,7 +144,7 @@ var _default = {
                       switch (_context.prev = _context.next) {
                         case 0:
                           _context.next = 2;
-                          return that.$api('/login/app', 'GET', {
+                          return that.$app('/wechat/api/login/app', 'GET', {
                             js_code: res.code,
                             config: that.$config.wx_projectkey
                           });

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -11022,7 +11022,7 @@ var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/inte
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.requestFile = exports.requestBase = void 0;
+exports.requestFile = exports.requestBase = exports.requestApp = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 30));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var _config = _interopRequireDefault(__webpack_require__(/*! ../config.js */ 38));
@@ -11088,6 +11088,56 @@ var requestBase = /*#__PURE__*/function () {
   };
 }();
 exports.requestBase = requestBase;
+var requestApp = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(uri) {
+    var method,
+      data,
+      type,
+      baseUrl,
+      header,
+      token,
+      _args2 = arguments;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            method = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 'GET';
+            data = _args2.length > 2 ? _args2[2] : undefined;
+            type = _args2.length > 3 ? _args2[3] : undefined;
+            baseUrl = "https://broadcast.waityou24.cn".concat(uri);
+            header = {};
+            token = uni.getStorageSync('token');
+            if (token) header.token = token;
+            return _context2.abrupt("return", new Promise(function (resolve, reject) {
+              uni.request({
+                url: baseUrl,
+                method: method || 'GET',
+                data: data || {},
+                header: header,
+                success: function success(res) {
+                  resolve(res.data);
+                },
+                fail: function fail(err) {
+                  uni.showToast({
+                    title: '请求接口失败',
+                    icon: 'fail'
+                  });
+                  reject(err.data);
+                }
+              });
+            }));
+          case 8:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return function requestApp(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+exports.requestApp = requestApp;
 var requestFile = function requestFile(uri, method, data, type) {
   var baseUrl = getDomain(uri, method, type);
   return new Promise(function (resolve, reject) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -187,8 +187,8 @@ var _default = {
       logoUrl: ''
     };
   },
-  onLoad: function () {
-    var _onLoad = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+  onShow: function () {
+    var _onShow = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
       var that;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) {
@@ -207,10 +207,10 @@ var _default = {
         }
       }, _callee, this);
     }));
-    function onLoad() {
-      return _onLoad.apply(this, arguments);
+    function onShow() {
+      return _onShow.apply(this, arguments);
     }
-    return onLoad;
+    return onShow;
   }(),
   methods: {
     // 查询基本设置
@@ -257,9 +257,13 @@ var _default = {
                 that = _this2;
                 _context3.prev = 1;
                 res = uni.getStorageSync('openid');
-                _context3.next = 5;
-                return that.$api("/login/app/".concat(res), 'POST', {});
-              case 5:
+                if (!res) {
+                  _context3.next = 8;
+                  break;
+                }
+                _context3.next = 6;
+                return that.$api("/login/wxapp/".concat(res), 'POST', {});
+              case 6:
                 aee = _context3.sent;
                 if (aee.errcode == '0') {
                   uni.reLaunch({
@@ -271,26 +275,27 @@ var _default = {
                     icon: 'none'
                   });
                 }
-                _context3.next = 12;
+              case 8:
+                _context3.next = 13;
                 break;
-              case 9:
-                _context3.prev = 9;
+              case 10:
+                _context3.prev = 10;
                 _context3.t0 = _context3["catch"](1);
                 uni.showToast({
                   title: err.errmsg,
                   icon: 'error',
                   duration: 2000
                 });
-              case 12:
+              case 13:
                 uni.reLaunch({
                   url: "/pages/home/index"
                 });
-              case 13:
+              case 14:
               case "end":
                 return _context3.stop();
             }
           }
-        }, _callee3, null, [[1, 9]]);
+        }, _callee3, null, [[1, 10]]);
       }))();
     }
   }