diff --git a/app.js b/app.js
index f4e0be0..fb7ab7f 100644
--- a/app.js
+++ b/app.js
@@ -6,10 +6,12 @@ App({
sessionId: '',
headers2: {
"content-type": "multipart/form-data",
+ Authorization: "",
'Cookie': ''
},
headers: {
"content-type": "application/x-www-form-urlencoded",
+ Authorization: "",
'Cookie': ''
},
userLoginTokenInfo: {
@@ -117,35 +119,94 @@ App({
return !this.isEmptyCheck(str);
},
getLoginUserTokenInfo: function() {
- var that = this;
- try {
- var value = wx.getStorageSync('loginUserTokenInfo');
- if (value) {
- that.globalData.userLoginTokenInfo = value;
-
- if (that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.tel)) {
- that.globalData.autoLoginTag = 1;
- // that.appLoginByTel();
-
- return new Promise(function(resolve, reject) {
- try {
+ var that = this;
+ // debugger;
+ try {
+ var value = wx.getStorageSync("loginUserTokenInfo");
+ console.log(value);
+ if (value) {
+ that.globalData.userLoginTokenInfo = value;
+ // console.log(that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.token));
+ if (that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.token)) {
+ let token = that.globalData.userLoginTokenInfo.token;
+ that.globalData.header.Authorization = "Bearer " + token;
+ that.globalData.headers2.Authorization = "Bearer " + token;
+ that.globalData.headers.Authorization = "Bearer " + token;
+ console.log(that.globalData.headers);
+ wx.request({
+ url: that.globalData.ip + "/checkToken",
+ method: "GET",
+ header: that.globalData.headers,
+ success: function (res) {
+ console.log(res);
+
+ if (res.data.status == 200) {
+ if (wx.getStorageSync("messageClick" + res.data.data.id)) {
+ console.log("messageClick" + res.data.data.id);
+ } else {
+ wx.setStorageSync("messageClick" + res.data.data.id, false);
+ }
+ that.globalData.isLogin = true;
+ that.globalData.test = "b";
+ that.globalData.user = res.data.data.user;
+ // that.globalData.user.idauth = 0;
+
+ that.globalData.loginUserInfo = res.data.data;
+ console.log(that.globalData.loginUserInfo);
+ that.getServiceInfo().then(() => {
+ console.log("getServiceInfo");
+ });
+ console.log("getLoginUserTokenInfo" + "+++++++++++++++++++++++++++++++++++++++++++");
+ if (that.userLoginCallback) {
+ that.userLoginCallback(res);
+ }
+ } else {
+ //已过期
+ that.globalData.autoLoginTag = 1;
+ // that.appLoginByTel();
+ // that.globalData.isLogin = false;
+ return new Promise(function (resolve, reject) {
+ try {
that.appLoginByTel(resolve, reject);
- } catch (e) {
- console.log('设置登录信息错误');
+ } catch (e) {
+ console.log("设置登录信息错误");
console.log(e);
reject();
- }
- });
-
- }
+ }
+ });
+ }
+ },
+ });
+ // console.log(that.globalData.isLogin);
+ } else if (that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.tel)) {
+ that.globalData.autoLoginTag = 1;
+
+ return new Promise(function (resolve, reject) {
+ try {
+ that.appLoginByTel(resolve, reject);
+ } catch (e) {
+ console.log("设置登录信息错误");
+ console.log(e);
+ reject();
+ }
+ });
+ }
+ } else {
+ if (that.userLoginCallback) {
+ that.userLoginCallback();
}
- console.log('获取用户登录信息---------------start');
- console.log(value);
- console.log('获取用户登录信息---------------end');
- } catch (e) {
- console.log('获取登录信息错误');
- console.log(e);
}
+ console.log("获取用户登录信息---------------start");
+ console.log(that.globalData.test);
+ // that.globalData.isLogin = true
+ setTimeout(() => {
+ console.log(that.globalData.isLogin);
+ }, 1000);
+ console.log("获取用户登录信息---------------end");
+ } catch (e) {
+ console.log("获取登录信息错误");
+ console.log(e);
+ }
},
setLoginUserTokenInfo: function(tel, token) {
var that = this;
@@ -226,11 +287,11 @@ App({
console.log(that.globalData);
console.log("login====result=======2");
- wx.showToast({
- title: '登录成功',
- icon: 'success',
- duration: 2000
- })
+ // wx.showToast({
+ // title: '登录成功',
+ // icon: 'success',
+ // duration: 2000
+ // })
}
})
},
@@ -243,6 +304,8 @@ App({
that.globalData.sessionId = '';
that.globalData.headers.Cookie = '';
that.globalData.headers2.Cookie = '';
+ that.globalData.headers.Authorization = "";
+ that.globalData.headers2.Authorization = "";
that.globalData.isLogin = false;
that.globalData.hasUserInfo = 0;
that.globalData.loginUserInfo = {};
@@ -261,7 +324,7 @@ App({
title: title,
content: content,
showCancel: false,
- confirmColor: "#e60012",
+ confirmColor: "#0dcc91",
confirmText: btxt,
success: function (res) {
if (res.confirm) {
diff --git a/app.json b/app.json
index 9415156..2d7e33b 100644
--- a/app.json
+++ b/app.json
@@ -111,6 +111,10 @@
"desc": "你的位置信息将用于小程序位置接口的效果展示"
}
},
+ "requiredPrivateInfos":[
+ "chooseLocation",
+ "getLocation"
+ ],
"requiredBackgroundModes": [
"audio"
],
diff --git a/app.wxss b/app.wxss
index 5a7336a..b4afc65 100644
--- a/app.wxss
+++ b/app.wxss
@@ -824,7 +824,7 @@ button::after {
width: 260px;
height: 42px;
opacity: 1;
- background: var(--color-yc);
+ background-color: var(--color-yc);
border-radius: 25px;
font-size: 18px;
font-weight: 601;
@@ -834,7 +834,7 @@ button::after {
margin-top: 100px;
}
.loginOut:active,.loginOut:hover,.loginOut:focus{
- background: var(--color-ych);
+ background-color: var(--color-ych);
}
.staticTitle {
margin-top: 20px;
diff --git a/pages/addCard/index.wxml b/pages/addCard/index.wxml
index c887e4e..73d5a94 100644
--- a/pages/addCard/index.wxml
+++ b/pages/addCard/index.wxml
@@ -43,12 +43,12 @@
-
+
-
+
我已阅读并同意
- 《用户服务协议》
+ 《用户服务协议》
及
- 《隐私政策》
+ 《隐私政策》
\ No newline at end of file
diff --git a/pages/addUserCard/index.wxml b/pages/addUserCard/index.wxml
index d079202..e178e98 100644
--- a/pages/addUserCard/index.wxml
+++ b/pages/addUserCard/index.wxml
@@ -49,12 +49,12 @@
-
+
-
+
我已阅读并同意
- 《用户服务协议》
+ 《用户服务协议》
及
- 《隐私政策》
+ 《隐私政策》
\ No newline at end of file
diff --git a/pages/addressBook/index.wxml b/pages/addressBook/index.wxml
index 4a2669f..1e08769 100644
--- a/pages/addressBook/index.wxml
+++ b/pages/addressBook/index.wxml
@@ -21,7 +21,7 @@
家
-
+
公司
@@ -32,7 +32,7 @@
-
{{item.defaultFlag == 1 ? '已设为默认' :
'设为默认'}}
diff --git a/pages/bindBankCard/index.wxml b/pages/bindBankCard/index.wxml
index efeb72f..7896322 100644
--- a/pages/bindBankCard/index.wxml
+++ b/pages/bindBankCard/index.wxml
@@ -95,9 +95,9 @@
-
+
-
+
我已阅读并同意
diff --git a/pages/changeSex/index.wxml b/pages/changeSex/index.wxml
index 3ff8dd3..4fb43f3 100644
--- a/pages/changeSex/index.wxml
+++ b/pages/changeSex/index.wxml
@@ -7,7 +7,7 @@
{{item.name}}
-
+
diff --git a/pages/detail的副本/index.wxml b/pages/detail的副本/index.wxml
index e684eb7..ca0ced8 100644
--- a/pages/detail的副本/index.wxml
+++ b/pages/detail的副本/index.wxml
@@ -62,7 +62,7 @@
-
+
{{jobDetail.poses.store.posContent ? jobDetail.poses.store.posContent :'暂无地址信息'}}
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 3cc20cf..d4e7ec1 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -1,12 +1,4 @@
/* pages/index/index.wxss */
-#nav {
- text-align: center;
- background: #eeeeee;
- margin: 1em;
- padding: 1em;
- border-radius: 5px;
+page{
+ overflow-x: hidden !important;
}
-
-#add {
- margin: 1em;
-}
\ No newline at end of file
diff --git a/pages/login/index.js b/pages/login/index.js
index 01e62c2..06a56fc 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -14,7 +14,7 @@ Page({
reg_type:'a',
wxCode: '',
btnColor:false,
- switch1Checked: true,
+ switch1Checked: false,
},
switch1Change: function (e) {
console.log("radio发生change事件，携带value值为：", e.detail.value);
@@ -178,10 +178,13 @@ Page({
code: that.data.wxCode,
iv: iv,
encryptedData: encryptedData,
+ type: "yishoudan",
+ appId:'wxd7aba642f7fd77fd'
},
success: function (res) {
console.log(res);
app.globalData.openId = res.data.data.openId;
+ app.globalData.unionid = res.data.data.unionid;
let promise = app.setLoginUserTokenInfo(res.data.data.phoneNumber, null);
promise.then(res => {
wx.reLaunch({
@@ -209,6 +212,8 @@ Page({
code: res.code,
iv: iv,
encryptedData: encryptedData,
+ type: "dtdl",
+ appId:'wxd7aba642f7fd77fd'
},
success: function (res) {
console.log(res);
@@ -288,7 +293,7 @@ Page({
}
wx.request({
- url: app.globalData.ip + '/appLoginByTel',
+ url: app.globalData.ip + '/appLoginByTelYiShouDan',
data: {
tel: that.data.tel,
code: that.data.msgCode,
@@ -297,6 +302,8 @@ Page({
autoLoginTag: 0,
loginType: 'login',
isScanQRCodes: app.globalData.isScanQRCodes,
+ wxCode: that.data.wxCode,
+ appId:'wxd7aba642f7fd77fd'
},
header: {
'content-type': 'application/json'
@@ -307,59 +314,7 @@ Page({
console.log(res.data);
if (res.data.status == 200) {
- app.globalData.user = res.data.data.user;
- app.globalData.sessionId = res.data.data.sessionId;
- app.globalData.headers.Cookie = 'JSESSIONID=' + res.data.data.sessionId;
- app.globalData.headers2.Cookie = 'JSESSIONID=' + res.data.data.sessionId;
- app.globalData.isLogin = true;
- app.globalData.agencyStatus = res.data.data.agencyStatus;
- app.globalData.loginUserInfo = res.data.data;
- //登录设置缓存
- app.globalData.userLoginTokenInfo.tel = res.data.data.tel;
- app.globalData.userLoginTokenInfo.token = null;
- wx.setStorageSync('loginUserTokenInfo', app.globalData.userLoginTokenInfo);
-
- console.log(111);
- try {
- var comeFrom = wx.getStorageSync('comeFromPage');
- // var comeFromPageParam = wx.getStorageSync('comeFromPageParam');
-
- if(comeFrom == 'me') {
- wx.reLaunch({
- url: '/pages/me/index'
- })
- } else if (comeFrom == 'index') {
- wx.reLaunch({
- url: '/pages/tgIndex/index'
- })
- } else if (comeFrom == 'detail') {
- wx.navigateBack({
- delta: 1
- })
-
- // wx.reLaunch({
- // url: "/pages/detail/index?storeJobId=" + comeFromPageParam.storeJobId
- // })
- } else {
- wx.setStorage({
- key: "comeFrom",
- data: "login"
- })
- wx.reLaunch({
- url: "../me/index"
- })
- }
- } catch (e) {
-
- wx.setStorage({
- key: "comeFrom",
- data: "login"
- })
- wx.reLaunch({
- url: "/pages/me/index"
- })
- }
- console.log(222);
+ that.setLoginData(res);
} else {
wx.showToast({
@@ -373,6 +328,70 @@ Page({
})
//console.log('form发生了submit事件，携带数据为：', e.detail.value)
},
+ setLoginData(res) {
+ app.globalData.user = res.data.data.user;
+ app.globalData.sessionId = res.data.data.sessionId;
+ app.globalData.headers.Cookie = "JSESSIONID=" + res.data.data.sessionId;
+ app.globalData.headers2.Cookie = "JSESSIONID=" + res.data.data.sessionId;
+ app.globalData.isLogin = true;
+ app.globalData.agencyStatus = res.data.data.agencyStatus;
+ app.globalData.loginUserInfo = res.data.data;
+ //登录设置缓存
+ app.globalData.userLoginTokenInfo.tel = res.data.data.tel;
+ app.globalData.userLoginTokenInfo.token = null;
+ wx.setStorageSync("loginUserTokenInfo", app.globalData.userLoginTokenInfo);
+
+ console.log(111);
+ try {
+ var comeFrom = wx.getStorageSync("comeFromPage");
+ // var comeFromPageParam = wx.getStorageSync('comeFromPageParam');
+ console.log(comeFrom);
+ if (comeFrom == "me") {
+ wx.reLaunch({
+ url: "/pages/me/index",
+ });
+ } else if (comeFrom == "index") {
+ wx.reLaunch({
+ url: "/pages/index/index",
+ });
+ } else if (comeFrom == "detail") {
+ wx.navigateBack({
+ delta: 1,
+ });
+
+ // wx.reLaunch({
+ // url: "/pages/detail/index?storeJobId=" + comeFromPageParam.storeJobId
+ // })
+ } else if (comeFrom == "collect") {
+ wx.reLaunch({
+ url: "/pages/collect/index",
+ });
+ } else if (comeFrom == "BillInfo") {
+ // console.log(wx.getStorageSync('QRBillInfo'));
+ // console.log(JSON.stringify(wx.getStorageSync('QRBillInfo')));
+ wx.reLaunch({
+ url: "/pages/wodeBillDetail/index?info=" + JSON.stringify(wx.getStorageSync("QRBillInfo")),
+ });
+ wx.removeStorageSync("QRBillInfo");
+ } else {
+ wx.setStorage({
+ key: "comeFrom",
+ data: "login",
+ });
+ wx.reLaunch({
+ url: "/pages/index/index",
+ });
+ }
+ } catch (e) {
+ wx.setStorage({
+ key: "comeFrom",
+ data: "login",
+ });
+ wx.reLaunch({
+ url: "/pages/index/index",
+ });
+ }
+ },
ohShitfadeOut() {
var fadeOutTimeout = setTimeout(() => {
this.setData({ popErrorMsg: '', pop: 0 });
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index ffd4194..806e2a7 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -4,7 +4,7 @@
- 一才找人才啦
+ 找工作，到一才！
-
+
-
+
我已阅读并同意
- 《用户服务协议》
+ 《用户服务协议》
及
- 《隐私政策》
+ 《隐私政策》
\ No newline at end of file
diff --git a/pages/makeInfo/index.wxml b/pages/makeInfo/index.wxml
index cf00f06..c955582 100644
--- a/pages/makeInfo/index.wxml
+++ b/pages/makeInfo/index.wxml
@@ -34,7 +34,7 @@
-
+
我已阅读并同意
diff --git a/pages/makeInfoSure/index.wxml b/pages/makeInfoSure/index.wxml
index 2c2e661..782911e 100644
--- a/pages/makeInfoSure/index.wxml
+++ b/pages/makeInfoSure/index.wxml
@@ -30,7 +30,7 @@
-
+
我已阅读并同意
diff --git a/pages/myCard/index.wxml b/pages/myCard/index.wxml
index 668488c..7fabbde 100644
--- a/pages/myCard/index.wxml
+++ b/pages/myCard/index.wxml
@@ -34,7 +34,7 @@
-
+
我已阅读并同意
diff --git a/pages/setUp/index.wxml b/pages/setUp/index.wxml
index 0638d7c..9e9db7a 100644
--- a/pages/setUp/index.wxml
+++ b/pages/setUp/index.wxml
@@ -31,7 +31,7 @@
-
+
退出登录
diff --git a/pages/setUp/index.wxss b/pages/setUp/index.wxss
index b5aff56..cfe114b 100644
--- a/pages/setUp/index.wxss
+++ b/pages/setUp/index.wxss
@@ -30,7 +30,7 @@ page{
line-height: 24px;
color: #b8b8b8;
}
-.loginOut{
+.loginOut2{
width: unset;
height: 56px;
background-color: #fff;
@@ -43,3 +43,6 @@ page{
font-weight: 400;
overflow: hidden;
}
+view.loginOut2:hover,view.loginOut2:active,view.loginOut2:focus{
+ background-color: #eee;
+}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index 489f6fe..b00ead9 100644
--- a/project.config.json
+++ b/project.config.json
@@ -65,5 +65,5 @@
"ignore": [],
"include": []
},
- "appid": "wxb1f7c694803f6f00"
+ "appid": "wxd7aba642f7fd77fd"
}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
index 6a2a030..7aab830 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,6 +1,6 @@
{
"setting": {
- "urlCheck": false,
+ "urlCheck": true,
"compileHotReLoad": true
},
"condition": {