Ver Fonte

调用优惠券,记录,领取

asd123a20 há 2 anos atrás
pai
commit
6cc3bbc57f
100 ficheiros alterados com 3451 adições e 1481 exclusões
  1. 20 0
      api/voucher.js
  2. 43 0
      components/popup.vue
  3. 7 7
      env.js
  4. 1 1
      manifest.json
  5. 18 0
      pages.json
  6. 160 0
      pages/goods/details.vue
  7. 218 0
      pages/goods/index.vue
  8. 181 0
      pages/goods/my.vue
  9. 16 0
      pages/my/index.vue
  10. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  11. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  12. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  13. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/components/gaoyia-parse/components/wxParseTable.js.map
  14. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/popup.js.map
  15. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/details.js.map
  16. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/index.js.map
  17. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/activity/uploadFiel.js.map
  18. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/details/index.js.map
  19. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/details.js.map
  20. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/index.js.map
  21. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/goods/my.js.map
  22. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/illness/index.js.map
  23. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/illness/receive.js.map
  24. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  25. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/integral/index.js.map
  26. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  27. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/policy/index.js.map
  28. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/property/butler.js.map
  29. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/property/butlerType.js.map
  30. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/property/index.js.map
  31. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/questionnaire/details.js.map
  32. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/questionnaire/index.js.map
  33. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/questionnaire/web.js.map
  34. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/recruit/details.js.map
  35. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/recruit/index.js.map
  36. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/register/index.js.map
  37. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/report/double.js.map
  38. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/report/index.js.map
  39. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/report/service.js.map
  40. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service/index.js.map
  41. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/familyInfo.js.map
  42. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/index.js.map
  43. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-badge/components/uni-badge/uni-badge.js.map
  44. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-card/components/uni-card/uni-card.js.map
  45. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-checkbox/components/uni-data-checkbox/uni-data-checkbox.js.map
  46. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-picker/components/uni-data-picker/uni-data-picker.js.map
  47. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.js.map
  48. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  49. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.js.map
  50. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.js.map
  51. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.js.map
  52. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.js.map
  53. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-easyinput/components/uni-easyinput/uni-easyinput.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-goods-nav/components/uni-goods-nav/uni-goods-nav.js.map
  57. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  58. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-chat/uni-list-chat.js.map
  59. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list-item/uni-list-item.js.map
  60. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-list/components/uni-list/uni-list.js.map
  61. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.js.map
  62. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.js.map
  63. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map
  64. 1 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js.map
  65. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-section/components/uni-section/uni-section.js.map
  66. 1 1
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-title/components/uni-title/uni-title.js.map
  67. 4 1
      unpackage/dist/dev/mp-weixin/app.json
  68. 2 2
      unpackage/dist/dev/mp-weixin/common/runtime.js
  69. 1447 1175
      unpackage/dist/dev/mp-weixin/common/vendor.js
  70. 10 10
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseAudio.js
  71. 10 10
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseImg.js
  72. 14 14
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTable.js
  73. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate0.js
  74. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate1.js
  75. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate10.js
  76. 14 14
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate11.js
  77. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate2.js
  78. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate3.js
  79. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate4.js
  80. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate5.js
  81. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate6.js
  82. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate7.js
  83. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate8.js
  84. 15 15
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate9.js
  85. 10 10
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseVideo.js
  86. 12 12
      unpackage/dist/dev/mp-weixin/components/gaoyia-parse/parse.js
  87. 201 0
      unpackage/dist/dev/mp-weixin/components/popup.js
  88. 7 0
      unpackage/dist/dev/mp-weixin/components/popup.json
  89. 1 0
      unpackage/dist/dev/mp-weixin/components/popup.wxml
  90. 4 4
      unpackage/dist/dev/mp-weixin/pages/activity/details.js
  91. 4 4
      unpackage/dist/dev/mp-weixin/pages/activity/index.js
  92. 1 1
      unpackage/dist/dev/mp-weixin/pages/details/index.js
  93. 308 0
      unpackage/dist/dev/mp-weixin/pages/goods/details.js
  94. 6 0
      unpackage/dist/dev/mp-weixin/pages/goods/details.json
  95. 1 0
      unpackage/dist/dev/mp-weixin/pages/goods/details.wxml
  96. 76 0
      unpackage/dist/dev/mp-weixin/pages/goods/details.wxss
  97. 422 0
      unpackage/dist/dev/mp-weixin/pages/goods/index.js
  98. 10 0
      unpackage/dist/dev/mp-weixin/pages/goods/index.json
  99. 1 0
      unpackage/dist/dev/mp-weixin/pages/goods/index.wxml
  100. 0 0
      unpackage/dist/dev/mp-weixin/pages/goods/index.wxss

