|
@@ -40,7 +40,7 @@
|
|
|
<view class="middle-switch">
|
|
<view class="middle-switch">
|
|
|
<text class="switch-loginMethod" @click="switchMode(1)">{{ switchText === "验证码登录" ? "账号密码登录" : "验证码登录" }}</text>
|
|
<text class="switch-loginMethod" @click="switchMode(1)">{{ switchText === "验证码登录" ? "账号密码登录" : "验证码登录" }}</text>
|
|
|
<view style="margin: auto"></view>
|
|
<view style="margin: auto"></view>
|
|
|
- <text class="switch-register" @click="switchMode(2)">注册账号</text>
|
|
|
|
|
|
|
+ <text class="switch-register" @click="switchMode(2)">注册账号1</text>
|
|
|
</view>
|
|
</view>
|
|
|
<!--#endif-->
|
|
<!--#endif-->
|
|
|
|
|
|
|
@@ -261,6 +261,20 @@ function login(data) {
|
|
|
proxy.$modal.closeLoading();
|
|
proxy.$modal.closeLoading();
|
|
|
useStore.GetInfo().then((res) => {
|
|
useStore.GetInfo().then((res) => {
|
|
|
proxy.$tab.reLaunch("/pages/index");
|
|
proxy.$tab.reLaunch("/pages/index");
|
|
|
|
|
+
|
|
|
|
|
+ var loginData={
|
|
|
|
|
+ username: state.switchText == "账号密码登录" ? state.username : undefined,
|
|
|
|
|
+ password: state.switchText == "账号密码登录" ? state.password : undefined,
|
|
|
|
|
+ phone: state.switchText == "验证码登录" ? state.phone : undefined,
|
|
|
|
|
+ verify: state.switchText == "验证码登录" ? state.verify : undefined,
|
|
|
|
|
+ tenantId: useStore.tenantId,
|
|
|
|
|
+ cids: proxy.$settingStore.pushClientId || undefined,
|
|
|
|
|
+ type: proxy.$common.isWechatMp() ? "wx" : "app",
|
|
|
|
|
+ openId: proxy.$common.isWechatMp() ? localStorage.getItem("wxOpenId") : undefined,
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
|
|
+ uni.setStorageSync("data", JSON.stringify(loginData));
|
|
|
|
|
+ // localStorage.setItem("data", JSON.stringify(loginData)),
|
|
|
proxy.$settingStore.initThemeColor(storageSystem.get("themeColor")); //初始化默认主题
|
|
proxy.$settingStore.initThemeColor(storageSystem.get("themeColor")); //初始化默认主题
|
|
|
});
|
|
});
|
|
|
});
|
|
});
|