diff --git a/App.vue b/App.vue
index c92a478..eb7583d 100644
--- a/App.vue
+++ b/App.vue
@@ -4,7 +4,7 @@
},
onLaunch: function() {
- this.login(); // 校验登录态 TODO 等待与后端对接
+ this.getUserInfo();
},
onShow: function() {
// #ifdef MP-WEIXIN
@@ -15,11 +15,27 @@
console.log('App Hide')
},
methods: {
+ // 获取用户信息
+ getUserInfo(){
+ let userinfo = uni.getStorageSync('userinfo');
+ if(userinfo && userinfo.id){
+ return;
+ }
+ uni.login({
+ complete: result => {
+ if(result.errMsg == 'login:ok'){
+ let code = result.code;
+ this.userCode(code);
+ }
+ }
+ })
+ },
// 接口code换取用户信息
userCode(code){
- return console.log("code", code);
- this.$http('', { code }).then(res => {
+ console.log("code", code);
+ this.$http(this.API.API_WXLOGIN, { code }).then(res => {
console.log("获得用户信息", res);
+ uni.setStorageSync('userinfo', res.data);
})
},
// 登录
@@ -27,12 +43,12 @@
this.checkSession().then(code => {
this.userCode(code);
}).catch(err => {
+ console.log("进入。。。。。。")
uni.login({
complete: result => {
console.log(result)
if(result.errMsg == 'login:ok'){
let code = result.code;
- uni.setStorageSync('login_token', code);
this.userCode(code);
}
}
@@ -45,7 +61,8 @@
uni.checkSession({
complete: result => {
if(result.errMsg == 'checkSession:ok'){ // 处于登录状态 session未过期
- let login_token = uni.getStorageSync('login_token');
+ // let login_token = uni.getStorageSync('login_token');
+ let login_token = undefined;
if(login_token){
resolve(login_token);
}else{
diff --git a/common/api.js b/common/api.js
index 9e1a03e..d8067b3 100644
--- a/common/api.js
+++ b/common/api.js
@@ -24,4 +24,7 @@ export const API_COLLECT_DEAL = '/api/collect/deal'; // 商品收藏
/* 个人中心相关 */
export const API_COLLECT_LIST = '/api/collect/list'; // 我的收藏列表
+/* 用户相关 */
+export const API_WXLOGIN = '/api/wxlogin'; // 用户登录
+
export const TEST = '/api/order/deal';
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index ee1fce2..0cfea6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,46 +2,10 @@
"requires": true,
"lockfileVersion": 1,
"dependencies": {
- "clipboard": {
- "version": "2.0.8",
- "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
- "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
- "requires": {
- "good-listener": "^1.2.2",
- "select": "^1.1.2",
- "tiny-emitter": "^2.0.0"
- }
- },
- "delegate": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
- "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw=="
- },
- "good-listener": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
- "integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
- "requires": {
- "delegate": "^3.1.2"
- }
- },
- "select": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
- "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
- },
- "tiny-emitter": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
- "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
- },
- "vue-clipboard2": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
- "integrity": "sha512-H5S/agEDj0kXjUb5GP2c0hCzIXWRBygaWLN3NEFsaI9I3uWin778SFEMt8QRXiPG+7anyjqWiw2lqcxWUSfkYg==",
- "requires": {
- "clipboard": "^2.0.0"
- }
+ "tki-qrcode": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/tki-qrcode/-/tki-qrcode-0.1.6.tgz",
+ "integrity": "sha512-EnnlS8psowC7PsW3MDYcxvJYkuklX3WAZ/BYanR4TdBHTu74GfjTBX8Y16REP+AeDENiVtBPh4jtTRL2P736hQ=="
}
}
}
diff --git a/pages/contactService/index.vue b/pages/contactService/index.vue
index 91344d3..12878e6 100644
--- a/pages/contactService/index.vue
+++ b/pages/contactService/index.vue
@@ -8,7 +8,7 @@
服务时间
10:00～20:00
-
+
客服电话
13278683790
@@ -20,12 +20,12 @@
客服微信
whhu8798
- 复制
+ 复制
当前版本
- 1.0.1
+ {{ version }}
@@ -34,14 +34,25 @@
export default {
data(){
return {
-
+ version: ''
}
},
onLoad(){
-
+ this.version = this.API.VERSION;
},
methods: {
-
+ // 拨打电话
+ makePhoneCall(){
+ uni.makePhoneCall({
+ phoneNumber: ''
+ })
+ },
+ // 复制
+ copy(){
+ uni.setClipboardData({
+ data: 'a'
+ })
+ }
}
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 37435f3..0540d18 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -14,7 +14,7 @@
- {{ item.specs[0].sold_percent_text }}
+ {{ item.specs[0].sold_percent_text }}
{{ item.specs[0].sold_stock_text }}
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 75de457..45bfd29 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -41,7 +41,8 @@
return {
checked: false, // 是否勾选协议
isLogin: false, // 是否已登录
- userInfo: {}
+ userInfo: {},
+ type: 'phone', // 页面授权类型 phone获取手机号 | userinfo获取用户信息
}
},
onLoad(){
diff --git a/pages/route/index.vue b/pages/route/index.vue
index 8e80ab3..841c95f 100644
--- a/pages/route/index.vue
+++ b/pages/route/index.vue
@@ -1,3 +1,7 @@
+
+
+
+