image.png

pagesHome/article/index.vue

@@ -335,10 +335,10 @@
 			// 触底
 			toScroll(e) {
 				const that = this;
-				let up = that.scrollTop;
-				that.$set(that, `scrollTop`, e.detail.scrollTop);
-				let num = Math.sign(up - e.detail.scrollTop);
-				if (num == 1) that.$set(that, `is_bottom`, false);
+				// let up = that.scrollTop;
+				// that.$set(that, `scrollTop`, e.detail.scrollTop);
+				// let num = Math.sign(up - e.detail.scrollTop);
+				// if (num == 1) that.$set(that, `is_bottom`, false);
 			},
 			// 清空列表
 			clearPage() {

pagesHome/hotel/info.vue

@@ -1,4 +1,6 @@
 <template>
+	<!-- 禁止滚动穿透 -->
+	<page-meta :page-style="'overflow:'+(show?'hidden':'visible')"></page-meta>
 	<view class="main">
 		<view class="one" v-if="info.file.length>0">
 			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
@@ -96,7 +98,7 @@
 			</view>
 		</view>
 		<!-- 领取优惠卷 -->
-		<uni-popup ref="coupon" background-color="#fff" type="bottom" :is-mask-click="false">
+		<uni-popup ref="coupon" background-color="#fff" type="bottom" :is-mask-click="false" @change="change">
 			<view class="coupon">
 				<view class="close">
 					<text>抵用券</text>
@@ -119,11 +121,13 @@
 									</view>
 									<view class="center">
 										<view class="name textOver">{{item.name}}</view>
-										<view class="content">有效日期：{{item.expire_type_label}}-{{item.expire_time}}
+										<view class="content">有效日期：({{item.expire_type_label}}) {{item.expire_time}}
 										</view>
 									</view>
 									<view class="right">
-										<button class="button" type="primary" @tap="toReceive">立即领取</button>
+										<button v-if="item.is_receive==false" class="button" type="primary"
+											@tap="toReceive(item)">立即领取</button>
+										<button v-else class="button_1" type="primary" @tap="toUser(item)">去使用</button>
 									</view>
 								</view>
 								<view class="list_2">
@@ -165,6 +169,8 @@
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,
+				// 禁止滚动穿透
+				show: false
 			}
 		},
 		onLoad: async function(e) {
@@ -180,6 +186,11 @@
 			await that.search();
 		},
 		methods: {
+			// 禁止滚动穿透
+			change(e) {
+				const that = this;
+				that.show = e.show
+			},
 			searchToken() {
 				const that = this;
 				try {
@@ -245,13 +256,53 @@
 				// 优惠券
 				const res = await that.$api(`/coupon/specialQuery`, 'GET', {
 					is_use: '0',
+					user: that.user._id,
 					type: '0'
 				})
 				if (res.errcode == '0') that.$set(that, `discountList`, res.data);
 				that.$refs.coupon.open()
 			},
 			// 领取优惠券
-			toReceive() {},
+			async toReceive(item) {
+				const that = this;
+				if (that.user._id) {
+					const form = {
+						user: that.user._id,
+						type: item.type,
+						coupon: item._id,
+						is_use: '0'
+					}
+					if (item.expire_type == 'fixed') form.time = item.expire_time
+					else {
+						form.time = `${moment().format('YYYY-MM-DD HH:mm:ss')} 至 ${moment()
+					.add(item.days, 'days')
+					.format('YYYY-MM-DD HH:mm:ss')}`;
+					}
+					const res = await that.$api(`/userCoupon`, 'POST', form);
+					if (res.errcode == '0') {
+						uni.showToast({
+							title: '领取成功',
+							icon: 'none'
+						})
+						that.toCoupon()
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						})
+					}
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
+			},
+			// 去使用
+			toUser(item) {
+				uni.navigateTo({
+					url: `/pagesMy/coupon/index`
+				})
+			},
 			// 关闭弹框
 			toCouponClose() {
 				const that = this;
@@ -265,6 +316,7 @@
 				res = await that.$api(`/coupon/specialQuery`, 'GET', {
 					is_use: '0',
 					discount_type: 'min',
+					user: that.user._id,
 					type: '0'
 				})
 				if (res.errcode == '0') that.$set(that, `couponList`, res.data.slice(0, 3));
@@ -625,11 +677,19 @@
 					}
 
 					.right {
-						button {
+						.button {
 							font-size: 12px;
 							border-radius: 20px;
 							background: linear-gradient(to right, #FFA500, #FF0000);
 						}
+
+						.button_1 {
+							font-size: 12px;
+							border-radius: 20px;
+							border: 1px solid var(--fF0Color);
+							color: var(--fF0Color);
+							background: var(--mainColor);
+						}
 					}
 				}
 

pagesHome/ticket/index.vue

@@ -1,4 +1,6 @@
 <template>
+	<!-- 禁止滚动穿透 -->
+	<page-meta :page-style="'overflow:'+(show?'hidden':'visible')"></page-meta>
 	<view class="main">
 		<view class="one">
 			<swiper class="swiper" circular :indicator-dots="true" indicator-color="#F5F5F5"
@@ -99,7 +101,7 @@
 		<uni-calendar ref="calendar" :clear-date="true" :insert="false" :lunar="true" :range="false"
 			@confirm="toConfirm" />
 		<!-- 筛选门票类型 -->
-		<uni-popup ref="popup" type="top" background-color="#fff" @maskClick="toClose">
+		<uni-popup ref="popup" type="top" background-color="#fff" @maskClick="toClose" @change="change">
 			<view class="popup">
 				<view class="one">
 					<view class="name">出游人群</view>
@@ -124,7 +126,7 @@
 			</view>
 		</uni-popup>
 		<!-- 领取优惠卷 -->
-		<uni-popup ref="coupon" background-color="#fff" type="bottom" :is-mask-click="false">
+		<uni-popup ref="coupon" background-color="#fff" type="bottom" :is-mask-click="false" @change="change">
 			<view class="coupon">
 				<view class="close">
 					<text>抵用券</text>
@@ -147,11 +149,13 @@
 									</view>
 									<view class="center">
 										<view class="name textOver">{{item.name}}</view>
-										<view class="content">有效日期：{{item.expire_type_label}}-{{item.expire_time}}
+										<view class="content">有效日期：({{item.expire_type_label}}) {{item.expire_time}}
 										</view>
 									</view>
 									<view class="right">
-										<button class="button" type="primary" @tap="toReceive">立即领取</button>
+										<button v-if="item.is_receive==false" class="button" type="primary"
+											@tap="toReceive(item)">立即领取</button>
+										<button v-else class="button_1" type="primary" @tap="toUser(item)">去使用</button>
 									</view>
 								</view>
 								<view class="list_2">
@@ -200,6 +204,8 @@
 				is_select: false,
 				is_person: '',
 				is_type: '',
+				// 禁止滚动穿透
+				show: false
 			}
 		},
 		onLoad: async function(e) {
@@ -208,7 +214,7 @@
 			uni.setNavigationBarTitle({
 				title: e && e.title || '分类'
 			});
-			
+
 		},
 		onShow: async function(e) {
 			const that = this;
@@ -219,6 +225,11 @@
 			await that.search();
 		},
 		methods: {
+			// 禁止滚动穿透
+			change(e) {
+				const that = this;
+				that.show = e.show
+			},
 			searchToken() {
 				const that = this;
 				try {
@@ -302,13 +313,53 @@
 				// 优惠券
 				const res = await that.$api(`/coupon/specialQuery`, 'GET', {
 					is_use: '0',
+					user: that.user._id,
 					type: '1'
 				})
 				if (res.errcode == '0') that.$set(that, `discountList`, res.data);
 				that.$refs.coupon.open()
 			},
 			// 领取优惠券
-			toReceive() {},
+			async toReceive(item) {
+				const that = this;
+				if (that.user._id) {
+					const form = {
+						user: that.user._id,
+						type: item.type,
+						coupon: item._id,
+						is_use: '0'
+					}
+					if (item.expire_type == 'fixed') form.time = item.expire_time
+					else {
+						form.time = `${moment().format('YYYY-MM-DD HH:mm:ss')} 至 ${moment()
+					.add(item.days, 'days')
+					.format('YYYY-MM-DD HH:mm:ss')}`;
+					}
+					const res = await that.$api(`/userCoupon`, 'POST', form);
+					if (res.errcode == '0') {
+						uni.showToast({
+							title: '领取成功',
+							icon: 'none'
+						})
+						that.toCoupon()
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+							icon: 'none'
+						})
+					}
+				} else {
+					uni.navigateTo({
+						url: `/pagesIndex/login/index`
+					})
+				}
+			},
+			// 去使用
+			toUser(item) {
+				uni.navigateTo({
+					url: `/pagesMy/coupon/index`
+				})
+			},
 			// 关闭弹框
 			toCouponClose() {
 				const that = this;
@@ -440,6 +491,7 @@
 				res = await that.$api(`/coupon/specialQuery`, 'GET', {
 					is_use: '0',
 					discount_type: 'min',
+					user: that.user._id,
 					type: '1'
 				})
 				if (res.errcode == '0') that.$set(that, `couponList`, res.data.slice(0, 3));
@@ -904,11 +956,19 @@
 					}
 
 					.right {
-						button {
+						.button {
 							font-size: 12px;
 							border-radius: 20px;
 							background: linear-gradient(to right, #FFA500, #FF0000);
 						}
+
+						.button_1 {
+							font-size: 12px;
+							border-radius: 20px;
+							border: 1px solid var(--fF0Color);
+							color: var(--fF0Color);
+							background: var(--mainColor);
+						}
 					}
 				}
 

pagesIndex/order/order.vue

@@ -1,4 +1,6 @@
 <template>
+	<!-- 禁止滚动穿透 -->
+	<page-meta :page-style="'overflow:'+(show?'hidden':'visible')"></page-meta>
 	<view class="main">
 		<view class="info">
 			<scroll-view scroll-y="true" class="scroll-view">
@@ -68,7 +70,7 @@
 		</view>
 		<uni-calendar ref="calendar" :clear-date="true" :date="date" :insert="false" :lunar="true"
 			:startDate="startDate" :endDate="endDate" :range="false" @confirm="confirm" />
-		<uni-popup ref="popup" background-color="#fff" type="bottom" :is-mask-click="false">
+		<uni-popup ref="popup" background-color="#fff" type="bottom" :is-mask-click="false" @change="change">
 			<view class="popup">
 				<view class="close">
 					<text>新增游客信息</text>
@@ -120,6 +122,8 @@
 				// 游客信息
 				form: {},
 				type: '身份证',
+				// 禁止滚动穿透
+				show: false,
 				// 校验规则
 				rules: {
 					name: {
@@ -170,6 +174,11 @@
 			that.search();
 		},
 		methods: {
+			// 禁止滚动穿透
+			change(e) {
+				const that = this;
+				that.show = e.show
+			},
 			searchToken() {
 				const that = this;
 				try {

pagesMy/coupon/index.vue

@@ -1,20 +1,285 @@
 <template>
 	<view class="main">
-		我的优惠卷
+		<!-- <view class="one">
+			<input type="text" v-model="searchInfo.name" @input="toInput" placeholder="搜索优惠券名称">
+		</view> -->
+		<view class="two">
+			<scroll-view scroll-y="true" class="scroll-view">
+				<view class="list-scroll-view">
+					<view class="list" v-for="(item, index) in list" :key="index">
+						<view class="list_1">
+							<view class="left">
+								<view class="left_1">
+									￥<text>{{item.discount_config.min}}</text>
+								</view>
+								<view class="left_2">
+									<text v-if="item.discount_config.limit=='0'">无门槛</text>
+									<text v-else>满{{item.discount_config.limit}}减{{item.discount_config.min}}</text>
+								</view>
+							</view>
+							<view class="center">
+								<view class="name textOver">{{item.name}}</view>
+								<view class="content">有效日期：({{item.expire_type_label}}) {{item.time}}
+								</view>
+							</view>
+							<view class="right">
+								<button class="button" type="primary" @tap="toUser(item)">去使用</button>
+							</view>
+						</view>
+						<view class="list_2">
+							<uni-collapse>
+								<uni-collapse-item title="使用规则补充说明" :open="false">
+									<view class="content">{{item.brief}}</view>
+								</uni-collapse-item>
+							</uni-collapse>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
 	</view>
 </template>
 
 <script>
 	export default {
 		data() {
-			return {}
+			return {
+				searchInfo: {},
+				config: {},
+				user: {},
+				list: [],
+				total: 0,
+				skip: 0,
+				limit: 6,
+				page: 0,
+				// 数据是否触底
+				is_bottom: false,
+				scrollTop: 0,
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.searchToken();
+			that.searchConfig();
+		},
+		onShow: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+		},
+		onPullDownRefresh: async function() {
+			const that = this;
+			that.clearPage();
+			await that.search();
+			uni.stopPullDownRefresh();
 		},
 		methods: {
-
+			searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) that.$set(that, `user`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			searchConfig() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('config');
+					if (res) that.$set(that, `config`, res);
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				let info = {
+					skip: that.skip,
+					limit: that.limit,
+					user: that.user._id,
+				}
+				const res = await that.$api(`/userCoupon/specialQuery`, 'GET', {
+					...info,
+					...that.searchInfo
+				})
+				if (res.errcode == '0') {
+					let list = [...that.list, ...res.data];
+					that.$set(that, `list`, list)
+					that.$set(that, `total`, res.total)
+				} else {
+					uni.showToast({
+						title: res.errmsg,
+					});
+				}
+			},
+			// 输入框
+			toInput(e) {
+				const that = this;
+				if (that.searchInfo.name) that.$set(that.searchInfo, `name`, e.detail.value)
+				else that.$set(that, `searchInfo`, {})
+				that.clearPage();
+				that.search();
+			},
+			// 去使用
+			toUser(item) {
+				if (item.type == '0') {
+					uni.navigateTo({
+						url: `/pagesHome/hotel/index`
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pagesHome/ticket/index`
+					})
+				}
+			},
+			// 分页
+			toPage(e) {
+				const that = this;
+				let list = that.list;
+				let limit = that.limit;
+				if (that.total > list.length) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					})
+					let page = that.page + 1;
+					that.$set(that, `page`, page)
+					let skip = page * limit;
+					that.$set(that, `skip`, skip)
+					that.search();
+					uni.hideLoading();
+				} else that.$set(that, `is_bottom`, true)
+			},
+			toScroll(e) {
+				const that = this;
+				let up = that.scrollTop;
+				that.$set(that, `scrollTop`, e.detail.scrollTop);
+				let num = Math.sign(up - e.detail.scrollTop);
+				if (num == 1) that.$set(that, `is_bottom`, false);
+			},
+			// 清空列表
+			clearPage() {
+				const that = this;
+				that.$set(that, `list`, [])
+				that.$set(that, `skip`, 0)
+				that.$set(that, `limit`, 6)
+				that.$set(that, `page`, 0)
+			}
 		}
 	}
 </script>
 
-<style>
-	.main {}
+<style lang="scss" scoped>
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+
+		.one {
+			padding: 2vw;
+
+			input {
+				padding: 2vw;
+				background-color: var(--f1Color);
+				font-size: var(--font14Size);
+				border-radius: 5px;
+			}
+		}
+
+		.two {
+			position: relative;
+			flex-grow: 1;
+			margin: 1vw 0 0 0;
+			background-color: var(--f9Color);
+
+			.list {
+				background-color: var(--mainColor);
+				border: 1px solid var(--f5Color);
+				padding: 2vw;
+				margin: 2vw 2vw 0 2vw;
+				border-radius: 5px;
+
+				.list_1 {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.left {
+						width: 20vw;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						color: var(--fF0Color);
+						font-size: var(--font14Size);
+
+						.left_1 {
+							text {
+								font-weight: bold;
+								font-size: 25px;
+							}
+						}
+
+						.left_2 {
+							margin: 2px 0 0 0;
+							font-size: var(--font12Size);
+						}
+					}
+
+					.center {
+						width: 40vw;
+
+						.name {
+							font-size: var(--font14Size);
+							font-weight: bold;
+							margin: 0 0 1vw 0;
+						}
+
+						.content {
+							color: var(--f85Color);
+							font-size: var(--font12Size);
+						}
+					}
+
+					.right {
+
+						.button {
+							font-size: 12px;
+							border-radius: 20px;
+							border: 1px solid var(--fF0Color);
+							color: var(--fF0Color);
+							background: var(--mainColor);
+						}
+					}
+				}
+
+				.list_2 {
+					font-size: var(--font12Size);
+
+					/deep/.uni-collapse-item__title-box {
+						padding: 0 !important;
+						font-size: 12px !important;
+					}
+
+					/deep/.uni-collapse-item__title-text {
+						font-size: 12px !important;
+					}
+
+					.content {
+						padding: 2vw;
+					}
+				}
+			}
+		}
+	}
 </style>

unpackage/dist/dev/mp-weixin/pagesHome/hotel/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 538))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 552))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesHome/hotel/info.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 538))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 552))
     },
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 549))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 504))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 556))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 511))
     },
     uniPopup: function () {
       return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 470))
@@ -227,7 +227,9 @@ var _default = {
       discountList: [],
       // 数据是否触底
       is_bottom: false,
-      scrollTop: 0
+      scrollTop: 0,
+      // 禁止滚动穿透
+      show: false
     };
   },
   onLoad: function () {
@@ -286,6 +288,11 @@ var _default = {
     return onShow;
   }(),
   methods: {
+    // 禁止滚动穿透
+    change: function change(e) {
+      var that = this;
+      that.show = e.show;
+    },
     searchToken: function searchToken() {
       var that = this;
       try {
@@ -378,6 +385,7 @@ var _default = {
                 _context4.next = 3;
                 return that.$api("/coupon/specialQuery", 'GET', {
                   is_use: '0',
+                  user: that.user._id,
                   type: '0'
                 });
               case 3:
@@ -393,7 +401,64 @@ var _default = {
       }))();
     },
     // 领取优惠券
-    toReceive: function toReceive() {},
+    toReceive: function toReceive(item) {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+        var that, form, res;
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                that = _this3;
+                if (!that.user._id) {
+                  _context5.next = 10;
+                  break;
+                }
+                form = {
+                  user: that.user._id,
+                  type: item.type,
+                  coupon: item._id,
+                  is_use: '0'
+                };
+                if (item.expire_type == 'fixed') form.time = item.expire_time;else {
+                  form.time = "".concat((0, _moment.default)().format('YYYY-MM-DD HH:mm:ss'), " \u81F3 ").concat((0, _moment.default)().add(item.days, 'days').format('YYYY-MM-DD HH:mm:ss'));
+                }
+                _context5.next = 6;
+                return that.$api("/userCoupon", 'POST', form);
+              case 6:
+                res = _context5.sent;
+                if (res.errcode == '0') {
+                  uni.showToast({
+                    title: '领取成功',
+                    icon: 'none'
+                  });
+                  that.toCoupon();
+                } else {
+                  uni.showToast({
+                    title: res.errmsg,
+                    icon: 'none'
+                  });
+                }
+                _context5.next = 11;
+                break;
+              case 10:
+                uni.navigateTo({
+                  url: "/pagesIndex/login/index"
+                });
+              case 11:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5);
+      }))();
+    },
+    // 去使用
+    toUser: function toUser(item) {
+      uni.navigateTo({
+        url: "/pagesMy/coupon/index"
+      });
+    },
     // 关闭弹框
     toCouponClose: function toCouponClose() {
       var that = this;
@@ -401,29 +466,30 @@ var _default = {
     },
     // 查询其他信息
     searchOther: function searchOther() {
-      var _this3 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+      var _this4 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var that, res;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+        return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
-                that = _this3;
-                _context5.next = 3;
+                that = _this4;
+                _context6.next = 3;
                 return that.$api("/coupon/specialQuery", 'GET', {
                   is_use: '0',
                   discount_type: 'min',
+                  user: that.user._id,
                   type: '0'
                 });
               case 3:
-                res = _context5.sent;
+                res = _context6.sent;
                 if (res.errcode == '0') that.$set(that, "couponList", res.data.slice(0, 3));
               case 5:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5);
+        }, _callee6);
       }))();
     },
     // 处理富文本
@@ -456,20 +522,20 @@ var _default = {
     },
     // 收藏
     onClick: function onClick(item) {
-      var _this4 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
+      var _this5 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
         var that, res, form;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
+        return _regenerator.default.wrap(function _callee7$(_context7) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context7.prev = _context7.next) {
               case 0:
-                that = _this4;
+                that = _this5;
                 if (!(that.user && that.user._id)) {
-                  _context6.next = 15;
+                  _context7.next = 15;
                   break;
                 }
                 if (!(item.is_collect == false)) {
-                  _context6.next = 9;
+                  _context7.next = 9;
                   break;
                 }
                 form = {
@@ -479,20 +545,20 @@ var _default = {
                   type: '1',
                   create_time: (0, _moment.default)().format('YYYY-MM-DD HH:mm:ss')
                 };
-                _context6.next = 6;
+                _context7.next = 6;
                 return that.$api("/like", 'POST', form);
               case 6:
-                res = _context6.sent;
-                _context6.next = 12;
+                res = _context7.sent;
+                _context7.next = 12;
                 break;
               case 9:
-                _context6.next = 11;
+                _context7.next = 11;
                 return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 11:
-                res = _context6.sent;
+                res = _context7.sent;
               case 12:
                 if (res.errcode == '0') that.search();
-                _context6.next = 16;
+                _context7.next = 16;
                 break;
               case 15:
                 uni.navigateTo({
@@ -500,10 +566,10 @@ var _default = {
                 });
               case 16:
               case "end":
-                return _context6.stop();
+                return _context7.stop();
             }
           }
-        }, _callee6);
+        }, _callee7);
       }))();
     },
     // 分页

unpackage/dist/dev/mp-weixin/pagesHome/hotel/info.wxss

@@ -213,11 +213,18 @@
   color: var(--f85Color);
   font-size: var(--font12Size);
 }
-.coupon .info_1 .list .list_1 .right button.data-v-1041d103 {
+.coupon .info_1 .list .list_1 .right .button.data-v-1041d103 {
   font-size: 12px;
   border-radius: 20px;
   background: linear-gradient(to right, #FFA500, #FF0000);
 }
+.coupon .info_1 .list .list_1 .right .button_1.data-v-1041d103 {
+  font-size: 12px;
+  border-radius: 20px;
+  border: 1px solid var(--fF0Color);
+  color: var(--fF0Color);
+  background: var(--mainColor);
+}
 .coupon .info_1 .list .list_2.data-v-1041d103 {
   font-size: var(--font12Size);
 }

unpackage/dist/dev/mp-weixin/pagesHome/news/detail.js

@@ -157,7 +157,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var swiperImg = function swiperImg() {
   __webpack_require__.e(/*! require.ensure | components/swiper/index */ "components/swiper/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/swiper/index.vue */ 531));
+    return resolve(__webpack_require__(/*! ../../components/swiper/index.vue */ 545));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesHome/notice/detail.js

@@ -157,7 +157,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var swiperImg = function swiperImg() {
   __webpack_require__.e(/*! require.ensure | components/swiper/index */ "components/swiper/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/swiper/index.vue */ 531));
+    return resolve(__webpack_require__(/*! ../../components/swiper/index.vue */ 545));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesHome/ticket/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 523))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 537))
     },
     uniCalendar: function () {
       return Promise.all(/*! import() | uni_modules/uni-calendar/components/uni-calendar/uni-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-calendar/components/uni-calendar/uni-calendar")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.vue */ 457))
@@ -110,10 +110,10 @@ try {
       return __webpack_require__.e(/*! import() | uni_modules/uni-popup/components/uni-popup/uni-popup */ "uni_modules/uni-popup/components/uni-popup/uni-popup").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-popup/components/uni-popup/uni-popup.vue */ 470))
     },
     uniCollapse: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 549))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse/uni-collapse */ "uni_modules/uni-collapse/components/uni-collapse/uni-collapse").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.vue */ 504))
     },
     uniCollapseItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 556))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item */ "uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.vue */ 511))
     },
   }
 } catch (e) {
@@ -223,7 +223,9 @@ var _default = {
       // 是否筛选
       is_select: false,
       is_person: '',
-      is_type: ''
+      is_type: '',
+      // 禁止滚动穿透
+      show: false
     };
   },
   onLoad: function () {
@@ -285,6 +287,11 @@ var _default = {
     return onShow;
   }(),
   methods: {
+    // 禁止滚动穿透
+    change: function change(e) {
+      var that = this;
+      that.show = e.show;
+    },
     searchToken: function searchToken() {
       var that = this;
       try {
@@ -403,6 +410,7 @@ var _default = {
                 _context4.next = 3;
                 return that.$api("/coupon/specialQuery", 'GET', {
                   is_use: '0',
+                  user: that.user._id,
                   type: '1'
                 });
               case 3:
@@ -418,7 +426,64 @@ var _default = {
       }))();
     },
     // 领取优惠券
-    toReceive: function toReceive() {},
+    toReceive: function toReceive(item) {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+        var that, form, res;
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                that = _this3;
+                if (!that.user._id) {
+                  _context5.next = 10;
+                  break;
+                }
+                form = {
+                  user: that.user._id,
+                  type: item.type,
+                  coupon: item._id,
+                  is_use: '0'
+                };
+                if (item.expire_type == 'fixed') form.time = item.expire_time;else {
+                  form.time = "".concat((0, _moment.default)().format('YYYY-MM-DD HH:mm:ss'), " \u81F3 ").concat((0, _moment.default)().add(item.days, 'days').format('YYYY-MM-DD HH:mm:ss'));
+                }
+                _context5.next = 6;
+                return that.$api("/userCoupon", 'POST', form);
+              case 6:
+                res = _context5.sent;
+                if (res.errcode == '0') {
+                  uni.showToast({
+                    title: '领取成功',
+                    icon: 'none'
+                  });
+                  that.toCoupon();
+                } else {
+                  uni.showToast({
+                    title: res.errmsg,
+                    icon: 'none'
+                  });
+                }
+                _context5.next = 11;
+                break;
+              case 10:
+                uni.navigateTo({
+                  url: "/pagesIndex/login/index"
+                });
+              case 11:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5);
+      }))();
+    },
+    // 去使用
+    toUser: function toUser(item) {
+      uni.navigateTo({
+        url: "/pagesMy/coupon/index"
+      });
+    },
     // 关闭弹框
     toCouponClose: function toCouponClose() {
       var that = this;
@@ -527,57 +592,58 @@ var _default = {
     },
     // 查询其他信息
     searchOther: function searchOther() {
-      var _this3 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+      var _this4 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var that, res;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+        return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
-                that = _this3;
-                _context5.next = 3;
+                that = _this4;
+                _context6.next = 3;
                 return that.$api("/dictData", 'GET', {
                   type: 'config_status',
                   is_use: '0'
                 });
               case 3:
-                res = _context5.sent;
+                res = _context6.sent;
                 if (res.errcode == '0') that.$set(that, "statusList", res.data);
                 // 出游人群
-                _context5.next = 7;
+                _context6.next = 7;
                 return that.$api("/dictData", 'GET', {
                   type: 'ticket_person',
                   is_use: '0'
                 });
               case 7:
-                res = _context5.sent;
+                res = _context6.sent;
                 if (res.errcode == '0') that.$set(that, "personList", res.data);
                 // 服务特色
-                _context5.next = 11;
+                _context6.next = 11;
                 return that.$api("/dictData", 'GET', {
                   type: 'ticket_type',
                   is_use: '0'
                 });
               case 11:
-                res = _context5.sent;
+                res = _context6.sent;
                 if (res.errcode == '0') that.$set(that, "typeList", res.data);
                 that.$set(that, "totalList", [].concat((0, _toConsumableArray2.default)(that.personList), (0, _toConsumableArray2.default)(that.typeList)));
                 // 优惠券
-                _context5.next = 16;
+                _context6.next = 16;
                 return that.$api("/coupon/specialQuery", 'GET', {
                   is_use: '0',
                   discount_type: 'min',
+                  user: that.user._id,
                   type: '1'
                 });
               case 16:
-                res = _context5.sent;
+                res = _context6.sent;
                 if (res.errcode == '0') that.$set(that, "couponList", res.data.slice(0, 3));
               case 18:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5);
+        }, _callee6);
       }))();
     },
     // 分页

unpackage/dist/dev/mp-weixin/pagesHome/ticket/index.wxss

@@ -344,11 +344,18 @@
   color: var(--f85Color);
   font-size: var(--font12Size);
 }
-.coupon .info_1 .list .list_1 .right button.data-v-1ae5c169 {
+.coupon .info_1 .list .list_1 .right .button.data-v-1ae5c169 {
   font-size: 12px;
   border-radius: 20px;
   background: linear-gradient(to right, #FFA500, #FF0000);
 }
+.coupon .info_1 .list .list_1 .right .button_1.data-v-1ae5c169 {
+  font-size: 12px;
+  border-radius: 20px;
+  border: 1px solid var(--fF0Color);
+  color: var(--fF0Color);
+  background: var(--mainColor);
+}
 .coupon .info_1 .list .list_2.data-v-1ae5c169 {
   font-size: var(--font12Size);
 }

unpackage/dist/dev/mp-weixin/pagesHome/ticket/info.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 538))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 552))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesHome/type/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 538))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 552))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesHome/type/info.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniFav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 538))
+      return Promise.all(/*! import() | uni_modules/uni-fav/components/uni-fav/uni-fav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-fav/components/uni-fav/uni-fav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-fav/components/uni-fav/uni-fav.vue */ 552))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesIndex/order/order.js

@@ -293,6 +293,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 //
 //
 //
+//
+//
 var _default = {
   data: function data() {
     return {
@@ -316,6 +318,8 @@ var _default = {
       // 游客信息
       form: {},
       type: '身份证',
+      // 禁止滚动穿透
+      show: false,
       // 校验规则
       rules: {
         name: {
@@ -378,6 +382,11 @@ var _default = {
     return onLoad;
   }(),
   methods: {
+    // 禁止滚动穿透
+    change: function change(e) {
+      var that = this;
+      that.show = e.show;
+    },
     searchToken: function searchToken() {
       var that = this;
       try {

unpackage/dist/dev/mp-weixin/pagesMy/account/index.js

@@ -146,7 +146,7 @@ var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 32));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 516));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 530));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/article/add.js

@@ -110,7 +110,7 @@ try {
       return __webpack_require__.e(/*! import() | uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput */ "uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.vue */ 497))
     },
     uniDataSelect: function () {
-      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 504))
+      return Promise.all(/*! import() | uni_modules/uni-data-select/components/uni-data-select/uni-data-select */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-data-select/components/uni-data-select/uni-data-select")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.vue */ 518))
     },
   }
 } catch (e) {
@@ -183,7 +183,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 516));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 530));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/pagesMy/article/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 523))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 537))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pagesMy/coupon/index.json

@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "优惠卷",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-collapse": "/uni_modules/uni-collapse/components/uni-collapse/uni-collapse",
+    "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item"
+  }
 }

unpackage/dist/dev/mp-weixin/pagesMy/coupon/index.wxss

@@ -1,3 +1,86 @@
-
-.main {}
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-7f32a554 {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+}
+.main .one.data-v-7f32a554 {
+  padding: 2vw;
+}
+.main .one input.data-v-7f32a554 {
+  padding: 2vw;
+  background-color: var(--f1Color);
+  font-size: var(--font14Size);
+  border-radius: 5px;
+}
+.main .two.data-v-7f32a554 {
+  position: relative;
+  flex-grow: 1;
+  margin: 1vw 0 0 0;
+  background-color: var(--f9Color);
+}
+.main .two .list.data-v-7f32a554 {
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.main .two .list .list_1.data-v-7f32a554 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.main .two .list .list_1 .left.data-v-7f32a554 {
+  width: 20vw;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  color: var(--fF0Color);
+  font-size: var(--font14Size);
+}
+.main .two .list .list_1 .left .left_1 text.data-v-7f32a554 {
+  font-weight: bold;
+  font-size: 25px;
+}
+.main .two .list .list_1 .left .left_2.data-v-7f32a554 {
+  margin: 2px 0 0 0;
+  font-size: var(--font12Size);
+}
+.main .two .list .list_1 .center.data-v-7f32a554 {
+  width: 40vw;
+}
+.main .two .list .list_1 .center .name.data-v-7f32a554 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+}
+.main .two .list .list_1 .center .content.data-v-7f32a554 {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.main .two .list .list_1 .right .button.data-v-7f32a554 {
+  font-size: 12px;
+  border-radius: 20px;
+  border: 1px solid var(--fF0Color);
+  color: var(--fF0Color);
+  background: var(--mainColor);
+}
+.main .two .list .list_2.data-v-7f32a554 {
+  font-size: var(--font12Size);
+}
+.main .two .list .list_2.data-v-7f32a554 .uni-collapse-item__title-box {
+  padding: 0 !important;
+  font-size: 12px !important;
+}
+.main .two .list .list_2.data-v-7f32a554 .uni-collapse-item__title-text {
+  font-size: 12px !important;
+}
+.main .two .list .list_2 .content.data-v-7f32a554 {
+  padding: 2vw;
+}
 

unpackage/dist/dev/mp-weixin/pagesMy/opinion/index.js

@@ -176,7 +176,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
 var upload = function upload() {
   __webpack_require__.e(/*! require.ensure | components/upload/index */ "components/upload/index").then((function () {
-    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 516));
+    return resolve(__webpack_require__(/*! ../../components/upload/index.vue */ 530));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

unpackage/dist/dev/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 523))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 537))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js

@@ -80,7 +80,7 @@ var components
 try {
   components = {
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 523))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 537))
     },
   }
 } catch (e) {