|
|
@@ -2,28 +2,26 @@
|
|
|
<div class="login-wrapper bglogin">
|
|
|
<up-navbar title="登录" placeholder>
|
|
|
<template #left>
|
|
|
-<!-- <view-->
|
|
|
-<!-- v-if="appStore?.$wxConfig?.auditModeEnabled"-->
|
|
|
-<!-- @click="backHome"-->
|
|
|
-<!-- >-->
|
|
|
-<!-- <image src="@/static/images/tabbar/1-001.png" style="height: 40rpx;width: 40rpx;"></image>-->
|
|
|
-<!-- </view>-->
|
|
|
- <view
|
|
|
- class="back_extend"
|
|
|
- v-if="appStore?.$wxConfig?.auditModeEnabled"
|
|
|
- @click="backHome"
|
|
|
- >
|
|
|
- {{ "<" }} 回到首页
|
|
|
- </view>
|
|
|
+ <!-- <view-->
|
|
|
+ <!-- v-if="appStore?.$wxConfig?.auditModeEnabled"-->
|
|
|
+ <!-- @click="backHome"-->
|
|
|
+ <!-- >-->
|
|
|
+ <!-- <image src="@/static/images/tabbar/1-001.png" style="height: 40rpx;width: 40rpx;"></image>-->
|
|
|
+ <!-- </view>-->
|
|
|
+ <view class="back_extend" v-if="appStore?.$wxConfig?.auditModeEnabled" @click="backHome">
|
|
|
+ {{ "<" }} 回到首页
|
|
|
+ </view>
|
|
|
</template>
|
|
|
</up-navbar>
|
|
|
<div class="shading">
|
|
|
<view class="">Hello！</view>
|
|
|
<view class="">欢迎来到水贝搬运工</view>
|
|
|
+ <image src="@/static/images/login_ip.png" class="ip-pic"></image>
|
|
|
</div>
|
|
|
<div class="whiteBg" v-if="formItem === 1">
|
|
|
<view class="whiteBg-tab whiteBg-tabimg" :class="{'whiteBg-tabs whiteBg-tabsimg':current == 1}">
|
|
|
- <view @click="current = item.type" :class="{active:current != index,noActive:current == index}" class="whiteBg-tab-li" v-for="(item,index) in navList" :key="index">
|
|
|
+ <view @click="current = item.type" :class="{active:current != index,noActive:current == index}"
|
|
|
+ class="whiteBg-tab-li" v-for="(item,index) in navList" :key="index">
|
|
|
<view class="">{{ item.name }}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -47,10 +45,10 @@
|
|
|
<input type="text" class="texts" placeholder="输入邀请码" v-model="inviteCode" />
|
|
|
</div>
|
|
|
</template>
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
<div class="privacy-box" @click="aloneChecked = !aloneChecked">
|
|
|
-
|
|
|
+
|
|
|
<image v-if="aloneChecked" src="/static/images/select-active@2x.png" mode=""></image>
|
|
|
<image v-else src="/static/images/select@2x.png" mode=""></image>
|
|
|
<view class="">我已阅读并同意</view>
|
|
|
@@ -59,10 +57,25 @@
|
|
|
</div>
|
|
|
<view class="footer">
|
|
|
<button class="logon" @click="loginMobile" v-if="current !== 0">登录</button>
|
|
|
- <button class="logonWX" open-type="getPhoneNumber" @getphonenumber="getPhoneNumberFn" v-if="current !== 0">微信登录</button>
|
|
|
+ <!-- <button class="logonWX" open-type="getPhoneNumber" @getphonenumber="getPhoneNumberFn" v-if="current !== 0">微信登录</button> -->
|
|
|
<button class="logon" @click="submit" v-if="current === 0">登录</button>
|
|
|
</view>
|
|
|
-
|
|
|
+ <view class="wx-login" open-type="getPhoneNumber" @getphonenumber="getPhoneNumberFn" v-if="current !== 0">
|
|
|
+ <view class="wx-login-tip">
|
|
|
+ <view class="login-line">
|
|
|
+ </view>
|
|
|
+ <text class="wx-tip">第三方登录</text>
|
|
|
+ <view class="login-line">
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+ <view class="wx-login-btn">
|
|
|
+ <button class="logonWX" open-type="getPhoneNumber" @getphonenumber="getPhoneNumberFn"
|
|
|
+ v-if="current !== 0">
|
|
|
+ <image class="wx-icon" src="@/static/images/wxLogin.png" mode="widthFix"></image>
|
|
|
+ </button>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -98,7 +111,9 @@
|
|
|
useSendCode
|
|
|
} from "@/hooks/useSendCode";
|
|
|
import Cache from "@/utils/cache";
|
|
|
- import { getPhoneNumber } from "@/utils/util.js";
|
|
|
+ import {
|
|
|
+ getPhoneNumber
|
|
|
+ } from "@/utils/util.js";
|
|
|
import {
|
|
|
useToast
|
|
|
} from "@/hooks/useToast.js";
|
|
|
@@ -108,7 +123,9 @@
|
|
|
// import {
|
|
|
// getGroupchatList
|
|
|
// } from "@/api/customerService";
|
|
|
- import { footprintScan } from "@/api/merchant.js";
|
|
|
+ import {
|
|
|
+ footprintScan
|
|
|
+ } from "@/api/merchant.js";
|
|
|
import {
|
|
|
EXPIRES_TIME
|
|
|
} from "@/config/cache";
|
|
|
@@ -125,7 +142,13 @@
|
|
|
const BACK_URL = "login_back_url";
|
|
|
|
|
|
// Reactive state
|
|
|
- const navList = ref([{name:"快速登录",type:1}, {name:"账号登录",type:0}]);
|
|
|
+ const navList = ref([{
|
|
|
+ name: "快速登录",
|
|
|
+ type: 1
|
|
|
+ }, {
|
|
|
+ name: "账号登录",
|
|
|
+ type: 0
|
|
|
+ }]);
|
|
|
const current = ref(1);
|
|
|
const account = ref("");
|
|
|
const inviteCode = ref(""); // 邀请码
|
|
|
@@ -137,17 +160,17 @@
|
|
|
const keyCode = ref("");
|
|
|
const codeUrl = ref("");
|
|
|
const codeVal = ref("");
|
|
|
-
|
|
|
+
|
|
|
const platform = ref("");
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
const appleShow = ref(false);
|
|
|
const aloneChecked = ref(false);
|
|
|
|
|
|
- const merchantId = ref('');
|
|
|
- const userInfo = ref({});
|
|
|
+ const merchantId = ref('');
|
|
|
+ const userInfo = ref({});
|
|
|
|
|
|
// Watch formItem to update type
|
|
|
watch(formItem, (newVal) => {
|
|
|
@@ -159,26 +182,26 @@
|
|
|
text,
|
|
|
sendCode
|
|
|
} = useSendCode();
|
|
|
-
|
|
|
+
|
|
|
|
|
|
function openPrivacy() {
|
|
|
// void plus.runtime.openWeb("https://www.shuibeibyg.com/shenhe.html");
|
|
|
- goDetail("https://www.shuibeibyg.com/shenhe.html")
|
|
|
+ goDetail("https://www.shuibeibyg.com/shenhe.html")
|
|
|
}
|
|
|
- const goDetail = (url) => {
|
|
|
- const webviewPageUrl = `/pages/webview/privacy?path=${url}`;
|
|
|
- uni.navigateTo({
|
|
|
- url: webviewPageUrl,
|
|
|
- fail: (err) => {
|
|
|
- console.error("跳转到webview页面失败：", err);
|
|
|
- uni.showToast({
|
|
|
- title: "跳转失败，请重试",
|
|
|
- icon: "none",
|
|
|
- duration: 1500,
|
|
|
- });
|
|
|
- },
|
|
|
- });
|
|
|
- };
|
|
|
+ const goDetail = (url) => {
|
|
|
+ const webviewPageUrl = `/pages/webview/privacy?path=${url}`;
|
|
|
+ uni.navigateTo({
|
|
|
+ url: webviewPageUrl,
|
|
|
+ fail: (err) => {
|
|
|
+ console.error("跳转到webview页面失败：", err);
|
|
|
+ uni.showToast({
|
|
|
+ title: "跳转失败，请重试",
|
|
|
+ icon: "none",
|
|
|
+ duration: 1500,
|
|
|
+ });
|
|
|
+ },
|
|
|
+ });
|
|
|
+ };
|
|
|
|
|
|
// Get logo image
|
|
|
const getLogoImage = async () => {
|
|
|
@@ -417,7 +440,7 @@
|
|
|
appStore.SETUID(data.uid);
|
|
|
const res = await getUserInfo();
|
|
|
appStore.UPDATE_USERINFO(res.data);
|
|
|
- userInfo.value = res.data;
|
|
|
+ userInfo.value = res.data;
|
|
|
|
|
|
// connect({
|
|
|
// id: appStore.uid?.toString(),
|
|
|
@@ -431,18 +454,21 @@
|
|
|
// 订阅已加入的群组
|
|
|
// await getGroupchatListFn(data.uid);
|
|
|
|
|
|
- if(merchantId.value != ''){
|
|
|
- let obj ={
|
|
|
- merchantId:merchantId.value,
|
|
|
- userId:res.data.userId
|
|
|
- }
|
|
|
- await footprintScanFn(obj)
|
|
|
- }else{
|
|
|
- console.log('============')
|
|
|
- appStore.UPDATE_MERCHANT_ID('')
|
|
|
- Toast({ title: "登录成功" });
|
|
|
- backHome();
|
|
|
- }
|
|
|
+ if (merchantId.value != '') {
|
|
|
+ let obj = {
|
|
|
+ merchantId: merchantId.value,
|
|
|
+ userId: res.data.userId
|
|
|
+ }
|
|
|
+ appStore.setIndexRefersh(true)
|
|
|
+ await footprintScanFn(obj)
|
|
|
+ } else {
|
|
|
+ console.log('============')
|
|
|
+ appStore.UPDATE_MERCHANT_ID('')
|
|
|
+ Toast({
|
|
|
+ title: "登录成功"
|
|
|
+ });
|
|
|
+ backHome();
|
|
|
+ }
|
|
|
} catch (err) {
|
|
|
console.error(err);
|
|
|
uni.showToast({
|
|
|
@@ -451,45 +477,48 @@
|
|
|
});
|
|
|
}
|
|
|
};
|
|
|
- const backHome = () => {
|
|
|
- if(userInfo.value.merchant && userInfo.value.merchant.id){
|
|
|
- uni.navigateTo({
|
|
|
- url:"/pages/merchantCenter/index"
|
|
|
- })
|
|
|
- }else{
|
|
|
- uni.switchTab({
|
|
|
- url: "/pages/index/index",
|
|
|
- });
|
|
|
- }
|
|
|
- };
|
|
|
- const footprintScanFn =async (data) => {
|
|
|
- const res = await footprintScan(data);
|
|
|
- Toast({ title: "登录成功" });
|
|
|
- backHome();
|
|
|
- }
|
|
|
- const getPhoneNumberFn = async (e) => {
|
|
|
- // Toast({ title: "登录中..." });
|
|
|
- if (!aloneChecked.value) {
|
|
|
- return Toast({
|
|
|
- title: "请阅读并同意用户协议和隐私政策",
|
|
|
- icon: "none"
|
|
|
- });
|
|
|
- }
|
|
|
- const res = await getPhoneNumber(e);
|
|
|
- console.log('res',res);
|
|
|
- if (res) {
|
|
|
- appStore.LOGIN({
|
|
|
- token: res.data.token
|
|
|
- });
|
|
|
- // 保存过期时间（999天后过期）
|
|
|
- const expiresTime = Math.round(new Date() / 1000) + 999 * 24 * 60 * 60;
|
|
|
- Cache.set(EXPIRES_TIME, expiresTime, 0);
|
|
|
- await getUserInfoFn(res.data);
|
|
|
- }
|
|
|
- }
|
|
|
+ const backHome = () => {
|
|
|
+ if (userInfo.value.merchant && userInfo.value.merchant.id) {
|
|
|
+ uni.navigateTo({
|
|
|
+ url: "/pages/merchantCenter/index"
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ uni.switchTab({
|
|
|
+ url: "/pages/index/index",
|
|
|
+ });
|
|
|
+ }
|
|
|
+ };
|
|
|
+ const footprintScanFn = async (data) => {
|
|
|
+ const res = await footprintScan(data);
|
|
|
+ appStore.USERINFO();
|
|
|
+ Toast({
|
|
|
+ title: "登录成功"
|
|
|
+ });
|
|
|
+ backHome();
|
|
|
+ }
|
|
|
+ const getPhoneNumberFn = async (e) => {
|
|
|
+ // Toast({ title: "登录中..." });
|
|
|
+ if (!aloneChecked.value) {
|
|
|
+ return Toast({
|
|
|
+ title: "请阅读并同意用户协议和隐私政策",
|
|
|
+ icon: "none"
|
|
|
+ });
|
|
|
+ }
|
|
|
+ const res = await getPhoneNumber(e);
|
|
|
+ console.log('res', res);
|
|
|
+ if (res) {
|
|
|
+ appStore.LOGIN({
|
|
|
+ token: res.data.token
|
|
|
+ });
|
|
|
+ // 保存过期时间（999天后过期）
|
|
|
+ const expiresTime = Math.round(new Date() / 1000) + 999 * 24 * 60 * 60;
|
|
|
+ Cache.set(EXPIRES_TIME, expiresTime, 0);
|
|
|
+ await getUserInfoFn(res.data);
|
|
|
+ }
|
|
|
+ }
|
|
|
onLoad(() => {
|
|
|
- console.log(appStore.$wxConfig)
|
|
|
- merchantId.value = appStore.merchantId || '';
|
|
|
+ console.log(appStore.$wxConfig)
|
|
|
+ merchantId.value = appStore.merchantId || '';
|
|
|
getLogoImage();
|
|
|
});
|
|
|
|
|
|
@@ -510,19 +539,21 @@
|
|
|
background: transparent;
|
|
|
background-color: transparent !important;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
::v-deep .u-navbar__content {
|
|
|
background: transparent;
|
|
|
background-color: transparent !important;
|
|
|
}
|
|
|
+
|
|
|
.login-wrapper {
|
|
|
//background: url('https://sb-admin.oss-cn-shenzhen.aliyuncs.com/shuibei-mini/new-mini/login@2x.png');
|
|
|
background-repeat: no-repeat;
|
|
|
background-size: 100% 624rpx;
|
|
|
background-color: #FFFFFF;
|
|
|
}
|
|
|
+
|
|
|
.appLogin {
|
|
|
-
|
|
|
+
|
|
|
|
|
|
.hds {
|
|
|
display: flex;
|
|
|
@@ -606,27 +637,43 @@
|
|
|
|
|
|
.login-wrapper {
|
|
|
|
|
|
+ height: 100vh;
|
|
|
|
|
|
.shading {
|
|
|
padding: 72rpx 78rpx;
|
|
|
display: flex;
|
|
|
justify-content: center;
|
|
|
flex-direction: column;
|
|
|
+ position: relative;
|
|
|
+ z-index: 1;
|
|
|
+
|
|
|
view {
|
|
|
color: #333333;
|
|
|
font-size: 36rpx;
|
|
|
font-weight: bold;
|
|
|
+
|
|
|
&:first-child {
|
|
|
font-size: 48rpx;
|
|
|
margin-bottom: 16rpx;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ .ip-pic {
|
|
|
+ width: 261rpx;
|
|
|
+ height: 480rpx;
|
|
|
+ position: absolute;
|
|
|
+ right: 14rpx;
|
|
|
+ bottom: calc(-76rpx - 88rpx);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.whiteBg {
|
|
|
- margin-top: 100rpx;
|
|
|
+ // margin-top: 100rpx;
|
|
|
background: #FFFFFF;
|
|
|
border-radius: 48rpx 48rpx 0rpx 0rpx;
|
|
|
+ position: relative;
|
|
|
+ z-index: 5;
|
|
|
+
|
|
|
.whiteBg-tab {
|
|
|
color: #666666;
|
|
|
display: flex;
|
|
|
@@ -636,13 +683,15 @@
|
|
|
//background: url('https://sb-admin.oss-cn-shenzhen.aliyuncs.com/shuibei-mini/new-mini/logintab1.png');
|
|
|
background-repeat: no-repeat;
|
|
|
background-size: cover;
|
|
|
+
|
|
|
.active {
|
|
|
width: 407rpx;
|
|
|
-
|
|
|
+
|
|
|
view {
|
|
|
color: #F8C008;
|
|
|
font-weight: bold;
|
|
|
position: relative;
|
|
|
+
|
|
|
&::after {
|
|
|
left: 50%;
|
|
|
bottom: -12rpx;
|
|
|
@@ -656,15 +705,18 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.noActive {
|
|
|
flex: 1;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.whiteBg-tabs {
|
|
|
//background: url('https://sb-admin.oss-cn-shenzhen.aliyuncs.com/shuibei-mini/new-mini/logintab.png');
|
|
|
background-repeat: no-repeat;
|
|
|
background-size: cover;
|
|
|
}
|
|
|
+
|
|
|
.list {
|
|
|
padding: 0 80rpx;
|
|
|
margin-top: 120rpx;
|
|
|
@@ -678,11 +730,12 @@
|
|
|
background: #F9F7F0;
|
|
|
border-radius: 16rpx;
|
|
|
margin-bottom: 32rpx;
|
|
|
+
|
|
|
.texts {
|
|
|
flex: 1;
|
|
|
font-size: 28rpx;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
.code {
|
|
|
padding: 0;
|
|
|
margin: 0;
|
|
|
@@ -697,6 +750,7 @@
|
|
|
font-size: 28rpx;
|
|
|
font-weight: bold;
|
|
|
border: none;
|
|
|
+
|
|
|
&::after {
|
|
|
width: 0;
|
|
|
border: none;
|
|
|
@@ -716,21 +770,22 @@
|
|
|
font-size: 32rpx;
|
|
|
font-weight: bold;
|
|
|
}
|
|
|
- .logonWX{
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: center;
|
|
|
- height: 88rpx;
|
|
|
- background-color: #28C445;
|
|
|
- border-radius: 16rpx;
|
|
|
- color: #ffffff;
|
|
|
- font-size: 32rpx;
|
|
|
- font-weight: bold;
|
|
|
- margin-top: 30rpx;
|
|
|
- }
|
|
|
- .logonWX[disabled]{
|
|
|
- background-color: #BEEDC7;
|
|
|
- }
|
|
|
+
|
|
|
+ .logonWX {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ // height: 88rpx;
|
|
|
+ background-color: #fff;
|
|
|
+ border: none !important;
|
|
|
+ border-radius: 16rpx;
|
|
|
+ color: #ffffff;
|
|
|
+ font-size: 32rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .logonWX[disabled] {
|
|
|
+ background-color: #BEEDC7;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.privacy-box {
|
|
|
@@ -738,7 +793,7 @@
|
|
|
padding: 0 80rpx;
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
-
|
|
|
+
|
|
|
image {
|
|
|
width: 28rpx;
|
|
|
height: 28rpx;
|
|
|
@@ -747,19 +802,60 @@
|
|
|
|
|
|
.privacy-text {
|
|
|
color: #F8C008;
|
|
|
-
|
|
|
+
|
|
|
vertical-align: top;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.footer {
|
|
|
- padding: 48rpx 80rpx;
|
|
|
+ padding: 48rpx 80rpx 72rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .back_extend {
|
|
|
+ //position: fixed;
|
|
|
+ //top: 50px;
|
|
|
+ //left: 10px;
|
|
|
+ //font-size: 26rpx;
|
|
|
+ //color: #999;
|
|
|
+ }
|
|
|
+
|
|
|
+ .wx-login-tip {
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ width: 590rpx;
|
|
|
+ margin: 0 auto;
|
|
|
+ justify-content: space-between;
|
|
|
+
|
|
|
+ .login-line {
|
|
|
+ width: 193rpx;
|
|
|
+ height: 1rpx;
|
|
|
+ background-color: #F1F3F8;
|
|
|
+ }
|
|
|
+
|
|
|
+ .wx-tip {
|
|
|
+ font-size: 28rpx;
|
|
|
+ line-height: 44rpx;
|
|
|
+ color: #999;
|
|
|
+ flex: 1;
|
|
|
+ width: 100rpx;
|
|
|
+ text-align: center;
|
|
|
+ display: block;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ .wx-login-btn {
|
|
|
+ width: 590rpx;
|
|
|
+ margin: 0 auto;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ margin-top: 32rpx;
|
|
|
+ padding-bottom: 30rpx;
|
|
|
+
|
|
|
+ .wx-icon {
|
|
|
+ width: 92rpx;
|
|
|
+ height: 92rpx;
|
|
|
+ }
|
|
|
}
|
|
|
- .back_extend {
|
|
|
- //position: fixed;
|
|
|
- //top: 50px;
|
|
|
- //left: 10px;
|
|
|
- //font-size: 26rpx;
|
|
|
- //color: #999;
|
|
|
- }
|
|
|
-</style>
|
|
|
+</style>
|
ext.zhangbin71
