JH 2 years ago
parent
commit
3b0c7cf382
100 changed files with 1646 additions and 1495 deletions
  1. 10 5
      .hbuilderx/launch.json
  2. 2 1
      config/api.js
  3. 6 1
      pages.json
  4. 109 23
      pages/index/index.vue
  5. 1 1
      pagesMain/contractInfo.vue
  6. 28 29
      pagesMain/openMember.vue
  7. 114 1
      pagesMember/venueDetail.vue
  8. 105 0
      pagesMember/venueMore.vue
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/member/index.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/contractInfo.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/couponList.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/evaluateList.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/memberCardList.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/openMember.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/orderList.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResult.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResultNo.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/shareInfo.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/studentList.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/subscribeList.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/classDetail.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/courseForm.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/evaluateForm.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/leaveForm.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/myClassDetail.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelForm.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelSuccess.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueDetail.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueMore.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-action-sheet/u-action-sheet.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-avatar/u-avatar.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-calendar/u-calendar.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-card/u-card.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-group/u-cell-group.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-item/u-cell-item.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line-progress/u-line-progress.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-modal/u-modal.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-read-more/u-read-more.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-section/u-section.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-select/u-select.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs-swiper/u-tabs-swiper.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-top-tips/u-top-tips.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map
  65. 3 3
      unpackage/dist/dev/mp-weixin/app.json
  66. 32 32
      unpackage/dist/dev/mp-weixin/common/main.js
  67. 36 183
      unpackage/dist/dev/mp-weixin/common/main.wxss
  68. 1 1
      unpackage/dist/dev/mp-weixin/common/runtime.js
  69. 0 0
      unpackage/dist/dev/mp-weixin/common/vendor.js
  70. 158 93
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  71. 2 1
      unpackage/dist/dev/mp-weixin/pages/index/index.json
  72. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/index.wxml
  73. 9 10
      unpackage/dist/dev/mp-weixin/pages/index/index.wxss
  74. 55 56
      unpackage/dist/dev/mp-weixin/pages/login/index.js
  75. 56 59
      unpackage/dist/dev/mp-weixin/pages/member/index.js
  76. 54 55
      unpackage/dist/dev/mp-weixin/pages/user/index.js
  77. 5 21
      unpackage/dist/dev/mp-weixin/pages/user/index.wxss
  78. 53 56
      unpackage/dist/dev/mp-weixin/pagesMain/contractInfo.js
  79. 1 1
      unpackage/dist/dev/mp-weixin/pagesMain/contractInfo.wxml
  80. 55 58
      unpackage/dist/dev/mp-weixin/pagesMain/couponList.js
  81. 2 8
      unpackage/dist/dev/mp-weixin/pagesMain/couponList.wxss
  82. 55 58
      unpackage/dist/dev/mp-weixin/pagesMain/evaluateList.js
  83. 1 3
      unpackage/dist/dev/mp-weixin/pagesMain/evaluateList.wxss
  84. 52 55
      unpackage/dist/dev/mp-weixin/pagesMain/memberCardList.js
  85. 81 85
      unpackage/dist/dev/mp-weixin/pagesMain/openMember.js
  86. 0 0
      unpackage/dist/dev/mp-weixin/pagesMain/openMember.wxml
  87. 2 8
      unpackage/dist/dev/mp-weixin/pagesMain/openMember.wxss
  88. 57 60
      unpackage/dist/dev/mp-weixin/pagesMain/orderList.js
  89. 53 56
      unpackage/dist/dev/mp-weixin/pagesMain/payResult.js
  90. 53 56
      unpackage/dist/dev/mp-weixin/pagesMain/payResultNo.js
  91. 50 51
      unpackage/dist/dev/mp-weixin/pagesMain/shareInfo.js
  92. 54 57
      unpackage/dist/dev/mp-weixin/pagesMain/studentList.js
  93. 55 58
      unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.js
  94. 9 4
      unpackage/dist/dev/mp-weixin/pagesMember/classDetail.js
  95. 1 5
      unpackage/dist/dev/mp-weixin/pagesMember/classDetail.wxss
  96. 56 59
      unpackage/dist/dev/mp-weixin/pagesMember/courseForm.js
  97. 56 59
      unpackage/dist/dev/mp-weixin/pagesMember/evaluateForm.js
  98. 56 59
      unpackage/dist/dev/mp-weixin/pagesMember/leaveForm.js
  99. 57 60
      unpackage/dist/dev/mp-weixin/pagesMember/myClassDetail.js
  100. 1 4
      unpackage/dist/dev/mp-weixin/pagesMember/myClassDetail.wxss