+ 20 - 0
api/voucher.js

@@ -0,0 +1,20 @@
+import request from './request.js';
+
+const getList = async (data) => {
+	const res = await request.get({ url: `/discount/info/list`, data });
+	return res.data;
+}
+const getInfo = async (id) => {
+	const res = await request.get({ url: `/discount/info/${id}` });
+	return res.data;
+}
+const receivevoucher = async (discountId) => {
+	const res = await request.post({ url: `/discount/receive/${discountId}` });
+	return res.data;
+}
+
+const getMyList = async (data) => {
+	const res = await request.get({  url: `/discount/record/list` });
+	return res.data;
+}
+export default { getList, getInfo, receivevoucher, getMyList };

+ 43 - 0
components/popup.vue

@@ -0,0 +1,43 @@
+<template>
+	<uni-popup ref="alertDialog" type="dialog">
+		<uni-popup-dialog :type="popupInfo.msgType" :cancelText="popupInfo.cancelText" :confirmText="popupInfo.confirmText" :title="popupInfo.title" :content="popupInfo.content" @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		props: {
+			popupInfo: {
+				type: Object,
+				default: () => ({
+					msgType: 'success',
+					cancelText: '关闭',
+					confirmText: '确认',
+					title: '通知',
+					content: '默认消息'
+				})
+			}
+		},
+		data () {
+			return {}
+		},
+		mounted() {},
+		methods: {
+			dialogConfirm() {
+				this.$emit('confirm')
+			},
+			dialogClose() {
+				this.$emit('close')
+			},
+			open() {
+				this.$refs.alertDialog.open()
+			},
+			close() {
+				this.$refs.alertDialog.close()
+			}
+		}
+	}
+</script>
+
+<style>
+</style>

+ 7 - 7
env.js

