From e3d390046590c4a681fa047568a5957aa1b1bcdc Mon Sep 17 00:00:00 2001
From: Sliverber <2622874537@qq.com>
Date: Tue, 27 Feb 2024 15:35:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 5 ++++
api/myapi.js | 1 +
api/user.js | 4 ++-
config/app.js | 4 +--
manifest.json | 2 +-
pages.json | 13 +++++++++
pages/index/index.vue | 29 ++++++++++---------
pages/user/index.vue | 55 ++++++++++++++++++++++++++++++++----
pages/users/logins/index.vue | 29 +++++++++++++++----
9 files changed, 114 insertions(+), 28 deletions(-)
diff --git a/App.vue b/App.vue
index 092fe1d..5922ca2 100644
--- a/App.vue
+++ b/App.vue
@@ -155,6 +155,11 @@
scope
} = option.query;
console.log(option.query,'option.queryoption.queryoption.query');
+ if(option.query.channelId){
+ uni.setStorageSync('channelId', option.query.channelId);
+
+ }
+
if (code && code != uni.getStorageSync('snsapiCode') && location.pathname.indexOf(
'/pages/users/wechat_login/index') === -1) {
// 存储静默授权code
diff --git a/api/myapi.js b/api/myapi.js
index 18717f7..f1a4bb0 100644
--- a/api/myapi.js
+++ b/api/myapi.js
@@ -10,6 +10,7 @@ export function getInformation() {
// 查询用户是否已经保存过信息
export function getidentity(data) {
+ console.log(data,'datadata');
return request.get('api/front/identity/info', data, {
noAuth: true
});
diff --git a/api/user.js b/api/user.js
index bf0e14e..97ecd91 100644
--- a/api/user.js
+++ b/api/user.js
@@ -34,7 +34,9 @@ export function loginH5(data) {
export function loginMobile(data) {
return request.post("login/mobile", data, { noAuth : true });
}
-
+export function loginMobiles(data) {
+ return request.post("bindPhone", data, { noAuth : true });
+}
/**
* 验证码key
*/
diff --git a/config/app.js b/config/app.js
index eab6b24..f85ef8c 100644
--- a/config/app.js
+++ b/config/app.js
@@ -1,9 +1,9 @@
//移动端商城API
// let domain = 'http://117.50.163.143:20410'
// let domain = 'http://117.50.215.20:20410'
-let domain = 'http://192.168.2.26:20411'
+// let domain = 'http://192.168.2.26:20411'
// let domain = 'http://106.75.49.247:20410'
-// let domain = 'https://yruibao.com/prod'
+let domain = 'https://yruibao.com/prod'
module.exports = {
// 请求域名 格式： https://您的域名
// #ifdef MP || APP-PLUS
diff --git a/manifest.json b/manifest.json
index 85c8645..1275b3e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "先享后付",
- "appid" : "__UNI__E7B7107", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B
+ "appid" : "__UNI__EA8F22D", //wxb74514b47a2f29d4 wx46c3a73d8c4f7051 __UNI__EB8A7B
"description" : "crmeb商城",
"versionName" : "2.1",
"versionCode" : 2,
diff --git a/pages.json b/pages.json
index dfbcdd5..6bf14eb 100644
--- a/pages.json
+++ b/pages.json
@@ -738,6 +738,19 @@
}
}
},
+ {
+ "path": "logins/index",
+ "style": {
+ "navigationBarTitleText": "绑定手机号",
+ "app-plus": {
+ // #ifdef APP-PLUS
+ "titleNView": {
+ "type": "default"
+ }
+ // #endif
+ }
+ }
+ },
{
"path": "goods_comment_list/index",
"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index dc8621a..deaeacb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -470,6 +470,22 @@
}
},
onShow() {
+
+
+
+ let self = this;
+ if (!self.$Cache.getItem('cityList')) getCityList()
+ // #ifdef APP-PLUS
+ let barHeight = uni.getSystemInfoSync().statusBarHeight;
+ self.marTop = barHeight + 40; //刘海屏
+ setTimeout(() => {
+ if (self.appUpdate.openUpgrade == 'true') {
+ self.appVersionConfig();
+ }
+ }, 1000)
+ // #endif
+ uni.showTabBar();
+
let currentUrl = window.location.href;
// 解析URL，提取参数
@@ -498,19 +514,6 @@
}else{
}
- let self = this;
- if (!self.$Cache.getItem('cityList')) getCityList()
- // #ifdef APP-PLUS
- let barHeight = uni.getSystemInfoSync().statusBarHeight;
- self.marTop = barHeight + 40; //刘海屏
- setTimeout(() => {
- if (self.appUpdate.openUpgrade == 'true') {
- self.appVersionConfig();
- }
- }, 1000)
- // #endif
- uni.showTabBar();
-
// 调用记录ip
// this.getip()
},
diff --git a/pages/user/index.vue b/pages/user/index.vue
index ee4371b..c833e37 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -152,7 +152,7 @@
import {
getMenuList,
copyrightApi,
-
+ getUserInfo
} from '@/api/user.js';
import {
orderData,
@@ -332,9 +332,15 @@
if(uni.getStorageSync('loginstause')){
console.log('进入判断3');
}else{
-
- console.log('进入判断4');
+ if(uni.getStorageSync('loginopen')){
+ uni.navigateTo({
+ url:'/pages/users/logins/index'
+ })
+ }else{
this.sendwxcode(codeValue)
+ }
+ console.log('进入判断4');
+
// uni.navigateTo({
// url:'/pages/users/login/index'
// })
@@ -365,21 +371,58 @@
console.log(code,'wxcodewxcodewxcodewxcode');
// sendwxcodes(code).then(res => {
// console.log('wxcodewxcodewxcodewxcode');
- // // uni.setStorageSync('openids', res.data.openId);
+ // //
// })
uni.request({
- // url: 'https://yruibao.com/prod/api/front/login/wxpublic',
- url: 'http://192.168.2.26:20411/api/front/login/wxpublic', //仅为示例，并非真实接口地址。
+ url: 'https://yruibao.com/prod/api/front/login/wxpublic',
+ // url: 'http://192.168.2.26:20411/api/front/login/wxpublic', //仅为示例，并非真实接口地址。
data: data,
method:'POST',
success: (res) => {
console.log(res.data);
+
+ if(res.data.data.isBandPhone==false){
+ console.log('调换 aaaaaaaaaa');
+ uni.setStorageSync('loginopen', res.data.data.openid);
+ uni.navigateTo({
+ url:'/pages/users/logins/index'
+ })
+ }else{
+ console.log(res.data.data.token,'');
+ this.$store.commit("LOGIN", {
+ 'token': res.data.data.token
+ });
+ // uni.switchTab({
+ // url:'/pages/index/index'
+ // })
+ let login = true
+ uni.setStorageSync('loginstause',login);
+ let data = res.data.data;
+ this.getUserInfo(data)
+ }
// this.text = 'request success';
}
});
},
+ getUserInfo(data){
+ console.log(data,'dadadada');
+ this.$store.commit("SETUID", data.uid);
+ getUserInfo().then(res => {
+ this.$store.commit("UPDATE_USERINFO", res.data);
+ console.log('成功登录了');
+ this.$forceUpdate()
+ let backUrl = this.$Cache.get(BACK_URL) || "/pages/index/index";
+ if (backUrl.indexOf('/pages/users/login/index') !== -1) {
+ backUrl = '/pages/index/index';
+ }
+ uni.reLaunch({
+ url: backUrl
+ });
+
+ })
+ },
// 查询是否进行过身份保存
getidentityq:function(){
let data = {
diff --git a/pages/users/logins/index.vue b/pages/users/logins/index.vue
index 4837514..9b11ada 100644
--- a/pages/users/logins/index.vue
+++ b/pages/users/logins/index.vue
@@ -2,7 +2,7 @@
- 登录
+ 绑定手机号
登录
@@ -82,11 +82,12 @@