diff --git a/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue b/ceres-uniapp-master/pages_category_page1/coupon/1.vue
index c963196..95879b1 100644
--- a/ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue
+++ b/ceres-uniapp-master/pages_category_page1/coupon/1.vue
@@ -116,11 +116,11 @@ export default {
// title: '加载中...'
// })
this.loading = true
- NET.request(API.youhuiquan, {
+ NET.request(API.couponnew, {
page: this.page,
pageSize: this.pageSize,
shopId:154
- }, 'GET').then(res => {
+ }, 'POST').then(res => {
uni.hideLoading()
if (res.data.length === 0) {
this.loadingType = 1
diff --git a/ceres-uniapp-master/pages_category_page1/coupon/list.vue b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
index 95879b1..c963196 100644
--- a/ceres-uniapp-master/pages_category_page1/coupon/list.vue
+++ b/ceres-uniapp-master/pages_category_page1/coupon/list.vue
@@ -116,11 +116,11 @@ export default {
// title: '加载中...'
// })
this.loading = true
- NET.request(API.couponnew, {
+ NET.request(API.youhuiquan, {
page: this.page,
pageSize: this.pageSize,
shopId:154
- }, 'POST').then(res => {
+ }, 'GET').then(res => {
uni.hideLoading()
if (res.data.length === 0) {
this.loadingType = 1
diff --git a/ceres-uniapp-master/pages_category_page1/store/index.vue b/ceres-uniapp-master/pages_category_page1/store/index.vue
index 86abd65..a49dd92 100644
--- a/ceres-uniapp-master/pages_category_page1/store/index.vue
+++ b/ceres-uniapp-master/pages_category_page1/store/index.vue
@@ -53,6 +53,20 @@
+
+
+
+
+ 3折
+
+
+
+ 领取
+
+
+
+
+
@@ -162,6 +176,32 @@
+
+
+ 免费领
+
+
+
+
+
+
+
+
+ ￥2
+ 代金券
+
+
+ 有效期2024.12.1
+
+
+
+ 领取
+
+
+
+
+
+
@@ -173,6 +213,7 @@
export default {
data() {
return {
+ couponshow:false,
componentsData: [],
navIndex: 0,
id: '',
@@ -611,7 +652,86 @@
page {
background: #F8F8F8;
}
-
+ .couponItem {
+ background: #333333;
+ margin-top: 20rpx;
+ padding: 10rpx;
+ overflow: hidden;
+ background-image: url("https://jy.scjysm.asia:18086/mefile/file/static/images/borderIcon.png");
+ background-repeat: no-repeat;
+ background-size: contain;
+ background-position: right top;
+
+ .itemLeft {
+ padding-right: 10rpx;
+ position: relative;
+ border-right: 2rpx dashed #666666;
+ /* width: 170rpx; */
+
+ .topIcon {
+ position: absolute;
+ right: -16rpx;
+ top: -50rpx;
+ width: 32rpx;
+ height: 32rpx;
+ background: #FFFFFF;
+ border-radius: 50%;
+ }
+
+ .bottomIcon {
+ position: absolute;
+ right: -16rpx;
+ bottom: -50rpx;
+ width: 32rpx;
+ height: 32rpx;
+ background: #FFFFFF;
+ border-radius: 50%;
+ }
+
+ //.price {
+ // width: 100rpx;
+ //}
+ .unitBox {
+ height: 70rpx;
+ }
+
+ .unit {
+ color: #FFEBC4;
+ font-size: 36rpx;
+ }
+
+ .priceValue {
+ font-size: 22rpx;
+ color: #FFEBC4;
+ }
+ }
+
+ .itemRight {
+ /* padding-left: 45rpx; */
+ flex: 1;
+
+ .topInfo {
+ padding-bottom: 10rpx;
+ border-bottom: 2rpx solid #444444;
+ margin-bottom: 10rpx;
+
+ .couponDate {
+ width: 300rpx;
+ }
+
+ .exchangeBtnBox {
+ width: 110rpx;
+ height: 70rpx;
+ text-align: center;
+
+ .exchangeBtn {
+ padding: 5rpx;
+ border: 2rpx solid #999999;
+ }
+ }
+ }
+ }
+ }
.shop-top {
background: #39be7a;
display: flex;
@@ -629,7 +749,7 @@
// #endif
.stopInfo {
- padding: 200rpx 20rpx 20rpx 20rpx;
+ padding: 140rpx 20rpx 20rpx 20rpx;
background: #F8F8F8;
}
diff --git a/settled-merchant-master/src/views/moblie/mEnterprise.vue b/settled-merchant-master/src/views/moblie/mEnterprise.vue
index e5be6e4..f965852 100644
--- a/settled-merchant-master/src/views/moblie/mEnterprise.vue
+++ b/settled-merchant-master/src/views/moblie/mEnterprise.vue
@@ -801,6 +801,4 @@ export default {
text-align: center;
background: rgba(0, 0, 0, 0.3);
}
-
-
diff --git a/settled-merchant-master/src/views/moblie/mPersonal.vue b/settled-merchant-master/src/views/moblie/mPersonal.vue
index 7f75eee..68aaa23 100644
--- a/settled-merchant-master/src/views/moblie/mPersonal.vue
+++ b/settled-merchant-master/src/views/moblie/mPersonal.vue
@@ -666,6 +666,4 @@ export default {
text-align: center;
background: rgba(0, 0, 0, 0.3);
}
-
-