Ver Fonte

修改订单详情 提交订单

zs há 1 ano atrás
pai
commit
8081b8d0a8
75 ficheiros alterados com 1193 adições e 111 exclusões
  1. 7 1
      pages.json
  2. 1 2
      pages/my/index.vue
  3. 19 18
      pagesIndex/order/detail.vue
  4. 2 2
      pagesIndex/order/index.vue
  5. 365 0
      pagesIndex/order/info.vue
  6. 7 4
      pagesIndex/order/order.vue
  7. 1 0
      pagesMy/coupon/index.vue
  8. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  9. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/swiper/index.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/customer/common/submit_1.js.map
  14. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/customer/index.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/index.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  19. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/article/index.js.map
  20. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hotel/detail.js.map
  21. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hotel/index.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hotel/info.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/info/index.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/news/detail.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/news/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/notice/detail.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/notice/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/ticket/index.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/ticket/info.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/type/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/type/info.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/collect/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/comment/index.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/like/index.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/login/index.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/detail.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/index.js.map
  38. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/info.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/order.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/article/add.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/article/index.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/coupon/index.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/opinion/index.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/service/index.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-fav/components/uni-fav/uni-fav.js.map
  54. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map
  55. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map
  56. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  57. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js.map
  58. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map
  59. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  60. 1 0
      unpackage/dist/dev/mp-weixin/app.json
  61. 11 6
      unpackage/dist/dev/mp-weixin/common/vendor.js
  62. 1 2
      unpackage/dist/dev/mp-weixin/pages/my/index.wxss
  63. 15 2
      unpackage/dist/dev/mp-weixin/pagesIndex/order/detail.js
  64. 1 1
      unpackage/dist/dev/mp-weixin/pagesIndex/order/detail.wxml
  65. 2 14
      unpackage/dist/dev/mp-weixin/pagesIndex/order/detail.wxss
  66. 1 1
      unpackage/dist/dev/mp-weixin/pagesIndex/order/index.js
  67. 1 1
      unpackage/dist/dev/mp-weixin/pagesIndex/order/index.wxml
  68. 569 0
      unpackage/dist/dev/mp-weixin/pagesIndex/order/info.js
  69. 4 0
      unpackage/dist/dev/mp-weixin/pagesIndex/order/info.json
  70. 1 0
      unpackage/dist/dev/mp-weixin/pagesIndex/order/info.wxml
  71. 122 0
      unpackage/dist/dev/mp-weixin/pagesIndex/order/info.wxss
  72. 1 1
      unpackage/dist/dev/mp-weixin/pagesIndex/order/order.json
  73. 1 1
      unpackage/dist/dev/mp-weixin/pagesIndex/order/order.wxml
  74. 6 3
      unpackage/dist/dev/mp-weixin/pagesIndex/order/order.wxss
  75. 2 1
      unpackage/dist/dev/mp-weixin/pagesMy/coupon/index.js

+ 7 - 1
pages.json

@@ -75,11 +75,17 @@
 						"navigationBarTitleText": "订单详情"
 					}
 				},
+				{
+					"path": "order/info",
+					"style": {
+						"navigationBarTitleText": "核销券码"
+					}
+				},
 				{
 					"path": "order/order",
 					"style": {
 						"navigationBarTitleText": "提交订单",
-						"navigationBarBackgroundColor": "#0000ff"
+						"navigationBarBackgroundColor": "#007AFF"
 					}
 				}
 			]

+ 1 - 2
pages/my/index.vue

@@ -190,10 +190,9 @@
 		flex-direction: column;
 		width: 100vw;
 		height: 100vh;
