优惠券接口

pages.json

@@ -93,7 +93,9 @@
 		{
 			"path": "pages/coupons/coupons",
 			"style": {
-				"navigationBarTitleText": "优惠券"
+				"navigationBarTitleText": "优惠券",
+				"navigationStyle":"default",
+				"backgroundColorTop": "#fff"
 			}
 		},
 		{

pages/banner-page/banner-page.css

@@ -1,25 +1,22 @@
 ax-body{
 	display: block;
 	height: 100%;
-	background:linear-gradient(to bottom, rgba(82, 180, 251,0.9),rgba(82, 180, 251,1));
 }
 .page-background{
 	position: fixed;
 	top: 0;
 	left: 0;
 	right: 0;
-	z-index: 0;
+	z-index: -100;
 }
 .page-background image{
 	display: block;
 	width: 100%;
 }
 .image-box{
-	position: relative;
 	width: 100%;
 	height: 100%;
 }
 .image-bg{
-	position: absolute;
 	width: 100%;
 }

pages/banner-page/banner-page.vue

@@ -2,7 +2,8 @@
 	<ax-body blank="0" hideIndicatorArea>
 		<view class="page-background"><image src="@/static/img/my-bg.svg" mode="widthFix"></image></view>
 		<view class="image-box">
-			<image class="image-bg" :src="image_bg" mode="widthFix"></image>
+			<image class="image-bg" :src="image_bgs" mode="widthFix"></image>
+			<image class="image-bg" style="margin-top: -20rpx;" :src="image_bg" mode="widthFix"></image>
 		</view>
 	</ax-body>
 </template>
@@ -11,6 +12,7 @@
 	export default {
 		data(){
 			return {
+				image_bgs:'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/aDqt1XamIpNIbb02da799fbd9ab857ecb59304bdeb45.jpg/1.jpg',
 				image_bg:'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bMb4w0IRfi5Md70c3a069a1db244bfea4f227e60f837.jpg/1.jpg'
 			}
 		}

pages/coupons/coupons.css

@@ -1,7 +1,7 @@
 ax-body {
 	display: block;
 	height: 100%;
-	background: #F5F7FB;
+	/* background: #F5F7FB; */
 }
 
 ax-body>>>.ax-custom-title {
@@ -15,7 +15,7 @@ ax-body>>>.ax-custom-title {
 	width: 100%;
 	left: 0;
 	height: 100rpx;
-	background-color: #fff;
+	background-color:#C7FFFD;
 	display: flex;
 	align-items: center;
 	text-align: center;
@@ -64,6 +64,7 @@ ax-body>>>.ax-custom-title {
 }
 
 .coupons-list-box {
+	margin: auto;
 	margin-top: 20rpx;
 	position: relative;
 	overflow: hidden;
@@ -115,6 +116,7 @@ ax-body>>>.ax-custom-title {
 	text-align: center;
 	margin-left: 30rpx;
 	margin-top: 24rpx;
+	width: 280rpx;
 }
 
 .coupons-title {
@@ -168,4 +170,13 @@ ax-body>>>.ax-custom-title {
 	text-align: center;
 	color: #fff;
 	font-size: 20rpx;
+}
+.not-data{
+	width: 100%;
+	height:500rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 28rpx;
+	color: #aaa;
 }

pages/coupons/coupons.vue

@@ -1,60 +1,130 @@
 <template>
-	<ax-body title="">
-		<view class="tabs-body">
-			<view class="tabs-box">
-				<view class="item-tabs" :class="{active:currentIndex===item.id}" v-for="item in tabsList" :key="item.id" @click="handleTabClick(item)">{{item.text}}({{item.id}})</view>
-			</view>
-			<view style="height: 100rpx;"></view>
-			<view class="list-body">
-				<view class="coupons-list-box" :style="{opacity:`${currentIndex===3?'0.5':''}`}" v-for="item in 3">
-					<image class="coupons-bg-img" src="../../static/img/coupons-new.png" mode=""></image>
-					<view class="coupons-content-box">
-						<view class="coupons-left">
-							<view class="left-price">10<text>元</text></view>
-							<view class="left-rules">满100元可用</view>
-						</view>
-						<view class="coupons-center">
-							<view class="coupons-title">优惠券名称优惠券名称</view>
-							<view class="coupons-valid">有效期：领取后60天</view>
-							<view class="coupons-range">平台所有充电桩可用</view>
-						</view>
-						<view class="coupons-right">
-							<view class="coupons-dayrules" v-if="currentIndex===0">每日限领一次</view>
-							<view class="coupons-getbtn" v-if="currentIndex===0">立即领取</view>
-							<view class="coupons-getbtn" v-if="currentIndex===2">查看订单</view>
-						</view>
+	<view class="tabs-body">
+		<view class="tabs-box">
+			<view class="item-tabs" :class="{active:currentIndex===item.id}" v-for="item in tabsList" :key="item.id"
+				@click="handleTabClick(item)">{{item.text}}({{item.count||0}})</view>
+		</view>
+		<view style="height: 100rpx;"></view>
+		<view class="list-body">
+			<view class="coupons-list-box" :style="{opacity:`${currentIndex===3?'0.5':''}`}"
+				v-for="item in toBeclaimedCoupons" :key="item.id">
+				<image class="coupons-bg-img" :src="coupons_card" mode=""></image>
+				<view class="coupons-content-box">
+					<view class="coupons-left">
+						<view class="left-price">{{item.discountPrice}}<text>元</text></view>
+						<view class="left-rules">满{{item.usePrice}}元可用</view>
+					</view>
+					<view class="coupons-center">
+						<view class="coupons-title">{{item.name}}</view>
+						<view class="coupons-valid" v-if="currentIndex==0">有效期：领取后{{item.failureTime}}天</view>
+						<view class="coupons-valid" v-else>{{item.validEndTime}}到期</view>
+						<view class="coupons-range">平台所有充电桩可用</view>
 					</view>
-					<view class="ribbon" :style="{backgroundColor:`${currentIndex===3?'#e8e8e8':''}`,color:`${currentIndex===3?'#8c8c8c':''}`}">{{tabsList[currentIndex].text}}</view>
+					<view class="coupons-right">
+						<view class="coupons-dayrules" v-if="currentIndex===0">{{item.description}}</view>
+						<view class="coupons-getbtn" v-if="currentIndex===0" @click="get_coupons(item)">立即领取</view>
+						<view class="coupons-getbtn" v-if="currentIndex===2">查看订单</view>
+					</view>
+				</view>
+				<view class="ribbon"
+					:style="{backgroundColor:`${currentIndex===3?'#e8e8e8':''}`,color:`${currentIndex===3?'#8c8c8c':''}`}">
+					{{tabsList[currentIndex].text}}
 				</view>
 			</view>
+			<view style="height: 30rpx;"></view>
+			<view v-if="toBeclaimedCoupons.length<1" class="not-data">
+				暂无数据
+			</view>
 		</view>
-	</ax-body>
+	</view>
 </template>
 
 <script>
 	export default {
 		data() {
 			return {
-				currentIndex: 0 ,// 默认选中第一个选项卡
-				tabsList:[{
-					text:'待领取',
-					id:0
-				},{
-					text:'待使用',
-					id:1
-				},{
-					text:'已使用',
-					id:2
-				},{
-					text:'已过期',
-					id:3
-				},]
+				coupons_card: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bNfT8BQFvtcead404bdf22856fe1306af8fbb672a74c.png/1.png',
+				currentIndex: 0, // 默认选中第一个选项卡
+				tabsList: [{
+					text: '待领取',
+					id: 0
+				}, {
+					text: '待使用',
+					id: 1
+				}, {
+					text: '已使用',
+					id: 2
+				}, {
+					text: '已过期',
+					id: 3
+				}],
+				toBeclaimedCoupons: [],
+				totalStatistics:{},
+				form_submit: {
+					pageNum: 1,
+					pageSize: 10,
+					status:1,
+				}
 			};
 		},
+		onLoad() {
+			this.get_statistical()
+		},
+		onReachBottom(e) {
+			this.form_submit.pageNum++
+			this.get_TobeclaimedCoupons()
+		},
+
+		mounted() {
+			this.get_TobeclaimedCoupons()
+		},
 		methods: {
-			// 处理选项卡点击
+			//选项卡点击
 			handleTabClick(e) {
 				this.currentIndex = e.id;
+				this.form_submit.status=e.id
+				this.get_TobeclaimedCoupons()
+			},
+			get_TobeclaimedCoupons() {
+				if (this.currentIndex == 0) {
+					this.$api.base("post", "/couponApi/list-pending", {}, {}).then(res => {
+						this.toBeclaimedCoupons = res.list
+					})
+				} else {
+					this.$api.base("post", "/couponApi/list-user",this.form_submit, {}).then(res => {
+						if(this.form_submit.pageNum==1){
+							this.toBeclaimedCoupons = res.rows
+						}else{
+							this.toBeclaimedCoupons=[...this.toBeclaimedCoupons,...res.rows]
+						}
+					})
+				}
+
+			},
+			get_statistical(){
+				// 数据映射
+				const idToKeyMap = {
+				  0: 'list-pending',
+				  1: 'list-unused',
+				  2: 'list-used',
+				  3: 'list-overdue'
+				};
+				this.$api.base("post", "/couponApi/statistical", {}, {}).then(res => {
+					this.tabsList.forEach(tab => {
+					  const key = idToKeyMap[tab.id];
+					  tab.count = res.data[key] || 0;
+					});
+				})
+			},
+			
+			get_coupons(e){
+				this.$api.base("post", "/couponApi/receive", {templateId:e.id}, {}).then(res => {
+					if(res.code==0){
+						this.get_statistical()
+						this.get_TobeclaimedCoupons()
+						this.$app.popup.toast('领取成功')
+					}
+				})
 			}
 		}
 	};

pages/my/my.vue

@@ -21,7 +21,7 @@
 							class="get-phone-number">授权并登录</button>
 					</view>
 				</view>
-				<!-- <image src="@/static/img/Coupons.png" class="seting-icon" @click="$app.url.goto('/pages/coupons/coupons')"></image> -->
+				<image src="@/static/img/Coupons.png" class="seting-icon" @click="$app.url.goto('/pages/coupons/coupons')"></image>
 			</view>
 			<!-- 统计卡 -->
 			<view class="app-flex c-between">

static/js/config.js

@@ -7,7 +7,7 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	// request : 'https://charge.hub.zswlgz.com/',
-	request : 'http://192.168.1.36:80/',
+	request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
 	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.js

@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/banner-page/banner-page"],{"03eb":function(n,e,t){},"2f4e":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{image_bg:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bMb4w0IRfi5Md70c3a069a1db244bfea4f227e60f837.jpg/1.jpg"}}}},"857c":function(n,e,t){"use strict";t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){return a}));var a={axBody:function(){return t.e("components/ax-body/ax-body").then(t.bind(null,"8839"))}},c=function(){var n=this.$createElement;this._self._c},u=[]},a19a:function(n,e,t){"use strict";t.r(e);var a=t("2f4e"),c=t.n(a);for(var u in a)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(u);e["default"]=c.a},c21f:function(n,e,t){"use strict";(function(n,e){var a=t("47a9");t("2acb");a(t("3240"));var c=a(t("f06d"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("3223")["default"],t("df3c")["createPage"])},c476:function(n,e,t){"use strict";var a=t("03eb"),c=t.n(a);c.a},f06d:function(n,e,t){"use strict";t.r(e);var a=t("857c"),c=t("a19a");for(var u in c)["default"].indexOf(u)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(u);t("c476");var r=t("828b"),f=Object(r["a"])(c["default"],a["b"],a["c"],!1,null,"6d8a00a9",null,!1,a["a"],void 0);e["default"]=f.exports}},[["c21f","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/banner-page/banner-page"],{"16f5":function(n,e,a){"use strict";a.d(e,"b",(function(){return c})),a.d(e,"c",(function(){return u})),a.d(e,"a",(function(){return t}));var t={axBody:function(){return a.e("components/ax-body/ax-body").then(a.bind(null,"8839"))}},c=function(){var n=this.$createElement;this._self._c},u=[]},"2d73":function(n,e,a){"use strict";var t=a("e2b0"),c=a.n(t);c.a},"2f4e":function(n,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={data:function(){return{image_bgs:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/aDqt1XamIpNIbb02da799fbd9ab857ecb59304bdeb45.jpg/1.jpg",image_bg:"https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bMb4w0IRfi5Md70c3a069a1db244bfea4f227e60f837.jpg/1.jpg"}}}},a19a:function(n,e,a){"use strict";a.r(e);var t=a("2f4e"),c=a.n(t);for(var u in t)["default"].indexOf(u)<0&&function(n){a.d(e,n,(function(){return t[n]}))}(u);e["default"]=c.a},c21f:function(n,e,a){"use strict";(function(n,e){var t=a("47a9");a("2acb");t(a("3240"));var c=t(a("f06d"));n.__webpack_require_UNI_MP_PLUGIN__=a,e(c.default)}).call(this,a("3223")["default"],a("df3c")["createPage"])},e2b0:function(n,e,a){},f06d:function(n,e,a){"use strict";a.r(e);var t=a("16f5"),c=a("a19a");for(var u in c)["default"].indexOf(u)<0&&function(n){a.d(e,n,(function(){return c[n]}))}(u);a("2d73");var r=a("828b"),f=Object(r["a"])(c["default"],t["b"],t["c"],!1,null,"8b00678e",null,!1,t["a"],void 0);e["default"]=f.exports}},[["c21f","common/runtime","common/vendor"]]]);

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.wxml

@@ -1 +1 @@
-<ax-body vue-id="ca9af144-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-6d8a00a9" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background data-v-6d8a00a9"><image src="/static/img/my-bg.svg" mode="widthFix" class="data-v-6d8a00a9"></image></view><view class="image-box data-v-6d8a00a9"><image class="image-bg data-v-6d8a00a9" src="{{image_bg}}" mode="widthFix"></image></view></ax-body>
+<ax-body vue-id="ca9af144-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-8b00678e" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background data-v-8b00678e"><image src="/static/img/my-bg.svg" mode="widthFix" class="data-v-8b00678e"></image></view><view class="image-box data-v-8b00678e"><image class="image-bg data-v-8b00678e" src="{{image_bgs}}" mode="widthFix"></image><image class="image-bg data-v-8b00678e" style="margin-top:-20rpx;" src="{{image_bg}}" mode="widthFix"></image></view></ax-body>

unpackage/dist/build/mp-weixin/pages/banner-page/banner-page.wxss

@@ -1 +1 @@
-ax-body.data-v-6d8a00a9{display:block;height:100%;background:linear-gradient(180deg,rgba(82,180,251,.9),#52b4fb)}.page-background.data-v-6d8a00a9{position:fixed;top:0;left:0;right:0;z-index:0}.page-background image.data-v-6d8a00a9{display:block;width:100%}.image-box.data-v-6d8a00a9{position:relative;width:100%;height:100%}.image-bg.data-v-6d8a00a9{position:absolute;width:100%}
+ax-body.data-v-8b00678e{display:block;height:100%}.page-background.data-v-8b00678e{position:fixed;top:0;left:0;right:0;z-index:-100}.page-background image.data-v-8b00678e{display:block;width:100%}.image-box.data-v-8b00678e{width:100%;height:100%}.image-bg.data-v-8b00678e{width:100%}

unpackage/dist/build/mp-weixin/static/js/config.js

@@ -7,7 +7,7 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	request : 'https://charge.hub.zswlgz.com/',
-	// request : 'http://192.168.1.36:80/',
+	// request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
 	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址

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

@@ -10842,7 +10842,7 @@ var config = {};
 config.url = {
   // API请求基础URL
   // request : 'https://charge.hub.zswlgz.com/',
-  request: 'http://192.168.1.36:80/',
+  request: 'http://192.168.1.34:80/',
   // request : 'http://120.78.228.211:8866/',
   // request : 'https://charge.dev.hub.zswlgz.com/',
   // 上传地址
@@ -10990,7 +10990,9 @@ var _default = {
   }, {
     "path": "pages/coupons/coupons",
     "style": {
-      "navigationBarTitleText": "优惠券"
+      "navigationBarTitleText": "优惠券",
+      "navigationStyle": "default",
+      "backgroundColorTop": "#fff"
     }
   }, {
     "path": "pages/web/web",

unpackage/dist/dev/mp-weixin/pages/Invite-staff/Invite-staff.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     rCanvas: function () {
       return Promise.all(/*! import() | components/r-canvas/r-canvas */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/r-canvas/r-canvas")]).then(__webpack_require__.bind(null, /*! @/components/r-canvas/r-canvas.vue */ 66))

unpackage/dist/dev/mp-weixin/pages/banner-page/banner-page.wxml

@@ -1 +1 @@
-<ax-body vue-id="ca9af144-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-2e47cea8" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background data-v-2e47cea8"><image src="/static/img/my-bg.svg" mode="widthFix" class="data-v-2e47cea8"></image></view><view class="image-box data-v-2e47cea8"><image class="image-bg data-v-2e47cea8" src="{{image_bg}}" mode="widthFix"></image></view></ax-body>
+<ax-body vue-id="ca9af144-1" blank="0" hideIndicatorArea="{{true}}" class="data-v-2e47cea8" bind:__l="__l" vue-slots="{{['default']}}"><view class="page-background data-v-2e47cea8"><image src="/static/img/my-bg.svg" mode="widthFix" class="data-v-2e47cea8"></image></view><view class="image-box data-v-2e47cea8"><image class="image-bg data-v-2e47cea8" src="{{image_bgs}}" mode="widthFix"></image><image class="image-bg data-v-2e47cea8" style="margin-top:-20rpx;" src="{{image_bg}}" mode="widthFix"></image></view></ax-body>

unpackage/dist/dev/mp-weixin/pages/banner-page/banner-page.wxss

@@ -1,26 +1,23 @@
 ax-body.data-v-2e47cea8{
 	display: block;
 	height: 100%;
-	background:linear-gradient(to bottom, rgba(82, 180, 251,0.9),rgba(82, 180, 251,1));
 }
 .page-background.data-v-2e47cea8{
 	position: fixed;
 	top: 0;
 	left: 0;
 	right: 0;
-	z-index: 0;
+	z-index: -100;
 }
 .page-background image.data-v-2e47cea8{
 	display: block;
 	width: 100%;
 }
 .image-box.data-v-2e47cea8{
-	position: relative;
 	width: 100%;
 	height: 100%;
 }
 .image-bg.data-v-2e47cea8{
-	position: absolute;
 	width: 100%;
 }
 

unpackage/dist/dev/mp-weixin/pages/charging/charging.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 223))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/coupon-buy/coupon-buy.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 223))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/coupons/coupons.js

@@ -98,33 +98,19 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
-try {
-  components = {
-    axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
-    },
-  }
-} catch (e) {
-  if (
-    e.message.indexOf("Cannot find module") !== -1 &&
-    e.message.indexOf(".vue") !== -1
-  ) {
-    console.error(e.message)
-    console.error("1. 排查组件名称拼写是否正确")
-    console.error(
-      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
-    )
-    console.error(
-      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
-    )
-  } else {
-    throw e
-  }
-}
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
+  var g0 = _vm.toBeclaimedCoupons.length
+  _vm.$mp.data = Object.assign(
+    {},
+    {
+      $root: {
+        g0: g0,
+      },
+    }
+  )
 }
 var recyclableRender = false
 var staticRenderFns = []
@@ -160,10 +146,20 @@ __webpack_require__.r(__webpack_exports__);
 "use strict";
 
 
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
+//
+//
+//
+//
+//
+//
+//
+//
 //
 //
 //
@@ -200,6 +196,7 @@ exports.default = void 0;
 var _default = {
   data: function data() {
     return {
+      coupons_card: 'https://hyxhsh.oss-cn-chengdu.aliyuncs.com/63b7c68b71a69169d1b33f92/store/bdb/user/avatar/bNfT8BQFvtcead404bdf22856fe1306af8fbb672a74c.png/1.png',
       currentIndex: 0,
       // 默认选中第一个选项卡
       tabsList: [{
@@ -214,13 +211,76 @@ var _default = {
       }, {
         text: '已过期',
         id: 3
-      }]
+      }],
+      toBeclaimedCoupons: [],
+      totalStatistics: {},
+      form_submit: {
+        pageNum: 1,
+        pageSize: 10,
+        status: 1
+      }
     };
   },
+  onLoad: function onLoad() {
+    this.get_statistical();
+  },
+  onReachBottom: function onReachBottom(e) {
+    this.form_submit.pageNum++;
+    this.get_TobeclaimedCoupons();
+  },
+  mounted: function mounted() {
+    this.get_TobeclaimedCoupons();
+  },
   methods: {
-    // 处理选项卡点击
+    //选项卡点击
     handleTabClick: function handleTabClick(e) {
       this.currentIndex = e.id;
+      this.form_submit.status = e.id;
+      this.get_TobeclaimedCoupons();
+    },
+    get_TobeclaimedCoupons: function get_TobeclaimedCoupons() {
+      var _this = this;
+      if (this.currentIndex == 0) {
+        this.$api.base("post", "/couponApi/list-pending", {}, {}).then(function (res) {
+          _this.toBeclaimedCoupons = res.list;
+        });
+      } else {
+        this.$api.base("post", "/couponApi/list-user", this.form_submit, {}).then(function (res) {
+          if (_this.form_submit.pageNum == 1) {
+            _this.toBeclaimedCoupons = res.rows;
+          } else {
+            _this.toBeclaimedCoupons = [].concat((0, _toConsumableArray2.default)(_this.toBeclaimedCoupons), (0, _toConsumableArray2.default)(res.rows));
+          }
+        });
+      }
+    },
+    get_statistical: function get_statistical() {
+      var _this2 = this;
+      // 数据映射
+      var idToKeyMap = {
+        0: 'list-pending',
+        1: 'list-unused',
+        2: 'list-used',
+        3: 'list-overdue'
+      };
+      this.$api.base("post", "/couponApi/statistical", {}, {}).then(function (res) {
+        _this2.tabsList.forEach(function (tab) {
+          var key = idToKeyMap[tab.id];
+          tab.count = res.data[key] || 0;
+        });
+      });
+    },
+    get_coupons: function get_coupons(e) {
+      var _this3 = this;
+      this.$api.base("post", "/couponApi/receive", {
+        templateId: e.id
+      }, {}).then(function (res) {
+        if (res.code == 0) {
+          _this3.get_statistical();
+          _this3.get_TobeclaimedCoupons();
+          _this3.$app.popup.toast('领取成功');
+        }
+      });
     }
   }
 };

unpackage/dist/dev/mp-weixin/pages/coupons/coupons.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "优惠券",
-  "usingComponents": {
-    "ax-body": "/components/ax-body/ax-body"
-  }
+  "navigationStyle": "default",
+  "backgroundColorTop": "#fff",
+  "usingComponents": {}
 }

unpackage/dist/dev/mp-weixin/pages/coupons/coupons.wxss

@@ -1,7 +1,7 @@
 ax-body {
 	display: block;
 	height: 100%;
-	background: #F5F7FB;
+	/* background: #F5F7FB; */
 }
 ax-body .ax-custom-title {
 	background-color: #fff !important;
@@ -14,7 +14,7 @@ ax-body .ax-custom-title {
 	width: 100%;
 	left: 0;
 	height: 100rpx;
-	background-color: #fff;
+	background-color:#C7FFFD;
 	display: flex;
 	align-items: center;
 	text-align: center;
@@ -58,6 +58,7 @@ ax-body .ax-custom-title {
 .list-body {
 }
 .coupons-list-box {
+	margin: auto;
 	margin-top: 20rpx;
 	position: relative;
 	overflow: hidden;
@@ -102,6 +103,7 @@ ax-body .ax-custom-title {
 	text-align: center;
 	margin-left: 30rpx;
 	margin-top: 24rpx;
+	width: 280rpx;
 }
 .coupons-title {
 	font-weight: 800;
@@ -150,4 +152,13 @@ ax-body .ax-custom-title {
 	color: #fff;
 	font-size: 20rpx;
 }
+.not-data{
+	width: 100%;
+	height:500rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 28rpx;
+	color: #aaa;
+}
 

unpackage/dist/dev/mp-weixin/pages/feedback-reply/feedback-reply.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/feedback/feedback.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 209))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 214))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 216))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/map/map.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 209))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 214))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 216))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/my/my.js

