修复bug

App.vue

@@ -1,6 +1,7 @@
 <script>
 	export default {
 		onLaunch: function() {
+			this.$store.commit('initConfig')
 		},
 		onShow: function() {
 		},

api/http.js

@@ -30,7 +30,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
 			res.data.message == '操作失败，用户不存在!'){
 				store.commit('logout')
 				console.error('登录过期');
-				// utils.toLogin()
+				utils.toLogin()
 			}
 			
 			if(res.statusCode == 200 && res.data.code != 200

api/model/index.js

@@ -21,7 +21,7 @@ const api = {
     // 我的收藏
     collectPageList: {
 		url: '/index_common/getCollectPageList',
-		method: 'GET', 
+		method: 'GET',
 	},
     // 旅行列表
     travelPageList: {
@@ -38,6 +38,17 @@ const api = {
 		url: '/index_common/getYueDong',
 		method: 'GET', 
 	},
+    // 悦动时刻信息
+    getArea: {
+		url: '/index_common/getArea',
+		method: 'GET', 
+	},
+	//我主理的信息
+	getTwoPageList: {
+		url: '/index_common/getTwoPageList',
+		method: 'GET', 
+		auth : true,
+	},
 }
 
 export default api

api/model/info.js

@@ -2,123 +2,123 @@
 // 个人相关接口
 
 const api = {
-	// 充值
-	recharge: {
-		url: '/rice_info/recharge',
-		method: 'GET',
-		auth : true,
-		limit : 1000,
-		showLoading : true,
-	},
-	// 提现
-	withdraw: {
-		url: '/rice_info/withdraw',
-		method: 'GET',
-		auth : true,
-		limit : 1000,
-		showLoading : true,
-	},
-	// 获取地址列表带分页
-	getAddressPageList: {
-		url: '/rice_info/getAddressPageList',
-		method: 'GET',
-		auth : true,
-	},
-	// 增加或修改地址信息
-	addOrUpdateAddress: {
-		url: '/rice_info/addOrUpdateAddress',
-		method: 'POST',
-		limit : 500,
-		auth : true,
-		showLoading : true,
-	},
-	// 删除地址
-	deleteAddress: {
-		url: '/rice_info/deleteAddress',
-		method: 'GET',
-		limit : 500,
-		auth : true,
-		showLoading : true,
-	},
-	// 修改默认地址
-	updateDefaultAddress: {
-		url: '/rice_info/updateDefaultAddress',
-		method: 'GET',
-		auth : true,
-		limit : 1000,
-	},
-	// 获取粉丝列表带分页
-	getFansPageList: {
-		url: '/rice_info/getFansPageList',
-		method: 'GET',
-		auth : true,
-	},
-	// 获取相关介绍
-	getInfoIntroduce: {
-		url: '/rice_info/getInfoIntroduce',
-		method: 'GET',
-		auth : true,
-	},
-	// 获取个人邀请码
-	getInviteCode: {
-		url: '/rice_info/getInviteCode',
-		method: 'GET',
-		auth : true,
-	},
-	// 获取订单列表带分页
-	getOrderPageList: {
-		url: '/rice_info/getOrderPageList',
-		method: 'GET',
-		auth : true,
-	},
-	// 获取订单详情
-	getOrderDetail: {
-		url: '/rice_info/getOrderDetail',
-		method: 'GET',
-		auth : true,
-	},
-	// 获取流水记录带分页
-	getWaterPageList: {
-		url: '/rice_info/getWaterPageList',
-		method: 'GET',
-		auth : true,
-	},
-	// 获取相关介绍
-	getInfoIntroduce: {
-		url: '/rice_info/getInfoIntroduce',
-		method: 'GET',
-	},
-	// 获取相关介绍详情
-	getInfoIntroduceDetail: {
-		url: '/rice_info/getRiceNewsDetail',
-		method: 'GET',
-	},
-	// 查询个人信息相关
-	getRiceInfo: {
-		url: '/rice_info/getRiceInfo',
-		method: 'GET',
-	},
-	// 获取购物车信息列表带分页
-	getCartPageList: {
-		url: '/rice_info/getCartPageList',
-		method: 'GET',
-	},
-	// 增加或者修改渠道申请信息
-	addOrUpdateCommonUser: {
-		url: '/rice_info/addOrUpdateCommonUser',
-		method: 'POST',
-		limit : 500,
-		auth : true,
-		showLoading : true,
-	},
-	// 查询渠道申请信息
-	getCommonUser: {
-		url: '/rice_info/getCommonUser',
-		method: 'GET',
-		limit : 500,
-		auth : true,
-		showLoading : true,
-	},
+	// // 充值
+	// recharge: {
+	// 	url: '/rice_info/recharge',
+	// 	method: 'GET',
+	// 	auth : true,
+	// 	limit : 1000,
+	// 	showLoading : true,
+	// },
+	// // 提现
+	// withdraw: {
+	// 	url: '/rice_info/withdraw',
+	// 	method: 'GET',
+	// 	auth : true,
+	// 	limit : 1000,
+	// 	showLoading : true,
+	// },
+	// // 获取地址列表带分页
+	// getAddressPageList: {
+	// 	url: '/rice_info/getAddressPageList',
+	// 	method: 'GET',
+	// 	auth : true,
+	// },
+	// // 增加或修改地址信息
+	// addOrUpdateAddress: {
+	// 	url: '/rice_info/addOrUpdateAddress',
+	// 	method: 'POST',
+	// 	limit : 500,
+	// 	auth : true,
+	// 	showLoading : true,
+	// },
+	// // 删除地址
+	// deleteAddress: {
+	// 	url: '/rice_info/deleteAddress',
+	// 	method: 'GET',
+	// 	limit : 500,
+	// 	auth : true,
+	// 	showLoading : true,
+	// },
+	// // 修改默认地址
+	// updateDefaultAddress: {
+	// 	url: '/rice_info/updateDefaultAddress',
+	// 	method: 'GET',
+	// 	auth : true,
+	// 	limit : 1000,
+	// },
+	// // 获取粉丝列表带分页
+	// getFansPageList: {
+	// 	url: '/rice_info/getFansPageList',
+	// 	method: 'GET',
+	// 	auth : true,
+	// },
+	// // 获取相关介绍
+	// getInfoIntroduce: {
+	// 	url: '/rice_info/getInfoIntroduce',
+	// 	method: 'GET',
+	// 	auth : true,
+	// },
+	// // 获取个人邀请码
+	// getInviteCode: {
+	// 	url: '/rice_info/getInviteCode',
+	// 	method: 'GET',
+	// 	auth : true,
+	// },
+	// // 获取订单列表带分页
+	// getOrderPageList: {
+	// 	url: '/rice_info/getOrderPageList',
+	// 	method: 'GET',
+	// 	auth : true,
+	// },
+	// // 获取订单详情
+	// getOrderDetail: {
+	// 	url: '/rice_info/getOrderDetail',
+	// 	method: 'GET',
+	// 	auth : true,
+	// },
+	// // 获取流水记录带分页
+	// getWaterPageList: {
+	// 	url: '/rice_info/getWaterPageList',
+	// 	method: 'GET',
+	// 	auth : true,
+	// },
+	// // 获取相关介绍
+	// getInfoIntroduce: {
+	// 	url: '/rice_info/getInfoIntroduce',
+	// 	method: 'GET',
+	// },
+	// // 获取相关介绍详情
+	// getInfoIntroduceDetail: {
+	// 	url: '/rice_info/getRiceNewsDetail',
+	// 	method: 'GET',
+	// },
+	// // 查询个人信息相关
+	// getRiceInfo: {
+	// 	url: '/rice_info/getRiceInfo',
+	// 	method: 'GET',
+	// },
+	// // 获取购物车信息列表带分页
+	// getCartPageList: {
+	// 	url: '/rice_info/getCartPageList',
+	// 	method: 'GET',
+	// },
+	// // 增加或者修改渠道申请信息
+	// addOrUpdateCommonUser: {
+	// 	url: '/rice_info/addOrUpdateCommonUser',
+	// 	method: 'POST',
+	// 	limit : 500,
+	// 	auth : true,
+	// 	showLoading : true,
+	// },
+	// // 查询渠道申请信息
+	// getCommonUser: {
+	// 	url: '/rice_info/getCommonUser',
+	// 	method: 'GET',
+	// 	limit : 500,
+	// 	auth : true,
+	// 	showLoading : true,
+	// },
 	// 获取国籍
 	nationalityPageList: {
 		url: '/info_common/getNationalityPageList',

api/model/login.js

@@ -7,7 +7,7 @@ const api = {
 	wxLogin: {
 		url: '/login_common/appletLogin',
 		method: 'GET', 
-		limit : 500,
+		limit : 1000,
 		showLoading : true,
 	},
 	// 修改个人信息接口

api/model/order.js

@@ -6,47 +6,57 @@ const api = {
 	orderPageList: {
 		url: '/order_common/getOrderPageList',
 		method: 'GET', 
+		auth : true,
 	},
     // 取消订单活动
     cancelOrder: {
 		url: '/order_common/cancelOrder',
 		method: 'POST', 
+		auth : true,
+		showLoading : true,
+		limit : 1000,
 	},
     // 订单活动评价
     evaluate: {
 		url: '/order_common/evaluate',
 		method: 'POST', 
+		auth : true,
+		showLoading : true,
+		limit : 1000,
 	},
     // 根据订单标识查询订单信息
     orderInfo: {
 		url: '/order_common/getOrderInfo',
 		method: 'GET', 
+		auth : true,
 	},
     // 订单开具发票
     invoice: {
 		url: '/order_common/invoice',
 		method: 'POST', 
+		auth : true,
 	},
 	//发票列表
 	getInvoicePageList:{
 		url: '/order_common/getInvoicePageList',
 		method: 'GET', 
+		auth : true,
 	},
     // 订单活动签到
     signIn: {
 		url: '/order_common/signIn',
 		method: 'POST', 
+		auth : true,
+		showLoading : true,
 	},
 	// 创建订单
 	  createOrder: {
 		url: '/order_common/createOrder',
 		method: 'POST', 
+		auth : true,
+		showLoading : true,
+		limit : 1000,
 	},
-	//我主理的信息
-	getTwoPageList: {
-		url: '/index_common/getTwoPageList',
-		method: 'GET', 
-	}
 }
 
 export default api

api/model/zhaomu.js

@@ -14,16 +14,27 @@ const api = {
 	joinRecruitInfo: {
 		url: '/shop_common/getJoinRecruitInfo',
 		method: 'get',
+		auth : true,
+		showLoading : true,
 	},
 	// 主理人主理的活动列表带分页
 	activityMemberPageList: {
 		url: '/shop_common/getActivityMemberPageList',
 		method: 'get',
+		auth : true,
+	},
+	// 主理人主理的活动签到里面的签到用户列表带分页
+	getSignInUserPageList: {
+		url: '/shop_common/getSignInUserPageList',
+		method: 'get',
+		auth : true,
 	},
 	//参与招募
 	shopUserAuth: {
 		url: '/shop_common/shopUserAuth',
 		method: 'POST',
+		auth : true,
+		showLoading : true,
 	},
 }
 

common.scss

@@ -94,6 +94,7 @@
                         width: 24rpx;
                         height: 24rpx;
                         margin-right: 10rpx;
+						flex-shrink: 0;
                     }
                 }
                 .address {
@@ -107,7 +108,7 @@
                         width: 22rpx;
                         height: 26rpx;
                         margin-right: 10rpx;
-												flex-shrink: 0;
+						flex-shrink: 0;
                     }
                 }
             }

components/active/active-item.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="cardList">
-		<view class="container" v-for="(item, index) in cardListData" :key="index">
+		<view class="container" 
+		@click="toDetail(item)"
+		v-for="(item, index) in cardListData" :key="index">
 			<view class="content" :class="['U','S'].includes(item.state) ? 'content_border' : ''">
 				<view class="left">
 					<img :src="item.image.split(',')[0]" alt="">
@@ -13,7 +15,7 @@
 					</view>
 					<view class="price">
 						<view class="num-box">{{item.num}}/{{item.sum}}</view>
-						<view class="btn-box" @click="toDetail(item)" v-if="item.state == 0">立即报名</view>
+						<view class="btn-box" v-if="item.state == 0">立即报名</view>
 						<view class="btn-box btn-box2"  v-if="item.state == 1">已结束</view>
 					</view>
 				</view>
@@ -63,6 +65,8 @@
 
 <style scoped lang="scss">
 	.cardList {
+		position: relative;
+		z-index: 9;
 		.container {
 			margin-top: 31rpx;
 			padding: 25rpx 0;

components/cart/CardList.vue

@@ -7,7 +7,7 @@
 			</view>
 			<view class="content cardStyle_" :class="['U','S'].includes(item.state) ? 'content_border' : ''">
 				<view class="left">
-					<img :src="item.image.split(',')[0]" alt="">
+					<img :src="getImage(item)" alt="">
 				</view>
 				<view class="right">
 					<view class="detailed">
@@ -19,6 +19,10 @@
 				</view>
 			</view>
 			<view class="button-sp-area">
+				
+				<button @click.stop="skip(item,4)" v-if="item.state == 0" :style="{background: '#492623;', color: '#FF3E3F',margin:'0 30rpx 0 0'}"
+				class="mini-btn" size="mini">立即支付</button>
+				
 				<button @click.stop="skip(item,0)" v-if="item.state == 1" :style="{background: '#34312E;', color: '#AFAFAF',margin:'0 30rpx 0 0'}"
 				class="mini-btn" size="mini">取消活动</button>
 
@@ -65,7 +69,10 @@
 			},
 			toOrderDetails(val) {
 				this.$emit('toOrderDetails', val)
-			}
+			},
+			getImage(){
+				return item.image && item.image.split(',')[0]
+			},
 		}
 	};
 </script>

