暂存code

pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="login_warp">
 		<view class="login_logo_warp">
-			<view style="margin-left: 8rpx;">
+			<view style="text-align: center;">
 				<up-image src="/static/logo.png" width="90" height="90" bgColor="#f1f6ff00" radius="10"></up-image>
 			</view>
 			<view style="margin-top: 20rpx;">
@@ -55,7 +55,6 @@
 			</view>
 			
 			<view class="login_comm_but login_comm_but_yes" @click="loginFun">
-				<up-loading-icon color="#FFFFFF" :show="butLoading"></up-loading-icon>
 				<text style="margin-left: 10rpx;">登录</text>
 			</view>
 			<view class="cut_way_warp">
@@ -76,9 +75,11 @@
 			>
 				<template #label>
 					<text>已阅读并同意</text>
-					<text class="policy_a_warp">《哈希优品服务协议》</text>
-					<text>及</text>
-					<text class="policy_a_warp">《隐私政策》</text>
+					<text class="policy_a_warp" @click="jumpUserAgreement">《服务协议》</text>
+					<text>、</text>
+					<text class="policy_a_warp" @click="jumpPrivacyAgreement">《隐私政策》</text>
+					<text>、</text>
+					<text class="policy_a_warp" @click="jumpProductAgreement">《售后保障协议》</text>
 				</template>
 			</up-checkbox>
 		</view>
@@ -93,6 +94,7 @@
 	import { getUserList } from '@/api/common.js';
 	import { loginbysms,loginbypw } from '@/api/auth.js';
 	import { setStorageFun,TOKEN_NAME,USER_KEY,USER_DATA,USER_LOGIN_TIME } from '@/utils/auth.js';
+	import CryptoJS from 'crypto-js';
 	
 	export default {
 		components: {
@@ -116,7 +118,6 @@
 				isShow:false,// 是否显示
 				isPolicy:false,// 是否同意
 				countdown:false,// 清空倒计时
-				butLoading:false,
 			}
 		},
 		methods: {
@@ -144,11 +145,10 @@
 					});
 					return;
 				}
-				this.butLoading=true;
 				let response={};
 				if(this.loginWay === 'password'){
 					params.mobile = form.name;
-					params.password = form.password;
+					params.password = CryptoJS.MD5(form.password).toString();
 					response = await loginbypw(params);
 				}else{
 					params.mobile = form.name;
@@ -170,7 +170,6 @@
 				// 当前登录得时间戳
 				let currentTimeStamp = new Date().getTime();
 				setStorageFun(USER_LOGIN_TIME,currentTimeStamp);
-				this.butLoading=false;
 				this.$refs.uToastRef.show({
 					type: 'success',
 					message: response.msg,
@@ -219,7 +218,25 @@
 				uni.navigateTo({
 					url:"/pages/register/register",
 				})
-			}
+			},
+			// 用户协议
+			jumpUserAgreement(){
+				uni.navigateTo({
+					url: '/pages/mine_user_agreement/mine_user_agreement?backPath=login'
+				})
+			},
+			// 隐私协议
+			jumpPrivacyAgreement(){
+				uni.navigateTo({
+					url: '/pages/mine_privacy_agreement/mine_privacy_agreement?backPath=login'
+				})
+			},
+			// 售后保障协议
+			jumpProductAgreement(){
+				uni.navigateTo({
+					url: '/pages/mine_product_agreement/mine_product_agreement?backPath=login'
+				})
+			},
 		}
 	}
 </script>