+ 10 - 5
.hbuilderx/launch.json

@@ -2,10 +2,15 @@
   // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
     "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "local"
-            }
-        }
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
     ]
 }

+ 2 - 1
config/api.js

@@ -1,4 +1,5 @@
-const API_BASE = 'https://xinghuolanqiu.com/newApi'
+// const API_BASE = 'https://xinghuolanqiu.com/newApi'
+const API_BASE = 'http://192.168.1.117:8089/'
 
 module.exports = {
 	//  微信授权登录

+ 6 - 1
pages.json

@@ -26,6 +26,11 @@
 	"subPackages": [{
 		"root": "pagesMember",
 		"pages": [{
+				"path": "venueMore",
+				"style": {
+					"navigationBarTitleText": "更多场馆"
+				}
+		},{
 			"path": "venueDetail",
 			"style": {
 				"navigationBarTitleText": "场馆详情",
@@ -130,7 +135,7 @@
 	"globalStyle": {
 		"navigationStyle": "default",
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "星火纵横销售端",
+		"navigationBarTitleText": "",
 		"navigationBarBackgroundColor": "#ffffff",
 		"backgroundColor": "#F8F8F8"
 	},

+ 109 - 23
pages/index/index.vue

@@ -1,8 +1,15 @@
 <template>
 	<view class="content">
-		<u-navbar back-icon-size="0" :back-text="locationText" title="星火纵横" :title-color="mainColor" title-bold></u-navbar>
-		<u-swiper :list="swiperList" mode="rect" effect3d border-radius="30" name="url" style="margin-bottom: 10px;"></u-swiper>
-		<view class="section-title">
+		<!-- 导航栏 -->
+		<u-navbar :is-back="false">
+			<view class="slot-wrap">
+				<view @click="show = true">{{ locationText }}</view>
+				<u-select v-model="show" mode="mutil-column-auto" :list="list" @confirm="confirm"></u-select>
+			</view>
+		</u-navbar>
+		<!-- 轮播图 -->
+		<u-swiper :list="swiperList" mode="rect" height="300" effect3d border-radius="30" name="url" style="margin-bottom: 10px;"></u-swiper>
+	<!-- 	<view class="section-title">
 			<u-image width="20px" height="10px" :src="sectionIcon"></u-image>
 			<u-section title="会员开通" font-size="32" :right="false" :show-line="false"></u-section>
 		</view>
@@ -12,10 +19,11 @@
 				<u-button type="warning" shape="circle" :ripple="true" :custom-style="{...handleCustomStyle, float: 'left', marginLeft: ''}" size="mini" @click="goToPay(item)">点击开通</u-button>
 				<view class="menber-icon iconfont iconzu4931"></view>
 			</view>
-		</view>
+		</view> -->
+		<!-- 会员开通 -->
 		<view class="section-title">
 			<u-image width="20px" height="10px" :src="sectionIcon"></u-image>
-			<u-section title="附近场馆" font-size="32" :right="false" :show-line="false"></u-section>
+			<u-section title="会员开通" font-size="32" :show-line="false" @click="handleMoreClick"></u-section>
 		</view>
 		<view class="venue-box">
 			<u-card :head-border-bottom="false" :foot-border-top="false" title-size="32" padding="0" margin="10px" v-for="(item, index) in venueList"
@@ -38,6 +46,7 @@
 				</view>
 			</u-card>
 		</view>
+		<!-- 精彩瞬间 -->
 		<view class="section-title">
 			<u-image width="20px" height="10px" :src="sectionIcon"></u-image>
 			<u-section title="精彩瞬间" font-size="32" :right="false" :show-line="false"></u-section>
@@ -70,14 +79,68 @@
 		},
 		data() {
 			return {
+				show: false,
 				sectionIcon: API.getServerImg + 'biaoti.png',
 				longitude: '',
 				latitude: '',
 				locationText: '',
 				swiperList: [],
-				menberList: [],
+				// menberList: [],
 				venueList: [],
 				videoList: [],
+				list: [
+					{
+						value: 1,
+						label: '中国',
+						children: [
+							{
+								value: 2,
+								label: '广东',
+								children: [
+									{
+										value: 3,
+										label: '深圳'
+									},
+									{
+										value: 4,
+										label: '广州',
+										extra: {'aaa':1,'bbb':222}
+									}
+								]
+							},
+							{
+								value: 5,
+								label: '广西',
+								children: [
+									{
+										value: 6,
+										label: '南宁'
+									},
+									{
+										value: 7,
+										label: '桂林'
+									}
+								]
+							}
+						]
+					},
+					{
+						value: 8,
+						label: '美国',
+						children: [
+							{
+								value: 9,
+								label: '纽约',
+								children: [
+									{
+										value: 10,
+										label: '皇后街区'
+									}
+								]
+							}
+						]
+					}
+				]
 			}
 		},
 		onLoad(options) {
@@ -124,8 +187,12 @@
 			}, 500)
 		},
 		methods: {
+			confirm(e) {
+				console.log(e);
+			},
 			//  获取初始化数据
 			initialize() {
+				// 轮播图
 				NET.request(API.getIndexSwiperList, {}, 'POST').then(res => {
 					this.swiperList = res.data
 				}).catch(error => {
@@ -134,14 +201,16 @@
 						type: 'warning',
 					})
 				})
-				NET.request(API.getMemberCardList, {}, 'POST').then(res => {
-					this.menberList = res.data
-				}).catch(error => {
-					this.$refs.uTips.show({
-						title: error.message,
-						type: 'warning',
-					})
-				})
+				// 会员卡
+				// NET.request(API.getMemberCardList, {}, 'POST').then(res => {
+				// 	this.menberList = res.data
+				// }).catch(error => {
+				// 	this.$refs.uTips.show({
+				// 		title: error.message,
+				// 		type: 'warning',
+				// 	})
+				// })
+				// 省-市-区
 				NET.request(API.getAddressInfo, uni.getStorageSync('locationData'), 'POST').then(res => {
 					this.locationText = res.data.province + '-' + res.data.city + '-' + res.data.district
 				}).catch(error => {
@@ -150,6 +219,7 @@
 						type: 'warning',
 					})
 				})
+				// 附件场馆
 				NET.request(API.getVenueList, uni.getStorageSync('locationData'), 'POST').then(res => {
 					this.venueList = res.data
 				}).catch(error => {
@@ -158,8 +228,11 @@
 						type: 'warning',
 					})
 				})
