"mall-admin/vscode:/vscode.git/clone" did not exist on "846854d5ff3283b867e2fb98dd36309fa530eb80"
Commit 20b97ec8 authored by Junling Bu's avatar Junling Bu
Browse files

chore[litemall-wx]: 使用微信开发者工具的格式化代码

parent 822d5075
...@@ -9,12 +9,12 @@ const api = require('../config/api.js'); ...@@ -9,12 +9,12 @@ const api = require('../config/api.js');
* Promise封装wx.checkSession * Promise封装wx.checkSession
*/ */
function checkSession() { function checkSession() {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
wx.checkSession({ wx.checkSession({
success: function () { success: function() {
resolve(true); resolve(true);
}, },
fail: function () { fail: function() {
reject(false); reject(false);
} }
}) })
...@@ -25,16 +25,16 @@ function checkSession() { ...@@ -25,16 +25,16 @@ function checkSession() {
* Promise封装wx.login * Promise封装wx.login
*/ */
function login() { function login() {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
wx.login({ wx.login({
success: function (res) { success: function(res) {
if (res.code) { if (res.code) {
resolve(res); resolve(res);
} else { } else {
reject(res); reject(res);
} }
}, },
fail: function (err) { fail: function(err) {
reject(err); reject(err);
} }
}); });
...@@ -46,10 +46,13 @@ function login() { ...@@ -46,10 +46,13 @@ function login() {
*/ */
function loginByWeixin(userInfo) { function loginByWeixin(userInfo) {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
return login().then((res) => { return login().then((res) => {
//登录远程服务器 //登录远程服务器
util.request(api.AuthLoginByWeixin, { code: res.code, userInfo: userInfo }, 'POST').then(res => { util.request(api.AuthLoginByWeixin, {
code: res.code,
userInfo: userInfo
}, 'POST').then(res => {
if (res.errno === 0) { if (res.errno === 0) {
//存储用户信息 //存储用户信息
wx.setStorageSync('userInfo', res.data.userInfo); wx.setStorageSync('userInfo', res.data.userInfo);
...@@ -72,7 +75,7 @@ function loginByWeixin(userInfo) { ...@@ -72,7 +75,7 @@ function loginByWeixin(userInfo) {
* 判断用户是否登录 * 判断用户是否登录
*/ */
function checkLogin() { function checkLogin() {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
if (wx.getStorageSync('userInfo') && wx.getStorageSync('token')) { if (wx.getStorageSync('userInfo') && wx.getStorageSync('token')) {
checkSession().then(() => { checkSession().then(() => {
resolve(true); resolve(true);
......
...@@ -23,7 +23,7 @@ function formatNumber(n) { ...@@ -23,7 +23,7 @@ function formatNumber(n) {
* 封封微信的的request * 封封微信的的request
*/ */
function request(url, data = {}, method = "GET") { function request(url, data = {}, method = "GET") {
return new Promise(function (resolve, reject) { return new Promise(function(resolve, reject) {
wx.request({ wx.request({
url: url, url: url,
data: data, data: data,
...@@ -32,7 +32,7 @@ function request(url, data = {}, method = "GET") { ...@@ -32,7 +32,7 @@ function request(url, data = {}, method = "GET") {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'X-Litemall-Token': wx.getStorageSync('token') 'X-Litemall-Token': wx.getStorageSync('token')
}, },
success: function (res) { success: function(res) {
if (res.statusCode == 200) { if (res.statusCode == 200) {
...@@ -56,7 +56,7 @@ function request(url, data = {}, method = "GET") { ...@@ -56,7 +56,7 @@ function request(url, data = {}, method = "GET") {
} }
}, },
fail: function (err) { fail: function(err) {
reject(err) reject(err)
} }
}) })
...@@ -90,6 +90,4 @@ module.exports = { ...@@ -90,6 +90,4 @@ module.exports = {
request, request,
redirect, redirect,
showErrorToast showErrorToast
} }
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment