修改优惠券管理

pagesHome/hotel/info.vue

@@ -35,6 +35,18 @@
 					<view class="left">联系电话：</view>
 					<view class="right"><text :user-select='true'>{{info.phone||'暂无'}}</text></view>
 				</view>
+				<view class="thr_2" v-if="couponList.length>0" @tap="toCoupon">
+					<view class="left">优惠卷</view>
+					<view class="center">
+						<view class="center_1" v-for="(item,index) in couponList" :key="index">
+							<text
+								v-if="item.discount_type=='min'&&item.discount_config.limit=='0'">立减{{item.discount_config.min}}</text>
+							<text
+								v-if="item.discount_type=='min'&&item.discount_config.limit!='0'">满{{item.discount_config.limit}}减{{item.discount_config.min}}</text>
+						</view>
+					</view>
+					<view class="right">领卷<text class="iconfont icon-dayuhao"></text></view>
+				</view>
 			</view>
 			<view class="four">
 				<uni-collapse>
@@ -83,6 +95,50 @@
 				</scroll-view>
 			</view>
 		</view>
+		<!-- 领取优惠卷 -->
+		<uni-popup ref="coupon" background-color="#fff" type="bottom" :is-mask-click="false">
+			<view class="coupon">
+				<view class="close">
+					<text>抵用券</text>
+					<text @click="toCouponClose" class="iconfont icon-shanchu"></text>
+				</view>
+				<view class="info_1">
+					<scroll-view scroll-y="true" class="scroll-view">
+						<view class="list-scroll-view">
+							<view class="list" v-for="(item, index) in discountList" :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.expire_time}}
+										</view>
+									</view>
+									<view class="right">
+										<button class="button" type="primary" @tap="toReceive">立即领取</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>
+		</uni-popup>
 	</view>
 </template>
 
@@ -102,6 +158,10 @@
 				skip: 0,
 				limit: 10,
 				page: 0,
+				// 优惠卷
+				couponList: [],
+				// 优惠券全部
+				discountList: [],
 				// 数据是否触底
 				is_bottom: false,
 				scrollTop: 0,
@@ -110,10 +170,11 @@
 		onLoad: async function(e) {
 			const that = this;
 			that.$set(that, `id`, e && e.id || '');
-			that.searchConfig();
 		},
 		onShow: async function(e) {
 			const that = this;
+			await that.searchOther();
+			await that.searchConfig();
 			await that.searchToken();
 			await that.clearPage();
 			await that.search();
@@ -178,6 +239,36 @@
 					}
 				}
 			},
+			// 领卷
+			async toCoupon() {
+				const that = this;
+				// 优惠券
+				const res = await that.$api(`/coupon/specialQuery`, 'GET', {
+					is_use: '0',
+					type: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `discountList`, res.data);
+				that.$refs.coupon.open()
+			},
+			// 领取优惠券
+			toReceive() {},
+			// 关闭弹框
+			toCouponClose() {
+				const that = this;
+				that.$refs.coupon.close();
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 优惠券
+				res = await that.$api(`/coupon/specialQuery`, 'GET', {
+					is_use: '0',
+					discount_type: 'min',
+					type: '0'
+				})
+				if (res.errcode == '0') that.$set(that, `couponList`, res.data.slice(0, 3));
+			},
 			// 处理富文本
 			formatRichText(html) {
 				if (html) {
@@ -342,6 +433,41 @@
 						}
 					}
 				}
+
+				.thr_2 {
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					padding: 3vw 2vw;
+					font-size: var(--font14Size);
+					background-color: var(--f9Color);
+					border-radius: 10px;
+					margin: 2vw 0;
+
+					.center {
+						display: flex;
+						align-items: center;
+						width: 65vw;
+
+						.center_1 {
+							text {
+								margin: 0 1vw 0 0;
+								padding: 2px;
+								font-size: var(--font12Size);
+								color: var(--mainColor);
+								border-radius: 5px;
+								background: linear-gradient(to right, #FFA500, #FF0000);
+							}
+						}
+					}
+
+					.right {
+						display: flex;
+						align-items: center;
+						font-size: var(--font14Size);
+						color: var(--fF0Color);
+					}
+				}
 			}
 
 			.four {
@@ -420,6 +546,113 @@
 		}
 	}
 
+	.uni-popup {
+		z-index: 9999 !important;
+	}
+
+	.coupon {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 60vh;
+		background-color: var(--f9Color);
+
+		.close {
+			display: flex;
+			justify-content: space-between;
+			padding: 2vw;
+
+			text:first-child {
+				font-size: var(--font16Size);
+				font-weight: bold;
+			}
+		}
+
+		.info_1 {
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			height: 54vh;
+			padding: 2vw;
+
+			.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;
+						padding: 3vw;
+						color: var(--fF0Color);
+						font-size: var(--font14Size);
+
+						.left_1 {
+							text {
+								font-weight: bold;
+								font-size: 25px;
+							}
+						}
+
+						.left_2 {
+							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;
+							background: linear-gradient(to right, #FFA500, #FF0000);
+						}
+					}
+				}
+
+				.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;
+					}
+				}
+			}
+		}
+	}
+
 	.scroll-view {
 		position: absolute;
 		top: 0;

pagesHome/ticket/index.vue

@@ -34,9 +34,17 @@
 						<text>地图</text>
 					</view>
 				</view>
-				<view class="two_4" v-if="couponList.length>0">
+				<view class="two_4" v-if="couponList.length>0" @tap="toCoupon">
 					<view class="left">优惠卷</view>
-					<view class="right" @click="toCoupon">领卷<text class="iconfont icon-dayuhao"></text></view>
+					<view class="center">
+						<view class="center_1" v-for="(item,index) in couponList" :key="index">
+							<text
+								v-if="item.discount_type=='min'&&item.discount_config.limit=='0'">立减{{item.discount_config.min}}</text>
+							<text
+								v-if="item.discount_type=='min'&&item.discount_config.limit!='0'">满{{item.discount_config.limit}}减{{item.discount_config.min}}</text>
+						</view>
+					</view>
+					<view class="right">领卷<text class="iconfont icon-dayuhao"></text></view>
 				</view>
 			</view>
 			<view class="thr">
@@ -115,6 +123,50 @@
 				</view>
 			</view>
 		</uni-popup>
+		<!-- 领取优惠卷 -->
+		<uni-popup ref="coupon" background-color="#fff" type="bottom" :is-mask-click="false">
+			<view class="coupon">
+				<view class="close">
+					<text>抵用券</text>
+					<text @click="toCouponClose" class="iconfont icon-shanchu"></text>
+				</view>
+				<view class="info_1">
+					<scroll-view scroll-y="true" class="scroll-view">
+						<view class="list-scroll-view">
+							<view class="list" v-for="(item, index) in discountList" :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.expire_time}}
+										</view>
+									</view>
+									<view class="right">
+										<button class="button" type="primary" @tap="toReceive">立即领取</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>
+		</uni-popup>
 	</view>
 </template>
 
@@ -137,6 +189,8 @@
 				scrollTop: 0,
 				// 优惠卷
 				couponList: [],
+				// 优惠券全部
+				discountList: [],
 				// 字典表
 				statusList: [],
 				personList: [],
@@ -154,12 +208,13 @@
 			uni.setNavigationBarTitle({
 				title: e && e.title || '分类'
 			});
-			that.searchConfig();
+			
 		},
 		onShow: async function(e) {
 			const that = this;
-			await that.searchOther();
 			await that.searchToken();
+			await that.searchOther();
+			await that.searchConfig();
 			await that.clearPage();
 			await that.search();
 		},
@@ -242,8 +297,22 @@
 				})
 			},
 			// 领卷
-			toCoupon() {
-
+			async toCoupon() {
+				const that = this;
+				// 优惠券
+				const res = await that.$api(`/coupon/specialQuery`, 'GET', {
+					is_use: '0',
+					type: '1'
+				})
+				if (res.errcode == '0') that.$set(that, `discountList`, res.data);
+				that.$refs.coupon.open()
+			},
+			// 领取优惠券
+			toReceive() {},
+			// 关闭弹框
+			toCouponClose() {
+				const that = this;
+				that.$refs.coupon.close();
 			},
 			// 打开日历
 			toOpen() {
@@ -367,6 +436,13 @@
 				})
 				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
 				that.$set(that, `totalList`, [...that.personList, ...that.typeList]);
