修改订单

pagesIndex/order/index.vue

@@ -10,10 +10,22 @@
 						<view class="list-scroll-view">
 							<view class="list" v-for="(item, index) in list" :key="index">
 								<view class="list_1">
-									订单
+									<view class="top">
+										<view class="left">
+											<image class="image"
+												:src="config.logo_url&&config.logo_url.length>0?config.logo_url[0].url:''">
+											</image>
+											<text v-if="no.type=='0'">酒店民宿</text>
+											<text v-else>景区门票</text>
+										</view>
+										<view class="right">{{item.zhStatus}}</view>
+									</view>
+									<view class="center">
+										
+									</view>
 								</view>
-								<view class="button">
-									<button size="mini" type="warn" @tap.stop="toDel(item)">删除</button>
+								<view class="bottom">
+									<button size="mini" type="warn" @tap.stop="toDel(item)">申请退款</button>
 								</view>
 							</view>
 						</view>
@@ -113,12 +125,16 @@
 					user: that.user._id,
 				}
 				if (status != '-1') info.status = status
-				const res = await that.$api(`/order`, 'GET', {
+				const res = await that.$api(`/orderDetail`, 'GET', {
 					...info,
 					...that.searchInfo
 				})
 				if (res.errcode == '0') {
 					let list = [...that.list, ...res.data];
+					for (let val of list) {
+						const status = that.statusList.find(i => i.value == val.status)
+						if (status) val.zhStatus = status.label
+					}
 					that.$set(that, `list`, list)
 					that.$set(that, `total`, res.total)
 				} else {
@@ -256,52 +272,29 @@
 						padding: 2vw 0;
 						font-size: var(--font16Size);
 
-						.status {
-							font-size: var(--font14Size);
-							color: var(--fF0Color);
-						}
-					}
-
-					.list_2 {
-						display: flex;
-
-						.left {
-							.image {
-								width: 20vw;
-								height: 20vw;
-								border-radius: 5px;
-								border: 1px solid var(--f9Color);
-							}
-						}
+						.top {
+							width: 100%;
+							display: flex;
+							justify-content: space-between;
 
-						.right {
-							width: 70vw;
-							margin: 0 0 0 2vw;
-
-							.right_1 {
+							.left {
 								display: flex;
-								justify-content: space-between;
-								margin: 0 0 2vw 0;
+								align-items: center;
 
-								.name {
-									font-size: var(--font14Size);
+								.image {
+									width: 8vw;
+									height: 8vw;
+									border-radius: 8vw;
 								}
 
-								.num {
-									display: flex;
-									flex-direction: column;
-									align-items: flex-end;
-
-									text:last-child {
-										font-size: var(--font13Size);
-										color: var(--f85Color);
-									}
+								text {
+									padding: 0 0 0 2vw;
 								}
 							}
 
-							.right_2 {
-								font-size: var(--font12Size);
-								color: var(--f85Color);
+							.right {
+								font-size: var(--font14Size);
+								color: var(--fF0Color);
 							}
 						}
 					}

pagesIndex/order/order.vue

@@ -22,7 +22,11 @@
 							</view>
 						</view>
 						<view class="one_4" v-if="couponList.length>0">
-							<view class="left">优惠</view>
+							<view class="left">优惠券</view>
+							<view class="right" @tap="toCoupon">
+								<text v-if="discountInfo.name">{{discountInfo.name}}</text>
+								<text class="iconfont icon-dayuhao"></text>
+							</view>
 						</view>
 					</view>
 					<view class="two">
@@ -95,6 +99,50 @@
 				</view>
 			</view>
 		</uni-popup>
+		<!-- 领取优惠卷 -->
+		<uni-popup ref="coupon" background-color="#fff" type="bottom" :is-mask-click="false" @change="change">
+			<view class="popup">
+				<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 couponList" :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_1" 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>
+		</uni-popup>
 	</view>
 </template>
 
@@ -114,6 +162,7 @@
 				}],
 				// 优惠券
 				couponList: [],
+				discountInfo: '',
 				// 数量
 				num: 1,
 				// 日期
@@ -186,7 +235,7 @@
 					const res = uni.getStorageSync('token');
 					if (res) {
 						that.$set(that, `user`, res);
-						const arr = await that.$api(`/userCoupon`, 'GET', {
+						const arr = await that.$api(`/userCoupon/specialQuery`, 'GET', {
 							user: res._id || res.id,
 							is_use: "0"
 						})
@@ -280,6 +329,28 @@
 					that.toClose()
 				})
 			},
+			// 领卷
+			toCoupon() {
+				const that = this;
+				that.$refs.coupon.open()
+			},
+			// 关闭弹框
+			toCouponClose() {
+				const that = this;
+				that.$refs.coupon.close();
+			},
+			// 去使用
+			toUser(item) {
+				const that = this;
+				if (item.type == '0') {
+					uni.showToast({
+						title: '该优惠券不符合使用类型！',
+						icon: 'none',
+						duration: 2000
+					});
+				} else that.$set(that, `discountInfo`, item);
+				that.toCouponClose();
+			},
 			// 关闭弹框
 			toClose() {
 				const that = this;
@@ -311,14 +382,15 @@
 						date: that.date,
 						num: that.num,
 						identity: that.identityList,
-						discount: '',
+						discount: that.discountInfo._id || that.discountInfo.id,
 						buy_time: moment().format('YYYY-MM-DD HH:mm:ss'),
 						pay_time: '',
-						pay: []
+						pay: [],
+						status: '1'
 					}
 					const res = await that.$api(`/order`, 'POST', data);
 					if (res.errcode == '0') {
-						uni.reLaunch({
+						uni.redirectTo({
 							url: `/pagesIndex/order/index?status=${'1'}`
 						})
 					} else {
@@ -414,6 +486,8 @@
 				}
 
 				.one_4 {
+					display: flex;
+					justify-content: space-between;
 					font-size: var(--font18Size);
 					font-weight: bold;
 					padding: 2vw;
@@ -550,6 +624,90 @@
 			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);
+						}
+
+						.button_1 {
+							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;
+					}
+				}
+			}
+
 			button {
 				font-size: var(--font14Size);
 				background: linear-gradient(to right, #00BFFF, #007AFF);

unpackage/dist/dev/mp-weixin/pagesIndex/order/index.wxss

@@ -39,43 +39,26 @@
   padding: 2vw 0;
   font-size: var(--font16Size);
 }
-.main .two .tabsList .list .list_1 .status.data-v-3e78a684 {
-  font-size: var(--font14Size);
-  color: var(--fF0Color);
-}
-.main .two .tabsList .list .list_2.data-v-3e78a684 {
-  display: flex;
-}
-.main .two .tabsList .list .list_2 .left .image.data-v-3e78a684 {
-  width: 20vw;
-  height: 20vw;
-  border-radius: 5px;
-  border: 1px solid var(--f9Color);
-}
-.main .two .tabsList .list .list_2 .right.data-v-3e78a684 {
-  width: 70vw;
-  margin: 0 0 0 2vw;
-}
-.main .two .tabsList .list .list_2 .right .right_1.data-v-3e78a684 {
+.main .two .tabsList .list .list_1 .top.data-v-3e78a684 {
+  width: 100%;
   display: flex;
   justify-content: space-between;
-  margin: 0 0 2vw 0;
 }
-.main .two .tabsList .list .list_2 .right .right_1 .name.data-v-3e78a684 {
-  font-size: var(--font14Size);
-}
-.main .two .tabsList .list .list_2 .right .right_1 .num.data-v-3e78a684 {
+.main .two .tabsList .list .list_1 .top .left.data-v-3e78a684 {
   display: flex;
-  flex-direction: column;
-  align-items: flex-end;
+  align-items: center;
 }
-.main .two .tabsList .list .list_2 .right .right_1 .num text.data-v-3e78a684:last-child {
-  font-size: var(--font13Size);
-  color: var(--f85Color);
+.main .two .tabsList .list .list_1 .top .left .image.data-v-3e78a684 {
+  width: 8vw;
+  height: 8vw;
+  border-radius: 8vw;
 }
-.main .two .tabsList .list .list_2 .right .right_2.data-v-3e78a684 {
-  font-size: var(--font12Size);
-  color: var(--f85Color);
+.main .two .tabsList .list .list_1 .top .left text.data-v-3e78a684 {
+  padding: 0 0 0 2vw;
+}
+.main .two .tabsList .list .list_1 .top .right.data-v-3e78a684 {
+  font-size: var(--font14Size);
+  color: var(--fF0Color);
 }
 .main .two .tabsList .list .bottom.data-v-3e78a684 {
   text-align: center;

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

@@ -7,6 +7,8 @@
     "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
     "uni-forms": "/uni_modules/uni-forms/components/uni-forms/uni-forms",
     "uni-forms-item": "/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item",
-    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput"
+    "uni-easyinput": "/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput",
+    "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/pagesIndex/order/order.wxss

@@ -65,6 +65,8 @@
   font-weight: bold;
 }
 .main .info .one .one_4.data-v-0ce3258c {
+  display: flex;
+  justify-content: space-between;
   font-size: var(--font18Size);
   font-weight: bold;
   padding: 2vw;
@@ -174,6 +176,72 @@
   height: 54vh;
   padding: 2vw;
 }
+.popup .info_1 .list.data-v-0ce3258c {
+  background-color: var(--mainColor);
+  border: 1px solid var(--f5Color);
+  padding: 2vw;
+  margin: 2vw 2vw 0 2vw;
+  border-radius: 5px;
+}
+.popup .info_1 .list .list_1.data-v-0ce3258c {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.popup .info_1 .list .list_1 .left.data-v-0ce3258c {
+  width: 20vw;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 3vw;
+  color: var(--fF0Color);
+  font-size: var(--font14Size);
+}
+.popup .info_1 .list .list_1 .left .left_1 text.data-v-0ce3258c {
+  font-weight: bold;
+  font-size: 25px;
+}
+.popup .info_1 .list .list_1 .left .left_2.data-v-0ce3258c {
+  font-size: var(--font12Size);
+}
+.popup .info_1 .list .list_1 .center.data-v-0ce3258c {
+  width: 40vw;
+}
+.popup .info_1 .list .list_1 .center .name.data-v-0ce3258c {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  margin: 0 0 1vw 0;
+}
+.popup .info_1 .list .list_1 .center .content.data-v-0ce3258c {
+  color: var(--f85Color);
+  font-size: var(--font12Size);
+}
+.popup .info_1 .list .list_1 .right .button.data-v-0ce3258c {
+  font-size: 12px;
+  border-radius: 20px;
+  background: linear-gradient(to right, #FFA500, #FF0000);
+}
+.popup .info_1 .list .list_1 .right .button_1.data-v-0ce3258c {
+  font-size: 12px;
+  border-radius: 20px;
+  border: 1px solid var(--fF0Color);
+  color: var(--fF0Color);
+  background: var(--mainColor);
+}
+.popup .info_1 .list .list_2.data-v-0ce3258c {
+  font-size: var(--font12Size);
+}
+.popup .info_1 .list .list_2.data-v-0ce3258c .uni-collapse-item__title-box {
+  padding: 0 !important;
+  font-size: 12px !important;
+}
+.popup .info_1 .list .list_2.data-v-0ce3258c .uni-collapse-item__title-text {
+  font-size: 12px !important;
+}
+.popup .info_1 .list .list_2 .content.data-v-0ce3258c {
+  padding: 2vw;
+}
 .popup .info_1 button.data-v-0ce3258c {
   font-size: var(--font14Size);
   background: linear-gradient(to right, #00BFFF, #007AFF);