1

李宇
1 parent b1d468f9
Showing 5 changed files with 126 additions and 10 deletions
ceres-uniapp-master/pages_category_page1/coupon/list - 副本.vue → ceres-uniapp-master/pages_category_page1/coupon/1.vue
ceres-uniapp-master/pages_category_page1/coupon/list.vue
ceres-uniapp-master/pages_category_page1/store/index.vue
settled-merchant-master/src/views/moblie/mEnterprise.vue
settled-merchant-master/src/views/moblie/mPersonal.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
@@ -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
@@ -53,6 +53,20 @@
 						<image src="https://jy.scjysm.asia:18086/mefile/file/static/images/arrowRight.png"></image>
 					</view>
 				</view>
+				<scroll-view style="white-space: nowrap;width: 100%;" scroll-x="true">
+					<view style="display: inline-block;" v-for="item of 10" @click="couponshow = true">
+						<view class="couponItem u-skeleton-fillet flex-items" style="margin-right: 20rpx;width: 130rpx;" >
+							<view style="color: #FFEBC4;font-size: 22rpx;">
+								3折
+							</view>
+							<view style=" border-right: 2rpx dashed #fff;height: 20rpx;margin: 0 10rpx;"></view>
+							<view style="color: #fff;font-size: 22rpx;">
+								领取
+							</view>
+						</view>
+					</view>
+					
+				</scroll-view>
 			</view>
 			<view class="shopContent">
 				<view class="tabs-nav-warp">
@@ -162,6 +176,32 @@
 				</view>
 			</view>
 		</view>
+		<u-popup v-model="couponshow" mode="bottom" border-radius="14" @close="couponshow =false">
+			<view style="background: #f3f3f3;">
+				<view style="text-align: center;padding: 30rpx 0;">免费领</view>
+				<view style="height: 500rpx;overflow-y: scroll;padding: 0 30rpx;">
+					<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;">
+						<view style="display: flex;">
+							<view>
+								<image :src="storeInfo.shopLogo" style="width: 100rpx;height: 100rpx;"></image>
+							</view>
+							<view style="height: 100rpx;display: flex;flex-direction: column;justify-content: space-around;margin-left: 10rpx;">
+								<view style="font-size: 26rpx;">
+									<span style="color: red;margin-right: 5rpx;">￥2</span>
+									代金券
+								</view>
+								<view style="font-size: 22rpx;color: #909090;">
+									有效期2024.12.1
+								</view>
+							</view>
+						</view>
+						<view style="color: red;font-size: 26rpx;">领取</view>
+					</view>
+					
+				</view>
+				<view style="height: 10rpx;"></view>
+			</view>
+		</u-popup>
 	</view>
 </template>
  
@@ -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;
 	}
  
@@ -801,6 +801,4 @@ export default {
   text-align: center;
   background: rgba(0, 0, 0, 0.3);
 }
-
-
 </style>
@@ -666,6 +666,4 @@ export default {
   text-align: center;
   background: rgba(0, 0, 0, 0.3);
 }
-
-
 </style>