@@ -1,14 +1,14 @@
 const ENV_API_URL = {
+	development: {
+		url: 'http://192.168.0.18:7070/api',
+		imgUrl: 'http://192.168.0.19/static/wxa',
+		fileUrl: 'http://192.168.0.18:80'
+	},
 	// development: {
-	// 	url: 'http://172.17.116.208:7070/api',
+	// 	url: 'https://fuyu.cc-lotus.info/wx-api/api',
 	// 	imgUrl: 'https://fuyu.cc-lotus.info/static/wxa',
-	// 	fileUrl: 'http://172.17.116.208:80'
+	// 	fileUrl: 'https://fuyu.cc-lotus.info'
 	// },
-	development: {
-		url: 'https://fuyu.cc-lotus.info/wx-api/api',
-		imgUrl: 'https://fuyu.cc-lotus.info/static/wxa',
-		fileUrl: 'https://fuyu.cc-lotus.info'
-	},
 	production: {
 		url: 'https://fuyu.scapp.cn/wx-api/api',
 		imgUrl: 'https://fuyu.scapp.cn/static/wxa/',

+ 1 - 1
manifest.json

@@ -47,7 +47,7 @@
     },
     /* SDK配置 */
     "quickapp" : {},
-    /* 快应用特有相关 */
+    /* 快应用特有相关 zs: wxfb8ee68c5e9a63e8  cs: wx81b6d12cb9349c6a*/
     "mp-weixin" : {
         "appid" : "wxfb8ee68c5e9a63e8",
         "setting" : {

+ 18 - 0
pages.json

@@ -181,6 +181,24 @@
 			"style": {
 				"navigationBarTitleText": "招募详情"
 			}
+		},
+		{
+			"path": "pages/goods/index",
+			"style": {
+				"navigationBarTitleText": "积分商城"
+			}
+		},
+		{
+			"path": "pages/goods/details",
+			"style": {
+				"navigationBarTitleText": "优惠券详情"
+			}
+		},
+		{
+			"path": "pages/goods/my",
+			"style": {
+				"navigationBarTitleText": "我的优惠券"
+			}
 		}
 	],
 	"globalStyle": {

+ 160 - 0
pages/goods/details.vue

@@ -0,0 +1,160 @@
+ <template>
+ 	<view class="voucher-coupon-detail">
+ 		<image class="voucher-coupon-detail-header-img" mode="aspectFit" v-if="coupon.photo" :src="fileUrl + coupon.photo"></image>
+ 		<view class="voucher-coupon-detail-header">
+ 			<view class="voucher-coupon-detail-header-info">
+ 				<view class="voucher-coupon-detail-header-info-title">{{coupon.name}}</view>
+ 				<view class="voucher-coupon-detail-header-info-desc">剩余:{{coupon.remainCount || 0}}</view>
+ 				<view class="voucher-coupon-detail-header-info-time">金额:¥{{coupon.money}}</view>
+ 			</view>
+ 		</view>
+ 		<view class="voucher-coupon-detail-content">
+ 			<view class="voucher-coupon-detail-content-title">使用说明</view>
+ 			<view class="voucher-coupon-detail-content-desc" v-html="coupon.details"></view>
+ 		</view>
+ 		<view class="voucher-coupon-detail-footer-btn" :class="{ remainCount: coupon.remainCount == 0 }" @click="receive">立即领取</view>
+		<popup ref="popup" :popupInfo="popupInfo" @confirm="popupBtnClick" @close="popupBtnClick"></popup>
+ 	</view>
+ </template>
+
+ <script>
+	import { BASE_URL } from '../../env.js';
+	import voucher from '../../api/voucher.js';
+	import popup from '../../components/popup.vue'
+ 	export default {
+		components: {
+			popup
+		},
+ 		data() {
+ 			return {
+				fileUrl: BASE_URL.fileUrl,
+ 				coupon: {
+ 					photo: '',
+ 					title: '',
+ 					remain_count: '',
+ 					describe: ``,
+ 					money: ''
+ 				},
+				popupInfo: {
+					msgType: 'success',
+					cancelText: '关闭',
+					confirmText: '确认',
+					title: '通知',
+					content: '默认消息'
+				},
+ 			};
+ 		},
+		onLoad: async function(option) {
+			if(option.id) this.id = option.id;
+			this.query();
+		},
+ 		methods: {
+			async query() {
+				const res = await voucher.getInfo(this.id);
+				this.coupon = res.data;
+			},
+			popupBtnClick() {
+				this.query();
+			},
+ 			async receive() {
+				if (this.coupon.remainCount == 0) return;
+				// 领取流程
+				const res = await voucher.receivevoucher(this.coupon.discountId);
+				if (res.code == 200) {
+					this.popupInfo.content = '领取成功'
+					this.$refs.popup.open();
+					this.query();
+				}
+ 			}
+ 		}
+ 	};
+ </script>
+
+ <style>
+ 	.voucher-coupon-detail {
+ 		padding: 20rpx;
+ 		width: 90%;
+ 		margin: 0 auto;
+ 	}
+
+ 	.voucher-coupon-detail-header {
+ 		display: flex;
+ 		align-items: center;
+ 		margin-bottom: 20rpx;
+ 	}
+
+ 	.voucher-coupon-detail-header-img {
+ 		width: 100%;
+ 		/* height: 120rpx; */
+ 		/* margin-right: 20rpx; */
+ 	}
+
+ 	.voucher-coupon-detail-header-info {
+ 		flex: 1;
+ 	}
+
+ 	.voucher-coupon-detail-header-info-title {
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 		margin-bottom: 10rpx;
+ 		margin-top: 30rpx;
+ 	}
+
+ 	.voucher-coupon-detail-header-info-desc {
+ 		font-size: 28rpx;
+ 		color: #999;
+ 		margin-bottom: 10rpx;
+ 	}
+
+ 	.voucher-coupon-detail-header-info-time {
+ 		font-size: 28rpx;
+ 		color: #999;
+ 	}
+
+ 	.voucher-coupon-detail-content {
+ 		margin-top: 30rpx;
+ 	}
+
+ 	.voucher-coupon-detail-content-title {
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 		margin-bottom: 20rpx;
+ 	}
+
+ 	.voucher-coupon-detail-content-desc {
+ 		font-size: 28rpx;
+ 		color: #999;
+ 		line-height: 1.5;
+ 		margin-bottom: 20rpx;
+ 	}
+
+ 	.voucher-coupon-detail-footer {
+ 		display: flex;
+ 		justify-content: space-between;
+ 		align-items: center;
+ 		background-color: #f5f5f5;
+ 		padding: 20rpx;
+ 		border-radius: 10rpx;
+ 	}
+
+ 	.voucher-coupon-detail-footer-price {
+ 		font-size: 36rpx;
+ 		font-weight: bold;
+ 	}
+
+ 	.voucher-coupon-detail-footer-btn {
+ 		display: flex;
+ 		justify-content: center;
+ 		align-items: center;
+ 		height: 80rpx;
+ 		background-color: #f60;
+ 		color: #FFFFFF;
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 		border-radius: 10rpx;
+ 		margin-top: 50rpx;
+ 	}
+	.remainCount {
+		background-color: #999;
+	}
+ </style>

+ 218 - 0
pages/goods/index.vue

@@ -0,0 +1,218 @@
+<template>
+	<view class="content">
+		<view class="page-section page-section-spacing swiper">
+			<swiper class="swiper" :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval" :duration="duration">
+				<swiper-item v-for="(item, index) in bannerList" :key="index">
+					<image style="width: 100%; height: 100%;" :src="item"></image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<uni-section class="mb-10" title="热门优惠" type="line">
+			<view class="mainList">
+				<uni-list>
+					<uni-list-item v-for="(item, index) in list" :key="index">
+						<!-- 自定义 header -->
+						<template v-slot:header>
+							<image class="slot-image" :src="fileUrl + item.photo" @click="btn(item)"></image>
+						</template>
+						<!-- 自定义 body -->
+						<template v-slot:body>
+							<view class="slot-body titleBox" @click="btn(item)">
+								<view class="slot-box slot-title">{{ item.name }}</view>
+								<view class="slot-box slot-text">金额:{{ item.money }}</view>
+								<view class="slot-box slot-text">剩余:{{ item.remainCount }}</view>
+							</view>
+						</template>
+						<!-- 自定义 footer-->
+						<template v-slot:footer>
+							<button type="default" class="receive" :class="{ remainCount: item.remainCount == 0 }" size="mini" @click="itemClick(item)">领取</button>
+						</template>
+					</uni-list-item>
+				</uni-list>
+			</view>
+		</uni-section>
+		<uni-load-more :status="more" />
+		<popup ref="popup" :popupInfo="popupInfo" @confirm="popupBtnClick" @close="popupBtnClick"></popup>
+	</view>
+</template>
+<script>
+	import login from '../../api/login.js';
+	import { BASE_URL } from '../../env.js';
+	import voucher from '../../api/voucher.js';
+	import popup from '../../components/popup.vue'
+	const appid = uni.getAccountInfoSync().miniProgram.appId;
+	export default {
+		components: {
+			popup
+		},
+		data() {
+			return {
+				bannerList: [],
+				fileUrl: BASE_URL.fileUrl,
+				list: [],
+				page: 0,
+				size: 10,
+				more: 'more',
+				popupInfo: {
+					msgType: 'success',
+					cancelText: '关闭',
+					confirmText: '确认',
+					title: '通知',
+					content: '默认消息'
+				},
+			};
+		},
+		onLoad: async function() {
+			const config = await login.getJson();
+			const { bannerList } = config.data;
+			this.bannerList = bannerList;
+			this.query();
+		},
+		methods: {
+			async query() {
+				this.page += 1;
+				this.more = 'loading';
+				// 此处是查询函数
+				const res = await voucher.getList({ pageNum: this.page, pageSize: this.size });
+				this.list.push(...res.rows)
+				// 根据总数 算页数  如果当前页 = 总页数就是没有数据  否则就是上拉加载
+				this.more = this.page >= Math.ceil(res.total / this.size) ? 'noMore' : 'more';
+			},
+			// 领取
+			async itemClick(item) {
+				if (item.remainCount == 0) return;
+				// 领取流程
+				const res = await voucher.receivevoucher(item.discountId);
+				if (res.code == 200) {
+					this.popupInfo.content = '领取成功'
+					this.$refs.popup.open();
+					this.query();
+				}
+			},
+			// 详情
+			btn(item) {
+				uni.navigateTo({ url: `/pages/goods/details?id=${item.discountId}` });
+			},
+			popupBtnClick() {
+				this.list = [];
+				this.page = 0;
+				this.query();
+			}
+		},
+		// 页面生命周期中onReachBottom(页面滚动到底部的事件)
+		onReachBottom() {
+			if(this.more != 'noMore') {
+				this.more = 'more';
+				this.query();
+			}
+		}
+	};
+</script>
+<style scoped>
+	.content {
+		width: 100%;
+		height: 100vh;
+		padding-bottom: 15rpx;
+		background: #F8F8F8;
+	}
+	.mainList {
+		width: 90%;
+		margin: 30rpx auto;
+	}
+
+	.mainText {
+		width: 100%;
+		color: #000000;
+		font-size: 34rpx;
+		text-align: left;
+		font-weight: 550;
+		opacity: 0.5;
+		margin-bottom: 50rpx;
+	}
+
+	.receive {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 120rpx;
+		background-color: #f60;
+		color: #FFFFFF;
+		font-size: 24rpx;
+		border-radius: 10rpx;
+		height: 2.5em;
+		margin-top: 30rpx;
+	}
+
+	button {
+		margin: unset;
+		padding: unset;
+	}
+
+	button:after {
+		border: unset;
+	}
+</style>
+<style>
+.slot-box {
+	position: relative;
+}
+.slot-image {
+	width: 130rpx;
+	height: 120rpx;
+}
+.status {
+	position: absolute;
+	left: 0;
+	top: 0;
+	font-size: 12px;
+	color: #fff;
+	background: #999;
+}
+.uni-list-item__container {
+	flex: none !important;
+	width: 90%;
+	padding: 12px 5% !important;
+}
+.titleBox {
+	width: 70%;
+	margin-left: 10px;
+	display: block;
+}
+.slot-title {
+	width: 100%;
+	font-weight: 600;
+	color: #000;
+	line-height: 2em;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	display: block;
+}
+.slot-text {
+	display: block;
+	width: 100%;
+	font-size: 22rpx;
+	color: #999;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.slot-footer {
+	margin-left: 3%;
+}
+.footerIcon {
+	line-height: 3em;
+}
+.remainCount {
+	background-color: #999 !important;
+}
+.swiper {
+	height: 45vw;
+	overflow: hidden;
+}
+
+/**/
+.uni-section .uni-section-header {
+	padding: 12px 20px !important;
+}
+</style>

+ 181 - 0
pages/goods/my.vue

@@ -0,0 +1,181 @@
+<template>
+	<view class="content">
+		<view class="mainList">
+			<uni-list>
+				<uni-list-item v-for="(item, index) in list" :key="index">
+					<!-- 自定义 header -->
+					<template v-slot:header>
+						<image class="slot-image" :src="fileUrl + item['discountInfo.photo']" @click="btn(item)"></image>
+					</template>
+					<!-- 自定义 body -->
+					<template v-slot:body>
+						<view class="slot-body titleBox" @click="btn(item)">
+							<view class="slot-box slot-title">{{ item['discountInfo.name'] }}</view>
+							<view class="slot-box slot-text">领取时间:{{ item.createTime }}</view>
+							
+						</view>
+					</template>
+					<!-- 自定义 footer-->
+					<template v-slot:footer></template>
+				</uni-list-item>
+			</uni-list>
+		</view>
+		<uni-load-more :status="more" />
+	</view>
+</template>
+<script>
+	import login from '../../api/login.js';
+	import { BASE_URL } from '../../env.js';
+	import voucher from '../../api/voucher.js';
+	export default {
+		components: {},
+		data() {
+			return {
+				fileUrl: BASE_URL.fileUrl,
+				list: [],
+				page: 0,
+				size: 10,
+				more: 'more',
+			};
+		},
+		onLoad: async function() {
+			this.query();
+		},
+		methods: {
+			async query() {
+				this.page += 1;
+				this.more = 'loading';
+				// 此处是查询函数
+				const res = await voucher.getMyList({ pageNum: this.page, pageSize: this.size });
+				this.list.push(...res.rows.map(e => {
+					for (const key in e.discountInfo) {
+						const itemKey = `discountInfo.${key}`;
+						e[itemKey] = e.discountInfo[key]
+					}
+					return e;
+				}))
+				// 根据总数 算页数  如果当前页 = 总页数就是没有数据  否则就是上拉加载
+				this.more = this.page >= Math.ceil(res.total / this.size) ? 'noMore' : 'more';
+			},
+			// 详情
+			btn(item) {
+				uni.navigateTo({ url: `/pages/good/details?id=${item.voucherId}` });
+			}
+		},
+		// 页面生命周期中onReachBottom(页面滚动到底部的事件)
+		onReachBottom() {
+			if(this.more != 'noMore') {
+				this.more = 'more';
+				this.query();
+			}
+		}
+	};
+</script>
+<style scoped>
+	.content {
+		width: 100%;
+		height: 100vh;
+		padding-bottom: 15rpx;
+		background: #F8F8F8;
+	}
+	.mainList {
+		width: 90%;
+		margin: 30rpx auto;
+	}
+
+	.mainText {
+		width: 100%;
+		color: #000000;
+		font-size: 34rpx;
+		text-align: left;
+		font-weight: 550;
+		opacity: 0.5;
+		margin-bottom: 50rpx;
+	}
+
+	.receive {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 120rpx;
+		background-color: #f60;
+		color: #FFFFFF;
+		font-size: 24rpx;
+		border-radius: 10rpx;
+		height: 2.5em;
+		margin-top: 30rpx;
+	}
+
+	button {
+		margin: unset;
+		padding: unset;
+	}
+
+	button:after {
+		border: unset;
+	}
+</style>
+<style>
+.slot-box {
+	position: relative;
+}
+.slot-image {
+	width: 130rpx;
+	height: 120rpx;
+}
+.status {
+	position: absolute;
+	left: 0;
+	top: 0;
+	font-size: 12px;
+	color: #fff;
+	background: #999;
+}
+.uni-list-item__container {
+	flex: none !important;
+	width: 90%;
+	padding: 12px 5% !important;
+}
+.titleBox {
+	width: 70%;
+	margin-left: 10px;
+	display: block;
+}
+.slot-title {
+	width: 100%;
+	font-weight: 600;
+	color: #000;
+	line-height: 2em;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	display: block;
+}
+.slot-text {
+	display: block;
+	width: 100%;
+	font-size: 22rpx;
+	color: #999;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.slot-footer {
+	margin-left: 3%;
+}
+.footerIcon {
+	line-height: 3em;
+}
+.remainCount {
+	background-color: #999 !important;
+}
+.swiper {
+	height: 45vw;
+	overflow: hidden;
+}
+
+/**/
+.uni-section .uni-section-header {
+	padding: 12px 20px !important;
+}
+</style>

+ 16 - 0
pages/my/index.vue

@@ -26,6 +26,11 @@
 					<uni-list-item :showExtraIcon="true" :extra-icon="extraIconList[3]" title="我的积分" link clickable @click="onClick(3)"></uni-list-item>
 				</uni-list>
 			</uni-card>
+			<uni-card>
+				<uni-list :border="false">
+					<uni-list-item :showExtraIcon="true" :extra-icon="extraIconList[5]" title="我的代金券" link clickable @click="onClick(5)"></uni-list-item>
+				</uni-list>
+			</uni-card>
 			<!-- <uni-card>
 				<uni-list :border="false">
 					<uni-list-item :showExtraIcon="true" :extra-icon="extraIconList[4]" title="意见反馈" link clickable @click="onClick(4)"></uni-list-item>
@@ -71,6 +76,11 @@
 						color: '#e70000',
 						size: '22',
 						type: 'email-filled'
+					},
+					{
+						color: '#ff8319',
+						size: '22',
+						type: 'flag'
 					}
 				],
 				src: '',