+				// 精彩瞬间
 				NET.request(API.getVideoList, uni.getStorageSync('locationData'), 'POST').then(res => {
-					this.videoList = res.data
+					const videoData = res.data
+					// 取4个精彩瞬间
+					this.videoList = videoData.length <= 4 ? videoData : videoData.slice(0,4)
 				}).catch(error => {
 					this.$refs.uTips.show({
 						title: error.message,
@@ -167,12 +240,18 @@
 					})
 				})
 			},
-			//  跳转开通支付
-			goToPay(site) {
+			//  更多场馆
+			handleMoreClick() {
 				uni.navigateTo({
-					url: '/pagesMain/openMember?memberCardType=' + site.type + '&typeValue=' + site.typeValue
+					url: '/pagesMember/venueMore'
 				});
 			},
+			//  跳转开通支付
+			// goToPay(site) {
+			// 	uni.navigateTo({
+			// 		url: '/pagesMain/openMember?memberCardType=' + site.type + '&typeValue=' + site.typeValue
+			// 	});
+			// },
 			//  跳转场馆详情
 			goToVenueDetail(item) {
 				uni.navigateTo({
@@ -190,12 +269,19 @@
 		width: 100%;
 		float: left;
 
-		/deep/.u-navbar {
-			.u-title {
-				font-weight: bold;
-			}
+		// /deep/.u-navbar {
+		// 	.u-title {
+		// 		font-weight: bold;
+		// 	}
+		// }
+		.slot-wrap {
+			display: flex;
+			align-items: center;
+			/* 如果您想让slot内容占满整个导航栏的宽度 */
+			flex: 1;
+			/* 如果您想让slot内容与导航栏左右有空隙 */
+			padding: 0 30rpx;
 		}
-
 		.section-title {
 			width: 100%;
 			height: 28px;

+ 1 - 1
pagesMain/contractInfo.vue

@@ -11,7 +11,7 @@
 			</u-cell-item>
 		</u-cell-group>
 		<view class="handle-fix-box" style="height:100px">
-			<u-button style="margin-bottom: 10px;display: block;" type="warning" shape="circle" :ripple="true" :custom-style="customStyle" :disabled="!ifSign" @click="submitContract0()">其他方式支付</u-button>
+			<u-button style="margin-bottom: 10px;display: block;" type="warning" shape="circle" :ripple="true" :custom-style="customStyle" @click="submitContract0()">其他方式支付</u-button>
 			<u-button type="warning" shape="circle" :ripple="true" :custom-style="customStyle" :disabled="!ifSign" @click="submitContract()">确定支付</u-button>
 		</view>
 		<u-top-tips ref="uTips"></u-top-tips>

+ 28 - 29
pagesMain/openMember.vue

@@ -1,10 +1,12 @@
 <template>
 	<view class="content">
-		<view class="card-list">
-			<view class="card-label">{{memberInfo.typeValue}}</view>
-			<view class="card-num">¥{{memberInfo.originalAmount ? memberInfo.originalAmount : 0}}</view>
-			<view class="card-icon iconfont iconzu4931"></view>
-		</view>
+		<template v-if="memberCardList.length">
+			<view class="card-list" v-for="i in memberCardList">
+				<view class="card-label">{{memberInfo.typeValue}}</view>
+				<view class="card-num">¥{{memberInfo.originalAmount ? memberInfo.originalAmount : 0}}</view>
+				<view class="card-icon iconfont iconzu4931"></view>
+			</view>
+		</template>
 		<u-form :model="form" label-width="140" style="width: 100%; float: left;">
 			<u-form-item label="选择场馆" :right-icon="venueEdit ? 'arrow-right' : ''" required @click.native="venueShow = venueEdit ? true : false">
 				<text>{{venueName}}</text>
@@ -24,7 +26,7 @@
 			<u-form-item label="家长名称" required>
 				<u-input v-model="form.parentName" placeholder="请输入家长姓名" />
 			</u-form-item>
-			<u-form-item label="性别" prop="sex" required right-icon="arrow-right" @click.native="sexShow = true">
+			<u-form-item label="家长性别" prop="sex" required right-icon="arrow-right" @click.native="sexShow = true">
 				<text>{{form.sex}}</text>
 			</u-form-item>
 		</u-form>
@@ -91,6 +93,7 @@
 		data() {
 			return {
 				memberCardType: '',
+				memberCardList: [],
 				memberInfo: {
 					id: '',
 					originalAmount: '',
@@ -117,7 +120,7 @@
 				studentShow: false,
 				studentList: [],
 				form: {
-					parentName: 'xsaxs',
+					parentName: '',
 					sex: '',
 				},
 				sexShow: false,
@@ -131,28 +134,24 @@
 			}
 		},
 		onLoad(options) {
-			if (options.venueId) {
-				this.venueEdit = false
-				this.venueId = options.venueId
-				this.venueName = options.venueName
-			}
-			if (options.studentId) {
-				this.studentEdit = false
-				this.studentId = options.studentId
-				this.studentName = options.studentName
-			}
-			this.memberCardType = options.memberCardType
-			if (this.venueId) {
-				this.getMemberInfo(1)
-			} else {
-				this.memberInfo.typeValue = options.typeValue
-			}
-		},
-		onUnload(){
-			console.log('1111')
-		},
-		onBackPress(){
-			console.log('2222')
+			this.memberCardList = JSON.parse(decodeURIComponent(options.cardinfo))
+			console.log(this.memberCardList);
+			// if (options.venueId) {
+			// 	this.venueEdit = false
+			// 	this.venueId = options.venueId
+			// 	this.venueName = options.venueName
+			// }
+			// if (options.studentId) {
+			// 	this.studentEdit = false
+			// 	this.studentId = options.studentId
+			// 	this.studentName = options.studentName
+			// }
+			// this.memberCardType = options.memberCardType
+			// if (this.venueId) {
+			// 	this.getMemberInfo(1)
+			// } else {
+			// 	this.memberInfo.typeValue = options.typeValue
+			// }
 		},
 		onShow() {
 			NET.request(API.getAllVenueList, uni.getStorageSync('locationData'), 'POST').then(res => {

+ 114 - 1
pagesMember/venueDetail.vue

@@ -6,8 +6,26 @@
 			<u-icon name="map" style="font-size: 14px;margin-right: 2px;"></u-icon>
 			{{venueInfo.address}}
 		</view>
+		
+		<!-- 场馆简介 -->
 		<u-section title="场馆简介" :right="false" :show-line="false" font-size="32" class="title-box"></u-section>
 		<view class="venue-text">{{venueInfo.desc}}</view>
+		
+		<!-- 会员开通 -->
+		<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-label">{{item.typeValue}}</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>
+				<view class="menber-icon iconfont iconzu4931"></view>
+			</view>
+			<view v-if="checkedCardList.length">
+				<u-button type="warning" shape="circle" :ripple="true" :custom-style="{...handleCustomStyle, float: 'right'}" size="mini" @click="handlePayClick">去支付</u-button>
+			</view>
+		</view>
+		
+		<!-- 班级信息 -->
 		<u-section title="班级信息" :right="false" :show-line="false" font-size="32" class="title-box"></u-section>
 		<view class="class-box">
 			<u-card :head-border-bottom="false" :foot-border-top="false" padding="0" margin="10px" v-for="(item, index) in venueInfo.classListResList"
@@ -91,6 +109,8 @@
 					desc: '',
 					classListResList: [],
 				},
+				menberList: [],
+				checkedCardList: [],
 				classId: '',
 				cardStyle: {
 					fontWeight: 'bold'
@@ -142,6 +162,31 @@
 						type: 'warning',
 					})
 				})
+				// 会员卡
+				NET.request(API.getMemberCardList, {}, 'POST').then(res => {
+					this.menberList = res.data.map(item => {
+						return {
+							type: item.type,
+							typeValue: item.typeValue,
+							checked: false
+						}
+					})
+
+				}).catch(error => {
+					this.$refs.uTips.show({
+						title: error.message,
+						type: 'warning',
+					})
+				})
+			},
+			//  选择会员卡
+			changeCardClick(cardItem) {
+				const cardItemIndex = this.checkedCardList.findIndex( item => item.typeValue === cardItem.typeValue )
+				if(cardItemIndex === -1) {
+					this.checkedCardList.push(cardItem)
+				} else {
+					this.checkedCardList.splice(cardItemIndex,1)
+				}
 			},
 			//  跳转班级详情
 			goToClassDetail(item) {
@@ -194,6 +239,16 @@
 					})
 				})
 			},
+			//  跳转开通支付
+			handlePayClick() {
+				console.log(this.checkedCardList);
+				// uni.navigateTo({
+				// 	url: '/pagesMain/openMember?memberCardType=' + site.type + '&typeValue=' + site.typeValue
+				// });
+				uni.navigateTo({
+					url: '/pagesMain/openMember?cardinfo=' + encodeURIComponent(JSON.stringify(this.checkedCardList))
+				})
+			},
 			//  跳转新增学员表单
 			goToSubscribelForm() {
 				uni.navigateTo({
@@ -227,7 +282,65 @@
 			font-size: 10px;
 			line-height: 16px;
 		}
-
+		
+		.section-title {
+			width: 100%;
+			height: 28px;
+			display: flex;
+			align-items: center;
+			margin-top: 20px;
+			padding: 0 15px;
+		
+			u-section {
+				margin-left: 10px;
+				flex: 1;
+			}
+		}
+		
+		.menber-box {
+			width: 100vw;
+			float: left;
+			padding: 10px 15px;
+			
+			.menber-col {
+				width: 100%;
+				padding: 15px 20px;
+				margin-bottom: 10px;
+				display: inline-block;
+				background-color: #FFFFFF;
+				border-radius: 15px;
+				box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.2);
+				position: relative;
+				overflow: hidden;
+		
+				.menber-label {
+					width: 100%;
+					margin-bottom: 10px;
+					float: left;
+					font-size: 14px;
+					font-weight: bold;
+					line-height: 20px;
+				}
+		
+				.menber-num {
+					width: 100%;
+					float: left;
+					font-size: 26px;
+					line-height: 28px;
+					color: $mainColor;
+				}
+		
+				.menber-icon {
+					font-size: 80px;
+					color: $mainColor;
+					position: absolute;
+					right: -5px;
+					bottom: -15px;
+					opacity: 0.5;
+				}
+			}
+		}
+		
 		.class-box {
 			width: 100vw;
 			padding: 5px;

+ 105 - 0
pagesMember/venueMore.vue

@@ -0,0 +1,105 @@
+<template>
+	<view class="content">
+		<view class="venue-box">
+			<u-card :head-border-bottom="false" :foot-border-top="false" title-size="32" padding="0" margin="10px" v-for="(item, index) in venueList"
+			 :key="index" class="venue-card" @click="goToVenueDetail(item)">
+				<view class="venue-content" slot="head" style="padding-top: 10px;">
+					<view class="venue-name">{{item.name}}</view>
+				</view>
+				<view class="venue-content" slot="body">
+					<view class="info-text">
+						<u-icon name="car"></u-icon>
+						距您{{item.distance}}
+					</view>
+					<view class="info-text">
+						<u-icon name="map"></u-icon>
+						{{item.address}}
+					</view>
+				</view>
+				<view class="venue-content" slot="foot" style="text-align: right;">
+					<u-button type="warning" shape="circle" :ripple="true" :custom-style="handleCustomStyle" size="mini" @click="goToVenueDetail(item)">预约</u-button>
+				</view>
+			</u-card>
+		</view>
+	</view>
+</template>
+
+<script>
+	const NET = require('@/utils/request')
+	const API = require('@/config/api')
+	
+	export default {
+		data() {
+			return {
+				venueList: []
+			}
+		},
+		onLoad() {
+			// 附件场馆
+			NET.request(API.getVenueList, uni.getStorageSync('locationData'), 'POST').then(res => {
+				this.venueList = res.data
+			}).catch(error => {
+				this.$refs.uTips.show({
+					title: error.message,
+					type: 'warning',
+				})
+				setTimeout(() => {
+					uni.navigateBack()
+				},1000)
+			})
+		},
+		methods: {
+			//  跳转场馆详情
+			goToVenueDetail(item) {
+				uni.navigateTo({
+					url: '/pagesMember/venueDetail?id=' + item.id
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
+	
+	.content {
+		width: 100%;
+		float: left;
+		
+		.venue-box {
+			width: 100vw;
+			float: left;
+		
+			/deep/.u-card--border:after {
+				border-color: #cccccc;
+				border-radius: 15px;
+			}
+		
+			.venue-card {
+				min-width: 100vw;
+				display: inline-block;
+		
+				.venue-content {
+					padding: 0px 15px 10px 15px;
+		
+					.venue-name {
+						height: 20px;
+						font-weight: bold;
+						font-size: 15px;
+						line-height: 20px;
+					}
+		
+					.info-text {
+						color: #999999;
+						line-height: 18px;
+		
+						/deep/.u-icon {
+							margin-right: 5px;
+							font-size: 14px;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/login/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/member/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/contractInfo.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/couponList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/evaluateList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/memberCardList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/openMember.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/orderList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResult.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/payResultNo.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/shareInfo.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/studentList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMain/subscribeList.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/classDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/courseForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/evaluateForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/leaveForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/myClassDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelForm.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/subscribelSuccess.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueDetail.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMember/venueMore.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-action-sheet/u-action-sheet.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-avatar/u-avatar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-button/u-button.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-calendar/u-calendar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-card/u-card.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-group/u-cell-group.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-cell-item/u-cell-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-checkbox/u-checkbox.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-divider/u-divider.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form-item/u-form-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-form/u-form.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-image/u-image.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-line-progress/u-line-progress.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-loading/u-loading.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-mask/u-mask.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-modal/u-modal.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-navbar/u-navbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-picker/u-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-popup/u-popup.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-rate/u-rate.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-read-more/u-read-more.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-section/u-section.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-select/u-select.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-swiper/u-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-tabs-swiper/u-tabs-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-top-tips/u-top-tips.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uview-ui/components/u-upload/u-upload.js.map


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

@@ -9,6 +9,7 @@
     {
       "root": "pagesMember",
       "pages": [
+        "venueMore",
         "venueDetail",
         "classDetail",
         "subscribelForm",
@@ -39,7 +40,7 @@
   "window": {
     "navigationStyle": "default",
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "星火纵横销售端",
+    "navigationBarTitleText": "",
     "navigationBarBackgroundColor": "#ffffff",
     "backgroundColor": "#F8F8F8"
   },
@@ -75,6 +76,5 @@
       "desc": "获取当前区域定位以选取附近场馆"
     }
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "usingComponents": {}
 }

File diff suppressed because it is too large
+ 32 - 32
unpackage/dist/dev/mp-weixin/common/main.js


+ 36 - 183
unpackage/dist/dev/mp-weixin/common/main.wxss

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

File diff suppressed because it is too large
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/runtime.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/common/vendor.js


File diff suppressed because it is too large
+ 158 - 93
unpackage/dist/dev/mp-weixin/pages/index/index.js


+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -4,12 +4,13 @@
   "enablePullDownRefresh": true,
   "usingComponents": {
     "u-navbar": "/uview-ui/components/u-navbar/u-navbar",
+    "u-select": "/uview-ui/components/u-select/u-select",
     "u-swiper": "/uview-ui/components/u-swiper/u-swiper",
     "u-image": "/uview-ui/components/u-image/u-image",
     "u-section": "/uview-ui/components/u-section/u-section",
-    "u-button": "/uview-ui/components/u-button/u-button",
     "u-card": "/uview-ui/components/u-card/u-card",
     "u-icon": "/uview-ui/components/u-icon/u-icon",
+    "u-button": "/uview-ui/components/u-button/u-button",
     "u-top-tips": "/uview-ui/components/u-top-tips/u-top-tips"
   }
 }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/index.wxml


+ 9 - 10
unpackage/dist/dev/mp-weixin/pages/index/index.wxss

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

File diff suppressed because it is too large
+ 55 - 56
unpackage/dist/dev/mp-weixin/pages/login/index.js


File diff suppressed because it is too large
+ 56 - 59
unpackage/dist/dev/mp-weixin/pages/member/index.js


File diff suppressed because it is too large
+ 54 - 55
unpackage/dist/dev/mp-weixin/pages/user/index.js


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

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

File diff suppressed because it is too large
+ 53 - 56
unpackage/dist/dev/mp-weixin/pagesMain/contractInfo.js


+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesMain/contractInfo.wxml

@@ -1 +1 @@
-<view class="content data-v-06aebfc0"><rich-text class="web-view data-v-06aebfc0" nodes="{{contractInfo.url}}"></rich-text><u-cell-group style="width:100%;float:left;" vue-id="cf283634-1" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['default']}}"><u-cell-item vue-id="{{('cf283634-2')+','+('cf283634-1')}}" title="乙方签字" arrow="{{false}}" title-style="{{({width:'100%'})}}" required="{{true}}" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['label']}}"><view class="canvas-container data-v-06aebfc0" slot="label"><canvas style="width:100%;height:200px;background-color:#FFFFFF;" canvas-id="canvas" id="canvas" disable-scroll="{{true}}" data-event-opts="{{[['touchstart',[['handleTouchStart',['$event']]]],['touchmove',[['handleTouchMove',['$event']]]],['touchend',[['handleTouchEnd',['$event']]]],['touchcancel',[['handleEnd',['$event']]]]]}}" bindtouchstart="__e" bindtouchmove="__e" bindtouchend="__e" bindtouchcancel="__e" class="data-v-06aebfc0"></canvas></view></u-cell-item></u-cell-group><view class="handle-fix-box data-v-06aebfc0" style="height:100px;"><u-button style="margin-bottom:10px;display:block;" vue-id="cf283634-3" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" disabled="{{!ifSign}}" data-event-opts="{{[['^click',[['submitContract0']]]]}}" bind:click="__e" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['default']}}">其他方式支付</u-button><u-button vue-id="cf283634-4" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" disabled="{{!ifSign}}" data-event-opts="{{[['^click',[['submitContract']]]]}}" bind:click="__e" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['default']}}">确定支付</u-button></view><u-top-tips vue-id="cf283634-5" data-ref="uTips" class="data-v-06aebfc0 vue-ref" bind:__l="__l"></u-top-tips></view>
+<view class="content data-v-06aebfc0"><rich-text class="web-view data-v-06aebfc0" nodes="{{contractInfo.url}}"></rich-text><u-cell-group style="width:100%;float:left;" vue-id="cf283634-1" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['default']}}"><u-cell-item vue-id="{{('cf283634-2')+','+('cf283634-1')}}" title="乙方签字" arrow="{{false}}" title-style="{{({width:'100%'})}}" required="{{true}}" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['label']}}"><view class="canvas-container data-v-06aebfc0" slot="label"><canvas style="width:100%;height:200px;background-color:#FFFFFF;" canvas-id="canvas" id="canvas" disable-scroll="{{true}}" data-event-opts="{{[['touchstart',[['handleTouchStart',['$event']]]],['touchmove',[['handleTouchMove',['$event']]]],['touchend',[['handleTouchEnd',['$event']]]],['touchcancel',[['handleEnd',['$event']]]]]}}" bindtouchstart="__e" bindtouchmove="__e" bindtouchend="__e" bindtouchcancel="__e" class="data-v-06aebfc0"></canvas></view></u-cell-item></u-cell-group><view class="handle-fix-box data-v-06aebfc0" style="height:100px;"><u-button style="margin-bottom:10px;display:block;" vue-id="cf283634-3" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" data-event-opts="{{[['^click',[['submitContract0']]]]}}" bind:click="__e" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['default']}}">其他方式支付</u-button><u-button vue-id="cf283634-4" type="warning" shape="circle" ripple="{{true}}" custom-style="{{customStyle}}" disabled="{{!ifSign}}" data-event-opts="{{[['^click',[['submitContract']]]]}}" bind:click="__e" class="data-v-06aebfc0" bind:__l="__l" vue-slots="{{['default']}}">确定支付</u-button></view><u-top-tips vue-id="cf283634-5" data-ref="uTips" class="data-v-06aebfc0 vue-ref" bind:__l="__l"></u-top-tips></view>

File diff suppressed because it is too large
+ 55 - 58
unpackage/dist/dev/mp-weixin/pagesMain/couponList.js


+ 2 - 8
unpackage/dist/dev/mp-weixin/pagesMain/couponList.wxss

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

File diff suppressed because it is too large
+ 55 - 58
unpackage/dist/dev/mp-weixin/pagesMain/evaluateList.js


+ 1 - 3
unpackage/dist/dev/mp-weixin/pagesMain/evaluateList.wxss

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

File diff suppressed because it is too large
+ 52 - 55
unpackage/dist/dev/mp-weixin/pagesMain/memberCardList.js


File diff suppressed because it is too large
+ 81 - 85
unpackage/dist/dev/mp-weixin/pagesMain/openMember.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pagesMain/openMember.wxml


+ 2 - 8
unpackage/dist/dev/mp-weixin/pagesMain/openMember.wxss

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

File diff suppressed because it is too large
+ 57 - 60
unpackage/dist/dev/mp-weixin/pagesMain/orderList.js


File diff suppressed because it is too large
+ 53 - 56
unpackage/dist/dev/mp-weixin/pagesMain/payResult.js


File diff suppressed because it is too large
+ 53 - 56
unpackage/dist/dev/mp-weixin/pagesMain/payResultNo.js


File diff suppressed because it is too large
+ 50 - 51
unpackage/dist/dev/mp-weixin/pagesMain/shareInfo.js


File diff suppressed because it is too large
+ 54 - 57
unpackage/dist/dev/mp-weixin/pagesMain/studentList.js


File diff suppressed because it is too large
+ 55 - 58
unpackage/dist/dev/mp-weixin/pagesMain/subscribeList.js


File diff suppressed because it is too large
+ 9 - 4
unpackage/dist/dev/mp-weixin/pagesMember/classDetail.js


+ 1 - 5
unpackage/dist/dev/mp-weixin/pagesMember/classDetail.wxss

@@ -66,14 +66,10 @@ 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 {
-  -webkit-box-flex: 1;
-  -webkit-flex: 1;
-          flex: 1;
+  flex: 1;
   margin-left: 10px;
 }
 .content .techaer-info-box .techaer-info .class-info-title.data-v-71e077ba {

File diff suppressed because it is too large
+ 56 - 59
unpackage/dist/dev/mp-weixin/pagesMember/courseForm.js


File diff suppressed because it is too large
+ 56 - 59
unpackage/dist/dev/mp-weixin/pagesMember/evaluateForm.js


File diff suppressed because it is too large
+ 56 - 59
unpackage/dist/dev/mp-weixin/pagesMember/leaveForm.js


File diff suppressed because it is too large
+ 57 - 60
unpackage/dist/dev/mp-weixin/pagesMember/myClassDetail.js


+ 1 - 4
unpackage/dist/dev/mp-weixin/pagesMember/myClassDetail.wxss

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

Some files were not shown because too many files changed in this diff