修改bug

.gitignore

@@ -0,0 +1,4 @@
+node_modules/
+.project
+unpackage/
+.DS_Store

config/api.js

@@ -76,6 +76,8 @@ module.exports = {
 	getQrcodeInfo: API_BASE + '/v2/sale/center/bindShareId',
 	//  获取我的评价列表
 	getEvaluateList: API_BASE + '/v2/student/myCenter/getClassEvaluateList',
+	//  获取我的签到评价列表
+	findSignEvaluate: API_BASE + '/v2/class/findSignEvaluate',
 	//  获取我的预约体验列表
 	getSubscribeList: API_BASE + '/v2/admin/subscribe/getSubscribeClassEvaluateList',
 	// 查询场馆下 班级列表

pages.json

@@ -110,6 +110,11 @@
 			"style": {
 				"navigationBarTitleText": "我的预约"
 			}
+		},{
+			"path": "subscribeListAll",
+			"style": {
+				"navigationBarTitleText": "我的预约记录"
+			}
 		}, {
 			"path": "memberCardList",
 			"style": {

pages/user/index.vue

@@ -103,7 +103,12 @@
 						icon: API.getServerImg + 'pingjia.png'
 					},
 					{
-						label: '预约体验',
+						label: '预约体验记录',
+						path: 'subscribeListAll',
+						icon: API.getServerImg + 'yuyueList.png'
+					},
+					{
+						label: '预约体验扫码',
 						path: 'subscribeList',
 						icon: API.getServerImg + 'yuyue.png'
 					},
@@ -115,7 +120,7 @@
 					{
 						label: '退出登录',
 						path: 'logout',
-						icon: API.getServerImg + 'yuyue.png'
+						icon: API.getServerImg + 'tuichu.png'
 					},
 				],
 				studentList: [],

pagesMain/evaluateList.vue

@@ -7,23 +7,23 @@
 			 :key="index" class="class-card">
 				<view class="class-content" slot="head" style="padding-top: 10px;">
 					<view class="student-name">{{item.studentName}}</view>
-					<view class="class-name">{{item.name}}</view>
+					<view class="class-name">{{item.courseName}}</view>
 				</view>
 				<view class="class-content" slot="body">
 					<view class="class-info-text">
 						<u-icon name="clock"></u-icon>
-						{{item.classStartDate}}&nbsp;&nbsp;{{item.classStartHours}}
+						{{item.remarkDate}}
 					</view>
 					<view class="class-info-text">
 						<u-icon name="map"></u-icon>
-						{{item.address}}
+						{{item.remark}}
 					</view>
 				</view>
 				<view class="class-content" slot="foot" style="display: flex;">
 					<view class="class-foot-label">评价信息：</view>
 					<view class="class-foot-content">
-						<u-rate :count="10" v-model="item.level" :active-color="mainColor" disabled></u-rate>
-						<view class="class-foot-text">{{item.content}}</view>
+						<u-rate :count="10" v-model="item.star" :active-color="mainColor" disabled></u-rate>
+						<view class="class-foot-text">{{item.remark}}</view>
 					</view>
 				</view>
 			</u-card>