@@ -126,6 +136,12 @@
 					})
 					return;
 				}
+				if (e == 5) {
+					uni.navigateTo({
+						url: '/pages/goods/my'
+					})
+					return;
+				}
 				uni.showToast({
 					title: '敬请期待',
 					icon: 'error',

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/runtime.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/gaoyia-parse/components/wxParseTable.js.map


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


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


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


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


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


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


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


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


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


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/illness/receive.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/integral/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/pages/policy/index.js.map


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


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


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


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


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


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


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


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


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


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


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


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


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


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


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/pages/user/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-card/components/uni-card/uni-card.js.map


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


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


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-picker/components/uni-data-pickerview/uni-data-pickerview.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-datetime-picker/components/uni-datetime-picker/calendar-item.js.map


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


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


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.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-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-goods-nav/components/uni-goods-nav/uni-goods-nav.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-list/components/uni-list-chat/uni-list-chat.js.map


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


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


Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 1
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.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 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.js.map


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


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


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


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

@@ -29,7 +29,10 @@
     "pages/report/double",
     "pages/report/service",
     "pages/recruit/index",
-    "pages/recruit/details"
+    "pages/recruit/details",
+    "pages/goods/index",
+    "pages/goods/details",
+    "pages/goods/my"
   ],
   "subPackages": [],
   "window": {

Diff do ficheiro suprimidas por serem muito extensas
+ 2 - 2
unpackage/dist/dev/mp-weixin/common/runtime.js


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


Diff do ficheiro suprimidas por serem muito extensas
+ 10 - 10
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseAudio.js


Diff do ficheiro suprimidas por serem muito extensas
+ 10 - 10
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseImg.js


Diff do ficheiro suprimidas por serem muito extensas
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTable.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate0.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate1.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate10.js


Diff do ficheiro suprimidas por serem muito extensas
+ 14 - 14
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate11.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate2.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate3.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate4.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate5.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate6.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate7.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate8.js


Diff do ficheiro suprimidas por serem muito extensas
+ 15 - 15
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseTemplate9.js


Diff do ficheiro suprimidas por serem muito extensas
+ 10 - 10
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/components/wxParseVideo.js


Diff do ficheiro suprimidas por serem muito extensas
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/gaoyia-parse/parse.js


Diff do ficheiro suprimidas por serem muito extensas
+ 201 - 0
unpackage/dist/dev/mp-weixin/components/popup.js


+ 7 - 0
unpackage/dist/dev/mp-weixin/components/popup.json

@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "uni-popup-dialog": "/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog"
+  }
+}

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