-		background-color: var(--footColor);
+		background-image: linear-gradient(to top, rgba(241, 241, 241, 1), rgba(0, 122, 255, 1));
 
 		.one {
-			background-image: linear-gradient(181.2deg, #FEFEFE 10.5%, #87CEFA 86.8%);
 			height: 45vw;
 
 			.one_1 {

+ 19 - 18
pagesIndex/order/detail.vue

@@ -23,7 +23,7 @@
 				<view class="right">
 					<view class="right_1">
 						<view class="left">
-							<view class="name textOne">{{info.no.source_name||'暂无'}}</view>
+							<view class="name textOver">{{info.source_name||'暂无'}}</view>
 							<view class="other">{{info.zhType||'暂无'}}</view>
 							<view class="other">{{info.zhPerson||'暂无'}}</view>
 						</view>
@@ -53,9 +53,14 @@
 			<view class="other">真实姓名:{{info.name||'暂无'}}</view>
 			<view class="other">手机号码:{{info.phone||'暂无'}}</view>
 			<view class="other">订单编号:{{info.no._id||'暂无'}}</view>
-			<view class="other">交易快照:当发生交易纠纷时可作为交易凭证<text class="iconfont icon-dayuhao"></text></view>
 			<view class="other">下单时间:{{info.no.buy_time||'暂无'}}</view>
 		</view>
+		<view class="four">
+			<view class="four_1">支付信息</view>
+			<view class="other">支付时间:{{info.no.pay_time||'暂无'}}</view>
+			<view class="other">交易快照:当发生交易纠纷时可作为交易凭证 ></view>
+			<view class="other">支付数据:{{info.no.pay||'暂无'}}</view>
+		</view>
 	</view>
 </template>
 
@@ -64,9 +69,17 @@
 		data() {
 			return {
 				id: '',
-				config: {},
+				config: {
+					logo_url: []
+				},
 				user: {},
-				info: {},
+				info: {
+					no: {
+						source: {
+							file: []
+						}
+					}
+				},
 				statusList: [],
 				personList: [],
 				typeList: [],
@@ -164,19 +177,15 @@
 		flex-direction: column;
 		width: 100vw;
 		height: 100vh;
-		background-image: linear-gradient(to top, rgba(241, 241, 241, 0), rgba(241, 241, 241, 0), rgba(0, 0, 255, 1));
+		background-image: linear-gradient(to top, rgba(241, 241, 241, 1), rgba(135, 206, 250, 1), rgba(0, 122, 255, 1));
 
 		.one {
-			padding: 8vw;
+			padding: 5vw;
 			font-size: var(--font20Size);
 			font-weight: bold;
 		}
 
 		.two {
-			position: absolute;
-			top: 25vw;
-			left: 0;
-			right: 0;
 			background-color: var(--mainColor);
 			border-radius: 5px;
 			margin: 2vw 2vw 0 2vw;
@@ -256,10 +265,6 @@
 		}
 
 		.thr {
-			position: absolute;
-			top: 63vw;
-			left: 0;
-			right: 0;
 			background-color: var(--mainColor);
 			border-radius: 5px;
 			margin: 2vw 2vw 0 2vw;
@@ -279,10 +284,6 @@
 		}
 
 		.four {
-			position: absolute;
-			top: 91vw;
-			left: 0;
-			right: 0;
 			background-color: var(--mainColor);
 			border-radius: 5px;
 			margin: 2vw 2vw 0 2vw;

+ 2 - 2
pagesIndex/order/index.vue

@@ -33,7 +33,7 @@
 											</image>
 										</view>
 										<view class="right">
-											<view class="name textOne">{{item.no.source_name||'暂无'}}</view>
+											<view class="name textOne">{{item.source_name||'暂无'}}</view>
 											<view class="other">
 												下单时间:{{item.no.buy_time||'暂无'}}
 											</view>
@@ -219,7 +219,7 @@
 					canvasId: 'qrcode', //切记canvasId 里边的内容需要跟canvas里边canvas-id="qrcode"的名字一样
 					componentInstance: this,
 					text: item._id,
-					// text: `${that.$config.serverUrl}/oederInfo?id=${item._id}`, //需要转成二维码的内容是后端传过来的,我这里是onLoad传过来的,根据自己的需要
+					// text: `${that.$config.serverUrl}/oederInfo?id=${item._id}`, //跳转小程序指定页面
 					size: 200,
 					margin: 0,
 					backgroundColor: '#ffffff',

+ 365 - 0
pagesIndex/order/info.vue

@@ -0,0 +1,365 @@
+<template>
+	<view class="main">
+		<view v-if="user.type=='1'">
+			<view class="one"> <text>{{info.zhStatus}}</text> </view>
+			<view class="two">
+				<view class="two_1">
+					<image v-if="info.no&&info.no.source&&info.no.source.file.length>0" class="image"
+						:src="info.no.source.file&&info.no.source.file.length>0?info.no.source.file[0].url:''">
+					</image>
+					<image v-else class="image"
+						:src="config.logo_url&&config.logo_url.length>0?config.logo_url[0].url:''">
+					</image>
+					<text v-if="info.no.type=='0'">酒店民宿</text>
+					<text v-else>景区门票</text>
+				</view>
+				<view class="two_2">
+					<view class="left">
+						<image v-if="info.no&&info.no.source&&info.no.source.file.length>0" class="image"
+							:src="info.no.source.file&&info.no.source.file.length>0?info.no.source.file[0].url:''">
+						</image>
+						<image v-else class="image"
+							:src="config.logo_url&&config.logo_url.length>0?config.logo_url[0].url:''">
+						</image>
+					</view>
+					<view class="right">
+						<view class="right_1">
+							<view class="left">
+								<view class="name textOver">{{info.source_name||'暂无'}}</view>
+								<view class="other">{{info.zhType||'暂无'}}</view>
+								<view class="other">{{info.zhPerson||'暂无'}}</view>
+							</view>
+							<view class="right">
+								<view class="other">
+									¥{{info.no.source.money||'0'}}
+								</view>
+								<view class="other">
+									×{{info.no.num||'0'}}
+								</view>
+							</view>
+						</view>
+						<view class="right_2">
+							实付 ¥{{info.no.money||'0'}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="thr">
+				<view class="thr_1">优惠</view>
+				<view class="other">商品总价:¥{{info.no.money||'0'}} <text>(共{{info.no.num||'0'}}件)</text> </view>
+				<view class="other">优惠:¥{{info.no.discount||'0'}}</view>
+				<view class="other">实付 ¥{{info.no.money||'0'}}</view>
+			</view>
+			<view class="four">
+				<view class="four_1">订单信息</view>
+				<view class="other">真实姓名:{{info.name||'暂无'}}</view>
+				<view class="other">证件号码:{{info.card||'暂无'}}</view>
+				<view class="other">手机号码:{{info.phone||'暂无'}}</view>
+				<view class="other">购买日期:{{info.no.date||'暂无'}}</view>
+				<view class="other">订单编号:{{info.no._id||'暂无'}}</view>
+				<view class="other">下单时间:{{info.no.buy_time||'暂无'}}</view>
+			</view>
+			<view class="four">
+				<view class="four_1">支付信息</view>
+				<view class="other">支付时间:{{info.no.pay_time||'暂无'}}</view>
+				<view class="other">交易快照:当发生交易纠纷时可作为交易凭证 ></view>
+				<view class="other">支付数据:{{info.no.pay||'暂无'}}</view>
+			</view>
+			<view class="five" v-if="info.status=='1'">
+				<button class="button" type="primary" size="mini" @tap="toOff()">确定核销</button>
+			</view>
+		</view>
+		<view class="one" v-else>暂无权限核销券码</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				id: '',
+				config: {
+					logo_url: []
+				},
+				user: {},
+				info: {
+					no: {
+						source: {
+							file: []
+						}
+					}
+				},
+				statusList: [],
+				personList: [],
+				typeList: [],
+			}
+		},
+		onLoad: async function(e) {
+			const that = this;
+			that.$set(that, `id`, e && e.id || '');
+		},
+		onShow: function() {
+			const that = this;
+			that.searchToken();
+		},
+		methods: {
+			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 searchToken() {
+				const that = this;
+				try {
+					const res = uni.getStorageSync('token');
+					if (res) {
+						const arr = await that.$api(`/user/${res._id}`, 'GET', {})
+						if (arr.errcode == '0') {
+							that.$set(that, `user`, arr.data);
+							if (arr.data.type == '1') {
+								that.searchConfig();
+								await that.searchOther();
+								await that.search();
+							}
+						}
+					} else {
+						uni.navigateTo({
+							url: `/pagesIndex/login/index`
+						})
+					}
+				} catch (e) {
+					uni.showToast({
+						title: err.errmsg,
+						icon: 'error',
+						duration: 2000
+					});
+				}
+			},
+			async search() {
+				const that = this;
+				if (that.id) {
+					const res = await that.$api(`/orderDetail/${that.id}`, 'GET', {})
+					if (res.errcode == '0') {
+						const status = that.statusList.find(i => i.value == res.data.status)
+						if (status) res.data.zhStatus = status.label
+						if (res.data && res.data.no && res.data.no.source && res.data.no.source.person) {
+							const person = that.personList.find(i => i.value == res.data.no.source.person)
+							if (person) res.data.zhPerson = person.label
+						}
+						if (res.data && res.data.no && res.data.no.source && res.data.no.source.type) {
+							const type = that.typeList.find(i => i.value == res.data.no.source.type)
+							if (type) res.data.zhType = type.label
+						}
+						res.data.phone = res.data.phone.replace(/^(\d{3})(\d{4})(\d{4})$/, "$1****$2")
+						that.$set(that, `info`, res.data)
+					} else {
+						uni.showToast({
+							title: res.errmsg,
+						});
+					}
+				}
+			},
+			// 核销券码
+			async toOff() {
+				const that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定核销券码吗?',
+					success: async function(res) {
+						if (res.confirm) {
+							const res = await that.$api(`/orderDetail/${that.id}`, 'POST', {
+								status: "2"
+							})
+							if (res.errcode == '0') {
+								uni.showToast({
+									title: `核销券码成功`,
+								});
+								that.search();
+							} else {
+								uni.showToast({
+									title: res.errmsg,
+								});
+							}
+						}
+					}
+				});
+			},
+			// 查询其他信息
+			async searchOther() {
+				const that = this;
+				let res;
+				// 查询类型
+				res = await that.$api(`/dictData`, 'GET', {
+					type: 'order_status',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `statusList`, res.data);
+				// 出游人群
+				res = await that.$api(`/dictData`, 'GET', {
+					type: 'ticket_person',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `personList`, res.data);
+				// 服务特色
+				res = await that.$api(`/dictData`, 'GET', {
+					type: 'ticket_type',
+					is_use: '0',
+				})
+				if (res.errcode == '0') that.$set(that, `typeList`, res.data);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.main {
+		display: flex;
+		flex-direction: column;
+		width: 100vw;
+		height: 100vh;
+		background-image: linear-gradient(to top, rgba(241, 241, 241, 1), rgba(135, 206, 250, 1), rgba(0, 122, 255, 1));
+
+		.one {
+			padding: 5vw;
+			font-size: var(--font20Size);
+			font-weight: bold;
+		}
+
+		.two {
+			background-color: var(--mainColor);
+			border-radius: 5px;
+			margin: 2vw 2vw 0 2vw;
+			padding: 2vw;
+
+			.two_1 {
+				display: flex;
+				align-items: center;
+
+				.image {
+					width: 8vw;
+					height: 8vw;
+					border-radius: 8vw;
+				}
+
+				text {
+					padding: 0 0 0 2vw;
+				}
+			}
+
+			.two_2 {
+				display: flex;
+				justify-content: space-between;
+				margin: 2vw 0 0 0;
+				padding: 0 2vw;
+
+				.left {
+					width: 20vw;
+
+					.image {
+						width: 20vw;
+						height: 20vw;
+						border-radius: 1vw;
+					}
+				}
+
+				.right {
+					width: 65vw;
+					margin: 0 0 0 2vw;
+
+					.right_1 {
+						display: flex;
+						justify-content: space-between;
+
+						.left {
+							width: 55vw;
+
+							.name {
+								font-size: var(--font14Size);
+							}
+
+							.other {
+								padding: 2px 0 0 0;
+								font-size: var(--font12Size);
+								color: var(--f85Color);
+							}
+						}
+
+						.right {
+							width: 10vw;
+							text-align: right;
+
+							.other {
+								padding: 2px 0 0 0;
+								font-size: var(--font12Size);
+								color: var(--f85Color);
+							}
+						}
+					}
+
+					.right_2 {
+						text-align: right;
+						font-size: var(--font12Size);
+					}
+				}
+			}
+		}
+
+		.thr {
+			background-color: var(--mainColor);
+			border-radius: 5px;
+			margin: 2vw 2vw 0 2vw;
+			padding: 2vw;
+
+			.thr_1 {
+				font-size: var(--font14Size);
+				font-weight: bold;
+				margin: 1vw 0;
+			}
+
+			.other {
+				padding: 2px 0 0 0;
+				font-size: var(--font12Size);
+				color: var(--f85Color);
+			}
+		}
+
+		.four {
+			background-color: var(--mainColor);
+			border-radius: 5px;
+			margin: 2vw 2vw 0 2vw;
+			padding: 2vw;
+
+			.four_1 {
+				font-size: var(--font14Size);
+				font-weight: bold;
+				margin: 1vw 0;
+			}
+
+			.other {
+				padding: 2px 0 0 0;
+				font-size: var(--font12Size);
+				color: var(--f85Color);
+			}
+		}
+
+		.five {
+			margin: 2vw 2vw 0 2vw;
+			text-align: center;
+
+			.button {
+				margin: 2vw 0 0 0;
+				background-color: var(--f3CColor);
+				color: var(--mainColor);
+				font-size: var(--font14Size);
+			}
+		}
+	}
+</style>

+ 7 - 4
pagesIndex/order/order.vue

@@ -7,7 +7,7 @@
 				<view class="list-scroll-view">
 					<view class="one">
 						<view class="one_1">
-							<text>{{info.name||'暂无'}}</text>
+							<text class="name textOver">{{info.name||'暂无'}}</text>
 							<text @tap='toInfo(info)'>购买须知<text class="iconfont icon-dayuhao"></text></text>
 						</view>
 						<view class="one_2">
@@ -422,7 +422,7 @@
 		.info {
 			position: relative;
 			flex-grow: 1;
-			background-image: linear-gradient(to top, rgba(241, 241, 241, 0), rgba(0, 0, 255, 1));
+			background-image: linear-gradient(to top, rgba(241, 241, 241, 1), rgba(241, 241, 241, 1), rgba(0, 122, 255, 1));
 			border-bottom: 1px solid var(--f9Color);
 
 			.one {
@@ -438,13 +438,16 @@
 					padding: 2vw;
 					border-bottom: 1px solid var(--f9Color);
 
-					text {
+					.name {
+						width: 85vw;
 						font-size: var(--font18Size);
 						font-weight: bold;
 					}
 
 					text:last-child {
-						width: 22vw;
+						width: 20vw;
+						text-align: right;
+						font-weight: bold;
 						font-size: var(--font12Size);
 						color: var(--f3CColor);
 					}

+ 1 - 0
pagesMy/coupon/index.vue

@@ -106,6 +106,7 @@
 					skip: that.skip,
 					limit: that.limit,
 					user: that.user._id,
+					is_use: "0"
 				}
 				const res = await that.$api(`/userCoupon/specialQuery`, 'GET', {
 					...info,

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/swiper/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabs/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/components/upload/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/customer/common/submit_1.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/customer/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/home/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/article/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hotel/detail.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hotel/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/hotel/info.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/info/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/news/detail.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/news/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/notice/detail.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/notice/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/ticket/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/ticket/info.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/type/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesHome/type/info.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/collect/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/comment/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/like/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/login/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/detail.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/info.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesIndex/order/order.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/account/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/article/add.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/article/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/coupon/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/opinion/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pagesMy/service/index.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-calendar/components/uni-calendar/uni-calendar.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-fav/components/uni-fav/uni-fav.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms-item/uni-forms-item.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-forms/components/uni-forms/uni-forms.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-number-box/components/uni-number-box/uni-number-box.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map


+ 1 - 0
unpackage/dist/dev/mp-weixin/app.json

@@ -16,6 +16,7 @@
         "collect/index",
         "order/index",
         "order/detail",
+        "order/info",
         "order/order"
       ]
     },

+ 11 - 6
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));
@@ -45175,11 +45175,16 @@ var _default = {
       "style": {
         "navigationBarTitleText": "订单详情"
       }
+    }, {
+      "path": "order/info",
+      "style": {
+        "navigationBarTitleText": "核销券码"
+      }
     }, {
       "path": "order/order",
       "style": {
         "navigationBarTitleText": "提交订单",
-        "navigationBarBackgroundColor": "#0000ff"
+        "navigationBarBackgroundColor": "#007AFF"
       }
     }]
   }, {

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

@@ -6,10 +6,9 @@
   flex-direction: column;
   width: 100vw;
   height: 100vh;
-  background-color: var(--footColor);
+  background-image: linear-gradient(to top, #f1f1f1, #007aff);
 }
 .main .one.data-v-4dcceeb0 {
-  background-image: linear-gradient(181.2deg, #FEFEFE 10.5%, #87CEFA 86.8%);
   height: 45vw;
 }
 .main .one .one_1.data-v-4dcceeb0 {

+ 15 - 2
unpackage/dist/dev/mp-weixin/pagesIndex/order/detail.js

@@ -228,13 +228,26 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 //
 //
 //
+//
+//
+//
+//
+//
 var _default = {
   data: function data() {
     return {
       id: '',
-      config: {},
+      config: {
+        logo_url: []
+      },
       user: {},
-      info: {},
+      info: {
+        no: {
+          source: {
+            file: []
+          }
+        }
+      },
       statusList: [],
       personList: [],
       typeList: []

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesIndex/order/detail.wxml


+ 2 - 14
unpackage/dist/dev/mp-weixin/pagesIndex/order/detail.wxss

@@ -6,18 +6,14 @@
   flex-direction: column;
   width: 100vw;
   height: 100vh;
-  background-image: linear-gradient(to top, rgba(241, 241, 241, 0), rgba(241, 241, 241, 0), blue);
+  background-image: linear-gradient(to top, #f1f1f1, lightskyblue, #007aff);
 }
 .main .one.data-v-5ff60ad6 {
-  padding: 8vw;
+  padding: 5vw;
   font-size: var(--font20Size);
   font-weight: bold;
 }
 .main .two.data-v-5ff60ad6 {
-  position: absolute;
-  top: 25vw;
-  left: 0;
-  right: 0;
   background-color: var(--mainColor);
   border-radius: 5px;
   margin: 2vw 2vw 0 2vw;
@@ -82,10 +78,6 @@
   font-size: var(--font12Size);
 }
 .main .thr.data-v-5ff60ad6 {
-  position: absolute;
-  top: 63vw;
-  left: 0;
-  right: 0;
   background-color: var(--mainColor);
   border-radius: 5px;
   margin: 2vw 2vw 0 2vw;
@@ -102,10 +94,6 @@
   color: var(--f85Color);
 }
 .main .four.data-v-5ff60ad6 {
-  position: absolute;
-  top: 91vw;
-  left: 0;
-  right: 0;
   background-color: var(--mainColor);
   border-radius: 5px;
   margin: 2vw 2vw 0 2vw;

+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesIndex/order/index.js

@@ -470,7 +470,7 @@ var _default = {
                   //切记canvasId 里边的内容需要跟canvas里边canvas-id="qrcode"的名字一样
                   componentInstance: _this4,
                   text: item._id,
-                  // text: `${that.$config.serverUrl}/oederInfo?id=${item._id}`, //需要转成二维码的内容是后端传过来的,我这里是onLoad传过来的,根据自己的需要
+                  // text: `${that.$config.serverUrl}/oederInfo?id=${item._id}`, //跳转小程序指定页面
                   size: 200,
                   margin: 0,
                   backgroundColor: '#ffffff',

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesIndex/order/index.wxml


Diff do ficheiro suprimidas por serem muito extensas
+ 569 - 0
unpackage/dist/dev/mp-weixin/pagesIndex/order/info.js


+ 4 - 0
unpackage/dist/dev/mp-weixin/pagesIndex/order/info.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "核销券码",
+  "usingComponents": {}
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
unpackage/dist/dev/mp-weixin/pagesIndex/order/info.wxml


+ 122 - 0
unpackage/dist/dev/mp-weixin/pagesIndex/order/info.wxss

@@ -0,0 +1,122 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.main.data-v-6e2eeb72 {
+  display: flex;
+  flex-direction: column;
+  width: 100vw;
+  height: 100vh;
+  background-image: linear-gradient(to top, #f1f1f1, lightskyblue, #007aff);
+}
+.main .one.data-v-6e2eeb72 {
+  padding: 5vw;
+  font-size: var(--font20Size);
+  font-weight: bold;
+}
+.main .two.data-v-6e2eeb72 {
+  background-color: var(--mainColor);
+  border-radius: 5px;
+  margin: 2vw 2vw 0 2vw;
+  padding: 2vw;
+}
+.main .two .two_1.data-v-6e2eeb72 {
+  display: flex;
+  align-items: center;
+}
+.main .two .two_1 .image.data-v-6e2eeb72 {
+  width: 8vw;
+  height: 8vw;
+  border-radius: 8vw;
+}
+.main .two .two_1 text.data-v-6e2eeb72 {
+  padding: 0 0 0 2vw;
+}
+.main .two .two_2.data-v-6e2eeb72 {
+  display: flex;
+  justify-content: space-between;
+  margin: 2vw 0 0 0;
+  padding: 0 2vw;
+}
+.main .two .two_2 .left.data-v-6e2eeb72 {
+  width: 20vw;
+}
+.main .two .two_2 .left .image.data-v-6e2eeb72 {
+  width: 20vw;
+  height: 20vw;
+  border-radius: 1vw;
+}
+.main .two .two_2 .right.data-v-6e2eeb72 {
+  width: 65vw;
+  margin: 0 0 0 2vw;
+}
+.main .two .two_2 .right .right_1.data-v-6e2eeb72 {
+  display: flex;
+  justify-content: space-between;
+}
+.main .two .two_2 .right .right_1 .left.data-v-6e2eeb72 {
+  width: 55vw;
+}
+.main .two .two_2 .right .right_1 .left .name.data-v-6e2eeb72 {
+  font-size: var(--font14Size);
+}
+.main .two .two_2 .right .right_1 .left .other.data-v-6e2eeb72 {
+  padding: 2px 0 0 0;
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
+.main .two .two_2 .right .right_1 .right.data-v-6e2eeb72 {
+  width: 10vw;
+  text-align: right;
+}
+.main .two .two_2 .right .right_1 .right .other.data-v-6e2eeb72 {
+  padding: 2px 0 0 0;
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
+.main .two .two_2 .right .right_2.data-v-6e2eeb72 {
+  text-align: right;
+  font-size: var(--font12Size);
+}
+.main .thr.data-v-6e2eeb72 {
+  background-color: var(--mainColor);
+  border-radius: 5px;
+  margin: 2vw 2vw 0 2vw;
+  padding: 2vw;
+}
+.main .thr .thr_1.data-v-6e2eeb72 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  margin: 1vw 0;
+}
+.main .thr .other.data-v-6e2eeb72 {
+  padding: 2px 0 0 0;
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
+.main .four.data-v-6e2eeb72 {
+  background-color: var(--mainColor);
+  border-radius: 5px;
+  margin: 2vw 2vw 0 2vw;
+  padding: 2vw;
+}
+.main .four .four_1.data-v-6e2eeb72 {
+  font-size: var(--font14Size);
+  font-weight: bold;
+  margin: 1vw 0;
+}
+.main .four .other.data-v-6e2eeb72 {
+  padding: 2px 0 0 0;
+  font-size: var(--font12Size);
+  color: var(--f85Color);
+}
+.main .five.data-v-6e2eeb72 {
+  margin: 2vw 2vw 0 2vw;
+  text-align: center;
+}
+.main .five .button.data-v-6e2eeb72 {
+  margin: 2vw 0 0 0;
+  background-color: var(--f3CColor);
+  color: var(--mainColor);
+  font-size: var(--font14Size);
+}
+

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

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "提交订单",
-  "navigationBarBackgroundColor": "#0000ff",
+  "navigationBarBackgroundColor": "#007AFF",
   "usingComponents": {
     "uni-number-box": "/uni_modules/uni-number-box/components/uni-number-box/uni-number-box",
     "uni-calendar": "/uni_modules/uni-calendar/components/uni-calendar/uni-calendar",

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/mp-weixin/pagesIndex/order/order.wxml


+ 6 - 3
unpackage/dist/dev/mp-weixin/pagesIndex/order/order.wxss

@@ -10,7 +10,7 @@
 .main .info.data-v-0ce3258c {
   position: relative;
   flex-grow: 1;
-  background-image: linear-gradient(to top, rgba(241, 241, 241, 0), blue);
+  background-image: linear-gradient(to top, #f1f1f1, #f1f1f1, #007aff);
   border-bottom: 1px solid var(--f9Color);
 }
 .main .info .one.data-v-0ce3258c {
@@ -26,12 +26,15 @@
   padding: 2vw;
   border-bottom: 1px solid var(--f9Color);
 }
-.main .info .one .one_1 text.data-v-0ce3258c {
+.main .info .one .one_1 .name.data-v-0ce3258c {
+  width: 85vw;
   font-size: var(--font18Size);
   font-weight: bold;
 }
 .main .info .one .one_1 text.data-v-0ce3258c:last-child {
-  width: 22vw;
+  width: 20vw;
+  text-align: right;
+  font-weight: bold;
   font-size: var(--font12Size);
   color: var(--f3CColor);
 }

+ 2 - 1
unpackage/dist/dev/mp-weixin/pagesMy/coupon/index.js

@@ -341,7 +341,8 @@ var _default = {
                 info = {
                   skip: that.skip,
                   limit: that.limit,
-                  user: that.user._id
+                  user: that.user._id,
+                  is_use: "0"
                 };
                 _context4.next = 4;
                 return that.$api("/userCoupon/specialQuery", 'GET', _objectSpread(_objectSpread({}, info), that.searchInfo));