待上线版本

components/nodata/nodata.vue

@@ -0,0 +1,38 @@
+<template>
+	<view class="noDate">
+		<view class="img">
+			<image src="@/static/images/nodata.png" mode=""></image>
+		</view>
+		<view class="text">
+			<slot>
+				<text>暂无数据</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+</script>
+
+<style lang="scss" scoped>
+	.noDate {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		padding: 40rpx 0;
+	}
+	.img {
+		width: 396rpx;height: 227rpx;
+		image {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	.text {
+		font-size: 26rpx;
+		color: #999;
+		margin-top: 60rpx;
+	}
+</style>

config/api.js

@@ -12,7 +12,8 @@ export const loginSMS = (data) => http.post('member/auth/sms-login', data, { cus
 // 用户协议和隐私协议
 export const getAgreement = (params={}) => http.get('app/student-record/getAgreement', {params})
 // 获取个人信息
-export const getUserInfo = (data) => http.post('member/user/get', {header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
+// export const getUserInfo = (data) => http.post('face/user_info', {header: {'content-type': 'application/x-www-form-urlencoded; charset=UTF-8'}})
+export const getUserInfo = (data) => http.post('face/user_info',)
 // 退出登录
 export const logOut = (data={}) => http.post('member/auth/logout', data, {custom: {catch: true, toast: false }})
 

config/request.js

@@ -38,7 +38,8 @@ let secretKey = '22d90e09d1374f0f9e4accd07d333e55'
 		config.header['Signature'] = hash
 		config.data = jsonString
 		
-		let token = counterStore.token
+		let token = uni.getStorageSync('token')
+		
 		if(token) {
 			config.header.Authorization = 'Bearer ' + token
 		}

config/site.config.js

@@ -16,6 +16,6 @@ let obj = {
 };
 
 export default obj
-// http://123.6.232.1:8099/测试地址 
+// http://192.168.1.106:8518/测试地址 
 // http://192.168.1.43:8318/本地地址 
 //http://www.lyjppt.com/正式地址

pages/index/index - 副本.vue

@@ -1,10 +0,0 @@
-<template>
-	<view class="content">
-	</view>
-</template>
-
-<script setup>
-import { ref,reactive } from 'vue';
-import {onLoad,onReady} from "@dcloudio/uni-app"
-
-</script>

pages/index/index.vue

@@ -1,16 +0,0 @@
-<template>
-	<view class="content">
-		题库
-	</view>
-</template>
-
-<script setup>
-import { ref, reactive } from 'vue';
-import { onLoad, onReady } from "@dcloudio/uni-app"
-import { getBannerList } from '@/config/api.js'
-async function getBannerListFn() {
-	const { data: res } = await getBannerList()
-	console.log(res)
-}
-getBannerListFn()	
-</script>

pages/subPage/ballots/ballotsList/ballotsList.vue

@@ -27,6 +27,10 @@
 				</view>
 			</view>
 		</view>
+		<view style="padding-bottom: 20rpx;" v-if="voteList.length>30">
+			<u-loadmore :status="status" />
+		</view>
+		<nodata v-if="!voteList.length&&status=='nomore'">暂无投票信息~</nodata>
 	</view>
 </template>
 
@@ -36,10 +40,11 @@
 	import {
 			onLoad,
 			onPullDownRefresh,
+			onReachBottom
 		} from '@dcloudio/uni-app'
 	import { reactive, ref } from 'vue';  
 	import { votePage, mineVotePage } from '@/config/api.js'
-	  
+	let  status = ref('loading')
 	const tabArr = reactive([  
 	    { name: '投票列表', id: 0 },  
 	    { name: '我的投票', id: 1 },
@@ -93,6 +98,7 @@
 		}
 		voteList.value.push(...res.list)
 		total.value = res.total
+		if(voteList.value.length>=total.value) status.value = 'nomore'
 		console.log(voteList.value)
 	}
 	votePageFn()
@@ -107,6 +113,12 @@
 	   await initList()
 	   uni.stopPullDownRefresh()
 	})
+	
+	onReachBottom(()=>{
+		if(total.value > voteList.value.length) {
+			votePageFn()
+		}
+	})
 </script>
 
 <style lang="scss" scoped>
@@ -139,7 +151,7 @@
 			border-radius: 25rpx;
 			border: 1px solid #F4F4F4;
 			line-height: 50rpx;
-			padding: 0 14rpx;
+			padding: 0 20rpx;
 			font-size: 24rpx;
 			margin-right: 30rpx;
 			&.active {

pages/subPage/ballots/vote/comp/topInfo.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="topInfo">
 		<view class="bg padding">
+			<view class="status_bar"></view>
 			<up-navbar  title="投票表决" :safeAreaInsetTop="true" :autoBack="true" bgColor="transparent" ></up-navbar>
 			<view class="tit">{{ detailInfo.title}}</view>
 			<view class="textCon">

pages/subPage/ballots/vote/vote.vue

@@ -99,7 +99,7 @@
 	  .bg {
 	    width: 100%;
 		background: linear-gradient(0deg, #ffffff 0%, #FFD4D3 100%);
-		padding: 90rpx 20rpx 20rpx 20rpx;
+		padding: 120rpx 20rpx 20rpx 20rpx;
 	    .tit {
 			font-size: 36rpx;
 			padding: 10rpx 0 20rpx 0;

pages/subPage/ballots/vote/voteReslut.vue

@@ -1,11 +1,7 @@
 <template>
 	<view class="content">
 		<topInfo :detailInfo="detailInfo"/>
-		
-		
 		<view class="padding">
-			
-			
 			<view class="ul" >
 				<view class="li2 flex-b" v-for="(item,index) in detailInfo.voteResults" :key="index" :class="{active: item.voted}">
 					<view class="proccess" :style="{width: item.itemVoteProportion}"></view>
@@ -61,7 +57,7 @@
 	  .bg {
 	    width: 100%;
 		background: linear-gradient(0deg, #ffffff 0%, #FFD4D3 100%);
-		padding: 90rpx 20rpx 20rpx 20rpx;
+		padding: 120rpx 20rpx 20rpx 20rpx;
 	    .tit {
 			font-size: 36rpx;
 			padding: 10rpx 0 20rpx 0;

pages/subPage/login/login.vue

@@ -79,14 +79,12 @@
 	async function getPhoneNumber(e) {
 		if (!isCheck.value) return toast('请勾选产品协议与隐私政策');
 		let phoneCode = e.detail.code
-		console.log('来到这里了吗？')
-		console.log(phoneCode)
+		
 		console.log(e.detail.errMsg) // 回调信息（成功失败都会返回）
 		console.log(e.detail) // 错误码（失败时返回）
 		const loginCode = await loginFn()
 		if (!loginCode || !phoneCode) return
-		console.log('登录验证码')
-		console.log(loginCode)
+		
 		let obj = {
 			phoneCode,
 			socialCode: loginCode
@@ -94,19 +92,18 @@
 		const {
 			data: res
 		} = await weixinLogin(obj)
-		console.log(res)
-		// console.log('什么都没有？')
-		// console.log(userStore())
+		
 		const counterStore = userStore();
-		console.log('什么都没有？')
-		console.log(counterStore)
-		console.log(counterStore.upDateLoginInfo)
-		counterStore.upDateLoginInfo(res)
-		counterStore.upDateToken(res.accessToken)
+		await counterStore.upDateToken(res.accessToken)
+		await counterStore.upDateLoginInfo(res)
+		
 		// this.$goPage('/pages/userCenter/login/face')
-		uni.switchTab({
-			url: '/pages/tabbar/index/index'
-		})
+		uni.$u.toast('登录成功')
+		setTimeout(()=>{
+			uni.switchTab({
+				url: '/pages/tabbar/index/index'
+			})
+		},2000)
 	}
 </script>
 

pages/subPage/notice/notice.vue

@@ -2,6 +2,10 @@
 	<view class="content">
 		<view class="padding">
 			<notice :list="noticeList"/>
+			<view style="padding-bottom: 20rpx;" v-if="noticeList.length>0">
+				<u-loadmore :status="status" />
+			</view>
+			<nodata v-if="!noticeList.length&&status=='nomore'">暂无投票信息~</nodata>
 		</view>
 	</view>
 </template>
@@ -11,7 +15,7 @@
 	import { getNoticeList,  } from '@/config/api.js'
 	import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
 	import { ref } from 'vue'
-	
+	let  status = ref('loading')
 	let params = ref({
 		"pageNo": 1,
 		  "pageSize": 30,
@@ -22,6 +26,7 @@
 		const {data: res} = await getNoticeList(params.value)
 		noticeList.value.push(...res.list)
 		total.value = res.total
+		if(noticeList.value.length>=total.value) status.value = 'nomore'
 		console.log(res)
 	}
 	getNoticeListFn()

pages/subPage/privacyAgreement/privacyAgreement.vue

@@ -5,7 +5,6 @@
 </template>
 
 <script>
-	import { getAgreement } from '@/config/api.js'
 	export default {
 		data() {
 			return {
@@ -28,11 +27,10 @@
 		},
 		methods: {
 			async getAgreementFn() {
-				const {data: res} = await getAgreement()
 				if(this.type==1) {
-					this.url = res.privacyAgreementUrl
+					this.url = 'http://www.jakjgs.com/htmls/yszc.html'
 				}else {
-					this.url = res.useAgreementUrl
+					this.url = 'http://www.jakjgs.com/htmls/yhxy.html'
 				}
 			}
 		}

pages/tabbar/index/index.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="content ">
-		<up-navbar leftText=" " title="事务通" :safeAreaInsetTop="false" :autoBack="false">
+		<view class="status_bar"></view>
+		<up-navbar leftText=" " title="事务通" :safeAreaInsetTop="false" :autoBack="false" :fixed="false">
 			<template #left>
 				<view class=""></view>
 			</template>
@@ -12,7 +13,7 @@
 			<view class="myhome">
 				<view class="flex-b">
 					<view class="h2">我的房屋</view>
-					<view class="btn" @click="goHome">关联房屋</view>
+					<view class="btn" @click="goHome('/pages/subPage/authentication/authentication')">关联房屋</view>
 				</view>
 				
 				<view class="borderCard" @click="$goPage('/pages/subPage/login/login')" v-if="!counterStore.token">
@@ -44,7 +45,7 @@
 				<view class="h1pad">
 					<view class="h1">服务</view>
 				</view>
-				<view class="banner2" @click="$goPage('/pages/subPage/ballots/ballotsList/ballotsList')">
+				<view class="banner2" @click="goHome('/pages/subPage/ballots/ballotsList/ballotsList')">
 					<!-- <image src="@/static/images/homebanner2.png" mode=""></image> -->
 					<image :src="imgUrl + 'homebanner2.png'" mode=""></image>
 				</view>
@@ -124,12 +125,16 @@
 		counterStore.upDateUseInfo('name', res.userName)
 	}
 	
-	function goHome() {
+	function goHome(url) {
+		uni.requestSubscribeMessage({
+		  tmplIds: ['OH_1gceM-m3EXRKOtjl_Hb1ymyC5zw8_Ag6LaFXV4Do', 'AjD_oLafmKGO8X3YvDGl1qmITq_Q6bSFMDeygJNAIes'],
+		  success (res) { console.log('订阅成功: ', res) },
+		  fail(err) {console.log('订阅失败：', err)}
+		})
 		let token = counterStore.token;
-		console.log('eee'+token)
 		if(token) {
 			uni.$u.route({
-				url: '/pages/subPage/authentication/authentication'
+				url
 			})
 		}else {
 			uni.$u.route({
@@ -139,7 +144,6 @@
 	}
 	
 	onPullDownRefresh(async ()=>{
-		console.log('没来这？')
 		await getNoticeListFn()
 		await getHousesFn()
 		uni.stopPullDownRefresh()
@@ -183,7 +187,7 @@
 
 	.content {
 		width: 100%;
-		padding: 90rpx 0 100rpx 0;
+		padding: 0rpx 0 100rpx 0;
 
 		.banner1 {
 			width: 100%;
@@ -225,7 +229,8 @@
 				width: 100%;
 				border-radius: 20rpx;
 				border: 2rpx solid #EFEFEF;
-				padding: 40rpx 20rpx 30rpx 30rpx;
+				padding: 40rpx 20rpx 0rpx 30rpx;
+				margin-top: 30rpx;
 
 				.text {
 					font-size: 28rpx;

pages/tabbar/mine/mine.vue

@@ -1,21 +1,27 @@
 <template>
 	<view class="content" :style="{background:'url('+topBgUrl+') #F5F5F5 no-repeat', backgroundSize: '100% 552rpx' }">
+		<avabtnBox/>
 		<view class="padding">
 			<view class="userInfo flex">
 				<view class="avatar">
-					<image :src="avatarUrl" mode="" v-if="avatarUrl"></image>
+					<image :src="avaUrl" mode="" v-if="avaUrl"></image>
+				</view>
+				<view class="userTxt">
+					<view class="" v-if="counterStore.token">
+						<view class="name" > {{ counterStore.userInfo.name }} </view>
+						<view class="phone">{{ counterStore.userInfo.userPhone }}</view>
+					</view>
+					<view class="name" v-else  @click="$goPage('/pages/subPage/login/login')">登录/注册</view>
 				</view>
-				<view class="name" v-if="counterStore.token"> {{ userName?userName:counterStore.userInfo.name }} </view>
-				<view class="name" v-else  @click="$goPage('/pages/subPage/login/login')">登录/注册</view>
-			</view>
 				
+			</view>
 			<view class="card">
 				<view class="li flex-b" v-for="(item,index) in configList" :key="index" @click="$goPage(item.url)">
 					<view class="text">{{ item.text }}</view>
 					<u-icon name="arrow-right"></u-icon>
 				</view>
 				<view class="li flex-b" >
-					<button type="default" open-type="contact" class="cotact">联系客服</button>
+					<button type="default" open-type="contact" class="cotact" ref="avatarRef">联系客服</button>
 					<view class="text">联系客服</view>
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -34,10 +40,12 @@ const {imgUrl} = siteObj
 const topBgUrl = imgUrl + 'minebg.png'
 import { logOut } from '@/config/api.js'
 
+import { getUserInfo } from '@/config/api.js'
+import { onShow } from '@dcloudio/uni-app'
 	import { userStore } from '@/store/index.js';
 	const counterStore = userStore();
 	
-import { ref } from 'vue'
+import { ref,  } from 'vue'
 const configList = ref([
 	{text: '用户协议', url: '/pages/subPage/privacyAgreement/privacyAgreement?type=1'},
 	{text: '隐私政策', url: '/pages/subPage/privacyAgreement/privacyAgreement?type=2'},
@@ -57,29 +65,44 @@ const configList = ref([
 	 });
  }
  
-const userName = ref('')
-const avatarUrl = ref('')
-
-uni.login({
-    provider: 'weixin',
-    success: function (loginRes) {
-        console.log(loginRes.authResult); // 打印登录凭证
-        // 使用登录凭证获取用户信息
-        uni.getUserInfo({
-            provider: 'weixin',
-            success: function (infoRes) {
-                console.log(infoRes.userInfo); // 打印用户信息
-                console.log('用户昵称为: ' + infoRes.userInfo.nickName); // 打印用户昵称
-				userName.value = infoRes.userInfo.nickName
-				avatarUrl.value = infoRes.userInfo.avatarUrl
-				
-                // 在这里，你可以将用户的头像和昵称保存到本地或者发送到后端进行处理
-                // infoRes.userInfo.avatarUrl是用户的头像链接
-                // infoRes.userInfo.nickName是用户的昵称
-            }
-        });
-    }
-});
+ async function getUserInfoFn() {
+	 const {data: res} = await getUserInfo()
+	 counterStore.upDateUseInfo('name', res.userName)
+	 counterStore.upDateUseInfo('userPhone', res.userPhone)
+	 console.log(res)
+ }
+
+ onShow(()=>{
+	 counterStore.upDateUseInfo('name', '')
+	 if(counterStore.token && !counterStore.userInfo.name) {
+		getUserInfoFn()
+	 }
+ })
+
+
+// const userName = ref('')
+
+// uni.login({
+//     provider: 'weixin',
+//     success: function (loginRes) {
+//         console.log(loginRes.authResult); // 打印登录凭证
+//         // 使用登录凭证获取用户信息
+// 		console.log('来这里了吗？')
+//         uni.getUserProfile({
+//             provider: 'weixin',
+//             success: function (infoRes) {
+//                 console.log(infoRes.userInfo); // 打印用户信息
+//                 console.log('用户昵称为: ' + infoRes.userInfo.nickName); // 打印用户昵称
+// 				userName.value = infoRes.userInfo.nickName
+// 				avatarUrl.value = infoRes.userInfo.avatarUrl
+//             },
+// 			fail(err) {
+// 				console.log('失败了吗？')
+// 				console.log(err)
+// 			}
+//         });
+//     }
+// });
 
 </script>
 
@@ -91,7 +114,7 @@ uni.login({
 	}
 	.logOutBtn {
 		position: fixed;
-		bottom: 130rpx;
+		bottom: 90rpx;
 		left: 0;
 		width: 100%;
 		.btn {
@@ -127,6 +150,12 @@ uni.login({
 			font-weight: 700;
 			color: #fff;
 	    }
+		.phone {
+			margin: 10px 0 0 30rpx;
+			font-size: 26rpx;
+			font-weight: 400;
+			color: #fff;
+		}
 	  }
 	
 	  .card {

static/css/app.scss

@@ -44,7 +44,10 @@ view {
 	padding: 0 20px;
 }
 
-
+.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+	}
 	
 	.h1 {
 		font-size: 32rpx;

store/index.js

@@ -6,7 +6,7 @@ const store = createPinia();
 export const userStore = defineStore({
   id: 'userStore',
   state: () => ({
-    token: uni.getStorageSync('token')?uni.getStorageSync('token'):'e5fad81d3dd54ec6a2ecd8e347eb755a',
+    token: uni.getStorageSync('token')?uni.getStorageSync('token'):'',
 	loginInfo: uni.getStorageSync('loginInfo')?uni.getStorageSync('loginInfo'):{},
 	userInfo: {
 		idCard: '',
@@ -18,19 +18,20 @@ export const userStore = defineStore({
 		  "houseTypeName": '',
 		  "communityId": '',
 		  "communityName": '',
-		  "userName": 0,
-		  "idNo": "用户身份证号",
+		  "userName": '',
+		  "idNo": "",
 		  "houseId": '',
-	  }
-	  
+	  },
+	timer: null,
   }),
   actions: {
     upDateToken(token) {
+		console.log('没到storeToken么？')
       this.token = token
+	  console.log(this.token)
 	  uni.setStorageSync('token', token)
     },
 	upDateLoginInfo(info) {
-		console.log('没来这里么？')
 		this.loginInfo = info
 		uni.setStorageSync('loginInfo', info)
 	},
@@ -50,9 +51,20 @@ export const userStore = defineStore({
 		}
 		uni.setStorageSync('token', '')
 		uni.setStorageSync('loginInfo', '')
-		uni.navigateTo({
-			url: '/pages/subPage/login/login'
-		})
+		const pages = getCurrentPages();
+		const page = pages[pages.length - 1].$page.fullPath; //完整路由地址
+		let url = '/pages/subPage/login/login'
+		if(page!= url) {
+			console.log('当前页面')
+			console.log(page)
+			if(this.timer) clearTimeout(this.timer)
+			this.timer = setTimeout(()=>{
+				uni.navigateTo({
+					url: url+'?redirect='+ page
+				})
+				this.timer = null
+			},1000)
+		}
 	}
   },
 });

unpackage/dist/dev/mp-weixin/app.wxss

@@ -3135,6 +3135,10 @@ view {
 .padding {
   padding: 0 20px;
 }
+.status_bar {
+  height: var(--status-bar-height);
+  width: 100%;
+}
 .h1 {
   font-size: 32rpx;
   position: relative;

unpackage/dist/dev/mp-weixin/common/assets.js

@@ -1,9 +1,11 @@
 "use strict";
-const _imports_0$3 = "/static/images/arrRight.png";
-const _imports_0$2 = "/static/images/logo.png";
-const _imports_0$1 = "/static/images/okIcon.png";
+const _imports_0$4 = "/static/images/arrRight.png";
+const _imports_0$3 = "/static/images/logo.png";
+const _imports_0$2 = "/static/images/okIcon.png";
+const _imports_0$1 = "/static/images/nodata.png";
 const _imports_0 = "/static/images/searchIcon.png";
-exports._imports_0 = _imports_0$3;
-exports._imports_0$1 = _imports_0$2;
-exports._imports_0$2 = _imports_0$1;
-exports._imports_0$3 = _imports_0;
+exports._imports_0 = _imports_0$4;
+exports._imports_0$1 = _imports_0$3;
+exports._imports_0$2 = _imports_0$2;
+exports._imports_0$3 = _imports_0$1;
+exports._imports_0$4 = _imports_0;

unpackage/dist/dev/mp-weixin/components/nodata/nodata.js

@@ -0,0 +1,11 @@
+"use strict";
+const common_assets = require("../../common/assets.js");
+const common_vendor = require("../../common/vendor.js");
+const _sfc_main = {};
+function _sfc_render(_ctx, _cache) {
+  return {
+    a: common_assets._imports_0$3
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-abef9dda"], ["__file", "D:/work/xinjiangMiniProgram/components/nodata/nodata.vue"]]);
+wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/components/nodata/nodata.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxml

@@ -0,0 +1 @@
+<view class="noDate data-v-abef9dda"><view class="img data-v-abef9dda"><image class="data-v-abef9dda" src="{{a}}" mode=""></image></view><view class="text data-v-abef9dda"><block wx:if="{{$slots.d}}"><slot></slot></block><block wx:else><text class="data-v-abef9dda">暂无数据</text></block></view></view>

unpackage/dist/dev/mp-weixin/components/nodata/nodata.wxss

@@ -0,0 +1,46 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.noDate.data-v-abef9dda {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-direction: column;
+  padding: 40rpx 0;
+}
+.img.data-v-abef9dda {
+  width: 396rpx;
+  height: 227rpx;
+}
+.img image.data-v-abef9dda {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+.text.data-v-abef9dda {
+  font-size: 26rpx;
+  color: #999;
+  margin-top: 60rpx;
+}

unpackage/dist/dev/mp-weixin/components/searchRow/searchRow.js

@@ -27,7 +27,7 @@ if (!Math) {
 }
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {
-    a: common_assets._imports_0$3,
+    a: common_assets._imports_0$4,
     b: common_vendor.o(($event) => _ctx.$u.debounce($options.searchFn, 1500)),
     c: common_vendor.o(($event) => _ctx.$u.debounce($options.searchFn, 500)),
     d: common_vendor.o($options.clearSearchFn),

unpackage/dist/dev/mp-weixin/config/api.js

@@ -1,7 +1,7 @@
 "use strict";
 const uni_modules_uviewPlus_index = require("../uni_modules/uview-plus/index.js");
 const weixinLogin = (data) => uni_modules_uviewPlus_index.http.post("member/auth/wx_login", data, { custom: { noToken: true } });
-const getAgreement = (params = {}) => uni_modules_uviewPlus_index.http.get("app/student-record/getAgreement", { params });
+const getUserInfo = (data) => uni_modules_uviewPlus_index.http.post("face/user_info");
 const logOut = (data = {}) => uni_modules_uviewPlus_index.http.post("member/auth/logout", data, { custom: { catch: true, toast: false } });
 const getNoticeList = (data) => uni_modules_uviewPlus_index.http.post("article/simple_list", data, { custom: { noToken: true } });
 const getNoticeDetail = (data) => uni_modules_uviewPlus_index.http.post("article/article_detail?articleId=" + data.articleId, { custom: { noToken: true } });
@@ -17,12 +17,12 @@ const mineVotePage = (data) => uni_modules_uviewPlus_index.http.post("article/mi
 const articleVote = (data) => uni_modules_uviewPlus_index.http.post("article/vote", data);
 const voteResult = (data) => uni_modules_uviewPlus_index.http.post("article/vote_result", data);
 exports.articleVote = articleVote;
-exports.getAgreement = getAgreement;
 exports.getFaceResult = getFaceResult;
 exports.getFacetoken = getFacetoken;
 exports.getHouses = getHouses;
 exports.getNoticeDetail = getNoticeDetail;
 exports.getNoticeList = getNoticeList;
+exports.getUserInfo = getUserInfo;
 exports.houseRoom = houseRoom;
 exports.houseRoomBind = houseRoomBind;
 exports.houseTree = houseTree;

unpackage/dist/dev/mp-weixin/config/request.js

@@ -20,7 +20,7 @@ const request = (vm) => {
     let hash = common_vendor.md5(strSecretKey);
     config.header["Signature"] = hash;
     config.data = jsonString;
-    let token = counterStore.token;
+    let token = common_vendor.index.getStorageSync("token");
     if (token) {
       config.header.Authorization = "Bearer " + token;
     }

unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.js

@@ -121,16 +121,21 @@ require("../../../../uni_modules/uview-plus/libs/config/zIndex.js");
 require("../../../../uni_modules/uview-plus/libs/function/platform.js");
 if (!Array) {
   const _easycom_up_tabs2 = common_vendor.resolveComponent("up-tabs");
-  _easycom_up_tabs2();
+  const _easycom_u_loadmore2 = common_vendor.resolveComponent("u-loadmore");
+  const _easycom_nodata2 = common_vendor.resolveComponent("nodata");
+  (_easycom_up_tabs2 + _easycom_u_loadmore2 + _easycom_nodata2)();
 }
 const _easycom_up_tabs = () => "../../../../uni_modules/uview-plus/components/u-tabs/u-tabs.js";
+const _easycom_u_loadmore = () => "../../../../uni_modules/uview-plus/components/u-loadmore/u-loadmore.js";
+const _easycom_nodata = () => "../../../../components/nodata/nodata.js";
 if (!Math) {
-  _easycom_up_tabs();
+  (_easycom_up_tabs + _easycom_u_loadmore + _easycom_nodata)();
 }
 const _sfc_main = {
   __name: "ballotsList",
   setup(__props) {
     const { imgUrl } = config_site_config.obj;
+    let status = common_vendor.ref("loading");
     const tabArr = common_vendor.reactive([
       { name: "投票列表", id: 0 },
       { name: "我的投票", id: 1 }
@@ -175,6 +180,8 @@ const _sfc_main = {
       }
       voteList.value.push(...res.list);
       total.value = res.total;
+      if (voteList.value.length >= total.value)
+        status.value = "nomore";
       console.log(voteList.value);
     }
     votePageFn();
@@ -188,8 +195,13 @@ const _sfc_main = {
       await initList();
       common_vendor.index.stopPullDownRefresh();
     });
+    common_vendor.onReachBottom(() => {
+      if (total.value > voteList.value.length) {
+        votePageFn();
+      }
+    });
     return (_ctx, _cache) => {
-      return {
+      return common_vendor.e({
         a: common_vendor.unref(imgUrl) + "ballots.png",
         b: common_vendor.o(tabClick),
         c: common_vendor.p({
@@ -223,8 +235,15 @@ const _sfc_main = {
             j: common_vendor.t(item.endTime),
             k: index
           });
+        }),
+        f: common_vendor.unref(voteList).length > 30
+      }, common_vendor.unref(voteList).length > 30 ? {
+        g: common_vendor.p({
+          status: common_vendor.unref(status)
         })
-      };
+      } : {}, {
+        h: !common_vendor.unref(voteList).length && common_vendor.unref(status) == "nomore"
+      }, !common_vendor.unref(voteList).length && common_vendor.unref(status) == "nomore" ? {} : {});
     };
   }
 };

unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.json

@@ -3,6 +3,8 @@
   "enablePullDownRefresh": true,
   "backgroundTextStyle": "dark",
   "usingComponents": {
-    "up-tabs": "../../../../uni_modules/uview-plus/components/u-tabs/u-tabs"
+    "up-tabs": "../../../../uni_modules/uview-plus/components/u-tabs/u-tabs",
+    "u-loadmore": "../../../../uni_modules/uview-plus/components/u-loadmore/u-loadmore",
+    "nodata": "../../../../components/nodata/nodata"
   }
 }

unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxml

@@ -1 +1 @@
-<view class="content padding data-v-747012e4"><view class="banner data-v-747012e4"><image class="data-v-747012e4" src="{{a}}" mode=""></image></view><view class="tabs data-v-747012e4"><up-tabs wx:if="{{c}}" class="data-v-747012e4" bindclick="{{b}}" u-i="747012e4-0" bind:__l="__l" u-p="{{c}}"></up-tabs></view><view class="tags data-v-747012e4"><view wx:for="{{d}}" wx:for-item="item" wx:key="b" class="{{['tag', 'data-v-747012e4', item.c && 'active']}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="ul data-v-747012e4"><view wx:for="{{e}}" wx:for-item="item" wx:key="k" class="li data-v-747012e4"><view class="flex-b data-v-747012e4"><view class="name towRowText data-v-747012e4">{{item.a}}</view><view wx:if="{{item.b}}" class="btn boder data-v-747012e4" bindtap="{{item.c}}">查看结果</view><view wx:elif="{{item.d}}" class="btn data-v-747012e4" style="opacity:0.4">未开始</view><view wx:elif="{{item.e}}" class="btn data-v-747012e4" bindtap="{{item.f}}">我要投票</view><view wx:elif="{{item.g}}" class="btn data-v-747012e4" bindtap="{{item.h}}" style="opacity:0.4">已结束</view></view><view class="text data-v-747012e4"><text class="data-v-747012e4">发起人：{{item.i}}</text><text class="data-v-747012e4">截止时间：{{item.j}}</text></view></view></view></view>
+<view class="content padding data-v-747012e4"><view class="banner data-v-747012e4"><image class="data-v-747012e4" src="{{a}}" mode=""></image></view><view class="tabs data-v-747012e4"><up-tabs wx:if="{{c}}" class="data-v-747012e4" bindclick="{{b}}" u-i="747012e4-0" bind:__l="__l" u-p="{{c}}"></up-tabs></view><view class="tags data-v-747012e4"><view wx:for="{{d}}" wx:for-item="item" wx:key="b" class="{{['tag', 'data-v-747012e4', item.c && 'active']}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="ul data-v-747012e4"><view wx:for="{{e}}" wx:for-item="item" wx:key="k" class="li data-v-747012e4"><view class="flex-b data-v-747012e4"><view class="name towRowText data-v-747012e4">{{item.a}}</view><view wx:if="{{item.b}}" class="btn boder data-v-747012e4" bindtap="{{item.c}}">查看结果</view><view wx:elif="{{item.d}}" class="btn data-v-747012e4" style="opacity:0.4">未开始</view><view wx:elif="{{item.e}}" class="btn data-v-747012e4" bindtap="{{item.f}}">我要投票</view><view wx:elif="{{item.g}}" class="btn data-v-747012e4" bindtap="{{item.h}}" style="opacity:0.4">已结束</view></view><view class="text data-v-747012e4"><text class="data-v-747012e4">发起人：{{item.i}}</text><text class="data-v-747012e4">截止时间：{{item.j}}</text></view></view></view><view wx:if="{{f}}" class="data-v-747012e4" style="padding-bottom:20rpx"><u-loadmore wx:if="{{g}}" class="data-v-747012e4" u-i="747012e4-1" bind:__l="__l" u-p="{{g}}"/></view><nodata wx:if="{{h}}" class="data-v-747012e4" u-s="{{['d']}}" u-i="747012e4-2" bind:__l="__l">暂无投票信息~</nodata></view>

unpackage/dist/dev/mp-weixin/pages/subPage/ballots/ballotsList/ballotsList.wxss

@@ -49,7 +49,7 @@ image.data-v-747012e4 {
   border-radius: 25rpx;
   border: 1px solid #F4F4F4;
   line-height: 50rpx;
-  padding: 0 14rpx;
+  padding: 0 20rpx;
   font-size: 24rpx;
   margin-right: 30rpx;
 }

unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/comp/topInfo.wxml

@@ -1 +1 @@
-<view class="topInfo data-v-248fb919"><view class="bg padding data-v-248fb919"><up-navbar wx:if="{{a}}" class="data-v-248fb919" u-i="248fb919-0" bind:__l="__l" u-p="{{a}}"></up-navbar><view class="tit data-v-248fb919">{{b}}</view><view class="textCon data-v-248fb919"><view class="p data-v-248fb919"><view class="txt data-v-248fb919">发起人：{{c}}</view><view class="txt data-v-248fb919">创建时间：{{d}}</view><view class="txt data-v-248fb919">截止时间：{{e}}</view></view><view wx:if="{{f}}" class="status data-v-248fb919" style="opacity:0.4">未开始</view><view wx:if="{{g}}" class="status data-v-248fb919">我要投票</view><view wx:if="{{h}}" class="status data-v-248fb919" style="opacity:0.4">已结束</view></view></view><view class="detail padding data-v-248fb919">{{i}}</view><view class="padding data-v-248fb919"><view class="row flex-b data-v-248fb919"><view class="flex data-v-248fb919"><view class="radionItem data-v-248fb919">{{j}}</view></view><view class="checkboxs data-v-248fb919"><text class="data-v-248fb919">{{k}}</text></view></view></view></view>
+<view class="topInfo data-v-248fb919"><view class="bg padding data-v-248fb919"><view class="status_bar data-v-248fb919"></view><up-navbar wx:if="{{a}}" class="data-v-248fb919" u-i="248fb919-0" bind:__l="__l" u-p="{{a}}"></up-navbar><view class="tit data-v-248fb919">{{b}}</view><view class="textCon data-v-248fb919"><view class="p data-v-248fb919"><view class="txt data-v-248fb919">发起人：{{c}}</view><view class="txt data-v-248fb919">创建时间：{{d}}</view><view class="txt data-v-248fb919">截止时间：{{e}}</view></view><view wx:if="{{f}}" class="status data-v-248fb919" style="opacity:0.4">未开始</view><view wx:if="{{g}}" class="status data-v-248fb919">我要投票</view><view wx:if="{{h}}" class="status data-v-248fb919" style="opacity:0.4">已结束</view></view></view><view class="detail padding data-v-248fb919">{{i}}</view><view class="padding data-v-248fb919"><view class="row flex-b data-v-248fb919"><view class="flex data-v-248fb919"><view class="radionItem data-v-248fb919">{{j}}</view></view><view class="checkboxs data-v-248fb919"><text class="data-v-248fb919">{{k}}</text></view></view></view></view>

unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxss

@@ -29,7 +29,7 @@
 .content .bg.data-v-49022e38 {
   width: 100%;
   background: linear-gradient(0deg, #ffffff 0%, #FFD4D3 100%);
-  padding: 90rpx 20rpx 20rpx 20rpx;
+  padding: 120rpx 20rpx 20rpx 20rpx;
 }
 .content .bg .tit.data-v-49022e38 {
   font-size: 36rpx;

unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.wxss

@@ -29,7 +29,7 @@
 .content .bg.data-v-9c438604 {
   width: 100%;
   background: linear-gradient(0deg, #ffffff 0%, #FFD4D3 100%);
-  padding: 90rpx 20rpx 20rpx 20rpx;
+  padding: 120rpx 20rpx 20rpx 20rpx;
 }
 .content .bg .tit.data-v-9c438604 {
   font-size: 36rpx;

unpackage/dist/dev/mp-weixin/pages/subPage/login/login.js

@@ -168,15 +168,11 @@ const _sfc_main = {
       if (!isCheck.value)
         return uni_modules_uviewPlus_libs_function_index.toast("请勾选产品协议与隐私政策");
       let phoneCode = e.detail.code;
-      console.log("来到这里了吗？");
-      console.log(phoneCode);
       console.log(e.detail.errMsg);
       console.log(e.detail);
       const loginCode = await loginFn();
       if (!loginCode || !phoneCode)
         return;
-      console.log("登录验证码");
-      console.log(loginCode);
       let obj = {
         phoneCode,
         socialCode: loginCode
@@ -184,16 +180,15 @@ const _sfc_main = {
       const {
         data: res
       } = await config_api.weixinLogin(obj);
-      console.log(res);
       const counterStore = store_index.userStore();
-      console.log("什么都没有？");
-      console.log(counterStore);
-      console.log(counterStore.upDateLoginInfo);
-      counterStore.upDateLoginInfo(res);
-      counterStore.upDateToken(res.accessToken);
-      common_vendor.index.switchTab({
-        url: "/pages/tabbar/index/index"
-      });
+      await counterStore.upDateToken(res.accessToken);
+      await counterStore.upDateLoginInfo(res);
+      common_vendor.index.$u.toast("登录成功");
+      setTimeout(() => {
+        common_vendor.index.switchTab({
+          url: "/pages/tabbar/index/index"
+        });
+      }, 2e3);
     }
     return (_ctx, _cache) => {
       return common_vendor.e({

unpackage/dist/dev/mp-weixin/pages/subPage/notice/notice.js

@@ -118,13 +118,21 @@ require("../../../uni_modules/uview-plus/libs/config/props/transition.js");
 require("../../../uni_modules/uview-plus/libs/config/props/upload.js");
 require("../../../uni_modules/uview-plus/libs/config/zIndex.js");
 require("../../../uni_modules/uview-plus/libs/function/platform.js");
+if (!Array) {
+  const _easycom_u_loadmore2 = common_vendor.resolveComponent("u-loadmore");
+  const _easycom_nodata2 = common_vendor.resolveComponent("nodata");
+  (_easycom_u_loadmore2 + _easycom_nodata2)();
+}
+const _easycom_u_loadmore = () => "../../../uni_modules/uview-plus/components/u-loadmore/u-loadmore.js";
+const _easycom_nodata = () => "../../../components/nodata/nodata.js";
 if (!Math) {
-  notice();
+  (notice + _easycom_u_loadmore + _easycom_nodata)();
 }
 const notice = () => "../../tabbar/index/comp/notice.js";
 const _sfc_main = {
   __name: "notice",
   setup(__props) {
+    let status = common_vendor.ref("loading");
     let params = common_vendor.ref({
       "pageNo": 1,
       "pageSize": 30
@@ -135,6 +143,8 @@ const _sfc_main = {
       const { data: res } = await config_api.getNoticeList(params.value);
       noticeList.value.push(...res.list);
       total.value = res.total;
+      if (noticeList.value.length >= total.value)
+        status.value = "nomore";
       console.log(res);
     }
     getNoticeListFn();
@@ -153,11 +163,18 @@ const _sfc_main = {
       }
     });
     return (_ctx, _cache) => {
-      return {
+      return common_vendor.e({
         a: common_vendor.p({
           list: common_vendor.unref(noticeList)
+        }),
+        b: common_vendor.unref(noticeList).length > 0
+      }, common_vendor.unref(noticeList).length > 0 ? {
+        c: common_vendor.p({
+          status: common_vendor.unref(status)
         })
-      };
+      } : {}, {
+        d: !common_vendor.unref(noticeList).length && common_vendor.unref(status) == "nomore"
+      }, !common_vendor.unref(noticeList).length && common_vendor.unref(status) == "nomore" ? {} : {});
     };
   }
 };

unpackage/dist/dev/mp-weixin/pages/subPage/notice/notice.json

@@ -3,6 +3,8 @@
   "enablePullDownRefresh": true,
   "backgroundTextStyle": "dark",
   "usingComponents": {
+    "u-loadmore": "../../../uni_modules/uview-plus/components/u-loadmore/u-loadmore",
+    "nodata": "../../../components/nodata/nodata",
     "notice": "../../tabbar/index/comp/notice"
   }
 }

unpackage/dist/dev/mp-weixin/pages/subPage/notice/notice.wxml

@@ -1 +1 @@
-<view class="content data-v-f812fd22"><view class="padding data-v-f812fd22"><notice wx:if="{{a}}" class="data-v-f812fd22" u-i="f812fd22-0" bind:__l="__l" u-p="{{a}}"/></view></view>
+<view class="content data-v-f812fd22"><view class="padding data-v-f812fd22"><notice wx:if="{{a}}" class="data-v-f812fd22" u-i="f812fd22-0" bind:__l="__l" u-p="{{a}}"/><view wx:if="{{b}}" class="data-v-f812fd22" style="padding-bottom:20rpx"><u-loadmore wx:if="{{c}}" class="data-v-f812fd22" u-i="f812fd22-1" bind:__l="__l" u-p="{{c}}"/></view><nodata wx:if="{{d}}" class="data-v-f812fd22" u-s="{{['d']}}" u-i="f812fd22-2" bind:__l="__l">暂无投票信息~</nodata></view></view>

unpackage/dist/dev/mp-weixin/pages/subPage/privacyAgreement/privacyAgreement.js

@@ -1,123 +1,5 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
-const config_api = require("../../../config/api.js");
-require("../../../uni_modules/uview-plus/index.js");
-require("../../../uni_modules/uview-plus/libs/mixin/mixin.js");
-require("../../../uni_modules/uview-plus/libs/vue.js");
-require("../../../uni_modules/uview-plus/libs/function/index.js");
-require("../../../uni_modules/uview-plus/libs/function/test.js");
-require("../../../uni_modules/uview-plus/libs/function/digit.js");
-require("../../../uni_modules/uview-plus/libs/config/config.js");
-require("../../../uni_modules/uview-plus/libs/util/route.js");
-require("../../../uni_modules/uview-plus/libs/mixin/mpMixin.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/core/Request.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/core/dispatchRequest.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/adapters/index.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/helpers/buildURL.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/utils.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/core/buildFullPath.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/helpers/isAbsoluteURL.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/helpers/combineURLs.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/core/settle.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/core/InterceptorManager.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/core/mergeConfig.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/core/defaults.js");
-require("../../../uni_modules/uview-plus/libs/luch-request/utils/clone.js");
-require("../../../uni_modules/uview-plus/libs/function/colorGradient.js");
-require("../../../uni_modules/uview-plus/libs/function/debounce.js");
-require("../../../uni_modules/uview-plus/libs/function/throttle.js");
-require("../../../uni_modules/uview-plus/libs/config/props.js");
-require("../../../uni_modules/uview-plus/libs/config/props/actionSheet.js");
-require("../../../uni_modules/uview-plus/libs/config/props/album.js");
-require("../../../uni_modules/uview-plus/libs/config/props/alert.js");
-require("../../../uni_modules/uview-plus/libs/config/props/avatar.js");
-require("../../../uni_modules/uview-plus/libs/config/props/avatarGroup.js");
-require("../../../uni_modules/uview-plus/libs/config/props/backtop.js");
-require("../../../uni_modules/uview-plus/libs/config/props/badge.js");
-require("../../../uni_modules/uview-plus/libs/config/props/button.js");
-require("../../../uni_modules/uview-plus/libs/config/props/calendar.js");
-require("../../../uni_modules/uview-plus/libs/config/props/carKeyboard.js");
-require("../../../uni_modules/uview-plus/libs/config/props/cell.js");
-require("../../../uni_modules/uview-plus/libs/config/props/cellGroup.js");
-require("../../../uni_modules/uview-plus/libs/config/props/checkbox.js");
-require("../../../uni_modules/uview-plus/libs/config/props/checkboxGroup.js");
-require("../../../uni_modules/uview-plus/libs/config/props/circleProgress.js");
-require("../../../uni_modules/uview-plus/libs/config/props/code.js");
-require("../../../uni_modules/uview-plus/libs/config/props/codeInput.js");
-require("../../../uni_modules/uview-plus/libs/config/props/col.js");
-require("../../../uni_modules/uview-plus/libs/config/props/collapse.js");
-require("../../../uni_modules/uview-plus/libs/config/props/collapseItem.js");
-require("../../../uni_modules/uview-plus/libs/config/props/columnNotice.js");
-require("../../../uni_modules/uview-plus/libs/config/props/countDown.js");
-require("../../../uni_modules/uview-plus/libs/config/props/countTo.js");
-require("../../../uni_modules/uview-plus/libs/config/props/datetimePicker.js");
-require("../../../uni_modules/uview-plus/libs/config/props/divider.js");
-require("../../../uni_modules/uview-plus/libs/config/props/empty.js");
-require("../../../uni_modules/uview-plus/libs/config/props/form.js");
-require("../../../uni_modules/uview-plus/libs/config/props/formItem.js");
-require("../../../uni_modules/uview-plus/libs/config/props/gap.js");
-require("../../../uni_modules/uview-plus/libs/config/props/grid.js");
-require("../../../uni_modules/uview-plus/libs/config/props/gridItem.js");
-require("../../../uni_modules/uview-plus/libs/config/props/icon.js");
-require("../../../uni_modules/uview-plus/libs/config/props/image.js");
-require("../../../uni_modules/uview-plus/libs/config/props/indexAnchor.js");
-require("../../../uni_modules/uview-plus/libs/config/props/indexList.js");
-require("../../../uni_modules/uview-plus/libs/config/props/input.js");
-require("../../../uni_modules/uview-plus/libs/config/props/keyboard.js");
-require("../../../uni_modules/uview-plus/libs/config/props/line.js");
-require("../../../uni_modules/uview-plus/libs/config/props/lineProgress.js");
-require("../../../uni_modules/uview-plus/libs/config/props/link.js");
-require("../../../uni_modules/uview-plus/libs/config/props/list.js");
-require("../../../uni_modules/uview-plus/libs/config/props/listItem.js");
-require("../../../uni_modules/uview-plus/libs/config/props/loadingIcon.js");
-require("../../../uni_modules/uview-plus/libs/config/props/loadingPage.js");
-require("../../../uni_modules/uview-plus/libs/config/props/loadmore.js");
-require("../../../uni_modules/uview-plus/libs/config/props/modal.js");
-require("../../../uni_modules/uview-plus/libs/config/props/navbar.js");
-require("../../../uni_modules/uview-plus/libs/config/color.js");
-require("../../../uni_modules/uview-plus/libs/config/props/noNetwork.js");
-require("../../../uni_modules/uview-plus/libs/config/props/noticeBar.js");
-require("../../../uni_modules/uview-plus/libs/config/props/notify.js");
-require("../../../uni_modules/uview-plus/libs/config/props/numberBox.js");
-require("../../../uni_modules/uview-plus/libs/config/props/numberKeyboard.js");
-require("../../../uni_modules/uview-plus/libs/config/props/overlay.js");
-require("../../../uni_modules/uview-plus/libs/config/props/parse.js");
-require("../../../uni_modules/uview-plus/libs/config/props/picker.js");
-require("../../../uni_modules/uview-plus/libs/config/props/popup.js");
-require("../../../uni_modules/uview-plus/libs/config/props/radio.js");
-require("../../../uni_modules/uview-plus/libs/config/props/radioGroup.js");
-require("../../../uni_modules/uview-plus/libs/config/props/rate.js");
-require("../../../uni_modules/uview-plus/libs/config/props/readMore.js");
-require("../../../uni_modules/uview-plus/libs/config/props/row.js");
-require("../../../uni_modules/uview-plus/libs/config/props/rowNotice.js");
-require("../../../uni_modules/uview-plus/libs/config/props/scrollList.js");
-require("../../../uni_modules/uview-plus/libs/config/props/search.js");
-require("../../../uni_modules/uview-plus/libs/config/props/section.js");
-require("../../../uni_modules/uview-plus/libs/config/props/skeleton.js");
-require("../../../uni_modules/uview-plus/libs/config/props/slider.js");
-require("../../../uni_modules/uview-plus/libs/config/props/statusBar.js");
-require("../../../uni_modules/uview-plus/libs/config/props/steps.js");
-require("../../../uni_modules/uview-plus/libs/config/props/stepsItem.js");
-require("../../../uni_modules/uview-plus/libs/config/props/sticky.js");
-require("../../../uni_modules/uview-plus/libs/config/props/subsection.js");
-require("../../../uni_modules/uview-plus/libs/config/props/swipeAction.js");
-require("../../../uni_modules/uview-plus/libs/config/props/swipeActionItem.js");
-require("../../../uni_modules/uview-plus/libs/config/props/swiper.js");
-require("../../../uni_modules/uview-plus/libs/config/props/swipterIndicator.js");
-require("../../../uni_modules/uview-plus/libs/config/props/switch.js");
-require("../../../uni_modules/uview-plus/libs/config/props/tabbar.js");
-require("../../../uni_modules/uview-plus/libs/config/props/tabbarItem.js");
-require("../../../uni_modules/uview-plus/libs/config/props/tabs.js");
-require("../../../uni_modules/uview-plus/libs/config/props/tag.js");
-require("../../../uni_modules/uview-plus/libs/config/props/text.js");
-require("../../../uni_modules/uview-plus/libs/config/props/textarea.js");
-require("../../../uni_modules/uview-plus/libs/config/props/toast.js");
-require("../../../uni_modules/uview-plus/libs/config/props/toolbar.js");
-require("../../../uni_modules/uview-plus/libs/config/props/tooltip.js");
-require("../../../uni_modules/uview-plus/libs/config/props/transition.js");
-require("../../../uni_modules/uview-plus/libs/config/props/upload.js");
-require("../../../uni_modules/uview-plus/libs/config/zIndex.js");
-require("../../../uni_modules/uview-plus/libs/function/platform.js");
 const _sfc_main = {
   data() {
     return {
@@ -140,11 +22,10 @@ const _sfc_main = {
   },
   methods: {
     async getAgreementFn() {
-      const { data: res } = await config_api.getAgreement();
       if (this.type == 1) {
-        this.url = res.privacyAgreementUrl;
+        this.url = "http://www.jakjgs.com/htmls/yszc.html";
       } else {
-        this.url = res.useAgreementUrl;
+        this.url = "http://www.jakjgs.com/htmls/yhxy.html";
       }
     }
   }

unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.js

@@ -166,12 +166,20 @@ const _sfc_main = {
       myHouse.value = res;
       counterStore.upDateUseInfo("name", res.userName);
     }
-    function goHome() {
+    function goHome(url) {
+      common_vendor.index.requestSubscribeMessage({
+        tmplIds: ["OH_1gceM-m3EXRKOtjl_Hb1ymyC5zw8_Ag6LaFXV4Do", "AjD_oLafmKGO8X3YvDGl1qmITq_Q6bSFMDeygJNAIes"],
+        success(res) {
+          console.log("订阅成功: ", res);
+        },
+        fail(err) {
+          console.log("订阅失败：", err);
+        }
+      });
       let token = counterStore.token;
-      console.log("eee" + token);
       if (token) {
         common_vendor.index.$u.route({
-          url: "/pages/subPage/authentication/authentication"
+          url
         });
       } else {
         common_vendor.index.$u.route({
@@ -180,7 +188,6 @@ const _sfc_main = {
       }
     }
     common_vendor.onPullDownRefresh(async () => {
-      console.log("没来这？");
       await getNoticeListFn();
       await getHousesFn();
       common_vendor.index.stopPullDownRefresh();
@@ -195,10 +202,11 @@ const _sfc_main = {
           leftText: " ",
           title: "事务通",
           safeAreaInsetTop: false,
-          autoBack: false
+          autoBack: false,
+          fixed: false
         }),
         b: common_vendor.unref(imgUrl) + "homebanner.png",
-        c: common_vendor.o(goHome),
+        c: common_vendor.o(($event) => goHome("/pages/subPage/authentication/authentication")),
         d: !common_vendor.unref(counterStore).token
       }, !common_vendor.unref(counterStore).token ? {
         e: common_vendor.p({
@@ -219,7 +227,7 @@ const _sfc_main = {
         j: common_vendor.unref(imgUrl) + "homebanner3.png"
       } : {}, {
         k: common_vendor.unref(imgUrl) + "homebanner2.png",
-        l: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/ballots/ballotsList/ballotsList")),
+        l: common_vendor.o(($event) => goHome("/pages/subPage/ballots/ballotsList/ballotsList")),
         m: common_assets._imports_0,
         n: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/notice/notice")),
         o: common_vendor.p({

unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.wxml

@@ -1 +1 @@
-<view class="content data-v-184b8d5d"><up-navbar wx:if="{{a}}" class="data-v-184b8d5d" u-s="{{['left']}}" u-i="184b8d5d-0" bind:__l="__l" u-p="{{a}}"><view class=" data-v-184b8d5d" slot="left"></view></up-navbar><view class="padding data-v-184b8d5d"><view class="banner1 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{b}}" mode=""></image></view><view class="myhome data-v-184b8d5d"><view class="flex-b data-v-184b8d5d"><view class="h2 data-v-184b8d5d">我的房屋</view><view class="btn data-v-184b8d5d" bindtap="{{c}}">关联房屋</view></view><view wx:if="{{d}}" class="borderCard data-v-184b8d5d" bindtap="{{g}}"><view class="flex data-v-184b8d5d"><view class="text2 data-v-184b8d5d">立即登录</view><u-icon wx:if="{{e}}" class="data-v-184b8d5d" u-i="184b8d5d-1" bind:__l="__l" u-p="{{e}}"></u-icon></view><view class="text3 data-v-184b8d5d">登录成功即可关联房屋~</view><view class="banner3 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{f}}" mode=""></image></view></view><view wx:if="{{h}}" class="borderCard data-v-184b8d5d"><view wx:for="{{i}}" wx:for-item="item" wx:key="c" class=" data-v-184b8d5d"><view class="text data-v-184b8d5d">房屋地址：{{item.a}}</view><view class="text data-v-184b8d5d">房屋面积：{{item.b}}</view></view><view class="banner3 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{j}}" mode=""></image></view></view></view><view class="severCon data-v-184b8d5d"><view class="h1pad data-v-184b8d5d"><view class="h1 data-v-184b8d5d">服务</view></view><view class="banner2 data-v-184b8d5d" bindtap="{{l}}"><image class="data-v-184b8d5d" src="{{k}}" mode=""></image></view></view><view class="noticeCon data-v-184b8d5d"><view class="h1pad flex-b data-v-184b8d5d"><view class="h1 data-v-184b8d5d">公示公告</view><view class="more data-v-184b8d5d" bindtap="{{n}}"><view class="txt data-v-184b8d5d">更多</view><view class="icon data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{m}}" mode=""></image></view></view></view><notice wx:if="{{o}}" class="data-v-184b8d5d" u-i="184b8d5d-2" bind:__l="__l" u-p="{{o}}"/></view></view><up-popup wx:if="{{s}}" class="data-v-184b8d5d" u-s="{{['d']}}" bindclose="{{r}}" u-i="184b8d5d-3" bind:__l="__l" u-p="{{s}}"><view class="popCon data-v-184b8d5d"><view class="hello data-v-184b8d5d">你好：</view><view class="p data-v-184b8d5d"> 欢迎来到 <text class="data-v-184b8d5d">“新疆首付公馆”</text>，为了更好的为您提供服务，请您选择房屋信息，进行业主身份认证。 </view><one-btn wx:if="{{q}}" class="data-v-184b8d5d" bindclick="{{p}}" u-i="184b8d5d-4,184b8d5d-3" bind:__l="__l" u-p="{{q}}"></one-btn></view></up-popup></view>
+<view class="content data-v-184b8d5d"><view class="status_bar data-v-184b8d5d"></view><up-navbar wx:if="{{a}}" class="data-v-184b8d5d" u-s="{{['left']}}" u-i="184b8d5d-0" bind:__l="__l" u-p="{{a}}"><view class=" data-v-184b8d5d" slot="left"></view></up-navbar><view class="padding data-v-184b8d5d"><view class="banner1 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{b}}" mode=""></image></view><view class="myhome data-v-184b8d5d"><view class="flex-b data-v-184b8d5d"><view class="h2 data-v-184b8d5d">我的房屋</view><view class="btn data-v-184b8d5d" bindtap="{{c}}">关联房屋</view></view><view wx:if="{{d}}" class="borderCard data-v-184b8d5d" bindtap="{{g}}"><view class="flex data-v-184b8d5d"><view class="text2 data-v-184b8d5d">立即登录</view><u-icon wx:if="{{e}}" class="data-v-184b8d5d" u-i="184b8d5d-1" bind:__l="__l" u-p="{{e}}"></u-icon></view><view class="text3 data-v-184b8d5d">登录成功即可关联房屋~</view><view class="banner3 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{f}}" mode=""></image></view></view><view wx:if="{{h}}" class="borderCard data-v-184b8d5d"><view wx:for="{{i}}" wx:for-item="item" wx:key="c" class=" data-v-184b8d5d"><view class="text data-v-184b8d5d">房屋地址：{{item.a}}</view><view class="text data-v-184b8d5d">房屋面积：{{item.b}}</view></view><view class="banner3 data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{j}}" mode=""></image></view></view></view><view class="severCon data-v-184b8d5d"><view class="h1pad data-v-184b8d5d"><view class="h1 data-v-184b8d5d">服务</view></view><view class="banner2 data-v-184b8d5d" bindtap="{{l}}"><image class="data-v-184b8d5d" src="{{k}}" mode=""></image></view></view><view class="noticeCon data-v-184b8d5d"><view class="h1pad flex-b data-v-184b8d5d"><view class="h1 data-v-184b8d5d">公示公告</view><view class="more data-v-184b8d5d" bindtap="{{n}}"><view class="txt data-v-184b8d5d">更多</view><view class="icon data-v-184b8d5d"><image class="data-v-184b8d5d" src="{{m}}" mode=""></image></view></view></view><notice wx:if="{{o}}" class="data-v-184b8d5d" u-i="184b8d5d-2" bind:__l="__l" u-p="{{o}}"/></view></view><up-popup wx:if="{{s}}" class="data-v-184b8d5d" u-s="{{['d']}}" bindclose="{{r}}" u-i="184b8d5d-3" bind:__l="__l" u-p="{{s}}"><view class="popCon data-v-184b8d5d"><view class="hello data-v-184b8d5d">你好：</view><view class="p data-v-184b8d5d"> 欢迎来到 <text class="data-v-184b8d5d">“新疆首付公馆”</text>，为了更好的为您提供服务，请您选择房屋信息，进行业主身份认证。 </view><one-btn wx:if="{{q}}" class="data-v-184b8d5d" bindclick="{{p}}" u-i="184b8d5d-4,184b8d5d-3" bind:__l="__l" u-p="{{q}}"></one-btn></view></up-popup></view>

unpackage/dist/dev/mp-weixin/pages/tabbar/index/index.wxss

@@ -48,7 +48,7 @@ image.data-v-184b8d5d {
 }
 .content.data-v-184b8d5d {
   width: 100%;
-  padding: 90rpx 0 100rpx 0;
+  padding: 0rpx 0 100rpx 0;
 }
 .content .banner1.data-v-184b8d5d {
   width: 100%;
@@ -85,7 +85,8 @@ image.data-v-184b8d5d {
   width: 100%;
   border-radius: 20rpx;
   border: 2rpx solid #EFEFEF;
-  padding: 40rpx 20rpx 30rpx 30rpx;
+  padding: 40rpx 20rpx 0rpx 30rpx;
+  margin-top: 30rpx;
 }
 .content .myhome .borderCard .text.data-v-184b8d5d {
   font-size: 28rpx;

unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.js

@@ -121,8 +121,9 @@ require("../../../uni_modules/uview-plus/libs/config/props/upload.js");
 require("../../../uni_modules/uview-plus/libs/config/zIndex.js");
 require("../../../uni_modules/uview-plus/libs/function/platform.js");
 if (!Array) {
+  const _component_avabtnBox = common_vendor.resolveComponent("avabtnBox");
   const _easycom_u_icon2 = common_vendor.resolveComponent("u-icon");
-  _easycom_u_icon2();
+  (_component_avabtnBox + _easycom_u_icon2)();
 }
 const _easycom_u_icon = () => "../../../uni_modules/uview-plus/components/u-icon/u-icon.js";
 if (!Math) {
@@ -151,54 +152,50 @@ const _sfc_main = {
         }
       });
     }
-    const userName = common_vendor.ref("");
-    const avatarUrl = common_vendor.ref("");
-    common_vendor.index.login({
-      provider: "weixin",
-      success: function(loginRes) {
-        console.log(loginRes.authResult);
-        common_vendor.index.getUserInfo({
-          provider: "weixin",
-          success: function(infoRes) {
-            console.log(infoRes.userInfo);
-            console.log("用户昵称为: " + infoRes.userInfo.nickName);
-            userName.value = infoRes.userInfo.nickName;
-            avatarUrl.value = infoRes.userInfo.avatarUrl;
-          }
-        });
+    async function getUserInfoFn() {
+      const { data: res } = await config_api.getUserInfo();
+      counterStore.upDateUseInfo("name", res.userName);
+      counterStore.upDateUseInfo("userPhone", res.userPhone);
+      console.log(res);
+    }
+    common_vendor.onShow(() => {
+      counterStore.upDateUseInfo("name", "");
+      if (counterStore.token && !counterStore.userInfo.name) {
+        getUserInfoFn();
       }
     });
     return (_ctx, _cache) => {
       return common_vendor.e({
-        a: avatarUrl.value
-      }, avatarUrl.value ? {
-        b: avatarUrl.value
+        a: _ctx.avaUrl
+      }, _ctx.avaUrl ? {
+        b: _ctx.avaUrl
       } : {}, {
         c: common_vendor.unref(counterStore).token
       }, common_vendor.unref(counterStore).token ? {
-        d: common_vendor.t(userName.value ? userName.value : common_vendor.unref(counterStore).userInfo.name)
+        d: common_vendor.t(common_vendor.unref(counterStore).userInfo.name),
+        e: common_vendor.t(common_vendor.unref(counterStore).userInfo.userPhone)
       } : {
-        e: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/login/login"))
+        f: common_vendor.o(($event) => _ctx.$goPage("/pages/subPage/login/login"))
       }, {
-        f: common_vendor.f(configList.value, (item, index, i0) => {
+        g: common_vendor.f(configList.value, (item, index, i0) => {
           return {
             a: common_vendor.t(item.text),
-            b: "23ed4277-0-" + i0,
+            b: "23ed4277-1-" + i0,
             c: index,
             d: common_vendor.o(($event) => _ctx.$goPage(item.url), index)
           };
         }),
-        g: common_vendor.p({
+        h: common_vendor.p({
           name: "arrow-right"
         }),
-        h: common_vendor.p({
+        i: common_vendor.p({
           name: "arrow-right"
         }),
-        i: common_vendor.unref(counterStore).token
+        j: common_vendor.unref(counterStore).token
       }, common_vendor.unref(counterStore).token ? {
-        j: common_vendor.o(logOutFn)
+        k: common_vendor.o(logOutFn)
       } : {}, {
-        k: "url(" + topBgUrl + ") #F5F5F5 no-repeat"
+        l: "url(" + topBgUrl + ") #F5F5F5 no-repeat"
       });
     };
   }

unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxml

@@ -1 +1 @@
-<view class="content data-v-23ed4277" style="{{'background:' + k + ';' + ('background-size:' + '100% 552rpx')}}"><view class="padding data-v-23ed4277"><view class="userInfo flex data-v-23ed4277"><view class="avatar data-v-23ed4277"><image wx:if="{{a}}" class="data-v-23ed4277" src="{{b}}" mode=""></image></view><view wx:if="{{c}}" class="name data-v-23ed4277">{{d}}</view><view wx:else class="name data-v-23ed4277" bindtap="{{e}}">登录/注册</view></view><view class="card data-v-23ed4277"><view wx:for="{{f}}" wx:for-item="item" wx:key="c" class="li flex-b data-v-23ed4277" bindtap="{{item.d}}"><view class="text data-v-23ed4277">{{item.a}}</view><u-icon wx:if="{{g}}" class="data-v-23ed4277" u-i="{{item.b}}" bind:__l="__l" u-p="{{g}}"></u-icon></view><view class="li flex-b data-v-23ed4277"><button type="default" open-type="contact" class="cotact data-v-23ed4277">联系客服</button><view class="text data-v-23ed4277">联系客服</view><u-icon wx:if="{{h}}" class="data-v-23ed4277" u-i="23ed4277-1" bind:__l="__l" u-p="{{h}}"></u-icon></view></view></view><view wx:if="{{i}}" class="logOutBtn padding data-v-23ed4277"><view class="btn data-v-23ed4277" bindtap="{{j}}">退出登录</view></view></view>
+<view class="content data-v-23ed4277" style="{{'background:' + l + ';' + ('background-size:' + '100% 552rpx')}}"><avabtn-box class="data-v-23ed4277" u-i="23ed4277-0" bind:__l="__l"/><view class="padding data-v-23ed4277"><view class="userInfo flex data-v-23ed4277"><view class="avatar data-v-23ed4277"><image wx:if="{{a}}" class="data-v-23ed4277" src="{{b}}" mode=""></image></view><view class="userTxt data-v-23ed4277"><view wx:if="{{c}}" class=" data-v-23ed4277"><view class="name data-v-23ed4277">{{d}}</view><view class="phone data-v-23ed4277">{{e}}</view></view><view wx:else class="name data-v-23ed4277" bindtap="{{f}}">登录/注册</view></view></view><view class="card data-v-23ed4277"><view wx:for="{{g}}" wx:for-item="item" wx:key="c" class="li flex-b data-v-23ed4277" bindtap="{{item.d}}"><view class="text data-v-23ed4277">{{item.a}}</view><u-icon wx:if="{{h}}" class="data-v-23ed4277" u-i="{{item.b}}" bind:__l="__l" u-p="{{h}}"></u-icon></view><view class="li flex-b data-v-23ed4277"><button type="default" open-type="contact" class="cotact data-v-23ed4277" ref="avatarRef">联系客服</button><view class="text data-v-23ed4277">联系客服</view><u-icon wx:if="{{i}}" class="data-v-23ed4277" u-i="23ed4277-2" bind:__l="__l" u-p="{{i}}"></u-icon></view></view></view><view wx:if="{{j}}" class="logOutBtn padding data-v-23ed4277"><view class="btn data-v-23ed4277" bindtap="{{k}}">退出登录</view></view></view>

unpackage/dist/dev/mp-weixin/pages/tabbar/mine/mine.wxss

@@ -30,7 +30,7 @@ image.data-v-23ed4277 {
 }
 .logOutBtn.data-v-23ed4277 {
   position: fixed;
-  bottom: 130rpx;
+  bottom: 90rpx;
   left: 0;
   width: 100%;
 }
@@ -63,6 +63,12 @@ image.data-v-23ed4277 {
   font-weight: 700;
   color: #fff;
 }
+.content .userInfo .phone.data-v-23ed4277 {
+  margin: 10px 0 0 30rpx;
+  font-size: 26rpx;
+  font-weight: 400;
+  color: #fff;
+}
 .content .card.data-v-23ed4277 {
   background: #FFFFFF;
   border-radius: 14rpx;

unpackage/dist/dev/mp-weixin/static/css/app.scss

@@ -44,7 +44,10 @@ view {
 	padding: 0 20px;
 }
 
-
+.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+	}
 	
 	.h1 {
 		font-size: 32rpx;

unpackage/dist/dev/mp-weixin/store/index.js

@@ -4,7 +4,7 @@ const store = common_vendor.createPinia();
 const userStore = common_vendor.defineStore({
   id: "userStore",
   state: () => ({
-    token: common_vendor.index.getStorageSync("token") ? common_vendor.index.getStorageSync("token") : "e5fad81d3dd54ec6a2ecd8e347eb755a",
+    token: common_vendor.index.getStorageSync("token") ? common_vendor.index.getStorageSync("token") : "",
     loginInfo: common_vendor.index.getStorageSync("loginInfo") ? common_vendor.index.getStorageSync("loginInfo") : {},
     userInfo: {
       idCard: "",
@@ -16,18 +16,20 @@ const userStore = common_vendor.defineStore({
       "houseTypeName": "",
       "communityId": "",
       "communityName": "",
-      "userName": 0,
-      "idNo": "用户身份证号",
+      "userName": "",
+      "idNo": "",
       "houseId": ""
-    }
+    },
+    timer: null
   }),
   actions: {
     upDateToken(token) {
+      console.log("没到storeToken么？");
       this.token = token;
+      console.log(this.token);
       common_vendor.index.setStorageSync("token", token);
     },
     upDateLoginInfo(info) {
-      console.log("没来这里么？");
       this.loginInfo = info;
       common_vendor.index.setStorageSync("loginInfo", info);
     },
@@ -47,9 +49,21 @@ const userStore = common_vendor.defineStore({
       }
       common_vendor.index.setStorageSync("token", "");
       common_vendor.index.setStorageSync("loginInfo", "");
-      common_vendor.index.navigateTo({
-        url: "/pages/subPage/login/login"
-      });
+      const pages = getCurrentPages();
+      const page = pages[pages.length - 1].$page.fullPath;
+      let url = "/pages/subPage/login/login";
+      if (page != url) {
+        console.log("当前页面");
+        console.log(page);
+        if (this.timer)
+          clearTimeout(this.timer);
+        this.timer = setTimeout(() => {
+          common_vendor.index.navigateTo({
+            url: url + "?redirect=" + page
+          });
+          this.timer = null;
+        }, 1e3);
+      }
     }
   }
 });

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/props.js

@@ -0,0 +1,37 @@
+"use strict";
+const uni_modules_uviewPlus_libs_vue = require("../../libs/vue.js");
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = uni_modules_uviewPlus_libs_vue.defineMixin({
+  props: {
+    color: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.line.color
+    },
+    // 长度，竖向时表现为高度，横向时表现为长度，可以为百分比，带px单位的值等
+    length: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.line.length
+    },
+    // 线条方向，col-竖向，row-横向
+    direction: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.line.direction
+    },
+    // 是否显示细边框
+    hairline: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.line.hairline
+    },
+    // 线条与上下左右元素的间距，字符串形式，如"30px"、"20px 30px"
+    margin: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.line.margin
+    },
+    // 是否虚线，true-虚线，false-实线
+    dashed: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.line.dashed
+    }
+  }
+});
+exports.props = props;

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.js

@@ -0,0 +1,133 @@
+"use strict";
+const uni_modules_uviewPlus_components_uLine_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/vue.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-line",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uLine_props.props],
+  computed: {
+    lineStyle() {
+      const style = {};
+      style.margin = this.margin;
+      if (this.direction === "row") {
+        style.borderBottomWidth = "1px";
+        style.borderBottomStyle = this.dashed ? "dashed" : "solid";
+        style.width = uni_modules_uviewPlus_libs_function_index.addUnit(this.length);
+        if (this.hairline)
+          style.transform = "scaleY(0.5)";
+      } else {
+        style.borderLeftWidth = "1px";
+        style.borderLeftStyle = this.dashed ? "dashed" : "solid";
+        style.height = uni_modules_uviewPlus_libs_function_index.addUnit(this.length);
+        if (this.hairline)
+          style.transform = "scaleX(0.5)";
+      }
+      style.borderColor = this.color;
+      return uni_modules_uviewPlus_libs_function_index.deepMerge(style, uni_modules_uviewPlus_libs_function_index.addStyle(this.customStyle));
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return {
+    a: common_vendor.s($options.lineStyle)
+  };
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-72791e59"], ["__file", "D:/work/xinjiangMiniProgram/uni_modules/uview-plus/components/u-line/u-line.vue"]]);
+wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.wxml

@@ -0,0 +1 @@
+<view class="u-line data-v-72791e59" style="{{a}}"></view>

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-line/u-line.wxss

@@ -0,0 +1,44 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-72791e59,
+.u-empty__wrap.data-v-72791e59,
+.u-tabs.data-v-72791e59,
+.u-tabs__wrapper.data-v-72791e59,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-72791e59,
+.u-tabs__wrapper__scroll-view.data-v-72791e59,
+.u-tabs__wrapper__nav.data-v-72791e59,
+.u-tabs__wrapper__nav__line.data-v-72791e59 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-line.data-v-72791e59 {
+  vertical-align: middle;
+}

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/props.js

@@ -0,0 +1,63 @@
+"use strict";
+const uni_modules_uviewPlus_libs_vue = require("../../libs/vue.js");
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = uni_modules_uviewPlus_libs_vue.defineMixin({
+  props: {
+    // 是否显示组件
+    show: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.show
+    },
+    // 颜色
+    color: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.color
+    },
+    // 提示文字颜色
+    textColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.textColor
+    },
+    // 文字和图标是否垂直排列
+    vertical: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.vertical
+    },
+    // 模式选择，circle-圆形，spinner-花朵形，semicircle-半圆形
+    mode: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.mode
+    },
+    // 图标大小，单位默认px
+    size: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.size
+    },
+    // 文字大小
+    textSize: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.textSize
+    },
+    // 文字内容
+    text: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.text
+    },
+    // 动画模式
+    timingFunction: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.timingFunction
+    },
+    // 动画执行周期时间
+    duration: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.duration
+    },
+    // mode=circle时的暗边颜色
+    inactiveColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadingIcon.inactiveColor
+    }
+  }
+});
+exports.props = props;

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.js

@@ -0,0 +1,200 @@
+"use strict";
+const uni_modules_uviewPlus_components_uLoadingIcon_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const uni_modules_uviewPlus_libs_function_colorGradient = require("../../libs/function/colorGradient.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/vue.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-loading-icon",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uLoadingIcon_props.props],
+  data() {
+    return {
+      // Array.form可以通过一个伪数组对象创建指定长度的数组
+      // https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Global_Objects/Array/from
+      array12: Array.from({
+        length: 12
+      }),
+      // 这里需要设置默认值为360，否则在安卓nvue上，会延迟一个duration周期后才执行
+      // 在iOS nvue上，则会一开始默认执行两个周期的动画
+      aniAngel: 360,
+      // 动画旋转角度
+      webviewHide: false,
+      // 监听webview的状态，如果隐藏了页面，则停止动画，以免性能消耗
+      loading: false
+      // 是否运行中，针对nvue使用
+    };
+  },
+  computed: {
+    // 当为circle类型时，给其另外三边设置一个更轻一些的颜色
+    // 之所以需要这么做的原因是，比如父组件传了color为红色，那么需要另外的三个边为浅红色
+    // 而不能是固定的某一个其他颜色(因为这个固定的颜色可能浅蓝，导致效果没有那么细腻良好)
+    otherBorderColor() {
+      const lightColor = uni_modules_uviewPlus_libs_function_colorGradient.colorGradient$1(this.color, "#ffffff", 100)[80];
+      if (this.mode === "circle") {
+        return this.inactiveColor ? this.inactiveColor : lightColor;
+      } else {
+        return "transparent";
+      }
+    }
+  },
+  watch: {
+    show(n) {
+    }
+  },
+  mounted() {
+    this.init();
+  },
+  methods: {
+    addUnit: uni_modules_uviewPlus_libs_function_index.addUnit,
+    addStyle: uni_modules_uviewPlus_libs_function_index.addStyle,
+    init() {
+      setTimeout(() => {
+      }, 20);
+    },
+    // 监听webview的显示与隐藏
+    addEventListenerToWebview() {
+      const pages = getCurrentPages();
+      const page = pages[pages.length - 1];
+      const currentWebview = page.$getAppWebview();
+      currentWebview.addEventListener("hide", () => {
+        this.webviewHide = true;
+      });
+      currentWebview.addEventListener("show", () => {
+        this.webviewHide = false;
+      });
+    }
+  }
+};
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.show
+  }, _ctx.show ? common_vendor.e({
+    b: !$data.webviewHide
+  }, !$data.webviewHide ? common_vendor.e({
+    c: _ctx.mode === "spinner"
+  }, _ctx.mode === "spinner" ? {
+    d: common_vendor.f($data.array12, (item, index, i0) => {
+      return {
+        a: index
+      };
+    })
+  } : {}, {
+    e: common_vendor.n(`u-loading-icon__spinner--${_ctx.mode}`),
+    f: _ctx.color,
+    g: $options.addUnit(_ctx.size),
+    h: $options.addUnit(_ctx.size),
+    i: _ctx.color,
+    j: $options.otherBorderColor,
+    k: $options.otherBorderColor,
+    l: $options.otherBorderColor,
+    m: `${_ctx.duration}ms`,
+    n: _ctx.mode === "semicircle" || _ctx.mode === "circle" ? _ctx.timingFunction : ""
+  }) : {}, {
+    o: _ctx.text
+  }, _ctx.text ? {
+    p: common_vendor.t(_ctx.text),
+    q: $options.addUnit(_ctx.textSize),
+    r: _ctx.textColor
+  } : {}, {
+    s: common_vendor.s($options.addStyle(_ctx.customStyle)),
+    t: common_vendor.n(_ctx.vertical && "u-loading-icon--vertical")
+  }) : {});
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-2af81691"], ["__file", "D:/work/xinjiangMiniProgram/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.vue"]]);
+wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.wxml

@@ -0,0 +1 @@
+<view wx:if="{{a}}" style="{{s}}" class="{{['u-loading-icon', 'data-v-2af81691', t]}}"><view wx:if="{{b}}" class="{{['u-loading-icon__spinner', 'data-v-2af81691', e]}}" ref="ani" style="{{'color:' + f + ';' + ('width:' + g) + ';' + ('height:' + h) + ';' + ('border-top-color:' + i) + ';' + ('border-bottom-color:' + j) + ';' + ('border-left-color:' + k) + ';' + ('border-right-color:' + l) + ';' + ('animation-duration:' + m) + ';' + ('animation-timing-function:' + n)}}"><block wx:if="{{c}}"><view wx:for="{{d}}" wx:for-item="item" wx:key="a" class="u-loading-icon__dot data-v-2af81691"></view></block></view><text wx:if="{{o}}" class="u-loading-icon__text data-v-2af81691" style="{{'font-size:' + q + ';' + ('color:' + r)}}">{{p}}</text></view>

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loading-icon/u-loading-icon.wxss

@@ -0,0 +1,173 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-2af81691,
+.u-empty__wrap.data-v-2af81691,
+.u-tabs.data-v-2af81691,
+.u-tabs__wrapper.data-v-2af81691,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-2af81691,
+.u-tabs__wrapper__scroll-view.data-v-2af81691,
+.u-tabs__wrapper__nav.data-v-2af81691,
+.u-tabs__wrapper__nav__line.data-v-2af81691 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-loading-icon.data-v-2af81691 {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  color: #c8c9cc;
+}
+.u-loading-icon__text.data-v-2af81691 {
+  margin-left: 4px;
+  color: #606266;
+  font-size: 14px;
+  line-height: 20px;
+}
+.u-loading-icon__spinner.data-v-2af81691 {
+  width: 30px;
+  height: 30px;
+  position: relative;
+  box-sizing: border-box;
+  max-width: 100%;
+  max-height: 100%;
+  animation: u-rotate-2af81691 1s linear infinite;
+}
+.u-loading-icon__spinner--semicircle.data-v-2af81691 {
+  border-width: 2px;
+  border-color: transparent;
+  border-top-right-radius: 100px;
+  border-top-left-radius: 100px;
+  border-bottom-left-radius: 100px;
+  border-bottom-right-radius: 100px;
+  border-style: solid;
+}
+.u-loading-icon__spinner--circle.data-v-2af81691 {
+  border-top-right-radius: 100px;
+  border-top-left-radius: 100px;
+  border-bottom-left-radius: 100px;
+  border-bottom-right-radius: 100px;
+  border-width: 2px;
+  border-top-color: #e5e5e5;
+  border-right-color: #e5e5e5;
+  border-bottom-color: #e5e5e5;
+  border-left-color: #e5e5e5;
+  border-style: solid;
+}
+.u-loading-icon--vertical.data-v-2af81691 {
+  flex-direction: column;
+}
+.data-v-2af81691:host {
+  font-size: 0px;
+  line-height: 1;
+}
+.u-loading-icon__spinner--spinner.data-v-2af81691 {
+  animation-timing-function: steps(12);
+}
+.u-loading-icon__text.data-v-2af81691:empty {
+  display: none;
+}
+.u-loading-icon--vertical .u-loading-icon__text.data-v-2af81691 {
+  margin: 6px 0 0;
+  color: #606266;
+}
+.u-loading-icon__dot.data-v-2af81691 {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+.u-loading-icon__dot.data-v-2af81691:before {
+  display: block;
+  width: 2px;
+  height: 25%;
+  margin: 0 auto;
+  background-color: currentColor;
+  border-radius: 40%;
+  content: " ";
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(1) {
+  transform: rotate(30deg);
+  opacity: 1;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(2) {
+  transform: rotate(60deg);
+  opacity: 0.9375;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(3) {
+  transform: rotate(90deg);
+  opacity: 0.875;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(4) {
+  transform: rotate(120deg);
+  opacity: 0.8125;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(5) {
+  transform: rotate(150deg);
+  opacity: 0.75;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(6) {
+  transform: rotate(180deg);
+  opacity: 0.6875;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(7) {
+  transform: rotate(210deg);
+  opacity: 0.625;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(8) {
+  transform: rotate(240deg);
+  opacity: 0.5625;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(9) {
+  transform: rotate(270deg);
+  opacity: 0.5;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(10) {
+  transform: rotate(300deg);
+  opacity: 0.4375;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(11) {
+  transform: rotate(330deg);
+  opacity: 0.375;
+}
+.u-loading-icon__dot.data-v-2af81691:nth-of-type(12) {
+  transform: rotate(360deg);
+  opacity: 0.3125;
+}
+@keyframes u-rotate-2af81691 {
+0% {
+    transform: rotate(0deg);
+}
+to {
+    transform: rotate(1turn);
+}
+}

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/props.js

@@ -0,0 +1,98 @@
+"use strict";
+const uni_modules_uviewPlus_libs_vue = require("../../libs/vue.js");
+const uni_modules_uviewPlus_libs_config_props = require("../../libs/config/props.js");
+const props = uni_modules_uviewPlus_libs_vue.defineMixin({
+  props: {
+    // 组件状态，loadmore-加载前的状态，loading-加载中的状态，nomore-没有更多的状态
+    status: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.status
+    },
+    // 组件背景色
+    bgColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.bgColor
+    },
+    // 是否显示加载中的图标
+    icon: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.icon
+    },
+    // 字体大小
+    fontSize: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.fontSize
+    },
+    // 图标大小
+    iconSize: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.iconSize
+    },
+    // 字体颜色
+    color: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.color
+    },
+    // 加载中状态的图标，spinner-花朵状图标，circle-圆圈状，semicircle-半圆
+    loadingIcon: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.loadingIcon
+    },
+    // 加载前的提示语
+    loadmoreText: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.loadmoreText
+    },
+    // 加载中提示语
+    loadingText: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.loadingText
+    },
+    // 没有更多的提示语
+    nomoreText: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.nomoreText
+    },
+    // 在“没有更多”状态下，是否显示粗点
+    isDot: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.isDot
+    },
+    // 加载中图标的颜色
+    iconColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.iconColor
+    },
+    // 上边距
+    marginTop: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.marginTop
+    },
+    // 下边距
+    marginBottom: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.marginBottom
+    },
+    // 高度，单位px
+    height: {
+      type: [String, Number],
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.height
+    },
+    // 是否显示左边分割线
+    line: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.line
+    },
+    // 线条颜色
+    lineColor: {
+      type: String,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.lineColor
+    },
+    // 是否虚线，true-虚线，false-实线
+    dashed: {
+      type: Boolean,
+      default: () => uni_modules_uviewPlus_libs_config_props.defProps.loadmore.dashed
+    }
+  }
+});
+exports.props = props;

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.js

@@ -0,0 +1,198 @@
+"use strict";
+const uni_modules_uviewPlus_components_uLoadmore_props = require("./props.js");
+const uni_modules_uviewPlus_libs_mixin_mpMixin = require("../../libs/mixin/mpMixin.js");
+const uni_modules_uviewPlus_libs_mixin_mixin = require("../../libs/mixin/mixin.js");
+const uni_modules_uviewPlus_libs_function_index = require("../../libs/function/index.js");
+const common_vendor = require("../../../../common/vendor.js");
+require("../../libs/vue.js");
+require("../../libs/config/props.js");
+require("../../libs/config/config.js");
+require("../../libs/config/props/actionSheet.js");
+require("../../libs/config/props/album.js");
+require("../../libs/config/props/alert.js");
+require("../../libs/config/props/avatar.js");
+require("../../libs/config/props/avatarGroup.js");
+require("../../libs/config/props/backtop.js");
+require("../../libs/config/props/badge.js");
+require("../../libs/config/props/button.js");
+require("../../libs/config/props/calendar.js");
+require("../../libs/config/props/carKeyboard.js");
+require("../../libs/config/props/cell.js");
+require("../../libs/config/props/cellGroup.js");
+require("../../libs/config/props/checkbox.js");
+require("../../libs/config/props/checkboxGroup.js");
+require("../../libs/config/props/circleProgress.js");
+require("../../libs/config/props/code.js");
+require("../../libs/config/props/codeInput.js");
+require("../../libs/config/props/col.js");
+require("../../libs/config/props/collapse.js");
+require("../../libs/config/props/collapseItem.js");
+require("../../libs/config/props/columnNotice.js");
+require("../../libs/config/props/countDown.js");
+require("../../libs/config/props/countTo.js");
+require("../../libs/config/props/datetimePicker.js");
+require("../../libs/config/props/divider.js");
+require("../../libs/config/props/empty.js");
+require("../../libs/config/props/form.js");
+require("../../libs/config/props/formItem.js");
+require("../../libs/config/props/gap.js");
+require("../../libs/config/props/grid.js");
+require("../../libs/config/props/gridItem.js");
+require("../../libs/config/props/icon.js");
+require("../../libs/config/props/image.js");
+require("../../libs/config/props/indexAnchor.js");
+require("../../libs/config/props/indexList.js");
+require("../../libs/config/props/input.js");
+require("../../libs/config/props/keyboard.js");
+require("../../libs/config/props/line.js");
+require("../../libs/config/props/lineProgress.js");
+require("../../libs/config/props/link.js");
+require("../../libs/config/props/list.js");
+require("../../libs/config/props/listItem.js");
+require("../../libs/config/props/loadingIcon.js");
+require("../../libs/config/props/loadingPage.js");
+require("../../libs/config/props/loadmore.js");
+require("../../libs/config/props/modal.js");
+require("../../libs/config/props/navbar.js");
+require("../../libs/config/color.js");
+require("../../libs/config/props/noNetwork.js");
+require("../../libs/config/props/noticeBar.js");
+require("../../libs/config/props/notify.js");
+require("../../libs/config/props/numberBox.js");
+require("../../libs/config/props/numberKeyboard.js");
+require("../../libs/config/props/overlay.js");
+require("../../libs/config/props/parse.js");
+require("../../libs/config/props/picker.js");
+require("../../libs/config/props/popup.js");
+require("../../libs/config/props/radio.js");
+require("../../libs/config/props/radioGroup.js");
+require("../../libs/config/props/rate.js");
+require("../../libs/config/props/readMore.js");
+require("../../libs/config/props/row.js");
+require("../../libs/config/props/rowNotice.js");
+require("../../libs/config/props/scrollList.js");
+require("../../libs/config/props/search.js");
+require("../../libs/config/props/section.js");
+require("../../libs/config/props/skeleton.js");
+require("../../libs/config/props/slider.js");
+require("../../libs/config/props/statusBar.js");
+require("../../libs/config/props/steps.js");
+require("../../libs/config/props/stepsItem.js");
+require("../../libs/config/props/sticky.js");
+require("../../libs/config/props/subsection.js");
+require("../../libs/config/props/swipeAction.js");
+require("../../libs/config/props/swipeActionItem.js");
+require("../../libs/config/props/swiper.js");
+require("../../libs/config/props/swipterIndicator.js");
+require("../../libs/config/props/switch.js");
+require("../../libs/config/props/tabbar.js");
+require("../../libs/config/props/tabbarItem.js");
+require("../../libs/config/props/tabs.js");
+require("../../libs/config/props/tag.js");
+require("../../libs/config/props/text.js");
+require("../../libs/config/props/textarea.js");
+require("../../libs/config/props/toast.js");
+require("../../libs/config/props/toolbar.js");
+require("../../libs/config/props/tooltip.js");
+require("../../libs/config/props/transition.js");
+require("../../libs/config/props/upload.js");
+require("../../libs/function/test.js");
+require("../../libs/util/route.js");
+require("../../libs/function/digit.js");
+const _sfc_main = {
+  name: "u-loadmore",
+  mixins: [uni_modules_uviewPlus_libs_mixin_mpMixin.mpMixin, uni_modules_uviewPlus_libs_mixin_mixin.mixin, uni_modules_uviewPlus_components_uLoadmore_props.props],
+  data() {
+    return {
+      // 粗点
+      dotText: "●"
+    };
+  },
+  computed: {
+    // 加载的文字显示的样式
+    loadTextStyle() {
+      return {
+        color: this.color,
+        fontSize: uni_modules_uviewPlus_libs_function_index.addUnit(this.fontSize),
+        lineHeight: uni_modules_uviewPlus_libs_function_index.addUnit(this.fontSize),
+        backgroundColor: this.bgColor
+      };
+    },
+    // 显示的提示文字
+    showText() {
+      let text = "";
+      if (this.status == "loadmore")
+        text = this.loadmoreText;
+      else if (this.status == "loading")
+        text = this.loadingText;
+      else if (this.status == "nomore" && this.isDot)
+        text = this.dotText;
+      else
+        text = this.nomoreText;
+      return text;
+    }
+  },
+  emits: ["loadmore"],
+  methods: {
+    addStyle: uni_modules_uviewPlus_libs_function_index.addStyle,
+    addUnit: uni_modules_uviewPlus_libs_function_index.addUnit,
+    loadMore() {
+      if (this.status == "loadmore")
+        this.$emit("loadmore");
+    }
+  }
+};
+if (!Array) {
+  const _easycom_u_line2 = common_vendor.resolveComponent("u-line");
+  const _easycom_u_loading_icon2 = common_vendor.resolveComponent("u-loading-icon");
+  (_easycom_u_line2 + _easycom_u_loading_icon2)();
+}
+const _easycom_u_line = () => "../u-line/u-line.js";
+const _easycom_u_loading_icon = () => "../u-loading-icon/u-loading-icon.js";
+if (!Math) {
+  (_easycom_u_line + _easycom_u_loading_icon)();
+}
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  return common_vendor.e({
+    a: _ctx.line
+  }, _ctx.line ? {
+    b: common_vendor.p({
+      length: "140rpx",
+      color: _ctx.lineColor,
+      hairline: false,
+      dashed: _ctx.dashed
+    })
+  } : {}, {
+    c: _ctx.status === "loading" && _ctx.icon
+  }, _ctx.status === "loading" && _ctx.icon ? {
+    d: common_vendor.p({
+      color: _ctx.iconColor,
+      size: _ctx.iconSize,
+      mode: _ctx.loadingIcon
+    })
+  } : {}, {
+    e: common_vendor.t($options.showText),
+    f: common_vendor.s($options.loadTextStyle),
+    g: common_vendor.n(_ctx.status == "nomore" && _ctx.isDot == true ? "u-loadmore__content__dot-text" : "u-loadmore__content__text"),
+    h: common_vendor.o((...args) => $options.loadMore && $options.loadMore(...args)),
+    i: common_vendor.n(_ctx.status == "loadmore" || _ctx.status == "nomore" ? "u-more" : ""),
+    j: _ctx.line
+  }, _ctx.line ? {
+    k: common_vendor.p({
+      length: "140rpx",
+      color: _ctx.lineColor,
+      hairline: false,
+      dashed: _ctx.dashed
+    })
+  } : {}, {
+    l: common_vendor.s($options.addStyle(_ctx.customStyle)),
+    m: common_vendor.s({
+      backgroundColor: _ctx.bgColor,
+      marginBottom: $options.addUnit(_ctx.marginBottom),
+      marginTop: $options.addUnit(_ctx.marginTop),
+      height: $options.addUnit(_ctx.height)
+    })
+  });
+}
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-4ccc1478"], ["__file", "D:/work/xinjiangMiniProgram/uni_modules/uview-plus/components/u-loadmore/u-loadmore.vue"]]);
+wx.createComponent(Component);

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "u-line": "../u-line/u-line",
+    "u-loading-icon": "../u-loading-icon/u-loading-icon"
+  }
+}

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.wxml

@@ -0,0 +1 @@
+<view class="u-loadmore data-v-4ccc1478" style="{{l + ';' + m}}"><u-line wx:if="{{a}}" class="data-v-4ccc1478" u-i="4ccc1478-0" bind:__l="__l" u-p="{{b}}"></u-line><view class="{{[i, 'u-loadmore__content', 'data-v-4ccc1478']}}"><view wx:if="{{c}}" class="u-loadmore__content__icon-wrap data-v-4ccc1478"><u-loading-icon wx:if="{{d}}" class="data-v-4ccc1478" u-i="4ccc1478-1" bind:__l="__l" u-p="{{d}}"></u-loading-icon></view><text style="{{f}}" class="{{['u-line-1', 'data-v-4ccc1478', g]}}" bindtap="{{h}}">{{e}}</text></view><u-line wx:if="{{j}}" class="data-v-4ccc1478" u-i="4ccc1478-2" bind:__l="__l" u-p="{{k}}"></u-line></view>

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/components/u-loadmore/u-loadmore.wxss

@@ -0,0 +1,70 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+/* 颜色变量 */
+/* 行为相关颜色 */
+/* 文字基本颜色 */
+/* 背景颜色 */
+/* 边框颜色 */
+/* 尺寸变量 */
+/* 文字尺寸 */
+/* 图片尺寸 */
+/* Border Radius */
+/* 水平间距 */
+/* 垂直间距 */
+/* 透明度 */
+/* 文章场景相关 */
+.u-empty.data-v-4ccc1478,
+.u-empty__wrap.data-v-4ccc1478,
+.u-tabs.data-v-4ccc1478,
+.u-tabs__wrapper.data-v-4ccc1478,
+.u-tabs__wrapper__scroll-view-wrapper.data-v-4ccc1478,
+.u-tabs__wrapper__scroll-view.data-v-4ccc1478,
+.u-tabs__wrapper__nav.data-v-4ccc1478,
+.u-tabs__wrapper__nav__line.data-v-4ccc1478 {
+  display: flex;
+  flex-direction: column;
+  flex-shrink: 0;
+  flex-grow: 0;
+  flex-basis: auto;
+  align-items: stretch;
+  align-content: flex-start;
+}
+.u-loadmore.data-v-4ccc1478 {
+
+  display: flex;
+
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  flex: 1;
+}
+.u-loadmore__content.data-v-4ccc1478 {
+  margin: 0 15px;
+
+  display: flex;
+
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+.u-loadmore__content__icon-wrap.data-v-4ccc1478 {
+  margin-right: 8px;
+}
+.u-loadmore__content__text.data-v-4ccc1478 {
+  font-size: 14px;
+  color: #606266;
+}
+.u-loadmore__content__dot-text.data-v-4ccc1478 {
+  font-size: 15px;
+  color: #909193;
+}

unpackage/dist/dev/mp-weixin/uni_modules/uview-plus/libs/function/colorGradient.js

@@ -110,3 +110,4 @@ const colorGradient$1 = {
   colorToRgba
 };
 exports.colorGradient = colorGradient$1;
+exports.colorGradient$1 = colorGradient;