+ 4 - 4
unpackage/dist/dev/mp-weixin/pages/activity/details.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniSection: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 291))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-section/components/uni-section/uni-section */ "uni_modules/uni-section/components/uni-section/uni-section").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-section/components/uni-section/uni-section.vue */ 301))
     },
     uniList: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 305))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 315))
     },
     uniListItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 312))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 322))
     },
     uniGoodsNav: function () {
-      return Promise.all(/*! import() | uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue */ 418))
+      return Promise.all(/*! import() | uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-goods-nav/components/uni-goods-nav/uni-goods-nav.vue */ 428))
     },
   }
 } catch (e) {

+ 4 - 4
unpackage/dist/dev/mp-weixin/pages/activity/index.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     uniList: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 305))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list/uni-list */ "uni_modules/uni-list/components/uni-list/uni-list").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list/uni-list.vue */ 315))
     },
     uniListItem: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 312))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-list/components/uni-list-item/uni-list-item */ "uni_modules/uni-list/components/uni-list-item/uni-list-item").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-list/components/uni-list-item/uni-list-item.vue */ 322))
     },
     uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 344))
+      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 354))
     },
     uniLoadMore: function () {
-      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 326))
+      return Promise.all(/*! import() | uni_modules/uni-load-more/components/uni-load-more/uni-load-more */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-load-more/components/uni-load-more/uni-load-more")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-load-more/components/uni-load-more/uni-load-more.vue */ 336))
     },
   }
 } catch (e) {

+ 1 - 1
unpackage/dist/dev/mp-weixin/pages/details/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uniTitle: function () {
-      return __webpack_require__.e(/*! import() | uni_modules/uni-title/components/uni-title/uni-title */ "uni_modules/uni-title/components/uni-title/uni-title").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-title/components/uni-title/uni-title.vue */ 352))
+      return __webpack_require__.e(/*! import() | uni_modules/uni-title/components/uni-title/uni-title */ "uni_modules/uni-title/components/uni-title/uni-title").then(__webpack_require__.bind(null, /*! @/uni_modules/uni-title/components/uni-title/uni-title.vue */ 362))
     },
   }
 } catch (e) {

Diff do ficheiro suprimidas por serem muito extensas
+ 308 - 0
unpackage/dist/dev/mp-weixin/pages/goods/details.js


+ 6 - 0
unpackage/dist/dev/mp-weixin/pages/goods/details.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "优惠券详情",
+  "usingComponents": {
+    "popup": "/components/popup"
+  }
+}