@@ -101,16 +101,16 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 209))
     },
     rCanvas: function () {
       return Promise.resolve(/*! import() */).then(__webpack_require__.bind(null, /*! @/components/r-canvas/r-canvas.vue */ 66))
     },
     appNavigation: function () {
-      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 214))
+      return Promise.all(/*! import() | components/app-navigation/app-navigation */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/app-navigation/app-navigation")]).then(__webpack_require__.bind(null, /*! @/components/app-navigation/app-navigation.vue */ 216))
     },
   }
 } catch (e) {
@@ -136,15 +136,18 @@ var render = function () {
   var _c = _vm._self._c || _h
   if (!_vm._isMounted) {
     _vm.e0 = function ($event) {
-      return _vm.$app.url.goto("/pages/coupon-buy/coupon-buy")
+      return _vm.$app.url.goto("/pages/coupons/coupons")
     }
     _vm.e1 = function ($event) {
-      return _vm.$app.url.goto("/pages/recharge-log/recharge-log")
+      return _vm.$app.url.goto("/pages/coupon-buy/coupon-buy")
     }
     _vm.e2 = function ($event) {
-      return _vm.$app.url.goto("/pages/order/order")
+      return _vm.$app.url.goto("/pages/recharge-log/recharge-log")
     }
     _vm.e3 = function ($event) {
+      return _vm.$app.url.goto("/pages/order/order")
+    }
+    _vm.e4 = function ($event) {
       return _vm.$app.url.goto("/pages/feedback/feedback")
     }
   }

unpackage/dist/dev/mp-weixin/pages/order-detail/order-detail.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
   }
 } catch (e) {

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

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 209))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/recharge-log/recharge-log.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/search/search.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/site-more/site-more.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 223))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/site/site.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/terminal/terminal.js

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     axBody: function () {
-      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 200))
+      return __webpack_require__.e(/*! import() | components/ax-body/ax-body */ "components/ax-body/ax-body").then(__webpack_require__.bind(null, /*! @/components/ax-body/ax-body.vue */ 202))
     },
     axIosIndicator: function () {
-      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 221))
+      return __webpack_require__.e(/*! import() | components/ax-ios-indicator/ax-ios-indicator */ "components/ax-ios-indicator/ax-ios-indicator").then(__webpack_require__.bind(null, /*! @/components/ax-ios-indicator/ax-ios-indicator.vue */ 223))
     },
     axPopup: function () {
-      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 207))
+      return __webpack_require__.e(/*! import() | components/ax-popup/ax-popup */ "components/ax-popup/ax-popup").then(__webpack_require__.bind(null, /*! @/components/ax-popup/ax-popup.vue */ 209))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/static/js/config.js

@@ -7,7 +7,7 @@ const config = {};
 config.url = {
 	// API请求基础URL
 	// request : 'https://charge.hub.zswlgz.com/',
-	request : 'http://192.168.1.36:80/',
+	request : 'http://192.168.1.34:80/',
 	// request : 'http://120.78.228.211:8866/',
 	// request : 'https://charge.dev.hub.zswlgz.com/',
 	// 上传地址