|
@@ -1,10 +1,4 @@
|
|
|
-const {
|
|
|
- login,
|
|
|
- register
|
|
|
-} = require('../../../utils/apiUtil.js')
|
|
|
-
|
|
|
-import routePath from '../../../utils/routePath.js';
|
|
|
-import routeUtil from '../../../utils/routeUtil.js';
|
|
|
+const constant = require('../../../utils/constant.js');
|
|
|
|
|
|
Page({
|
|
|
|
|
@@ -25,7 +19,7 @@ Page({
|
|
|
|
|
|
goabout(e) {
|
|
|
var param = '?type=' + e.currentTarget.dataset.index;
|
|
|
- routeUtil.jumpParam(routePath.aboutInfo, param);
|
|
|
+ constant.routeUtil.jumpParam(constant.routePath.aboutInfo, param);
|
|
|
},
|
|
|
|
|
|
getPhoneNumber(e) {
|
|
@@ -46,11 +40,11 @@ Page({
|
|
|
title: '加载中',
|
|
|
});
|
|
|
// {"openid":"oZHPJ5JcNem2och3ToaocggmUENw","unionid":null,"userId":null,"deviceUid":null,"accessToken":null,"phone":null,"headUrl":"","nickname":"","isNewUser":true}
|
|
|
- login({
|
|
|
+ constant.apiUtil.login({
|
|
|
code: res1.code,
|
|
|
unShowLoad: true,
|
|
|
}).then((res2) => {
|
|
|
- register({
|
|
|
+ constant.apiUtil.register({
|
|
|
openid: res2.openid,
|
|
|
code: phoneCode,
|
|
|
unShowLoad: true,
|
|
@@ -64,7 +58,7 @@ Page({
|
|
|
});
|
|
|
}, function () {
|
|
|
setTimeout(() => {
|
|
|
- routeUtil.redirectTo(routePath.deviceList);
|
|
|
+ constant.routeUtil.redirectTo(constant.routePath.deviceList);
|
|
|
}, 2000);
|
|
|
}, function () {
|
|
|
wx.hideLoading();
|