+				// 优惠券
+				res = await that.$api(`/coupon/specialQuery`, 'GET', {
+					is_use: '0',
+					discount_type: 'min',
+					type: '1'
+				})
+				if (res.errcode == '0') that.$set(that, `couponList`, res.data.slice(0, 3));
 			},
 			// 分页
 			toPage(e) {
@@ -523,7 +599,24 @@
 					font-size: var(--font14Size);
 					background-color: var(--mainColor);
 					border-radius: 10px;
-					margin: 1vw 0;
+					margin: 2vw 0;
+
+					.center {
+						display: flex;
+						align-items: center;
+						width: 65vw;
+
+						.center_1 {
+							text {
+								margin: 0 1vw 0 0;
+								padding: 2px;
+								font-size: var(--font12Size);
+								color: var(--mainColor);
+								border-radius: 5px;
+								background: linear-gradient(to right, #FFA500, #FF0000);
+							}
+						}
+					}
 
 					.right {
 						display: flex;
@@ -732,6 +825,113 @@
 		}
 	}
 
+	.uni-popup {
+		z-index: 9999 !important;
+	}
+
+	.coupon {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 60vh;
+		background-color: var(--f9Color);
+
+		.close {
+			display: flex;
+			justify-content: space-between;
+			padding: 2vw;
+
+			text:first-child {
+				font-size: var(--font16Size);
+				font-weight: bold;
+			}
+		}
+
+		.info_1 {
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			height: 54vh;
+			padding: 2vw;
+
+			.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;
+						padding: 3vw;
+						color: var(--fF0Color);
+						font-size: var(--font14Size);
+
+						.left_1 {
+							text {
+								font-weight: bold;
+								font-size: 25px;
+							}
+						}
+
+						.left_2 {
+							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;
+							background: linear-gradient(to right, #FFA500, #FF0000);
+						}
+					}
+				}
+
+				.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;
+					}
+				}
+			}
+		}
+	}
+
 	.scroll-view {
 		position: absolute;
 		top: 0;

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

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"travel_applet","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));

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

@@ -109,6 +109,9 @@ try {
     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))
     },