Diff do ficheiro suprimidas por serem muito extensas
+ 1 - 0
unpackage/dist/dev/mp-weixin/pages/goods/details.wxml


+ 76 - 0
unpackage/dist/dev/mp-weixin/pages/goods/details.wxss

@@ -0,0 +1,76 @@
+
+.voucher-coupon-detail {
+ 		padding: 20rpx;
+ 		width: 90%;
+ 		margin: 0 auto;
+}
+.voucher-coupon-detail-header {
+ 		display: flex;
+ 		align-items: center;
+ 		margin-bottom: 20rpx;
+}
+.voucher-coupon-detail-header-img {
+ 		width: 100%;
+ 		/* height: 120rpx; */
+ 		/* margin-right: 20rpx; */
+}
+.voucher-coupon-detail-header-info {
+ 		flex: 1;
+}
+.voucher-coupon-detail-header-info-title {
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 		margin-bottom: 10rpx;
+ 		margin-top: 30rpx;
+}
+.voucher-coupon-detail-header-info-desc {
+ 		font-size: 28rpx;
+ 		color: #999;
+ 		margin-bottom: 10rpx;
+}
+.voucher-coupon-detail-header-info-time {
+ 		font-size: 28rpx;
+ 		color: #999;
+}
+.voucher-coupon-detail-content {
+ 		margin-top: 30rpx;
+}
+.voucher-coupon-detail-content-title {
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 		margin-bottom: 20rpx;
+}
+.voucher-coupon-detail-content-desc {
+ 		font-size: 28rpx;
+ 		color: #999;
+ 		line-height: 1.5;
+ 		margin-bottom: 20rpx;
+}
+.voucher-coupon-detail-footer {
+ 		display: flex;
+ 		justify-content: space-between;
+ 		align-items: center;
+ 		background-color: #f5f5f5;
+ 		padding: 20rpx;
+ 		border-radius: 10rpx;
+}
+.voucher-coupon-detail-footer-price {
+ 		font-size: 36rpx;
+ 		font-weight: bold;
+}
+.voucher-coupon-detail-footer-btn {
+ 		display: flex;
+ 		justify-content: center;
+ 		align-items: center;
+ 		height: 80rpx;
+ 		background-color: #f60;
+ 		color: #FFFFFF;
+ 		font-size: 32rpx;
+ 		font-weight: bold;
+ 		border-radius: 10rpx;
+ 		margin-top: 50rpx;
+}
+.remainCount {
+		background-color: #999;
+}
+ 

Diff do ficheiro suprimidas por serem muito extensas
+ 422 - 0
unpackage/dist/dev/mp-weixin/pages/goods/index.js


+ 10 - 0
unpackage/dist/dev/mp-weixin/pages/goods/index.json

@@ -0,0 +1,10 @@
+{
+  "navigationBarTitleText": "积分商城",
+  "usingComponents": {
+    "uni-section": "/uni_modules/uni-section/components/uni-section/uni-section",
+    "uni-list": "/uni_modules/uni-list/components/uni-list/uni-list",
+    "uni-list-item": "/uni_modules/uni-list/components/uni-list-item/uni-list-item",
+    "uni-load-more": "/uni_modules/uni-load-more/components/uni-load-more/uni-load-more",
+    "popup": "/components/popup"
+  }
+}

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


+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/goods/index.wxss


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff