From 9f90ef8cd77e40c6962c0f25dbfd5195259f8e55 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Tue, 30 Jul 2024 18:27:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=B3=A8=E5=86=8C=E6=89=8B?=
 =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                      | 11 ++++-
 pages/index/index.vue           | 71 ++++++++++++++++++++++++++++-----
 pages/wxlogin/registerphone.vue | 65 ++++++++++++++++++++++++++++++
 3 files changed, 135 insertions(+), 12 deletions(-)
 create mode 100644 pages/wxlogin/registerphone.vue

diff --git a/pages.json b/pages.json
index 0520fcd..a40e107 100644
--- a/pages.json
+++ b/pages.json
@@ -12,7 +12,8 @@
 			"style": {
 				"navigationBarTitleText": "电子发票",
 				"navigationBarBackgroundColor": "#000",
-				"navigationBarTextStyle": "white"
+				"navigationBarTextStyle": "white",
+				"onReachBottomDistance": 10//上拉刷新距离
 			}
 		},
 		{
@@ -42,6 +43,14 @@
 				"navigationBarTitleText" : "",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/wxlogin/registerphone",
+			"style" : 
+			{
+				"navigationBarTitleText" : "手机注册",
+				"enablePullDownRefresh" : false
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3dd4845..c43a7ba 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -14,30 +14,30 @@
 		
 		<scroll-view scroll-y="true" class="scroll-Y">
 			<!-- :style="{'marginBottom':index < 2 ? '20rpx' : '0rpx'}" -->
-			<view class="index_list" v-for="(n, index) in 2" style="margin-bottom: 20rpx;" @click="toviewinvoice(n)">
+			<view class="index_list" v-for="(item, index) in list" style="margin-bottom: 20rpx;" @click="toviewinvoice(n)">
 				<view class="d-flex jcontent-between">
 					<view class="index_list_size">业务流水号3674</view>
 					<view class="index_list_color">已开票，点击获取</view>
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>开票项目</view>
-					<view>垃圾费</view>
+					<view>{{item.name}}</view>
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>开票总金额</view>
-					<view class="Price_color">￥7.2</view>
+					<view class="Price_color">￥{{item.money}}</view>
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>抬头类型</view>
-					<view>单位</view>
+					<view>{{item.Headuptype}}</view>
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>抬头名称</view>
-					<view>张三</view>
+					<view>{{item.title}}</view>
 				</view>
 				<view class="d-flex jcontent-between">
 					<view>申请时间</view>
-					<view>2024-07-22 18:45:31</view>
+					<view>{{item.time}}</view>
 				</view>
 				<view class="index_list_box">
 					<view class="index_list_box1">已开票</view>
@@ -73,7 +73,9 @@
 					<view class="index_list_box1">已作废</view>
 				</view>
 			</view>
+			<uni-load-more :status="status" :content-text="contentText" />
 		</scroll-view>
+		
 		<uni-popup ref="popup" type="bottom" background-color="#fff" border-radius="10px 10px 0 0" @close="close">
 			<view style="height: 150px;text-align: center;">
 				<view style="margin: 40rpx 80rpx;"><button type="primary" @click="login">登录</button></view>
@@ -87,8 +89,25 @@
 	export default {
 		data() {
 			return {
-				datetimerange: [],
-				list:[],
+				datetimerange: [],//时间
+				// 首页数据
+				list:[
+					{name:'垃圾费',money:'7.2',Headuptype:'单位',title:'张三',time:'2024-07-22 18:45:31'},
+					{name:'垃圾费',money:'7.2',Headuptype:'单位',title:'张三',time:'2024-07-22 18:45:31'},
+					{name:'垃圾费',money:'7.2',Headuptype:'单位',title:'张三',time:'2024-07-22 18:45:31'},
+					{name:'垃圾费',money:'7.2',Headuptype:'单位',title:'张三',time:'2024-07-22 18:45:31'},
+					{name:'垃圾费',money:'7.2',Headuptype:'单位',title:'张三',time:'2024-07-22 18:45:31'},
+					{name:'垃圾费',money:'7.2',Headuptype:'单位',title:'张三',time:'2024-07-22 18:45:31'}
+				],
+				page: 1,//页码
+				limit: 4,//每页显示几条
+				status: 'more',//状态
+				//显示的状态
+				contentText: {
+					contentdown: '查看更多',
+					contentrefresh: '加载中',
+					contentnomore: '没有更多'
+				},
 				appId:'',
 				redirectUri:'',
 				state:'',
@@ -103,6 +122,15 @@
 				console.log('范围选:', this.datetimerange);
 			}
 		},
+		//上拉加载
+		onReachBottom() {
+			console.log('触底了');
+			if (this.status == 'noMore') {
+				return;
+			}
+			this.page++;
+			this.getUniversityList();
+		},
 		onLoad(options) {
 			
 			const url = window.location.href;
@@ -118,6 +146,7 @@
 				this.cont()
 			}
 			this.getWxCode()
+			this.getUniversityList();
 		},
 		mounted() {
 			if(!uni.getStorageSync('AccessToken')){
@@ -148,6 +177,11 @@
 							uni.setStorageSync('openid', res.data.openid);
 							this.$refs.popup.close();
 							this.removepath()
+							if(res.data.phone){
+								uni.navigateTo({
+									url:"/pages/wxlogin/registerphone"
+								})
+							}
 						}else{
 							uni.showToast({title: res.msg,icon: 'none'});
 							this.login();
@@ -164,6 +198,24 @@
 					}
 				})
 			},