+    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))
+    },
   }
 } catch (e) {
   if (
@@ -132,15 +135,16 @@ var render = function () {
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
   var g0 = _vm.info.file.length
+  var g1 = _vm.couponList.length
   var m0 = _vm.info.prompt ? _vm.formatRichText(_vm.info.prompt) : null
   var m1 = _vm.info.children ? _vm.formatRichText(_vm.info.children) : null
   var m2 = _vm.formatRichText(_vm.info.brief)
   var l0 = _vm.__map(_vm.list, function (item, index) {
     var $orig = _vm.__get_orig(item)
-    var g1 = item.file && item.file.length > 0
+    var g2 = item.file && item.file.length > 0
     return {
       $orig: $orig,
-      g1: g1,
+      g2: g2,
     }
   })
   _vm.$mp.data = Object.assign(
@@ -148,6 +152,7 @@ var render = function () {
     {
       $root: {
         g0: g0,
+        g1: g1,
         m0: m0,
         m1: m1,
         m2: m2,
@@ -216,6 +221,10 @@ var _default = {
       skip: 0,
       limit: 10,
       page: 0,
+      // 优惠卷
+      couponList: [],
+      // 优惠券全部
+      discountList: [],
       // 数据是否触底
       is_bottom: false,
       scrollTop: 0
@@ -230,8 +239,7 @@ var _default = {
             case 0:
               that = this;
               that.$set(that, "id", e && e.id || '');
-              that.searchConfig();
-            case 3:
+            case 2:
             case "end":
               return _context.stop();
           }
@@ -252,14 +260,20 @@ var _default = {
             case 0:
               that = this;
               _context2.next = 3;
-              return that.searchToken();
+              return that.searchOther();
             case 3:
               _context2.next = 5;
-              return that.clearPage();
+              return that.searchConfig();
             case 5:
               _context2.next = 7;
-              return that.search();
+              return that.searchToken();
             case 7:
+              _context2.next = 9;
+              return that.clearPage();
+            case 9:
+              _context2.next = 11;
+              return that.search();
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -351,6 +365,67 @@ var _default = {
         }, _callee3);
       }))();
     },
+    // 领卷
+    toCoupon: function toCoupon() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var that, res;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                that = _this2; // 优惠券
+                _context4.next = 3;
+                return that.$api("/coupon/specialQuery", 'GET', {
+                  is_use: '0',
+                  type: '0'
+                });
+              case 3:
+                res = _context4.sent;
+                if (res.errcode == '0') that.$set(that, "discountList", res.data);
+                that.$refs.coupon.open();
+              case 6:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }))();
+    },
+    // 领取优惠券
+    toReceive: function toReceive() {},
+    // 关闭弹框
+    toCouponClose: function toCouponClose() {
+      var that = this;
+      that.$refs.coupon.close();
+    },
+    // 查询其他信息
+    searchOther: function searchOther() {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+        var that, res;
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                that = _this3;
+                _context5.next = 3;
+                return that.$api("/coupon/specialQuery", 'GET', {
+                  is_use: '0',
+                  discount_type: 'min',
+                  type: '0'
+                });
+              case 3:
+                res = _context5.sent;
+                if (res.errcode == '0') that.$set(that, "couponList", res.data.slice(0, 3));
+              case 5:
+              case "end":
+                return _context5.stop();
+            }
+          }
+        }, _callee5);
+      }))();
+    },
     // 处理富文本
     formatRichText: function formatRichText(html) {
       if (html) {
@@ -381,20 +456,20 @@ var _default = {
     },
     // 收藏
     onClick: function onClick(item) {
-      var _this2 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      var _this4 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var that, res, form;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
-                that = _this2;
+                that = _this4;
                 if (!(that.user && that.user._id)) {
-                  _context4.next = 15;
+                  _context6.next = 15;
                   break;
                 }
                 if (!(item.is_collect == false)) {
-                  _context4.next = 9;
+                  _context6.next = 9;
                   break;
                 }
                 form = {
@@ -404,20 +479,20 @@ var _default = {
                   type: '1',
                   create_time: (0, _moment.default)().format('YYYY-MM-DD HH:mm:ss')
                 };
-                _context4.next = 6;
+                _context6.next = 6;
                 return that.$api("/like", 'POST', form);
               case 6:
-                res = _context4.sent;
-                _context4.next = 12;
+                res = _context6.sent;
+                _context6.next = 12;
                 break;
               case 9:
-                _context4.next = 11;
+                _context6.next = 11;
                 return that.$api("/like/".concat(item.collect), 'DELETE', {});
               case 11:
-                res = _context4.sent;
+                res = _context6.sent;
               case 12:
                 if (res.errcode == '0') that.search();
-                _context4.next = 16;
+                _context6.next = 16;
                 break;
               case 15:
                 uni.navigateTo({
@@ -425,10 +500,10 @@ var _default = {
                 });
               case 16:
               case "end":
-                return _context4.stop();
+                return _context6.stop();
             }
           }
-        }, _callee4);
+        }, _callee6);
       }))();
     },
     // 分页

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

@@ -3,6 +3,7 @@
   "usingComponents": {
     "uni-fav": "/uni_modules/uni-fav/components/uni-fav/uni-fav",
     "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"
+    "uni-collapse-item": "/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item",
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
   }
 }

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

@@ -58,6 +58,35 @@
   font-size: var(--font14Size);
   color: var(--f3CColor);
 }
+.main .bottom .thr .thr_2.data-v-1041d103 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 3vw 2vw;
+  font-size: var(--font14Size);
+  background-color: var(--f9Color);
+  border-radius: 10px;
+  margin: 2vw 0;
+}
+.main .bottom .thr .thr_2 .center.data-v-1041d103 {
+  display: flex;
+  align-items: center;
+  width: 65vw;
+}
+.main .bottom .thr .thr_2 .center .center_1 text.data-v-1041d103 {
+  margin: 0 1vw 0 0;
+  padding: 2px;
+  font-size: var(--font12Size);
+  color: var(--mainColor);
+  border-radius: 5px;
+  background: linear-gradient(to right, #FFA500, #FF0000);
+}
+.main .bottom .thr .thr_2 .right.data-v-1041d103 {
+  display: flex;
+  align-items: center;
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
+}
 .main .bottom .four.data-v-1041d103 {
   padding: 0 2vw;
 }
@@ -117,6 +146,91 @@
   font-size: var(--font12Size);
   background-color: var(--f3CColor);
 }
