|
@@ -561,16 +561,19 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
|
|
|
_this.isUser = false;
|
|
|
}case 9:case "end":return _context2.stop();}}}, _callee2);}))();
|
|
|
},
|
|
|
- phoneLogin: function phoneLogin(res) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var data, resd, _resd;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:if (!(
|
|
|
+ phoneLogin: function phoneLogin(res, is) {var _this2 = this;return _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee3() {var data, resd, _resd;return _regenerator.default.wrap(function _callee3$(_context3) {while (1) {switch (_context3.prev = _context3.next) {case 0:if (!(
|
|
|
|
|
|
|
|
|
|
|
|
- !uni.getStorageSync("token") || !uni.getStorageSync("user") || res.is)) {_context3.next = 14;break;}
|
|
|
+ !uni.getStorageSync("token") || !uni.getStorageSync("user") || is)) {_context3.next = 17;break;}
|
|
|
+ console.log(!uni.getStorageSync("token"), '!uni.getStorageSync("token")');
|
|
|
+ console.log(!uni.getStorageSync("user"), '!uni.getStorageSync("user")');
|
|
|
+ console.log(res.is, 'res.is');
|
|
|
uni.showLoading({
|
|
|
title: '加载中' });
|
|
|
|
|
|
- console.log(res, 'res');_context3.next = 5;return (
|
|
|
- (0, _url.phoneLogin)(res));case 5:data = _context3.sent;
|
|
|
+ console.log(res, 'res');_context3.next = 8;return (
|
|
|
+ (0, _url.phoneLogin)(res));case 8:data = _context3.sent;
|
|
|
console.log(data, 'data');
|
|
|
uni.hideLoading();
|
|
|
uni.setStorageSync("token", data.data.token.access_token);
|
|
@@ -596,7 +599,7 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
|
|
|
|
|
|
} else {
|
|
|
_this2.starExam();
|
|
|
- }_context3.next = 16;break;case 14:
|
|
|
+ }_context3.next = 19;break;case 17:
|
|
|
|
|
|
_resd = uni.getStorageSync("examFlg") == 1 && uni.getStorageSync("examData").id == uni.
|
|
|
getStorageSync("oldExamId") && uni.getStorageSync("user").loginName == uni.getStorageSync(
|
|
@@ -608,7 +611,7 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
|
|
|
|
|
|
} else {
|
|
|
_this2.starExam();
|
|
|
- }case 16:case "end":return _context3.stop();}}}, _callee3);}))();
|
|
|
+ }case 19:case "end":return _context3.stop();}}}, _callee3);}))();
|
|
|
|
|
|
|
|
|
},
|
|
@@ -653,9 +656,9 @@ var _getOpenId = _interopRequireDefault(__webpack_require__(/*! ../../utils/getO
|
|
|
_this5.phoneLogin(_objectSpread(_objectSpread({},
|
|
|
res), {}, {
|
|
|
examId: _this5.htmlData.id,
|
|
|
- openId: uni.getStorageSync("openId") ? uni.getStorageSync("openId") : null,
|
|
|
- is: true }));
|
|
|
+ openId: uni.getStorageSync("openId") ? uni.getStorageSync("openId") : null }),
|
|
|
|
|
|
+ true);
|
|
|
_this5.$refs.popup.close();
|
|
|
}).catch(function (err) {
|
|
|
console.log('表单错误信息:', err);
|