+			// 首页获取数据
+			getUniversityList(){
+				// API.getWxCode({}, res => {
+				// 	if (res.code == 1) {
+				// 		if (this.page === 1) {
+				// 			this.universityList = res.data;
+				// 		} else {
+				// 			this.universityList = this.universityList.concat(res.data);
+				// 		}
+				// 		// 判断是否还有更多数据
+				// 		if (res.data.length < this.limit) {
+				// 			this.status = 'noMore'; // 没有更多数据
+				// 		} else {
+				// 			this.status = 'more'; // 还有更多数据
+				// 		}
+				// 	}
+				// })
+			},
 			// 正则匹配请求地址中的参数函数
 			getUrlCode(name) {
 				return decodeURIComponent((new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(location.href) ||[, ''])[1].replace(/\+/g, '%20')) || null
@@ -180,9 +232,6 @@
 				const newUrl = url.replace(/[\?&]code=[^&]*&?/, '?').replace(/[\?&]state=[^&]*&?/, '#/');
 				// 使用 replaceState 更新 URL，而不刷新页面
 				window.history.replaceState({}, document.title, newUrl);
-			},
-			close(){
-				
 			},
 			toInvoicing(){
 				uni.navigateTo({
diff --git a/pages/wxlogin/registerphone.vue b/pages/wxlogin/registerphone.vue
new file mode 100644
index 0000000..799fe6e
--- /dev/null
+++ b/pages/wxlogin/registerphone.vue
@@ -0,0 +1,65 @@
+<template>
+	<view class="box">
+		<view><uni-easyinput prefixIcon="phone-filled" v-model="mobile" @blur="onInput" placeholder="请输入手机号"></uni-easyinput></view>
+		<view style="margin-top: 10px;"><uni-easyinput prefixIcon="contact-filled" v-model="pucode" placeholder="请输入用户编号"></uni-easyinput></view>
+		<view class="input">
+			<uni-easyinput v-model="snsCode" placeholder="请输入内容" @input="input" style="width: 100px;margin-right: 10px;"></uni-easyinput>
+			<button class="mini-btn" type="primary" size="mini">获取验证码</button>
+		</view>
+		<view><button type="primary" style="width: 180px;margin-top: 20px;" @click="register">注册</button></view>
+	</view>
+</template>
+
+<script>
+	import API from '@/common/js/api.js'
+	export default {
+		data() {
+			return {
+				mobile:'',
+				pucode:'',
+				snsCode:'439764',
+				styles:{
+					width:'100px'
+				}
+			}
+		},
+		methods: {
+			// 限制手机号
+			onInput(event) {
+				// 使用正则表达式过滤非数字字符
+				const phonePattern = /^1[3-9]\d{9}$/;
+				if (!phonePattern.test(event.detail.value) && event.detail.value) {
+					uni.showToast({
+						title: '您输入的手机号格式有误',
+						icon: 'none'
+					});
+					this.mobile = ''; // 清空输入框
+				}else{
+					this.mobile = event.detail.value
+				}
+			},
+			register(){
+				const url = '/wechat/savePuCode'
+				let data = {
+					mobile:this.mobile,
+					pucode:this.pucode,
+					snsCode:this.snsCode
+				}
+				API.request(url,data, res => {
+					console.log('1111');
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.box{
+	padding: 40px;
+}
+.input{
+	display: flex;
+	align-items: center;
+	margin-top: 10px;
+}
+</style>