+.uni-popup.data-v-1041d103 {
+  z-index: 9999 !important;
+}
+.coupon.data-v-1041d103 {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 60vh;
+  background-color: var(--f9Color);
+}
+.coupon .close.data-v-1041d103 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw;
+}
+.coupon .close text.data-v-1041d103:first-child {
+  font-size: var(--font16Size);
+  font-weight: bold;
+}
+.coupon .info_1.data-v-1041d103 {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  height: 54vh;
+  padding: 2vw;
+}
+.coupon .info_1 .list.data-v-1041d103 {
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.coupon .info_1 .list .list_1.data-v-1041d103 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.coupon .info_1 .list .list_1 .left.data-v-1041d103 {
+  width: 20vw;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 3vw;
+  color: var(--fF0Color);
+  font-size: var(--font14Size);
+}
+.coupon .info_1 .list .list_1 .left .left_1 text.data-v-1041d103 {
+  font-weight: bold;
+  font-size: 25px;
+}
+.coupon .info_1 .list .list_1 .left .left_2.data-v-1041d103 {
+  font-size: var(--font12Size);
+}
+.coupon .info_1 .list .list_1 .center.data-v-1041d103 {
+  width: 40vw;
+}
+.coupon .info_1 .list .list_1 .center .name.data-v-1041d103 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+}
+.coupon .info_1 .list .list_1 .center .content.data-v-1041d103 {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.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_2.data-v-1041d103 {
+  font-size: var(--font12Size);
+}
+.coupon .info_1 .list .list_2.data-v-1041d103 .uni-collapse-item__title-box {
+  padding: 0 !important;
+  font-size: 12px !important;
+}
+.coupon .info_1 .list .list_2.data-v-1041d103 .uni-collapse-item__title-text {
+  font-size: 12px !important;
+}
+.coupon .info_1 .list .list_2 .content.data-v-1041d103 {
+  padding: 2vw;
+}
 .scroll-view.data-v-1041d103 {
   position: absolute;
   top: 0;

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

@@ -109,6 +109,12 @@ try {
     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))
     },
+    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))
+    },
+    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))
+    },
   }
 } catch (e) {
   if (
@@ -207,6 +213,8 @@ var _default = {
       scrollTop: 0,
       // 优惠卷
       couponList: [],
+      // 优惠券全部
+      discountList: [],
       // 字典表
       statusList: [],
       personList: [],
@@ -230,8 +238,7 @@ var _default = {
               uni.setNavigationBarTitle({
                 title: e && e.title || '分类'
               });
-              that.searchConfig();
-            case 4:
+            case 3:
             case "end":
               return _context.stop();
           }
@@ -252,17 +259,20 @@ var _default = {
             case 0:
               that = this;
               _context2.next = 3;
-              return that.searchOther();
+              return that.searchToken();
             case 3:
               _context2.next = 5;
-              return that.searchToken();
+              return that.searchOther();
             case 5:
               _context2.next = 7;
-              return that.clearPage();
+              return that.searchConfig();
             case 7:
               _context2.next = 9;
-              return that.search();
+              return that.clearPage();
             case 9:
+              _context2.next = 11;
+              return that.search();
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -381,7 +391,39 @@ var _default = {
       });
     },
     // 领卷
-    toCoupon: function toCoupon() {},
+    toCoupon: function toCoupon() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+        var that, res;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                that = _this2; // 优惠券
+                _context4.next = 3;
+                return that.$api("/coupon/specialQuery", 'GET', {
+                  is_use: '0',
+                  type: '1'
+                });
+              case 3:
+                res = _context4.sent;
+                if (res.errcode == '0') that.$set(that, "discountList", res.data);
+                that.$refs.coupon.open();
+              case 6:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4);
+      }))();
+    },
+    // 领取优惠券
+    toReceive: function toReceive() {},
+    // 关闭弹框
+    toCouponClose: function toCouponClose() {
+      var that = this;
+      that.$refs.coupon.close();
+    },
     // 打开日历
     toOpen: function toOpen() {
       var that = this;
@@ -485,47 +527,57 @@ var _default = {
     },
     // 查询其他信息
     searchOther: function searchOther() {
-      var _this2 = this;
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
         var that, res;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                that = _this2;
-                _context4.next = 3;
+                that = _this3;
+                _context5.next = 3;
                 return that.$api("/dictData", 'GET', {
                   type: 'config_status',
                   is_use: '0'
                 });
               case 3:
-                res = _context4.sent;
+                res = _context5.sent;
                 if (res.errcode == '0') that.$set(that, "statusList", res.data);
                 // 出游人群
-                _context4.next = 7;
+                _context5.next = 7;
                 return that.$api("/dictData", 'GET', {
                   type: 'ticket_person',
                   is_use: '0'
                 });
               case 7:
-                res = _context4.sent;
+                res = _context5.sent;
                 if (res.errcode == '0') that.$set(that, "personList", res.data);
                 // 服务特色
-                _context4.next = 11;
+                _context5.next = 11;
                 return that.$api("/dictData", 'GET', {
                   type: 'ticket_type',
                   is_use: '0'
                 });
               case 11:
-                res = _context4.sent;
+                res = _context5.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)));
-              case 14:
+                // 优惠券
+                _context5.next = 16;
+                return that.$api("/coupon/specialQuery", 'GET', {
+                  is_use: '0',
+                  discount_type: 'min',
+                  type: '1'
+                });
+              case 16:
+                res = _context5.sent;
+                if (res.errcode == '0') that.$set(that, "couponList", res.data.slice(0, 3));
+              case 18:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4);
+        }, _callee5);
       }))();
     },
     // 分页

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

@@ -4,6 +4,8 @@
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
     "uni-calendar": "/uni_modules/uni-calendar/components/uni-calendar/uni-calendar",
-    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "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/pagesHome/ticket/index.wxss

@@ -96,7 +96,20 @@
   font-size: var(--font14Size);
   background-color: var(--mainColor);
   border-radius: 10px;
-  margin: 1vw 0;
+  margin: 2vw 0;
+}
+.main .bottom .two .two_4 .center.data-v-1ae5c169 {
+  display: flex;
+  align-items: center;
+  width: 65vw;
+}
+.main .bottom .two .two_4 .center .center_1 text.data-v-1ae5c169 {
+  margin: 0 1vw 0 0;
+  padding: 2px;
+  font-size: var(--font12Size);
+  color: var(--mainColor);
+  border-radius: 5px;
+  background: linear-gradient(to right, #FFA500, #FF0000);
 }
 .main .bottom .two .two_4 .right.data-v-1ae5c169 {
   display: flex;
@@ -264,6 +277,91 @@
   color: var(--mainColor);
   background: linear-gradient(to right, #00BFFF, #007AFF);
 }
+.uni-popup.data-v-1ae5c169 {
+  z-index: 9999 !important;
+}
+.coupon.data-v-1ae5c169 {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 60vh;
+  background-color: var(--f9Color);
+}
+.coupon .close.data-v-1ae5c169 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw;
+}
+.coupon .close text.data-v-1ae5c169:first-child {
+  font-size: var(--font16Size);
+  font-weight: bold;
+}
+.coupon .info_1.data-v-1ae5c169 {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  height: 54vh;
+  padding: 2vw;
+}
+.coupon .info_1 .list.data-v-1ae5c169 {
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.coupon .info_1 .list .list_1.data-v-1ae5c169 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.coupon .info_1 .list .list_1 .left.data-v-1ae5c169 {
+  width: 20vw;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 3vw;
+  color: var(--fF0Color);
+  font-size: var(--font14Size);
+}
+.coupon .info_1 .list .list_1 .left .left_1 text.data-v-1ae5c169 {
+  font-weight: bold;
+  font-size: 25px;
+}
+.coupon .info_1 .list .list_1 .left .left_2.data-v-1ae5c169 {
+  font-size: var(--font12Size);
+}
+.coupon .info_1 .list .list_1 .center.data-v-1ae5c169 {
+  width: 40vw;
+}
+.coupon .info_1 .list .list_1 .center .name.data-v-1ae5c169 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+}
+.coupon .info_1 .list .list_1 .center .content.data-v-1ae5c169 {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.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_2.data-v-1ae5c169 {
+  font-size: var(--font12Size);
+}
+.coupon .info_1 .list .list_2.data-v-1ae5c169 .uni-collapse-item__title-box {
+  padding: 0 !important;
+  font-size: 12px !important;
+}
+.coupon .info_1 .list .list_2.data-v-1ae5c169 .uni-collapse-item__title-text {
+  font-size: 12px !important;
+}
+.coupon .info_1 .list .list_2 .content.data-v-1ae5c169 {
+  padding: 2vw;
+}
 .scroll-view.data-v-1ae5c169 {
   position: absolute;
   top: 0;