Commit 4f88a14919ca07cef801605b5276cd000437ec66
1 parent
b1d468f9
1
Showing
5 changed files
with
126 additions
and
10 deletions
ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue renamed to ceres-uniapp-master/pages_category_page1/coupon/1.vue
| @@ -116,11 +116,11 @@ export default { | @@ -116,11 +116,11 @@ export default { | ||
| 116 | // title: '加载中...' | 116 | // title: '加载中...' |
| 117 | // }) | 117 | // }) |
| 118 | this.loading = true | 118 | this.loading = true |
| 119 | - NET.request(API.youhuiquan, { | 119 | + NET.request(API.couponnew, { |
| 120 | page: this.page, | 120 | page: this.page, |
| 121 | pageSize: this.pageSize, | 121 | pageSize: this.pageSize, |
| 122 | shopId:154 | 122 | shopId:154 |
| 123 | - }, 'GET').then(res => { | 123 | + }, 'POST').then(res => { |
| 124 | uni.hideLoading() | 124 | uni.hideLoading() |
| 125 | if (res.data.length === 0) { | 125 | if (res.data.length === 0) { |
| 126 | this.loadingType = 1 | 126 | this.loadingType = 1 |
ceres-uniapp-master/pages_category_page1/coupon/list.vue
| @@ -116,11 +116,11 @@ export default { | @@ -116,11 +116,11 @@ export default { | ||
| 116 | // title: '加载中...' | 116 | // title: '加载中...' |
| 117 | // }) | 117 | // }) |
| 118 | this.loading = true | 118 | this.loading = true |
| 119 | - NET.request(API.couponnew, { | 119 | + NET.request(API.youhuiquan, { |
| 120 | page: this.page, | 120 | page: this.page, |
| 121 | pageSize: this.pageSize, | 121 | pageSize: this.pageSize, |
| 122 | shopId:154 | 122 | shopId:154 |
| 123 | - }, 'POST').then(res => { | 123 | + }, 'GET').then(res => { |
| 124 | uni.hideLoading() | 124 | uni.hideLoading() |
| 125 | if (res.data.length === 0) { | 125 | if (res.data.length === 0) { |
| 126 | this.loadingType = 1 | 126 | this.loadingType = 1 |
ceres-uniapp-master/pages_category_page1/store/index.vue
| @@ -53,6 +53,20 @@ | @@ -53,6 +53,20 @@ | ||
| 53 | <image src="https://jy.scjysm.asia:18086/mefile/file/static/images/arrowRight.png"></image> | 53 | <image src="https://jy.scjysm.asia:18086/mefile/file/static/images/arrowRight.png"></image> |
| 54 | </view> | 54 | </view> |
| 55 | </view> | 55 | </view> |
| 56 | + <scroll-view style="white-space: nowrap;width: 100%;" scroll-x="true"> | ||
| 57 | + <view style="display: inline-block;" v-for="item of 10" @click="couponshow = true"> | ||
| 58 | + <view class="couponItem u-skeleton-fillet flex-items" style="margin-right: 20rpx;width: 130rpx;" > | ||
| 59 | + <view style="color: #FFEBC4;font-size: 22rpx;"> | ||
| 60 | + 3折 | ||
| 61 | + </view> | ||
| 62 | + <view style=" border-right: 2rpx dashed #fff;height: 20rpx;margin: 0 10rpx;"></view> | ||
| 63 | + <view style="color: #fff;font-size: 22rpx;"> | ||
| 64 | + 领取 | ||
| 65 | + </view> | ||
| 66 | + </view> | ||
| 67 | + </view> | ||
| 68 | + | ||
| 69 | + </scroll-view> | ||
| 56 | </view> | 70 | </view> |
| 57 | <view class="shopContent"> | 71 | <view class="shopContent"> |
| 58 | <view class="tabs-nav-warp"> | 72 | <view class="tabs-nav-warp"> |
| @@ -162,6 +176,32 @@ | @@ -162,6 +176,32 @@ | ||
| 162 | </view> | 176 | </view> |
| 163 | </view> | 177 | </view> |
| 164 | </view> | 178 | </view> |
| 179 | + <u-popup v-model="couponshow" mode="bottom" border-radius="14" @close="couponshow =false"> | ||
| 180 | + <view style="background: #f3f3f3;"> | ||
| 181 | + <view style="text-align: center;padding: 30rpx 0;">免费领</view> | ||
| 182 | + <view style="height: 500rpx;overflow-y: scroll;padding: 0 30rpx;"> | ||
| 183 | + <view v-for="(item,index) in 5" style="display: flex;align-items: center;justify-content: space-between;padding:10rpx 20rpx;background: #fff;margin-bottom: 25rpx;border-radius: 18rpx;"> | ||
| 184 | + <view style="display: flex;"> | ||
| 185 | + <view> | ||
| 186 | + <image :src="storeInfo.shopLogo" style="width: 100rpx;height: 100rpx;"></image> | ||
| 187 | + </view> | ||
| 188 | + <view style="height: 100rpx;display: flex;flex-direction: column;justify-content: space-around;margin-left: 10rpx;"> | ||
| 189 | + <view style="font-size: 26rpx;"> | ||
| 190 | + <span style="color: red;margin-right: 5rpx;">￥2</span> | ||
| 191 | + 代金券 | ||
| 192 | + </view> | ||
| 193 | + <view style="font-size: 22rpx;color: #909090;"> | ||
| 194 | + 有效期2024.12.1 | ||
| 195 | + </view> | ||
| 196 | + </view> | ||
| 197 | + </view> | ||
| 198 | + <view style="color: red;font-size: 26rpx;">领取</view> | ||
| 199 | + </view> | ||
| 200 | + | ||
| 201 | + </view> | ||
| 202 | + <view style="height: 10rpx;"></view> | ||
| 203 | + </view> | ||
| 204 | + </u-popup> | ||
| 165 | </view> | 205 | </view> |
| 166 | </template> | 206 | </template> |
| 167 | 207 | ||
| @@ -173,6 +213,7 @@ | @@ -173,6 +213,7 @@ | ||
| 173 | export default { | 213 | export default { |
| 174 | data() { | 214 | data() { |
| 175 | return { | 215 | return { |
| 216 | + couponshow:false, | ||
| 176 | componentsData: [], | 217 | componentsData: [], |
| 177 | navIndex: 0, | 218 | navIndex: 0, |
| 178 | id: '', | 219 | id: '', |
| @@ -611,7 +652,86 @@ | @@ -611,7 +652,86 @@ | ||
| 611 | page { | 652 | page { |
| 612 | background: #F8F8F8; | 653 | background: #F8F8F8; |
| 613 | } | 654 | } |
| 614 | - | 655 | + .couponItem { |
| 656 | + background: #333333; | ||
| 657 | + margin-top: 20rpx; | ||
| 658 | + padding: 10rpx; | ||
| 659 | + overflow: hidden; | ||
| 660 | + background-image: url("https://jy.scjysm.asia:18086/mefile/file/static/images/borderIcon.png"); | ||
| 661 | + background-repeat: no-repeat; | ||
| 662 | + background-size: contain; | ||
| 663 | + background-position: right top; | ||
| 664 | + | ||
| 665 | + .itemLeft { | ||
| 666 | + padding-right: 10rpx; | ||
| 667 | + position: relative; | ||
| 668 | + border-right: 2rpx dashed #666666; | ||
| 669 | + /* width: 170rpx; */ | ||
| 670 | + | ||
| 671 | + .topIcon { | ||
| 672 | + position: absolute; | ||
| 673 | + right: -16rpx; | ||
| 674 | + top: -50rpx; | ||
| 675 | + width: 32rpx; | ||
| 676 | + height: 32rpx; | ||
| 677 | + background: #FFFFFF; | ||
| 678 | + border-radius: 50%; | ||
| 679 | + } | ||
| 680 | + | ||
| 681 | + .bottomIcon { | ||
| 682 | + position: absolute; | ||
| 683 | + right: -16rpx; | ||
| 684 | + bottom: -50rpx; | ||
| 685 | + width: 32rpx; | ||
| 686 | + height: 32rpx; | ||
| 687 | + background: #FFFFFF; | ||
| 688 | + border-radius: 50%; | ||
| 689 | + } | ||
| 690 | + | ||
| 691 | + //.price { | ||
| 692 | + // width: 100rpx; | ||
| 693 | + //} | ||
| 694 | + .unitBox { | ||
| 695 | + height: 70rpx; | ||
| 696 | + } | ||
| 697 | + | ||
| 698 | + .unit { | ||
| 699 | + color: #FFEBC4; | ||
| 700 | + font-size: 36rpx; | ||
| 701 | + } | ||
| 702 | + | ||
| 703 | + .priceValue { | ||
| 704 | + font-size: 22rpx; | ||
| 705 | + color: #FFEBC4; | ||
| 706 | + } | ||
| 707 | + } | ||
| 708 | + | ||
| 709 | + .itemRight { | ||
| 710 | + /* padding-left: 45rpx; */ | ||
| 711 | + flex: 1; | ||
| 712 | + | ||
| 713 | + .topInfo { | ||
| 714 | + padding-bottom: 10rpx; | ||
| 715 | + border-bottom: 2rpx solid #444444; | ||
| 716 | + margin-bottom: 10rpx; | ||
| 717 | + | ||
| 718 | + .couponDate { | ||
| 719 | + width: 300rpx; | ||
| 720 | + } | ||
| 721 | + | ||
| 722 | + .exchangeBtnBox { | ||
| 723 | + width: 110rpx; | ||
| 724 | + height: 70rpx; | ||
| 725 | + text-align: center; | ||
| 726 | + | ||
| 727 | + .exchangeBtn { | ||
| 728 | + padding: 5rpx; | ||
| 729 | + border: 2rpx solid #999999; | ||
| 730 | + } | ||
| 731 | + } | ||
| 732 | + } | ||
| 733 | + } | ||
| 734 | + } | ||
| 615 | .shop-top { | 735 | .shop-top { |
| 616 | background: #39be7a; | 736 | background: #39be7a; |
| 617 | display: flex; | 737 | display: flex; |
| @@ -629,7 +749,7 @@ | @@ -629,7 +749,7 @@ | ||
| 629 | 749 | ||
| 630 | // #endif | 750 | // #endif |
| 631 | .stopInfo { | 751 | .stopInfo { |
| 632 | - padding: 200rpx 20rpx 20rpx 20rpx; | 752 | + padding: 140rpx 20rpx 20rpx 20rpx; |
| 633 | background: #F8F8F8; | 753 | background: #F8F8F8; |
| 634 | } | 754 | } |
| 635 | 755 |
settled-merchant-master/src/views/moblie/mEnterprise.vue
settled-merchant-master/src/views/moblie/mPersonal.vue