From 60792fd456dcf7cd386df31c2ed8c7b9fa02b686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Fri, 9 Jul 2021 12:39:14 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=80=80=E6=AC=BE=E6=96=B0=E5=A2=9E=E5=B7=B2=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E5=AD=97=E6=95=B0=E6=98=BE=E7=A4=BA=20[=E6=96=B0=E5=A2=9E]=20?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                   |   6 ++
 pages/login/index.vue        | 176 +++++++++++++++++++++++++++++++++++
 pages/order/apply_refund.vue |   7 +-
 3 files changed, 187 insertions(+), 2 deletions(-)
 create mode 100644 pages/login/index.vue

diff --git a/pages.json b/pages.json
index f50df39..b7af771 100644
--- a/pages.json
+++ b/pages.json
@@ -142,6 +142,12 @@
 			"style": {
 				"navigationBarTitleText": "海南旅游"
 			}
+		},
+		{
+			"path": "pages/login/index",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/login/index.vue b/pages/login/index.vue
new file mode 100644
index 0000000..e6ddb9b
--- /dev/null
+++ b/pages/login/index.vue
@@ -0,0 +1,176 @@
+<template>
+	<view>
+		<view class="lf-row-center lf-flex-column box">
+			<!-- <image class="img" :src="userInfo.avatar" v-if="userInfo.avatar"></image> -->
+			<!-- <image class="img" src="../../static/logo.png" v-else></image> -->
+			<image class="img" src="../../static/logo.png" ></image>
+			<view class="lf-m-t-30 lf-font-32" v-if="type == 'phone'">{{ userInfo.nickname || '游客用户' }}</view>
+			<block v-if="type == 'userinfo'">
+				<button class="btn" @click="getUserProfile">
+					<text class="lf-iconfont lf-icon-weixin lf-font-60 lf-text-vertical"></text>
+					<text class="lf-m-l-20">微信快捷登录</text>
+				</button>
+				<!-- <view class="lf-m-t-40 lf-font-28" @click="$toBack()">暂不绑定继续操作</view> -->
+				<view class="mask" v-if="!checked" @click="$msg('您未同意协议条款')"></view>
+			</block>
+			<block v-else-if="type == 'phone'">
+				<button class="btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+					<text class="lf-iconfont lf-icon-weixin lf-font-60 lf-text-vertical"></text>
+					<text class="lf-m-l-20">绑定手机号</text>
+				</button>
+				<!-- <view class="lf-m-t-40 lf-font-28" @click="$url('/pages/login/accountLogin')">使用手机号登录</view> -->
+				<view class="mask" v-if="!checked" @click="$msg('您未同意协议条款')"></view>
+			</block>
+		</view>
+		<!-- 服务条款 -->
+		<view class="fixed-bottom lf-flex" v-show="agreement.title">
+			<checkbox-group @change="checkboxChange" style="display: inline-block;">
+				<checkbox class="lf-text-vertical" :checked="checked"></checkbox>
+			</checkbox-group>
+			<view class="lf-m-l-10 lf-font-24 lf-color-gray" style="display: inline-block;">
+				<text>请认真阅读并同意</text>
+				<text @click="enterAgree" class="text-orange">《{{ agreement.title }}》</text>
+				<text>，在小程序下单购买即表示您已默认同意</text>
+				<text @click="enterAgree" class="text-orange">《{{ agreement.title }}》</text>
+				<text>的所有条款。</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data(){
+			return {
+				checked: false, // 是否勾选协议
+				isLogin: false, // 是否已登录
+				userInfo: {},
+				type: 'userinfo', // 页面授权类型 phone获取手机号 | userinfo获取用户信息
+				agreement: {} // 协议
+			}
+		},
+		onLoad(options){
+			this.type = options.type || this.type;
+			this.getAgree();
+			getApp().globalData.wxlogin().then(res => {
+				this.userInfo = res;
+			});
+		},
+		methods: {
+			// 获取协议
+			getAgree(){
+				this.$http(this.API.API_WXLOGIN_VIEW).then(res => {
+					this.agreement = res.data?.agreement;
+				})
+			},
+			// 进入查看协议
+			enterAgree(){
+				this.$url('/pages/agreement/agreement?id='+ this.agreement.article_id);
+			},
+			// 勾选协议发生变化
+			checkboxChange(event){
+				this.checked = event.detail.value.length > 0;
+			},
+			// 微信快捷登录获取手机号
+			getPhoneNumber(event){
+				console.log(event);
+				if(event.detail.errMsg == 'getPhoneNumber:ok'){
+					let encryptedData = event.detail.encryptedData;
+					let iv = event.detail.iv;
+					// let userInfo = uni.getStorageSync('userinfo') || {};
+					this.$http(this.API.API_WECHAT_SETPHONE, {
+						encryptedData,
+						iv,
+						// token: userInfo.token // 已在公共参数传
+					}).then(res => {
+						console.log("更新手机号", res);
+						this.$msg('更新成功', {icon: 'success'});
+						uni.setStorageSync('userinfo', res.data);
+						setTimeout(() => {
+							this.$toBack();
+						}, 1000);
+					})
+				}
+			},
+			// 获取用户信息
+			getUserProfile(){
+				uni.getUserProfile({
+					desc: '您的信息将用于时空网显示',
+					lang: 'zh_CN',
+					complete: result => {
+						console.log(result)
+						if(result.errMsg == 'getUserProfile:ok'){
+							let encryptedData = result.encryptedData;
+							let iv = result.iv;
+							let signature = result.signature;
+							// let userInfo = uni.getStorageSync('userinfo') || {};
+							
+							this.$http(this.API.API_WECHAT_SETPROFILE, {
+								encryptedData,
+								iv,
+								// token: userInfo.token // 已在公共参数传
+							}).then(res => {
+								console.log("更新用户信息", res);
+								this.$msg('更新成功', {icon: 'success'});
+								uni.setStorageSync('userinfo', res.data);
+								setTimeout(() => {
+									this.$toBack();
+								}, 1000);
+							})
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		overflow: hidden;
+	}
+</style>
+<style lang="scss" scoped="scoped">
+	.box{
+		padding: 60rpx 32rpx;
+		width: 750rpx;
+		height: auto;
+		box-sizing: border-box;
+		position: relative;
+		.img{
+			width: 180rpx;
+			height: 180rpx;
+			border-radius: 50%;
+		}
+		.btn{
+			background-color: #09BB07;
+			color: #FFFFFF;
+			width: 100%;
+			height: 88rpx;
+			border-radius: 42rpx;
+			font-size: 32rpx;
+			line-height: 88rpx;
+			margin-top: 80rpx;
+		}
+	}
+	.fixed-bottom{
+		position: fixed;
+		bottom: 60rpx;
+		left: 0;
+		padding: 0 32rpx;
+		.highlight{
+			color: #1e90ff;
+		}
+	}
+	
+	.mask{
+		position: absolute;
+		bottom: 46rpx;
+		left: 0;
+		width: 100%;
+		height: 190rpx;
+	}
+	.display-inline-block{
+		display: inline-block;
+	}
+</style>
diff --git a/pages/order/apply_refund.vue b/pages/order/apply_refund.vue
index 09e09f3..0d1aa15 100644
--- a/pages/order/apply_refund.vue
+++ b/pages/order/apply_refund.vue
@@ -43,7 +43,7 @@
 				<!-- <input type="text" value="" placeholder="请输入退款说明" class="lf-m-t-30 lf-border-bottom" /> -->
 				<view class="cu-self menu" style="margin-top: 30rpx; position: relative;">
 					<textarea :cursor-spacing="120" maxlength="300" :adjust-position="true" type="text" v-model="applyInfo" class="text-left lf-font-32 area-self" placeholder="请输入退款说明" />
-					<view class="font-change">{{ applyInfo.length }}/300</view>
+					<view class="font-change">{{ dynamicLength() }}/300</view>
 				</view>
 			</view>
 		</view>
@@ -82,6 +82,9 @@
 			}
 		},
 		methods: {
+			dynamicLength(){
+				return parseInt(this.applyInfo.length);
+			},
 			checkImgInfo(tempFilePath, suc){
 				uni.getImageInfo({
 					src: tempFilePath,
@@ -247,7 +250,7 @@
 		width: 100%;
 		padding: 30rpx;
 		padding-bottom: 36rpx;
-		color: #999999;
+		color: #333;
 		border: 1px solid #D0D0D0;
 		border-radius: 10rpx;
 	}