diff --git a/pages/login/login.vue b/pages/login/login.vue
index ac9341d..c4e30c5 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -5,6 +5,7 @@
+ 返回首页
@@ -45,8 +46,21 @@ export default {
},
methods: {
+ // 返回首页
+ Return() {
+ uni.reLaunch({
+ url: "/pages/Home/Home",
+ });
+ },
// 获取手机号
async getPhoneNumber(e) {
+ if (e.detail.code == undefined) {
+ uni.showToast({
+ title: "登录失败",
+ icon: "none",
+ });
+ return;
+ }
uni.showLoading({
title: "登录中...",
mask: true,
@@ -141,4 +155,12 @@ export default {
font-size: 24rpx;
margin-top: 40rpx;
}
+.return{
+ margin-top: 30rpx;
+ width: 300rpx;
+ height: 100rpx;
+ color: rgb(255, 255, 255);
+ text-align: center;
+ line-height: 100rpx;
+}
diff --git a/unpackage/dist/build/mp-weixin/pages/login/login.js b/unpackage/dist/build/mp-weixin/pages/login/login.js
index 59a6e49..2cf7b62 100644
--- a/unpackage/dist/build/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/build/mp-weixin/pages/login/login.js
@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),i=require("../../components/request.js"),t=require("../../components/debug/GenerateTestUserSig.js"),n=require("../../components/TUILogin.js"),s=require("../../stores/counter.js").useCounterStore(),o={inject:["$global"],data:()=>({userInfo:{},info:{},userSig:"",lastPage:"",myuserSig:""}),onLoad(){e.index.getUserInfo({provider:"weixin",success:e=>{this.userInfo=e.userInfo}}),e.index.getStorage({key:"lastPage",success:e=>{this.lastPage="/"+e.data},fail:()=>{this.lastPage="/pages/Home/Home"}})},methods:{async getPhoneNumber(o){e.index.showLoading({title:"登录中...",mask:!0});const a=await i.request({url:"user/loginWithPhoneNumber",method:"POST",data:{code:o.detail.code},userInfo:!1});this.info=a;const r=Number(this.info.data.chatInfo.appId);this.userSig=t.genTestUserSig({SDKAPPID:r,SECRETKEY:this.info.data.chatInfo.appKey,userID:"administrator"}),this.myuserSig=t.genTestUserSig({SDKAPPID:r,SECRETKEY:this.info.data.chatInfo.appKey,userID:String(a.data.info.id)}),e.index.setStorageSync("myuserSig",this.myuserSig),e.index.setStorageSync("chatInfo",this.info.data.chatInfo),e.index.setStorageSync("userSig",this.userSig),e.index.setStorageSync("userinfo",this.info.data.info),s.$patch({myitem:this.info.data.info}),200===this.info.code?this.info.data.newAccount?(e.index.reLaunch({url:"/pages/UserInformation/UserInformation"}),n.TUIlogin(this.info.data.chatInfo.appId,this.info.data.info.id,this.myuserSig.userSig),e.index.hideLoading()):(e.index.setStorageSync("userinfo",this.info.data.info),n.TUIlogin(this.info.data.chatInfo.appId,this.info.data.info.id,this.myuserSig.userSig),e.index.hideLoading(),e.index.reLaunch({url:this.lastPage})):e.index.showToast({title:"登录失败",icon:"none"})}}};const a=e._export_sfc(o,[["render",function(i,t,n,s,o,a){return{a:o.userInfo.avatarUrl,b:e.t(o.userInfo.nickName),c:e.o$1(((...e)=>a.getPhoneNumber&&a.getPhoneNumber(...e)))}}]]);wx.createPage(a);
+"use strict";const e=require("../../common/vendor.js"),t=require("../../components/request.js"),i=require("../../components/debug/GenerateTestUserSig.js"),n=require("../../components/TUILogin.js"),o=require("../../stores/counter.js").useCounterStore(),s={inject:["$global"],data:()=>({userInfo:{},info:{},userSig:"",lastPage:"",myuserSig:""}),onLoad(){e.index.getUserInfo({provider:"weixin",success:e=>{this.userInfo=e.userInfo}}),e.index.getStorage({key:"lastPage",success:e=>{this.lastPage="/"+e.data},fail:()=>{this.lastPage="/pages/Home/Home"}})},methods:{Return(){e.index.reLaunch({url:"/pages/Home/Home"})},async getPhoneNumber(s){if(null==s.detail.code)return void e.index.showToast({title:"登录失败",icon:"none"});e.index.showLoading({title:"登录中...",mask:!0});const a=await t.request({url:"user/loginWithPhoneNumber",method:"POST",data:{code:s.detail.code},userInfo:!1});this.info=a;const r=Number(this.info.data.chatInfo.appId);this.userSig=i.genTestUserSig({SDKAPPID:r,SECRETKEY:this.info.data.chatInfo.appKey,userID:"administrator"}),this.myuserSig=i.genTestUserSig({SDKAPPID:r,SECRETKEY:this.info.data.chatInfo.appKey,userID:String(a.data.info.id)}),e.index.setStorageSync("myuserSig",this.myuserSig),e.index.setStorageSync("chatInfo",this.info.data.chatInfo),e.index.setStorageSync("userSig",this.userSig),e.index.setStorageSync("userinfo",this.info.data.info),o.$patch({myitem:this.info.data.info}),200===this.info.code?this.info.data.newAccount?(e.index.reLaunch({url:"/pages/UserInformation/UserInformation"}),n.TUIlogin(this.info.data.chatInfo.appId,this.info.data.info.id,this.myuserSig.userSig),e.index.hideLoading()):(e.index.setStorageSync("userinfo",this.info.data.info),n.TUIlogin(this.info.data.chatInfo.appId,this.info.data.info.id,this.myuserSig.userSig),e.index.hideLoading(),e.index.reLaunch({url:this.lastPage})):e.index.showToast({title:"登录失败",icon:"none"})}}};const a=e._export_sfc(s,[["render",function(t,i,n,o,s,a){return{a:s.userInfo.avatarUrl,b:e.t(s.userInfo.nickName),c:e.o$1(((...e)=>a.getPhoneNumber&&a.getPhoneNumber(...e))),d:e.o$1(((...e)=>a.Return&&a.Return(...e)))}}]]);wx.createPage(a);
diff --git a/unpackage/dist/build/mp-weixin/pages/login/login.wxml b/unpackage/dist/build/mp-weixin/pages/login/login.wxml
index 2ea2eab..944a6b9 100644
--- a/unpackage/dist/build/mp-weixin/pages/login/login.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/login/login.wxml
@@ -1 +1 @@
-{{b}}
\ No newline at end of file
+{{b}}返回首页
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/login/login.wxss b/unpackage/dist/build/mp-weixin/pages/login/login.wxss
index 37a3d26..a7ac3e3 100644
--- a/unpackage/dist/build/mp-weixin/pages/login/login.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/login/login.wxss
@@ -1 +1 @@
-.container{width:100%;height:100%;display:flex;flex-direction:column;justify-content:center;align-items:center;background:linear-gradient(to bottom,rgba(17,203,42,.43),rgba(37,116,252,.427))}.logo{width:200rpx;height:200rpx;border-radius:50%}.nickname{width:300rpx;height:100rpx;color:#fff;border-radius:0;padding:20rpx 40rpx;font-size:30rpx;text-align:center;line-height:100rpx}.login-btn{background-color:rgba(255,255,255,0);border:1px solid #00ff0000;color:#fff}.tips{color:#666;font-size:24rpx;margin-top:40rpx}
+.container{width:100%;height:100%;display:flex;flex-direction:column;justify-content:center;align-items:center;background:linear-gradient(to bottom,rgba(17,203,42,.43),rgba(37,116,252,.427))}.logo{width:200rpx;height:200rpx;border-radius:50%}.nickname{width:300rpx;height:100rpx;color:#fff;border-radius:0;padding:20rpx 40rpx;font-size:30rpx;text-align:center;line-height:100rpx}.login-btn{background-color:rgba(255,255,255,0);border:1px solid #00ff0000;color:#fff}.tips{color:#666;font-size:24rpx;margin-top:40rpx}.return{margin-top:30rpx;width:300rpx;height:100rpx;color:#fff;text-align:center;line-height:100rpx}
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
index c9e4d08..ebdec94 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/login.js.map
@@ -1 +1 @@
-{"version":3,"file":"login.js","sources":["pages/login/login.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvbG9naW4vbG9naW4udnVl"],"sourcesContent":["\r\n \r\n \r\n {{ userInfo.nickName }}\r\n \r\n \r\n\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/login/login.vue'\nwx.createPage(MiniProgramPage)"],"names":["useCounterStore","uni","request","genTestUserSig","TUIlogin"],"mappings":";;;;;;AAeA,MAAM,UAAUA,eAAAA,gBAAgB;AAEhC,MAAK,YAAU;AAAA,EACb,QAAQ,CAAC,SAAS;AAAA,EAClB,OAAO;AACL,WAAO;AAAA,MACL,UAAU,CAAE;AAAA,MACZ,MAAM,CAAE;AAAA,MACR,SAAS;AAAA,MACT,UAAU;AAAA,MACV,WAAW;AAAA;EAEd;AAAA,EACD,SAAS;AACPC,kBAAAA,MAAI,YAAY;AAAA,MACd,UAAU;AAAA,MACV,SAAS,CAAC,QAAQ;AAChB,aAAK,WAAW,IAAI;AAAA,MACrB;AAAA,IACH,CAAC;AACDA,kBAAAA,MAAI,WAAW;AAAA,MACb,KAAK;AAAA,MACL,SAAS,CAAC,QAAQ;AAChB,aAAK,WAAW,MAAI,IAAI;AAAA,MACzB;AAAA,MACD,MAAM,MAAM;AACV,aAAK,WAAW;AAAA,MACjB;AAAA,KACF;AAAA,EACF;AAAA,EAED,SAAS;AAAA;AAAA,IAEP,MAAM,eAAe,GAAG;AACtBA,oBAAAA,MAAI,YAAY;AAAA,QACd,OAAO;AAAA,QACP,MAAM;AAAA,MACR,CAAC;AACC,YAAM,MAAM,MAAMC,2BAAQ;AAAA,QACxB,KAAK;AAAA,QACL,QAAQ;AAAA,QACR,MAAM;AAAA,UACJ,MAAM,EAAE,OAAO;AAAA,QAChB;AAAA,QACD,UAAU;AAAA,MACZ,CAAC;AACD,WAAK,OAAO;AACZ,YAAM,WAAW,OAAO,KAAK,KAAK,KAAK,SAAS,KAAK;AACjD,YAAM,SAAQ;AACd,WAAK,UAAUC,oDAAe;AAAA,QAC5B,UAAW;AAAA,QACX,WAAU,KAAK,KAAK,KAAK,SAAS;AAAA,QAClC;AAAA,OACD;AACD,WAAK,YAAYA,oDAAe;AAAA,QAC9B,UAAW;AAAA,QACX,WAAU,KAAK,KAAK,KAAK,SAAS;AAAA,QAClC,QAAQ,OAAO,IAAI,KAAK,KAAK,EAAE;AAAA,OAChC;AACDF,oBAAAA,MAAI,eAAe,aAAa,KAAK,SAAS;AAC9CA,oBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,QAAQ;AACtDA,oBAAAA,MAAI,eAAe,WAAW,KAAK,OAAO;AAC1CA,oBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,IAAI;AAClD,cAAQ,OAAO,EAAE,QAAO,KAAK,KAAK,KAAK,MAAM;AACjD,UAAI,KAAK,KAAK,SAAS,KAAK;AAC1B,YAAI,KAAK,KAAK,KAAK,YAAY;AAC7BA,wBAAAA,MAAI,SAAS;AAAA,YACX,KAAK;AAAA,UACP,CAAC;AACDG,8BAAAA,SAAS,KAAK,KAAK,KAAK,SAAS,OAAO,KAAK,KAAK,KAAK,KAAK,IAAG,KAAK,UAAU,OAAO;AACrFH,wBAAG,MAAC,YAAW;AAAA,eACV;AACLA,wBAAG,MAAC,eAAe,YAAY,KAAK,KAAK,KAAK,IAAI;AAClDG,8BAAAA,SAAS,KAAK,KAAK,KAAK,SAAS,OAAO,KAAK,KAAK,KAAK,KAAK,IAAG,KAAK,UAAU,OAAO;AACrFH,wBAAG,MAAC,YAAW;AAEfA,wBAAAA,MAAI,SAAS;AAAA,YACb,KAAK,KAAK;AAAA,UACZ,CAAC;AAAA,QACD;AAAA,aACK;AACLA,sBAAAA,MAAI,UAAU;AAAA,UACZ,OAAO;AAAA,UACP,MAAM;AAAA,QACR,CAAC;AAAA,MACH;AAAA,IACH;AAAA,EACF;AACH;;;;;;;;;ACtGA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"login.js","sources":["pages/login/login.vue","../../HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvbG9naW4vbG9naW4udnVl"],"sourcesContent":["\r\n \r\n \r\n {{ userInfo.nickName }}\r\n \r\n 返回首页\r\n \r\n\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from 'D:/项目/tk-mini-program/pages/login/login.vue'\nwx.createPage(MiniProgramPage)"],"names":["useCounterStore","uni","request","genTestUserSig","TUIlogin"],"mappings":"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"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index b536af1..d17d4b4 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -8012,7 +8012,7 @@ function isConsoleWritable() {
function initRuntimeSocketService() {
const hosts = "192.168.1.112,127.0.0.1";
const port = "8090";
- const id = "mp-weixin_pcSXnJ";
+ const id = "mp-weixin_UBq38n";
const lazy = typeof swan !== "undefined";
let restoreError = lazy ? () => {
} : initOnError();
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
index 8441102..33ff5c7 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -34,8 +34,21 @@ const _sfc_main = {
});
},
methods: {
+ // 返回首页
+ Return() {
+ common_vendor.index.reLaunch({
+ url: "/pages/Home/Home"
+ });
+ },
// 获取手机号
async getPhoneNumber(e) {
+ if (e.detail.code == void 0) {
+ common_vendor.index.showToast({
+ title: "登录失败",
+ icon: "none"
+ });
+ return;
+ }
common_vendor.index.showLoading({
title: "登录中...",
mask: true
@@ -94,7 +107,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
return {
a: $data.userInfo.avatarUrl,
b: common_vendor.t($data.userInfo.nickName),
- c: common_vendor.o$1((...args) => $options.getPhoneNumber && $options.getPhoneNumber(...args))
+ c: common_vendor.o$1((...args) => $options.getPhoneNumber && $options.getPhoneNumber(...args)),
+ d: common_vendor.o$1((...args) => $options.Return && $options.Return(...args))
};
}
const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxml b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
index 2ea2eab..944a6b9 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
@@ -1 +1 @@
-{{b}}
\ No newline at end of file
+{{b}}返回首页
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxss b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
index c489f6e..a08ec27 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
@@ -33,3 +33,11 @@
font-size: 24rpx;
margin-top: 40rpx;
}
+.return{
+ margin-top: 30rpx;
+ width: 300rpx;
+ height: 100rpx;
+ color: rgb(255, 255, 255);
+ text-align: center;
+ line-height: 100rpx;
+}