@@ -80,7 +80,7 @@
 			},
 			//  获取列表数据
 			getTableList() {
-				NET.request(API.getEvaluateList, {
+				NET.request(API.findSignEvaluate, {
 					page: this.pageIndex,
 					size: 10,
 				}, 'POST').then(res => {

pagesMain/subscribeListAll.vue

@@ -0,0 +1,173 @@
+<template>
+	<view class="content">
+		<scroll-view scroll-y class="scroll-box" @scrolltolower="handleLoadMore" :refresher-enabled="true"
+		 :refresher-triggered="triggered" :refresher-threshold="100" refresher-background="white" @refresherrefresh="onRefresh"
+		 @refresherrestore="onRestore">
+			<u-card :head-border-bottom="false" padding="0px" margin="10px" borderRadius="40" v-for="(item, index) in tableList"
+			 :key="index" class="class-card" @click="handleJumpClick(item)">
+				<view class="class-content" slot="head" style="padding-top: 10px;">
+					<view class="student-name">{{item.studentName}}</view>
+					<view class="class-name">{{item.name}}</view>
+				</view>
+				<view class="class-content" slot="body">
+					<view class="class-info-text">
+						<u-icon name="clock"></u-icon>
+						{{item.classStartDate}}&nbsp;&nbsp;{{item.classStartHours}}
+					</view>
+					<view class="class-info-text">
+						<u-icon name="map"></u-icon>
+						{{item.address}}
+					</view>
+				</view>
+		<!-- 		<view class="class-foot" slot="foot">
+					<u-button type="default" shape="circle" :ripple="true" :custom-style="handleDefaultCustomStyle" size="mini"
+					 :hair-line="false" plain>已预约</u-button>
+				</view> -->
+			</u-card>
+			<u-divider v-if="isOver" bg-color="transparent">没有更多了</u-divider>
+		</scroll-view>
+		<u-top-tips ref="uTips"></u-top-tips>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters
+	} from 'vuex'
+	const NET = require('@/utils/request')
+	const API = require('@/config/api')
+	export default {
+		computed: {
+			...mapGetters([
+				'handleDefaultCustomStyle',
+			])
+		},
+		data() {
+			return {
+				triggered: false,
+				isOver: false,
+				pageIndex: 1,
+				tableList: [],
+			}
+		},
+		onLoad(options) {
+			console.log(options);
+			// 二维码中场馆id
+		},
+		onShow() {
+			this.tableList = []
+			this.getTableList()
+		},
+		onReady() {},
+		methods: {
+			// 跳转详情
+			handleJumpClick(item) {
+				uni.navigateTo({
+					url: '/pagesMain/subscribeInfo?item=' + encodeURIComponent(JSON.stringify(item))
+				})
+			},
+			//  下拉刷新
+			onRefresh() {
+				this.triggered = true
+				this.isOver = false
+				this.pageIndex = 1
+				this.tableList = []
+				this.getTableList()
+			},
+			//  重置下拉刷新状态
+			onRestore() {
+				this.triggered = 'restore'
+				this.triggered = false
+			},
+			//  懒加载
+			handleLoadMore() {
+				if (!this.isOver) {
+					this.pageIndex++
+					this.getTableList()
+				}
+			},
+			//  获取列表数据
+			getTableList() {
+				//  id:场馆id
+				NET.request(API.getSubscribeList, {
+					page: this.pageIndex,
+					size: 10,
+				}, 'POST').then(res => {
+					this.triggered = false
+					this.tableList = this.tableList.concat(res.data.row)
+					this.isOver = res.data.row.length != 10
+				}).catch(error => {
+					this.triggered = false
+					this.$refs.uTips.show({
+						title: error.message,
+						type: 'warning',
+					})
+				})
+			}
+		},
+	}
+</script>
+
+<style>
+	page {
+		width: 100%;
+		height: 100%;
+		background-color: #f7f7f7;
+	}
+</style>
+<style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
+
+	.content {
+		width: 100%;
+		float: left;
+
+		.scroll-box {
+			width: 100%;
+			height: 100vh;
+			padding-bottom: 10px;
+			box-sizing: border-box;
+
+			.class-card {
+				.class-content {
+					padding: 5px 15px;
+				}
+
+				.student-name {
+					height: 20px;
+					display: inline-block;
+					padding: 0 10px;
+					margin-right: 5px;
+					background-color: $mainColor;
+					border-radius: 10px;
+					line-height: 20px;
+					color: #FFFFFF;
+				}
+
+				.class-name {
+					height: 20px;
+					display: inline-block;
+					font-weight: bold;
+					font-size: 14px;
+					line-height: 20px;
+				}
+
+				.class-info-text {
+					color: #999999;
+					margin-bottom: 5px;
+
+					/deep/.u-icon {
+						margin-right: 5px;
+						font-size: 14px;
+						color: #000000;
+					}
+				}
+			}
+
+			.class-foot {
+				padding: 10px 15px;
+				text-align: right;
+			}
+		}
+	}
+</style>

pagesMember/venueDetail.vue

@@ -14,12 +14,12 @@
 		<!-- 会员开通 -->
 		<u-section title="会员开通" font-size="32" :right="false" :show-line="false" class="title-box"></u-section>
 		<view class="menber-box">
-			<view class="menber-col" v-for="(item, index) in menberList" :key="index">
+			<view class="menber-col" v-for="(item, index) in menberList" :key="index" @click.stop="checkBox(item)" :style="{background:item.checked?'#ffd5c7':'#fff'}">
 				<view class="menber-label">卡名: {{ item.typeValue }}</view>
 				<view class="menber-label">售价: ¥ {{ item.sellingPrice }}</view>
 				<view class="menber-label">使用时间: {{ item.startDate }}~{{ item.endDate }}</view>
 				<!-- <u-button type="warning" shape="circle" :ripple="true" :custom-style="{...handleCustomStyle, float: 'left', marginLeft: ''}" size="mini" @click="goToPay(item)">点击开通</u-button> -->
-				<u-checkbox v-model="item.checked" active-color="#ff6e3e" @change="changeCardClick(item)">选择</u-checkbox>
+				<!--<u-checkbox v-model="item.checked" active-color="#ff6e3e" @change.stop="changeCard(item)">选择</u-checkbox> -->
 				<view class="menber-icon iconfont iconzu4931"></view>
 			</view>
 			<view v-if="checkedCardList.length">
@@ -185,8 +185,16 @@
 					})
 				})
 			},