components/cart/signInQrcodePopup.vue

@@ -0,0 +1,132 @@
+<template>
+	<uv-popup ref="popup"
+	bgColor="#1B1713"
+	:safeAreaInsetBottom="false"
+	:round="30">
+		<view class="signInContent">
+			<view class="qrcode">
+				<uv-qrcode
+				ref="qrcode" 
+				size="400rpx" 
+				:hide="show"
+				:value="userInfo.id"></uv-qrcode>
+			</view>
+			
+			<!-- <view class="info">
+				<image src="/static/logo.png" mode="aspectFill"></image>
+				<view class="right">
+					<view class="text-title">
+						领队
+					</view>
+					<view class="">
+						
+					</view>
+				</view>
+			</view> -->
+			
+			<view class="lingdui-box">
+				<image class="use-img" :src="adminUserInfo.headImage" mode="aspectFill"></image>
+				<view class="lingdui-msg">
+					<view class="lingdui-msg-name">
+						<view>{{adminUserInfo.nickName}}</view>
+						<view class="name-tip">主理人</view>
+					</view>
+					<view>
+						<uv-rate :count="count" v-model="numValue" size="23" activeColor="#FFA200"></uv-rate>
+					</view>
+				</view>
+			</view>
+		</view>
+	</uv-popup>
+</template>
+
+<script>
+	export default {
+		props : {
+			adminUserInfo : {
+				default : {}
+			}
+		},
+		data() {
+			return {
+				show : true,
+			}
+		},
+		methods: {
+			open(){
+				this.show = true
+				setTimeout(() => {
+					this.show = false
+				}, 500)
+				this.$refs.popup.open()
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.signInContent{
+	overflow: hidden;
+	width: 500rpx;
+	border-radius: 20rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	.qrcode{
+		padding: 40rpx 0;
+		width: 400rpx;
+		height: 400rpx;
+	}
+	.info{
+		margin-top: 20rpx;
+		width: calc(500rpx - 40rpx);
+		padding: 10rpx;
+		background-color: #2A2A2A;
+		border-radius: 60rpx;
+		image{
+			width: 70rpx;
+			height: 70rpx;
+			border-radius: 50%;
+		}
+	}
+	.lingdui-box {
+		width: calc(500rpx - 80rpx);
+		// margin-top: 43rpx;
+		height: 130rpx;
+		background: #26201A;
+		border-radius: 60rpx;
+		display: flex;
+		align-items: center;
+		padding: 0 40rpx;
+		.use-img {
+			width: 86rpx;
+			height: 86rpx;
+			border-radius: 50%;
+		}
+		.lingdui-msg {
+			flex: 1;
+			margin-left: 24rpx;
+			.lingdui-msg-name {
+				font-weight: 500;
+				font-size: 29rpx;
+				color: #E6E6E6;
+				display: flex;
+				align-items: center;
+				margin-bottom: 11rpx;
+				.name-tip {
+					padding: 0 20rpx;
+					height: 27rpx;
+					background: #3C2D17;
+					border-radius: 0rpx 12rpx 12rpx 12rpx;
+					font-weight: 500;
+					font-size: 19rpx;
+					color: #FFA200;
+					line-height: 27rpx;
+					margin-left: 14rpx;
+				}
+			}
+		}
+	}
+}
+</style>

components/zhaomu/zlx-item.vue

@@ -2,7 +2,7 @@
 	<view class="cardList">
 		<view class="content" >
 			<view class="left">
-				<img :src="item.image.split(',')[0]" alt="">
+				<image :src="images[0]" mode="aspectFill">
 			</view>
 			<view class="right">
 				<view class="detailed">
@@ -11,7 +11,7 @@
 					<view class="address">{{item.address}}</view>
 				</view>
 				<view class="price" v-if="showBottom">
-					<view class="num-box">20/40</view>
+					<view class="num-box">{{ item.num }}/{{ item.sum }}</view>
 					<view class="btn-box" @click="qiandaoClick">开始签到</view>
 					<!-- <view class="btn-box jieshu-btn" v-else>已结束</view> -->
 				</view>
@@ -25,7 +25,10 @@
 		props: {
 			item: {
 				type: Object,
-				default: ()=>{}
+				default: {}
+			},
+			showBottom : {
+				default : false,
 			},
 		},
 		data() {
@@ -36,7 +39,12 @@
 		components: {
 
 		},
-		computed: {},
+		computed: {
+			images(){
+				return this.item.image ? this.item
+				.image.split(','): []
+			},
+		},
 		watch: {
 
 		},
@@ -45,11 +53,6 @@
 		},
 		mounted() {},
 		methods: {
-			skip(val) {
-				uni.navigateTo({
-					url: '/pages_order/orderDetails'
-				})
-			},
 			qiandaoClick() {
 				this.$emit('qiandaoClick')
 			}
@@ -71,8 +74,8 @@
 				height: 228rpx;
 				border-radius: 20rpx;
 				overflow: hidden;
-
-				img {
+				flex-shrink: 0;
+				image {
 					width: 100%;
 					height: 100%;
 				}
@@ -86,12 +89,15 @@
 				margin-left: 26rpx;
 				color: $uni-text-color-grey;
 				font-size: 24rpx;
-
+				width: 320rpx;
 				.detailed {
 					.title {
 						font-size: 32rpx;
 						color: #fff;
 						padding-top: 11rpx;
+						overflow:hidden; //超出的文本隐藏
+						text-overflow:ellipsis; //溢出用省略号显示
+						white-space:nowrap; //溢出不换行
 					}
 
 					.date {
@@ -127,11 +133,10 @@
 				}
 
 				.price {
-
 					display: flex;
 					align-items: center;
 					justify-content: space-between;
-
+					margin-top: 10rpx;
 					.num-box {
 						font-size: 27rpx;
 						color: #fff;

config.js

@@ -27,7 +27,7 @@ const config = {
 
 // 默认配置
 const defaultConfig = {
-	mapKey : 'XMBBZ-BCPCV-SXPPQ-5Y7MY-PHZXK-YFFVU',
+	mapKey : 'DGFBZ-JU76M-34A63-6BU47-2FLJH-XLBCN',
 	aliOss : {
 		url : 'https://image.hhlm1688.com/',
 		config : {

mixins/list.js

@@ -26,6 +26,7 @@ export default {
 			},
 			total : 0,
 			list : [],
+			uvLoadMore : 'loading',
 		}
 	},
 	onPullDownRefresh() {
@@ -55,6 +56,12 @@ export default {
 						this[this.mixinsListKey || 'list'] = res.result.records || res.result
 						
 						this.total = res.result.total || res.result.length
+						
+						if(this.queryParams.pageSize < this.total){
+							this.uvLoadMore = 'loadmore'
+						}else{
+							this.uvLoadMore = 'nomore'
+						}
 					}
 				})
 			})

pages.json

@@ -3,7 +3,8 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -30,12 +31,14 @@
 			"path": "pages/index/cart",
 			"style": {
 				"navigationStyle": "custom" ,
-				"navigationBarTextStyle": "white" 
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
 			"path": "pages/index/member",
 			"style": {
+				"enablePullDownRefresh": true,
 				"navigationBarTitleText": ""
 			}
 		}
@@ -89,6 +92,7 @@
 			{
 				"path": "invoiceRecords",
 				"style": {
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom" ,
 					"navigationBarTextStyle": "white"
 				}
@@ -114,6 +118,7 @@
 			{
 				"path": "zlx-qiandao",
 				"style": {
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom" ,
 					"navigationBarTextStyle": "white"
 				}
@@ -121,6 +126,7 @@
 			{
 				"path": "qiandao-list",
 				"style": {
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom" ,
 					"navigationBarTextStyle": "white"
 				}
@@ -142,6 +148,7 @@
 			{
 				"path": "collection",
 				"style": {
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom" ,
 					"navigationBarTextStyle": "white"
 				}
@@ -149,6 +156,7 @@
 			{
 				"path": "travelList",
 				"style": {
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom" ,
 					"navigationBarTextStyle": "white"
 				}
@@ -156,6 +164,7 @@
 			{
 				"path": "activeList",
 				"style": {
+					"enablePullDownRefresh": true,
 					"navigationStyle": "custom" ,
 					"navigationBarTextStyle": "white"
 				}

pages/index/cart.vue

@@ -14,6 +14,9 @@
 			<uv-load-more :status="status" fontSize="24rpx" dashed line />
 		</view>
 		<uv-modal ref="modal" align="center" content='是否取消订单？' @confirm="confirm"></uv-modal>
+		
+		<signInQrcodePopup ref="signInQrcodePopup"/>
+		
 		<tabber select="cart" />
 	</view>
 </template>
@@ -21,6 +24,7 @@
 <script>
 	import tabber from '@/components/base/tabbar.vue'
 	import cardList from '@/components/cart/CardList.vue'
+	import signInQrcodePopup from '@/components/cart/signInQrcodePopup.vue'
 	import Navbar from '@/pages/components/Navbar.vue'
 	import {
 		globalMixin
@@ -31,7 +35,8 @@
 		components: {
 			tabber,
 			cardList,
-			Navbar
+			Navbar,
+			signInQrcodePopup,
 		},
 		data() {
 			this.orderId = '';
@@ -82,6 +87,11 @@
 			this.params.state = this.tabList[this.tabCurrent].id
 			this.getOrderPageList()
 		},
+		onPullDownRefresh() {
+			this.params.pageNo = 1
+			this.cardListData = []
+			this.getOrderPageList()
+		},
 		methods: {
 			activeList() {
 				uni.navigateTo({
@@ -91,6 +101,7 @@
 			getOrderPageList() {
 				this.status = "loading"
 				this.$api('orderPageList', this.params, res => {
+					uni.stopPullDownRefresh()
 					if (res.code == 200) {
 						this.totalPage = res.result.pages
 						this.cardListData = [...this.cardListData, ...res.result.records]
@@ -115,22 +126,24 @@
 			},
 			btnClick(item, type) { //0取消活动 1活动签到 2评价活动 3开具发票 
 				this.orderId = item.id;
+				
 				if (type == 0) {
 					this.$refs.modal.open();
 				}
 				if (type == 1) {
-					this.$api('signIn', {
-						orderId: item.id
-					}, res => {
-						if (res.code == 200) {
-							this.cardListData = []
-							this.getOrderPageList()
-							this.$refs.toast.show({
-								type: 'success',
-								message: res.result
-							})
-						}
-					})
+					this.$refs.signInQrcodePopup.open(item.id)
+					// this.$api('signIn', {
+					// 	orderId: item.id
+					// }, res => {
+					// 	if (res.code == 200) {
+					// 		this.cardListData = []
+					// 		this.getOrderPageList()
+					// 		this.$refs.toast.show({
+					// 			type: 'success',
+					// 			message: res.result
+					// 		})
+					// 	}
+					// })
 				}
 				if (type == 2) {
 					uni.navigateTo({
@@ -142,6 +155,11 @@
 						url: `/pages_order/invoiceIssuance?orderId=${this.orderId}`
 					})
 				}
+				if (type == 4) {
+					uni.navigateTo({
+						url: `/pages_order/invoiceIssuance?orderId=${this.orderId}`
+					})
+				}
 			},
 			confirm() {
 				this.$api('cancelOrder', {

pages/index/index.vue

@@ -6,7 +6,7 @@
 			<view class="search-box">
 				<view class="search-box-l">
 					<image class="address-img" src="@/static/image/home/address-icon.png" mode="widthFix"></image>
-					<view>成都</view>
+					<view>{{ city }}</view>
 					<image class="sjx-img" src="@/static/image/home/sjx-icon.png" mode="widthFix"></image>
 				</view>
 				<view class="search-box-r">
@@ -83,7 +83,7 @@
 </template>
 
 <script>
-	
+	import Position from '@/utils/position.js'
 	import tabber from '@/components/base/tabbar.vue'
 	import activeItem from '@/components/active/active-item.vue'
 	export default {
@@ -110,7 +110,8 @@
 					{ id: 1, name: '往期活动' },
 				],
 				lineBg: require('@/static/image/cart/tabIcon.png'),
-				cardListData: []
+				cardListData: [],
+				city : '定位中',
 			}
 		},
 		onPageScroll(e) {
@@ -130,9 +131,20 @@
 		onLoad() {
 			this.getBanner()
 			this.getActivityPageList()
-			this.$store.commit('initConfig')
+			this.getLocationDetail()
+		},
+		onPullDownRefresh() {
+			this.params.pageNo = 1
+			this.cardListData = []
+			this.getActivityPageList()
 		},
 		methods:{
+			getLocationDetail(){
+				Position.getLocationDetail()
+				.then(res => {
+					this.city = res.addressDetail.city
+				})
+			},
 			search() {
 				this.params.pageNo = 1
 				this.cardListData = []
@@ -140,6 +152,7 @@
 			},
 			getActivityPageList() {
 				this.$api('activityPageList',this.params,res=>{
+					uni.stopPullDownRefresh()
 					if(res.code == 200) {
 						this.totalPage = res.result.pages
 						this.cardListData = [...this.cardListData,...res.result.records]

pages/index/member.vue

@@ -17,7 +17,7 @@
 					</view>
 					<view class="id-box">
 						<text>{{isLogin ? 'ID:' + userInfo.id : ''}}</text>
-						<text class="copy-text" @click="copy" v-if="isLogin">复制</text>
+						<text class="copy-text" @click.stop="copy" v-if="isLogin">复制</text>
 					</view>
 				</view>
 			</view>
@@ -94,6 +94,11 @@
 				this.getList()
 			}
 		},
+		onPullDownRefresh() {
+			this.params.pageNo = 1
+			this.cardListData = []
+			this.getList()
+		},
 		methods:{
 			search() {
 				this.params.pageNo = 1;
@@ -103,6 +108,7 @@
 			getList() {
 				this.status = "loading"
 				this.$api('recruitPageList',this.params,res=>{
+					uni.stopPullDownRefresh()
 					if(res.code == 200) {
 						this.totalPage = res.result.pages;
 						this.ecruitList = [...this.ecruitList,...res.result.records];
@@ -174,6 +180,7 @@
 			z-index: -1;
 		}
 		.content {
+			margin-top: 40rpx;
 			padding: 0 30rpx;
 			padding-top: calc(var(--status-bar-height) + 110rpx);
 			

pages_login/wxLogin.vue

@@ -2,17 +2,22 @@
 <div class="login">
 		<!-- logo -->
 		<div class="logo">
-			<image src="@/static/image/logo-img.jpg" mode=""></image>
+			<image :src="configList.logo_image" mode=""></image>
 		</div>
 
 		<!-- 标题 -->
-		<view class="login-title">vtrip</view>
+		<view class="login-title">{{ configList.logo_name }}</view>
 
 		<!-- 登录按钮 -->
 		<view @click="login" class="login-btn">
 			<uni-icons type="weixin" size="30" color="#fff"></uni-icons>
 			<text class="wx">微信登录</text>
 		</view>
+		
+		<view @click="toHome" 
+		class="uni-uncolor-btn">
+			<text class="wx">取消登录</text>
+		</view>
 
 		<!-- 隐私政策 -->
 		<view class="privacy">
@@ -60,6 +65,11 @@
 						url:'/pages_login/fuwutiaokuan'
 					})
 				}
+			},
+			toHome(){
+				uni.switchTab({
+					url: '/pages/index/index'
+				})
 			}
 		}
 	}
@@ -109,6 +119,15 @@
 			}
 		}
 		
+		.uni-uncolor-btn{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 70%;
+			height: 90rpx;
+			padding: 0;
+		}
+		
 		//隐私政策
 		.privacy {
 			display: flex;

pages_login/wxUserInfo.vue

@@ -198,7 +198,7 @@
 			margin-top: 10vh;
 		}
 		.getPhoneNumber{
-			all: unset;
+			// all: unset;
 			display: flex;
 			justify-content: center;
 			align-items: center;

pages_login/yinsixieyi.vue

@@ -1,7 +1,12 @@
 <template>
 	<view>
 		<view class="head-box"></view>
-		<uv-navbar autoBack title="隐私协议" leftIconColor="#fff" :bgColor="bgColor" height="100rpx" :titleStyle="{color:'#fff'}"></uv-navbar>
+		<uv-navbar autoBack 
+		:title="title[key] || '隐私协议'" 
+		leftIconColor="#fff" 
+		:bgColor="bgColor" 
+		height="100rpx" 
+		:titleStyle="{color:'#fff'}"></uv-navbar>
 		<view class="content" style="color: #fff!important;">
 			<uv-parse :content="content"></uv-parse>
 		</view>
@@ -13,7 +18,13 @@
 		data() {
 			return {
 				bgColor:'transparent',
-				content:''
+				content:'',
+				title : {
+					withdrawal_instructions : '旅行需知',
+					recharge_instructions : '支付需知',
+					vip_text : '主理人协议',
+				},
+				key : '',
 			}
 		},
 		onPageScroll(e) {
@@ -23,10 +34,10 @@
 				this.bgColor = 'transparent'
 			}
 		},
-		onLoad() {
-			console.log(this.$store.state.configList)
-			this.content = this.$store.state.configList.user_xy
-		}
+		onLoad({key}) {
+			this.key = key
+			this.content = this.$store.state.configList[key || 'user_xy']
+		},
 	}
 </script>
 
@@ -45,6 +56,7 @@
 		z-index: -1;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 	}

pages_my/activeList.vue

@@ -8,9 +8,13 @@
 					:extra-icon="{name:'arrow-down-fill',color:'#666',size:'26rpx'}"
 					:extra-active-icon="{name:'arrow-up-fill',color:'#fff',size:'26rpx'}" :defaultValue="defaultValue"
 					:custom-style="{padding: '0 30rpx'}" @click="selectMenu">
-					<uv-drop-down-item name="order" type="2" :label="dropItem('order').label" :value="dropItem('order').value">
+					<uv-drop-down-item name="state" type="2" :label="dropItem('state').label" :value="dropItem('state').value">
 					</uv-drop-down-item>
-					<uv-drop-down-item name="type" type="2" :label="dropItem('type').label" :value="dropItem('type').value">
+					
+					<uv-drop-down-item name="address" type="2" :label="dropItem('address').label" :value="dropItem('address').value">
+					</uv-drop-down-item>
+					
+					<uv-drop-down-item name="date" type="1" :label="dropItem('date').label" :value="dropItem('date').value">
 					</uv-drop-down-item>
 					<!-- <uv-drop-down-item name="type" type="2" :label="dropItem('type').label" :value="dropItem('type').value">
 					</uv-drop-down-item> -->
@@ -39,6 +43,10 @@
 					</view>
 				</view>
 			</view> -->
+			
+			<uv-calendars ref="calendars" 
+			@close="closeCalendars"
+			@confirm="confirmCalendars" />
 		</view>
 	</view>
 </template>
@@ -93,24 +101,20 @@
 				status:"loading",
 				bgColor:'transparent',
 				// 表示value等于这些值，就属于默认值
-				defaultValue: ['', 'all', '0'],
+				defaultValue: ['-1', 'all', 'allAddress'],
 				// 筛选结果
-				result: [{
-					name: 'order',
-					label: '全部',
-					value: ''
-				}],
+				result: [],
 				// { name: 'order', label: '最新发布', value: 'new' }
-				activeName: 'order',
-				order: {
+				activeName: 'state',
+				state: {
 					label: '全部',
-					value: '',
+					value: '-1',
 					activeIndex: 0,
-					color: '#333',
+					color: '#999',
 					activeColor: '#FF4546',
 					child: [{
 						label: '全部',
-						value: ''
+						value: '-1'
 					},{
 						label: '报名中',
 						value: '0'
@@ -119,41 +123,64 @@
 						value: '1'
 					}]
 				},
-				type: {
+				date: {
 					label: '时间',
 					value: 'all',
 					activeIndex: 0,
-					color: '#333',
+					color: '#999',
 					activeColor: '#FF4546',
-					child: [{
-						label: '全部',
-						value: 'all'
-					}, {
-						label: 'PDF',
-						value: 'pdf'
-					}, {
-						label: 'WROD',
-						value: 'word'
-					}, {
-						label: 'PPT',
-						value: 'ppt'
-					}]
+					child: [
+						{
+							label: '时间',
+							value: 'all'
+						},
+					]
+				},
+				address: {
+					label: '全部地区',
+					value: 'allAddress',
+					activeIndex: 0,
+					color: '#999',
+					activeColor: '#FF4546',
+					child: [
+						{
+							label: '全部地区',
+							value: 'allAddress'
+						},
+					]
 				},
 				totalPage:0,
 				cardListData:[],
 				params:{
-					state:'',
+					state : '',
 					pageNo:1,
 					pageSize:10
 				},
+				isC : false,
 			}
 		},
 		onLoad() {
 			this.getActivityPageList()
+			this.getArea()
+		},
+		onPullDownRefresh() {
+			this.params.pageNo = 1
+			this.cardListData = []
+			this.getActivityPageList()
 		},
 		methods: {
 			getActivityPageList() {
-				this.$api('activityPageList',this.params,res=>{
+				
+				let params = {
+					...this.params
+				}
+				
+				this.result.forEach(n => {
+					params[n.name] = n.value
+				})
+				
+				this.$api('activityPageList', params, res=>{
+					uni.stopPullDownRefresh()
 					if(res.code == 200) {
 						this.totalPage = res.result.pages
 						this.cardListData = [...this.cardListData,...res.result.records]
@@ -165,6 +192,18 @@
 					}
 				})
 			},
+			getArea(){
+				this.$api('getArea', res => {
+					if(res.code == 200){
+						res.result.forEach(n => {
+							this.address.child.push({
+								label: n.city,
+								value: n.id
+							})
+						})
+					}
+				})
+			},
 			change(e) {
 				console.log('弹窗打开状态：', e);
 			},
@@ -177,11 +216,7 @@
 				this.activeName = name;
 				// type 等于1 的需要特殊处理：type不等于1可以忽略
 				if (type == 1) {
-					this.clickItem({
-						name: 'vip_type',
-						label: 'VIP文档',
-						value: e.active ? 1 : 0
-					});
+					this.$refs.calendars.open()
 				} else {
 					const find = this.result.find(item => item.name == this.activeName);
 					if (find) {
@@ -200,9 +235,9 @@
 					value
 				} = e;
 				const findIndex = this.result.findIndex(item => item.name == this.activeName);
-				// if (this.defaultValue.indexOf(value) > -1 && this[this.activeName].label) {
-				// 	label = this[this.activeName].label;
-				// }
+				if (this.defaultValue.indexOf(value) > -1 && this[this.activeName].label) {
+					label = this[this.activeName].label;
+				}
 				// // 已经存在筛选项
 				if (findIndex > -1) {
 					this.$set(this.result, findIndex, {
@@ -217,12 +252,29 @@
 						value
 					});
 				}
-				let stateInfo = this.result.find(item=>item.name == 'order')
-				this.params.state = stateInfo.value
+				
+				this.result = this.result.filter(item => this.defaultValue.indexOf(item.value) == -1);
+				
 				this.params.pageNo = 1
 				this.cardListData = []
 				this.getActivityPageList()
-			}
+			},
+			confirmCalendars(e){
+				this.isC = true
+				this.clickItem({
+					name: 'date',
+					label: e.fulldate,
+					value: e.fulldate
+				});
+			},
+			closeCalendars(){
+				if(this.isC) return this.isC = false
+				this.clickItem({
+					name: 'date',
+					label: 'all',
+					value: 'all'
+				});
+			},
 		}
 	}
 </script>
@@ -235,6 +287,7 @@
 		position: absolute;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 	}
 	/deep/.uv-sticky__content {

pages_my/collection.vue

@@ -28,6 +28,7 @@
 				</view>
 				<i class="icon"></i>
 			</view>
+			<uv-load-more :status="status" fontSize="24rpx" dashed line />
 			<!-- <view class="info cardStyle_">
                 <view class="left">
                     <image src="https://img0.baidu.com/it/u=4274003247,920124130&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=1031" alt="">
@@ -70,6 +71,7 @@
 		data() {
 			return {
 				lineBg: require('@/static/image/cart/tabIcon.png'),
+				status:"loading",
 				tabCurrent:0,
 				params: {
 					pageNo: 1,
@@ -98,6 +100,11 @@
 		onLoad() {
 			this.collectPageList()
 		},
+		onPullDownRefresh() {
+			this.params.pageNo = 1
+			this.cardListData = []
+			this.collectPageList()
+		},
 		methods: {
 			tabs(e) {
 				this.tabCurrent = e.index
@@ -108,9 +115,15 @@
 			collectPageList() {
 				this.params.type = this.tabCurrent
 				this.$api('collectPageList', this.params, res => {
+					uni.stopPullDownRefresh()
 					if (res.code == 200) {
 						this.totalPage = res.result.pages
 						this.cardListData = [...this.cardListData, ...res.result.records]
+						if(this.params.pageNo >= this.totalPage) {
+							this.status = "nomore"
+						}else {
+							this.status = "loadmore"
+						}
 					}
 				})
 			},
@@ -135,7 +148,6 @@
 			.info {
 				position: relative;
 				margin: 10rpx 32rpx 36rpx;
-				;
 				border-radius: 26rpx;
 
 				.icon {

pages_my/guanyuwomen.vue

@@ -44,6 +44,7 @@
 		z-index: -1;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 	}

pages_my/qiandao-list.vue

@@ -4,14 +4,16 @@
 		<uv-navbar autoBack title="签到列表" leftIconColor="#fff" :bgColor="bgColor" height="100rpx" :titleStyle="{color:'#fff'}"></uv-navbar>
 	
 		<view class="content">
-			<zlx-item :showBottom="false"></zlx-item>
-			<view class="xie-box-val" v-for="(item,i) in signList" :key="i">
+			<zlx-item 
+			:item="detail.activityInfo"
+			:showBottom="false"></zlx-item>
+			<view class="xie-box-val" v-for="(item,i) in list" :key="i">
 				<view class="val-text">
 					<view>{{item.name}}</view>
 					<view class="phone-box">{{item.phone}}</view>
 					<view class="type-box">{{item.type}}X{{item.num}}</view>
 				</view>
-				<view class="choose-box" >
+				<view class="choose-box">
 					<view class="normol-box" v-if="i == 1"></view>
 					<image src="@/static/image/member/choose-icon.png" mode="widthFix" v-else></image>
 				</view>
@@ -26,30 +28,22 @@
 
 <script>
 	import zlxItem  from '@/components/zhaomu/zlx-item.vue'
+	import listMixin from '@/mixins/list.js'
 	export default{
+		mixins: [listMixin],
 		components:{
 			zlxItem
 		},
 		data() {
 			return {
+				mixinsListApi : 'getSignInUserPageList',
 				btnCustomStyle:{
 					color:'#FF5858'
 				},
 				bgColor:'transparent',
-				signList:[
-					{
-						name:'黎明',
-						phone:'19918812201',
-						type:'早鸟票',
-						num:1
-					},
-					{
-						name:'刘德华',
-						phone:'19918812201',
-						type:'尊享票',
-						num:3
-					}
-				]
+				detail : {
+					activityInfo : {},
+				},
 			}
 		},
 		onPageScroll(e) {
@@ -59,6 +53,10 @@
 				this.bgColor = 'transparent'
 			}
 		},
+		onLoad({id}) {
+			this.queryParams.recruitId = id
+			this.getActivityInfo()
+		},
 		methods:{
 			saoma() {
 				uni.scanCode({
@@ -66,7 +64,16 @@
 						
 					}
 				})
-			}
+			},
+			getActivityInfo(){
+				this.$api('activityInfo', {
+					activityId : this.queryParams.recruitId,
+				}, res => {
+					if(res.code == 200){
+						this.detail = res.result
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -86,6 +93,7 @@
 		z-index: -1;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 		.xie-box-val {

pages_my/travelList.vue

@@ -17,16 +17,16 @@
                     @click="selectMenu"
                 >
                     <uv-drop-down-item 
-                        name="order" 
+                        name="state" 
                         type="2" 
-                        :label="dropItem('order').label" 
-                        :value="dropItem('order').value">
+                        :label="dropItem('state').label" 
+                        :value="dropItem('state').value">
                     </uv-drop-down-item>
                     <uv-drop-down-item 
-                        name="type" 
-                        type="2" 
-                        :label="dropItem('type').label" 
-                        :value="dropItem('type').value">
+                        name="date" 
+                        type="1" 
+                        :label="dropItem('date').label" 
+                        :value="dropItem('date').value">
                     </uv-drop-down-item>
                 </uv-drop-down>
 
@@ -57,6 +57,10 @@
                 </view>
             </view>
         </view>
+		
+		<uv-calendars ref="calendars" 
+		@close="closeCalendars"
+		@confirm="confirmCalendars" />
 	</view>
 </template>
 
@@ -101,48 +105,37 @@
                 totalPage: '',
                 cardListData: [],
                 // 表示value等于这些值，就属于默认值
-				defaultValue: [0, 'all', '0'],
+				defaultValue: ['all'],
 				// 筛选结果
-				result: [{ name: 'order', label: '全部', value: 'new' }],
-				// { name: 'order', label: '最新发布', value: 'new' }
-				activeName: 'order',
-				order: {
+				result: [],
+				// { name: 'state', label: '最新发布', value: 'new' }
+				activeName: 'state',
+				state: {
 					label: '全部',
 					value: 'all',
 					activeIndex: 0,
-					color: '#333',
+					color: '#999',
 					activeColor: '#FF4546',
 					child: [{
-						label: '综合排序',
+						label: '全部',
 						value: 'all'
 					}, {
-						label: '最新发布',
-						value: 'new'
+						label: '报名中',
+						value: '0'
 					}, {
-						label: '低价优先',
-						value: 'money'
+						label: '已结束',
+						value: '1'
 					}]
 				},
-				type: {
+				date: {
 					label: '时间',
 					value: 'all',
 					activeIndex: 0,
-					color: '#333',
+					color: '#999',
 					activeColor: '#FF4546',
-					child: [{
-						label: '全部',
-						value: 'all'
-					}, {
-						label: 'PDF',
-						value: 'pdf'
-					}, {
-						label: 'WROD',
-						value: 'word'
-					}, {
-						label: 'PPT',
-						value: 'ppt'
-					}]
-				}
+					child: []
+				},
+				isC : false,
 			}
 		},
         onReachBottom() {
@@ -153,9 +146,24 @@
         onLoad() {
             this.travelPageList()
         },
+		onPullDownRefresh() {
+			this.params.pageNo = 1
+			this.cardListData = []
+			this.travelPageList()
+		},
 		methods: {
             travelPageList() {
-                this.$api('travelPageList',this.params, res=> {
+				
+				let params = {
+					...this.params
+				}
+				
+				this.result.forEach(n => {
+					params[n.name] = n.value
+				})
+				
+                this.$api('travelPageList',params, res=> {
+					uni.stopPullDownRefresh()
                     if(res.code == 200) {
 						this.totalPage = res.result.pages
 						this.cardListData = [...this.cardListData,...res.result.records]
@@ -179,11 +187,7 @@
 				this.activeName = name;
 				// type 等于1 的需要特殊处理：type不等于1可以忽略
 				if (type == 1) {
-					this.clickItem({
-						name: 'vip_type',
-						label: 'VIP文档',
-						value: e.active ? 1 : 0
-					});
+					this.$refs.calendars.open()
 				} else {
 					const find = this.result.find(item => item.name == this.activeName);
 					if (find) {
@@ -220,10 +224,26 @@
 					});
 				}
 				this.result = this.result.filter(item => this.defaultValue.indexOf(item.value) == -1);
-				uni.showModal({
-					content: `筛选的值：${JSON.stringify(this.result)}`
-				})
-			}
+				this.params.pageNo = 1
+				this.cardListData = []
+				this.travelPageList()
+			},
+			confirmCalendars(e){
+				this.isC = true
+				this.clickItem({
+					name: 'date',
+					label: e.fulldate,
+					value: e.fulldate
+				});
+			},
+			closeCalendars(){
+				if(this.isC) return this.isC = false
+				this.clickItem({
+					name: 'date',
+					label: 'all',
+					value: 'all'
+				});
+			},
 		}
 	}
 </script>
@@ -239,6 +259,7 @@
     // margin-bottom: 500rpx;
     
     .content {
+		margin-top: 40rpx;
         .info {
             position: relative;
             margin: 10rpx 32rpx 36rpx;;
@@ -256,7 +277,8 @@
                         border-radius: 30rpx 0px 0px 30rpx;
                     }
 					.btn-2 {
-					    color: $uni-color-primary;
+                        background: #333;
+					    color: #999;
 					    padding: 10rpx 40rpx;
 					    border-radius: 30rpx 0px 0px 30rpx;
 					}

pages_my/user-info.vue

@@ -37,7 +37,7 @@
 						<view>国籍</view>
 					</view>
 					<view class="value-box">
-					{{info.city}}
+					{{info.city || '未设置'}}
 					</view>
 				</view>
 				<view class="form-box-line">
@@ -46,7 +46,7 @@
 						<view>学历</view>
 					</view>
 					<view class="value-box">
-						{{info.shcool}}
+						{{info.shcool || '未设置'}}
 					</view>
 				</view>
 				<view class="form-box-line">
@@ -55,7 +55,7 @@
 						<view>行业</view>
 					</view>
 					<view class="value-box">
-						{{info.workValue}}
+						{{info.workValue || '未设置'}}
 					</view>
 				</view>
 				<view class="form-box-line">
@@ -64,7 +64,7 @@
 						<view>电话</view>
 					</view>
 					<view class="value-box">
-						{{info.phone}}
+						{{info.phone || '未设置'}}
 					</view>
 				</view>
 				<view class="form-box-line">
@@ -73,7 +73,7 @@
 						<view>性别</view>
 					</view>
 					<view class="value-box">
-						{{info.sex}}
+						{{info.sex || '未设置'}}
 					</view>
 				</view>
 			</view>
@@ -89,7 +89,7 @@
 			</view>
 			<view class="about-box">
 				<uv-divider text="关于我" textSize="28rpx"></uv-divider>
-				<view class="about-box-val">{{info.details}}</view>
+				<view class="about-box-val">{{info.details || '未设置'}}</view>
 			</view>
 		</view>
 		<view class="btn-box">

pages_my/zlx-qiandao.vue

@@ -4,40 +4,28 @@
 		<uv-navbar autoBack title="主理人签到" leftIconColor="#fff" :bgColor="bgColor" height="100rpx" :titleStyle="{color:'#fff'}"></uv-navbar>
 	
 		<view class="content">
-			<zlx-item :cardListData="cardListData" @qiandaoClick="qiandaoClick"></zlx-item>
+			<zlx-item 
+			v-for="(item, index) in list"
+			:key="index"
+			:item="item"
+			showBottom
+			@qiandaoClick="qiandaoClick(item.id)"></zlx-item>
 		</view>
 	</view>
 </template>
 
 <script>
 	import zlxItem  from '@/components/zhaomu/zlx-item.vue'
+	import listMixin from '@/mixins/list.js'
 	export default{
+		mixins: [listMixin],
 		components:{
 			zlxItem
 		},
 		data() {
 			return {
 				bgColor:'transparent',
-				cardListData: [
-					{
-						imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
-						orderTime: '2024.08.23 12:00',
-						state: 'U',
-						stateText: '待参加',
-						title: '夏日去撒野旅游计划～',
-						time: '2024.10.28 10:00',
-						address: '成都市东丽湖露营地32号',
-					},
-					{
-						imgUrl: 'https://up.zhuoku.org/22/a4/60/50/fc3bd0b4e656911fccdde4383637c1cd.jpg',
-						orderTime: '2024.08.23 12:00',
-						state: 'S',
-						stateText: '已完成',
-						title: '夏日去撒野旅游计划～',
-						time: '2024.10.28 10:00',
-						address: '成都市东丽湖露营地32号',
-					},
-				]
+				mixinsListApi : 'activityMemberPageList',//activityMemberPageList getTwoPageList
 			}
 		},
 		onPageScroll(e) {
@@ -48,19 +36,14 @@
 			}
 		},
 		onLoad() {
-			this.getactivityMemberPageList()
+			this.queryParams.type = 0
 		},
 		methods:{
-			getactivityMemberPageList(){
-				this.$api('activityMemberPageList',{type:0},res=>{
-					this.cardListData = res.result.records;
-				})
-			},
-			qiandaoClick() {
+			qiandaoClick(id) {
 				uni.navigateTo({
-					url:'/pages_my/qiandao-list'
+					url:'/pages_my/qiandao-list?id=' + id
 				})
-			}
+			},
 		}
 	}
 </script>
@@ -80,6 +63,7 @@
 		z-index: -1;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 	}

pages_order/huodong-detail.vue

@@ -5,19 +5,19 @@
 		
 		<view class="content">
 			<view class="content-head">
-				<image class="image-box" :src="imageArr[0]" mode=""></image>
+				<image class="image-box" :src="imageArr[0]" mode="aspectFill"></image>
 				<view class="msg-box">
 					<view class="msg-box-title">{{activityDetails.title}}</view>
 					<view class="msg-box-time">开始时间：{{activityDetails.startTime}}</view>
 					<view class="msg-box-address">
 						<view class="msg-box-address-text">活动地址：{{activityDetails.address}}</view>
 						<view class="address-icon" @click="daohang">
-							<image src="@/static/image/home/address-icon-2.png" mode=""></image>
+							<image src="@/static/image/home/address-icon-2.png" mode="aspectFill"></image>
 							<view>导航</view>
 						</view>
 					</view>
 					<view class="lingdui-box">
-						<image class="use-img" :src="adminUserInfo.headImage" mode=""></image>
+						<image class="use-img" :src="adminUserInfo.headImage" mode="aspectFill"></image>
 						<view class="lingdui-msg">
 							<view class="lingdui-msg-name">
 								<view>{{adminUserInfo.nickName}}</view>
@@ -138,7 +138,8 @@ import { error } from '../uni_modules/uv-ui-tools/libs/function'
 		},
 		computed:{
 			imageArr() {
-				return this.activityDetails.image.split(',')
+				return this.activityDetails
+				&& this.activityDetails.image.split(',')
 			}
 		},
 		onShareAppMessage(res) {
@@ -229,8 +230,14 @@ import { error } from '../uni_modules/uv-ui-tools/libs/function'
 								icon: 'none'
 							})
 							
-						}).catch(n => {
+							setTimeout(uni.switchTab, 800, {
+								url: '/pages/index/cart'
+							})
 							
+						}).catch(n => {
+							setTimeout(uni.switchTab, 800, {
+								url: '/pages/index/cart'
+							})
 						})
 					}
 				})
@@ -258,6 +265,7 @@ import { error } from '../uni_modules/uv-ui-tools/libs/function'
 		z-index: -1;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx 170rpx;
 		padding-top: calc(var(--status-bar-height) + 130rpx);
 		.content-head {

pages_order/invoiceIssuance.vue

@@ -108,8 +108,9 @@
 <style scoped lang="scss">
 .invoiceIssuance {
     .content {
+		margin-top: 40rpx;
         .info {
-            margin: 10rpx 32rpx 0rpx;;
+            margin: 10rpx 32rpx 0rpx;
             border-radius: 26rpx;
         }
         .choice {

pages_order/invoiceRecords.vue

@@ -5,17 +5,26 @@
         <view class="content contentPosition_">
             <view class="info cardStyle_" v-for="(item, index) in list" :key="index">
                 <view class="left" v-if="item.noType == 0">
-                    <image :src="item.activityList[0].image.split(',')[0]" alt="">
+                    <image :src="item.activityList[0] &&
+					 item.activityList[0].image &&
+					 item.activityList[0].image.split(',')[0]" alt="">
                 </view>
 				<view class="left" v-if="item.noType == 1">
-					<image :src="item.travelList[0].image.split(',')[0]" alt="">
+					<image :src="item.travelList[0] &&
+					 item.travelList[0].image &&
+					 item.travelList[0].image.split(',')[0]" alt="">
 				</view>
                 <view class="right">
                     <view class="detailed">
-                        <view class="title" v-if="item.noType == 0">{{item.activityList[0].title}}</view>
-						 <view class="title" v-if="item.noType == 1">{{item.travelList[0].title}}</view>
+                        <view class="title" v-if="item.noType == 0">
+							{{item.activityList[0] && item.activityList[0].title}}
+						</view>
+						 <view class="title" v-if="item.noType == 1">
+							 {{item.travelList[0] && item.travelList[0].title}}
+						 </view>
                         <view class="date">{{item.createTime}}</view>
-						<view class="date">{{item.name}}</view>
+						<view class="date"
+						style="padding-top: 0;">{{item.name}}</view>
                         <view class="address">{{item.emil}}</view>
                     </view>
                     <view class="data">
@@ -25,22 +34,23 @@
                     </view>
                 </view>
             </view>
-        </view>
+			<uv-load-more :status="uvLoadMore" fontSize="24rpx" dashed line />
+		</view>
      </view>
 </template>
 
 <script>
 import Navbar from '@/pages/components/Navbar.vue'
 import { globalMixin } from '../pages/mixins/globalMixin';
-
+import listMixin from '@/mixins/list.js'
 export default {
-     mixins: [globalMixin],
+     mixins: [globalMixin, listMixin],
     components:{
         Navbar
     },
     data() {
         return {
-			list:[]
+			mixinsListApi : 'getInvoicePageList',
         };
     },
     components: {
@@ -57,32 +67,40 @@ export default {
     },
 	onShow() {
 		console.log("进入了发票管理")
-		this.getInvoicePageList();
 	},
     mounted() {
 		
-
     },
     methods: {
-		getInvoicePageList(){
-			this.$api('getInvoicePageList',res=>{
-				if(res.code == 200) {
-					this.list = res.result.records
-				}
-			})
-		}
+		getImage(){
+			return item.image && item.image.split(',')[0]
+		},
     }
 };
 </script>
 
 <style scoped lang="scss">
 .invoiceRecords {
+	.content{
+		margin-top: 40rpx;
+		.title,
+		.date{
+			overflow:hidden; //超出的文本隐藏
+			text-overflow:ellipsis; //溢出用省略号显示
+			white-space:nowrap; //溢出不换行
+			width: 370rpx;
+		}
+	}
     .info {
         margin: 10rpx 32rpx 0rpx;
         padding: 35rpx 0 35rpx 24rpx;
         border-radius: 26rpx;
+		.left{
+			flex-shrink: 0;
+		}
         .right {
             .data {
+				padding-top: 10rpx;
                 display: flex;
                 justify-content: space-between;
                 .btn {

pages_order/lvyou-detail.vue

@@ -196,6 +196,7 @@
 		z-index: -1;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx 170rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 		.content-head {

pages_order/orderDetails.vue

@@ -32,10 +32,22 @@
 				</view>
 
 			</view>
-			<view class="tips" v-if="dataInfo.type == 1">
+			<view class="tips">
+				<view class="title">支付须知</view>
+				<view class="details">
+					<uv-parse :content="configList.recharge_instructions"></uv-parse>
+				</view>
+			</view>
+			<view class="tips" v-if="dataInfo.type == 0">
+				<view class="title">活动须知</view>
+				<view class="details">
+					<uv-parse :content="configList.withdrawal_instructions"></uv-parse>
+				</view>
+			</view>
+			<view class="tips" v-else-if="dataInfo.type == 1">
 				<view class="title">旅行须知</view>
 				<view class="details">
-					<uv-parse :content="content"></uv-parse>
+					<uv-parse :content="configList.withdrawal_instructions"></uv-parse>
 				</view>
 			</view>
 		</view>
@@ -58,7 +70,6 @@
 		},
 		data() {
 			return {
-				content:'',
 				orderId:'',
 				dataInfo:null,
 				customStyle:{
@@ -69,8 +80,6 @@
 		onLoad(e) {
 			this.orderId = e.id
 			this.getorderInfo()
-			console.log(this.$store.state.configList)
-			this.content = this.$store.state.configList.withdrawal_instructions
 		},
 		computed:{
 			orderStatus() {

pages_zlx/zlx-form.vue

@@ -13,7 +13,7 @@
 					</view>
 					<view class="id-box">
 						<text>ID:{{userInfo.id}}</text>
-						<text class="copy-text" @click="copy">复制</text>
+						<text class="copy-text" @click.stop="copy">复制</text>
 					</view>
 				</view>
 			</view>
@@ -194,6 +194,7 @@
 		z-index: -1;
 	}
 	.content {
+		margin-top: 40rpx;
 		padding: 0 30rpx;
 		padding-top: calc(var(--status-bar-height) + 110rpx);
 		

store/store.js

@@ -28,6 +28,7 @@ const store = new Vuex.Store({
 						state.configList[n.keyName] = n.keyContent
 					})
 				}
+				console.log("initConfig===============", res);
 			})
 			
 			// let config = ['getPrivacyPolicy', 'getUserAgreement']

uni_modules/uv-calendars/components/uv-calendars/i18n/zh-Hans.json

@@ -1,6 +1,6 @@
 {
 	"uv-calender.ok": "确定",
-	"uv-calender.cancel": "取消",
+	"uv-calender.cancel": "全部日期",
 	"uv-calender.today": "今日",
 	"uv-calender.SUN": "日",
 	"uv-calender.MON": "一",

uni_modules/uv-calendars/components/uv-calendars/i18n/zh-Hant.json

@@ -1,6 +1,6 @@
 {
 	"uv-calender.ok": "確定",
-	"uv-calender.cancel": "取消",
+	"uv-calender.cancel": "全部",
 	"uv-calender.today": "今日",
 	"uv-calender.SUN": "日",
 	"uv-calender.MON": "一",

uni_modules/uv-calendars/components/uv-calendars/uv-calendars.vue

@@ -22,7 +22,9 @@
 				@choiceDate="choiceDate"
 			></calendar-body>
 		</view>
-		<uv-popup ref="popup" mode="bottom" v-else :round="round" z-index="998" :close-on-click-overlay="closeOnClickOverlay" @maskClick="maskClick">
+		<uv-popup ref="popup" mode="bottom" v-else 
+		:round="round" z-index="998" 
+		:close-on-click-overlay="closeOnClickOverlay" @maskClick="maskClick">
 			<view style="min-height: 100px;">
 				<uv-toolbar
 					:show="true"
@@ -440,7 +442,7 @@
 <style scoped lang="scss">
 	$uv-border-color: #EDEDED !default;
 	.uv-calendar__content {
-		background-color: #fff;
+		background-color: #fff;//1B1713
 	}
 	.line {
 		width: 750rpx;

uni_modules/uv-drop-down/components/uv-drop-down-popup/uv-drop-down-popup.vue

@@ -1,14 +1,20 @@
 <template>
-	<view class="uv-drop-down-popup">
+	<view class="uv-drop-down-popup"
+	>
 		<uv-transition :show="show" mode="fade" :duration="300" :custom-style="overlayStyle" @click="clickOverlay">
 			<view class="uv-dp__container" ref="uvDPContainer" :style="{height: `${height}px`}" @click.stop="blockClick">
-				<view class="uv-dp__container__list" ref="uvDPList">
-					<slot>
-						<view class="uv-dp__container__list--item" v-for="(item,index) in list" :key="index" @click="clickHandler(item,index)" :style="[itemCustomStyle(index)]">
-							<uv-text :text="item[keyName]" :size="getTextSize(index)" :color="getTextColor(index)"></uv-text>
-						</view>
-					</slot>
-				</view>
+				<scroll-view
+				style="height: 100%;"
+				scroll-y="true">
+					<!-- <view class="head-box"></view> -->
+					<view class="uv-dp__container__list" ref="uvDPList">
+						<slot>
+							<view class="uv-dp__container__list--item" v-for="(item,index) in list" :key="index" @click="clickHandler(item,index)" :style="[itemCustomStyle(index)]">
+								<uv-text :text="item[keyName]" :size="getTextSize(index)" :color="getTextColor(index)"></uv-text>
+							</view>
+						</slot>
+					</view>
+				</scroll-view>
 			</view>
 		</uv-transition>
 	</view>
@@ -105,7 +111,7 @@
 					if (active) {
 						return activeColor ? activeColor : '#3c9cff';
 					}
-					return color ? color : '#333';
+					return color ? color : '#999';
 				}
 			},
 			getTextSize(index) {
@@ -227,12 +233,24 @@
 	}
 </script>
 <style scoped lang="scss">
+	.head-box {
+		background: url('@/static/image/nav-bg.png') no-repeat;
+		background-size: 100% 100%;
+		width: 100%;
+		height: 534rpx;
+		max-height: 100%;
+		position: absolute;
+		z-index: -1;
+	}
 	.uv-dp__container {
 		/* #ifndef APP-NVUE */
 		overflow: hidden;
+		// background: url('@/static/image/nav-bg.png') no-repeat;
+		// background-size: 100% 100%;
+		background-color: #1B1713;
 		transition: all .15s;
 		/* #endif */
-		background-color: #fff;
+		max-height: 40vh;
 	}
 	.uv-dp__container__list {
 		&--item {

utils/utils.js

@@ -186,7 +186,7 @@ export const toLogin = function(){
 		}
 		time = new Date().getTime()
 		uni.navigateTo({
-			url: '/pages_order/auth/wxLogin'
+			url: '/pages_login/wxLogin'
 		})
 	}
 }()