+			checkBox(item){
+				item.checked=!item.checked
+				this.changeCardClick(item)
+			},
+			changeCard(item){
+				item.checked=!item.checked
+			},
 			//  选择会员卡
 			changeCardClick(cardItem) {
+				console.log(cardItem.checked)
 				const cardItemIndex = this.checkedCardList.findIndex( item => item.id === cardItem.id )
 				if(cardItemIndex === -1) {
 					this.checkedCardList.push(cardItem)

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

@@ -30,6 +30,7 @@
         "evaluateList",
         "subscribeInfo",
         "subscribeList",
+        "subscribeListAll",
         "memberCardList",
         "openMember",
         "contractInfo",
@@ -77,6 +78,5 @@
       "desc": "获取当前区域定位以选取附近场馆"
     }
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -180,39 +180,65 @@ text {
   font-size: 34rpx;
 }
 .u-flex {
+
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  flex-direction: row;
-  align-items: center;
+
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 .u-flex-wrap {
-  flex-wrap: wrap;
+  -webkit-flex-wrap: wrap;
+          flex-wrap: wrap;
 }
 .u-flex-nowrap {
-  flex-wrap: nowrap;
+  -webkit-flex-wrap: nowrap;
+          flex-wrap: nowrap;
 }
 .u-col-center {
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 .u-col-top {
-  align-items: flex-start;
+  -webkit-box-align: start;
+  -webkit-align-items: flex-start;
+          align-items: flex-start;
 }
 .u-col-bottom {
-  align-items: flex-end;
+  -webkit-box-align: end;
+  -webkit-align-items: flex-end;
+          align-items: flex-end;
 }
 .u-row-center {
-  justify-content: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+          justify-content: center;
 }
 .u-row-left {
-  justify-content: flex-start;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+          justify-content: flex-start;
 }
 .u-row-right {
-  justify-content: flex-end;
+  -webkit-box-pack: end;
+  -webkit-justify-content: flex-end;
+          justify-content: flex-end;
 }
 .u-row-between {
-  justify-content: space-between;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+          justify-content: space-between;
 }
 .u-row-around {
-  justify-content: space-around;
+  -webkit-justify-content: space-around;
+          justify-content: space-around;
 }
 .u-text-left {
   text-align: left;
@@ -224,47 +250,80 @@ text {
   text-align: right;
 }
 .u-flex-col {
+
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  flex-direction: column;
+
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: column;
+          flex-direction: column;
 }
 .u-flex-0 {
-  flex: 0;
+  -webkit-box-flex: 0;
+  -webkit-flex: 0;
+          flex: 0;
 }
 .u-flex-1 {
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
 }
 .u-flex-2 {
-  flex: 2;
+  -webkit-box-flex: 2;
+  -webkit-flex: 2;
+          flex: 2;
 }
 .u-flex-3 {
-  flex: 3;
+  -webkit-box-flex: 3;
+  -webkit-flex: 3;
+          flex: 3;
 }
 .u-flex-4 {
-  flex: 4;
+  -webkit-box-flex: 4;
+  -webkit-flex: 4;
+          flex: 4;
 }
 .u-flex-5 {
-  flex: 5;
+  -webkit-box-flex: 5;
+  -webkit-flex: 5;
+          flex: 5;
 }
 .u-flex-6 {
-  flex: 6;
+  -webkit-box-flex: 6;
+  -webkit-flex: 6;
+          flex: 6;
 }
 .u-flex-7 {
-  flex: 7;
+  -webkit-box-flex: 7;
+  -webkit-flex: 7;
+          flex: 7;
 }
 .u-flex-8 {
-  flex: 8;
+  -webkit-box-flex: 8;
+  -webkit-flex: 8;
+          flex: 8;
 }
 .u-flex-9 {
-  flex: 9;
+  -webkit-box-flex: 9;
+  -webkit-flex: 9;
+          flex: 9;
 }
 .u-flex-10 {
-  flex: 10;
+  -webkit-box-flex: 10;
+  -webkit-flex: 10;
+          flex: 10;
 }
 .u-flex-11 {
-  flex: 11;
+  -webkit-box-flex: 11;
+  -webkit-flex: 11;
+          flex: 11;
 }
 .u-flex-12 {
-  flex: 12;
+  -webkit-box-flex: 12;
+  -webkit-flex: 12;
+          flex: 12;
 }
 .u-font-9 {
   font-size: 9px;
@@ -3009,8 +3068,13 @@ text {
   padding-bottom: 80rpx !important;
 }
 .u-reset-nvue {
-  flex-direction: row;
-  align-items: center;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -webkit-flex-direction: row;
+          flex-direction: row;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 .u-type-primary-light {
   color: #ecf5ff;
@@ -3140,8 +3204,12 @@ page {
 /* end--去除webkit的默认样式--end */
 /* start--icon图标外层套一个view，让其达到更好的垂直居中的效果--start */
 .u-icon-wrap {
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 /* end-icon图标外层套一个view，让其达到更好的垂直居中的效果--end */
 /* start--iPhoneX底部安全区定义--start */
@@ -3200,7 +3268,9 @@ page {
 .u-border-top-bottom:after,
 .u-border-top:after,
 .u-border:after {
+
   content: ' ';
+
   position: absolute;
   left: 0;
   top: 0;
@@ -3237,7 +3307,9 @@ page {
 /* start--clearfix--start */
 .u-clearfix:after,
 .clearfix:after {
+
   content: '';
+
   display: table;
   clear: both;
 }
@@ -3250,6 +3322,14 @@ page {
 }
 /* end--高斯模糊tabbar底部处理--end */
 /* start--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--start */
+
+
+
+
+
+
+
+
 /* end--提升H5端uni.toast()的层级，避免被uView的modal等遮盖--end */
 /* start--去除button的所有默认样式--start */
 .u-reset-button {
@@ -3263,35 +3343,102 @@ page {
   border: none;
 }
 /* end--去除button的所有默认样式--end */
+
+
+
+
+
+
+
 /* start--微信小程序编译后页面有组件名的元素，特别处理--start */
 u-td, u-th {
-  flex: 1;
-  align-self: stretch;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
+  -webkit-align-self: stretch;
+          align-self: stretch;
 }
 .u-td {
   height: 100%;
 }
 u-icon {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
   display: inline-flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 u-grid {
   width: 100%;
-  flex: 0 0 100%;
+  -webkit-box-flex: 0;
+  -webkit-flex: 0 0 100%;
+          flex: 0 0 100%;
 }
 u-line {
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
 }
 u-switch {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
   display: inline-flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 u-dropdown {
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
 }
+
 /* end-微信小程序编译后页面有组件名的元素，特别处理--end */
+
+
+
+
+
 /* start--头条小程序编译后页面有组件名的元素，特别处理--start */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 /* end-头条小程序编译后页面有组件名的元素，特别处理--end */
+
+
+
+
+
+
+
+
+
+
+
 /* 解决头条小程序组件内引入字体不生效的问题 */
 ::-webkit-scrollbar {
   display: none;

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

@@ -40,24 +40,36 @@
   float: left;
 }
 .content .slot-wrap.data-v-57280228 {
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
   /* 如果您想让slot内容占满整个导航栏的宽度 */
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
   /* 如果您想让slot内容与导航栏左右有空隙 */
   padding: 0 30rpx;
 }
 .content .section-title.data-v-57280228 {
   width: 100%;
   height: 28px;
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
   margin-top: 20px;
   padding: 0 15px;
 }
 .content .section-title u-section.data-v-57280228 {
   margin-left: 10px;
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
 }
 .content .menber-box.data-v-57280228 {
   width: 100vw;

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

@@ -75,9 +75,15 @@
   height: 110px;
   padding: 15px;
   float: left;
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
-  justify-content: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+          justify-content: center;
 }
 .content .member-box {
   white-space: nowrap;
@@ -128,20 +134,30 @@
   float: left;
   padding: 0 15px;
   margin-bottom: 10px;
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 .content .user-handle .handle-icon {
   width: 40px;
   height: 40px;
   text-align: center;
   line-height: 40px;
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
 }
 .content .user-handle .handle-label {
   height: 40px;
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
   margin-left: 10px;
   line-height: 40px;
   font-size: 15px;

unpackage/dist/dev/mp-weixin/pagesMain/couponList.wxss

@@ -60,8 +60,12 @@ page {
 }
 .content .swiper-box .swiper-item .scroll-box .class-card .class-content.data-v-b1261db8 {
   padding: 10px 15px;
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
   position: relative;
 }
 .content .swiper-box .swiper-item .scroll-box .class-card .class-info-img.data-v-b1261db8 {
@@ -70,7 +74,9 @@ page {
   margin-right: 10px;
 }
 .content .swiper-box .swiper-item .scroll-box .class-card .class-info-content.data-v-b1261db8 {
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
 }
 .content .swiper-box .swiper-item .scroll-box .class-card .class-info-label.data-v-b1261db8 {
   font-size: 16px;

unpackage/dist/dev/mp-weixin/pagesMain/evaluateList.wxss

@@ -86,7 +86,9 @@ page {
   color: #999999;
 }
 .content .scroll-box .class-card .class-foot-content.data-v-2dfd9897 {
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
 }
 .content .scroll-box .class-card .class-foot-content .class-foot-text.data-v-2dfd9897 {
   width: 100%;

unpackage/dist/dev/mp-weixin/pagesMain/openMember.wxss

@@ -81,8 +81,12 @@ page {
 }
 .content .class-card .class-content.data-v-8df83678 {
   padding: 10px 15px;
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  align-items: center;
+  -webkit-box-align: center;
+  -webkit-align-items: center;
+          align-items: center;
   position: relative;
 }
 .content .class-card .class-info-img.data-v-8df83678 {
@@ -91,7 +95,9 @@ page {
   margin-right: 10px;
 }
 .content .class-card .class-info-content.data-v-8df83678 {
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
 }
 .content .class-card .class-info-label.data-v-8df83678 {
   font-size: 16px;

unpackage/dist/dev/mp-weixin/pagesMember/classDetail.wxss

@@ -66,10 +66,14 @@ page {
   padding-bottom: 0px !important;
 }
 .content .techaer-info-box.data-v-71e077ba {
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
 }
 .content .techaer-info-box .techaer-info.data-v-71e077ba {
-  flex: 1;
+  -webkit-box-flex: 1;
+  -webkit-flex: 1;
+          flex: 1;
   margin-left: 10px;
 }
 .content .techaer-info-box .techaer-info .class-info-title.data-v-71e077ba {

unpackage/dist/dev/mp-weixin/pagesMember/myClassDetail.wxss

@@ -49,8 +49,11 @@ page {
   padding-bottom: 60px;
 }
 .content .signIn-box.data-v-42e40a2e {
+  display: -webkit-box;
+  display: -webkit-flex;
   display: flex;
-  justify-content: space-around;
+  -webkit-justify-content: space-around;
+          justify-content: space-around;
 }
 .content .signIn-box .signIn-col.data-v-42e40a2e {
   width: 40px;