拼团页面确认版

pages/activity/groupon/list.vue

@@ -1,13 +1,17 @@
 <!-- 拼团活动列表 -->
 <template>
-	<s-layout title="拼团列表" navbar="normal" :bgStyle="{ color: '#FE832A',backgroundColor: 'rgba(233,51,35)' }">
+  <s-layout navbar="inner" :bgStyle="{ color: '#FE832A' }">
-		<!-- <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]" /> -->
+    <view class="page-bg" :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]" />
     <view class="list-content">
       <!-- 参团会员统计 -->
       <view class="content-header ss-flex-col ss-col-center ss-row-center">
         <view class="content-header-title ss-flex ss-row-center">
-					<view v-for="(item, index) in state.summaryData.avatars" :key="index" class="picture"
+          <view
-						:style="index === 6 ? 'position: relative' : 'position: static'">
+            v-for="(item, index) in state.summaryData.avatars"
+            :key="index"
+            class="picture"
+            :style="index === 6 ? 'position: relative' : 'position: static'"
+          >
             <span class="avatar" :style="`background-image: url(${item})`" />
             <span v-if="index === 6 && state.summaryData.avatars.length > 3" class="mengceng">
               <i>···</i>
@@ -16,38 +20,45 @@
           <text class="pic_count">{{ state.summaryData.userCount || 0 }}人参与</text>
         </view>
       </view>
-			<scroll-view class="scroll-box" :style="{ height: pageHeight + 'rpx' }" scroll-y="true"
+      <scroll-view
-				:scroll-with-animation="false" :enable-back-to-top="true">
+        class="scroll-box"
+        :style="{ height: pageHeight + 'rpx' }"
+        scroll-y="true"
+        :scroll-with-animation="false"
+        :enable-back-to-top="true"
+      >
         <view class="goods-box ss-m-b-20" v-for="item in state.pagination.list" :key="item.id">
-					<s-goods-column class="" size="lg" :data="item" :grouponTag="true"
+          <s-goods-column
-						@click="sheep.$router.go('/pages/goods/groupon', { id: item.id })">
+            class=""
+            size="lg"
+            :data="item"
+            :grouponTag="true"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.id })"
+          >
             <template v-slot:cart>
               <button class="ss-reset-button cart-btn">去拼团</button>
             </template>
           </s-goods-column>
         </view>
-				<uni-load-more color="white" v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
+        <uni-load-more
+          v-if="state.pagination.total > 0"
+          :status="state.loadStatus"
+          :content-text="{
             contentdown: '上拉加载更多',
-          }" @tap="loadMore" />
+          }"
+          @tap="loadMore"
+        />
       </scroll-view>
     </view>
   </s-layout>
 </template>
 <script setup>
-	import {
+  import { reactive } from 'vue';
-		reactive
+  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-	} from 'vue';
-	import {
-		onLoad,
-		onReachBottom
-	} from '@dcloudio/uni-app';
   import sheep from '@/sheep';
   import CombinationApi from '@/sheep/api/promotion/combination';
 
-	const {
+  const { safeAreaInsets, safeArea } = sheep.$platform.device;
-		safeAreaInsets,
-		safeArea
-	} = sheep.$platform.device;
   const sysNavBar = sheep.$platform.navbar;
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   const pageHeight =
@@ -67,26 +78,19 @@
 
   // 加载统计数据
   const getSummary = async () => {
-		const {
+    const { data } = await CombinationApi.getCombinationRecordSummary();
-			data
-		} = await CombinationApi.getCombinationRecordSummary();
     state.summaryData = data;
   };
 
   // 加载活动列表
   async function getList() {
     state.loadStatus = 'loading';
-		const {
+    const { data } = await CombinationApi.getCombinationActivityPage({
-			data
-		} = await CombinationApi.getCombinationActivityPage({
       pageNo: state.pagination.pageNo,
       pageSize: state.pagination.pageSize,
     });
     data.list.forEach((activity) => {
-			state.pagination.list.push({
+      state.pagination.list.push({ ...activity, price: activity.combinationPrice });
-				...activity,
-				price: activity.combinationPrice
-			});
     });
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
@@ -118,44 +122,17 @@
     background: url('https://zysc.fjptzykj.com:3000/shangcheng/fea9ad54f32d4705a633874efd534e70e507030ea5a7604b0110fdf7292f1f4d.png');
     background-size: 100% 100%;
   }
-
   .list-content {
     position: relative;
     z-index: 3;
-		margin: 0 20rpx 0 20rpx;
+    margin: -190rpx 20rpx 0 20rpx;
     // background: #fff;
     border-radius: 20rpx 20rpx 0 0;
-
     .content-header {
       width: 100%;
       border-radius: 20rpx 20rpx 0 0;
-			height: 50rpx;
+      height: 100rpx;
-			margin: 10px 0;
+      background: linear-gradient(180deg, #fff4f7, #ffe4d1);
-			position: relative;
-
-			// background: linear-gradient(180deg, #fff4f7, #ffe4d1);
-			&::after {
-				content: '';
-				position: absolute;
-				right: 15%;
-				height: 1px;
-				width: 50px;
-				background: white;
-				top: 50%;
-				transform: translateY(-50%);
-			}
-
-			&::before {
-				content: '';
-				position: absolute;
-				left: 15%;
-				height: 1px;
-				width: 50px;
-				background: white;
-				top: 50%;
-				transform: translateY(-50%);
-			}
-
       .content-header-title {
         width: 100%;
         font-size: 30rpx;
@@ -163,7 +140,6 @@
         color: #ff2923;
         line-height: 30rpx;
         position: relative;
-
         .more {
           position: absolute;
           right: 30rpx;
@@ -219,7 +195,6 @@
           left: -2rpx;
           color: #fff;
           top: 2rpx;
-
           i {
             font-style: normal;
             font-size: 20rpx;
@@ -227,15 +202,12 @@
         }
       }
     }
-
     .scroll-box {
-			// margin-top: 13px;
+	  margin-top: 13px;
       height: 900rpx;
-
       .goods-box {
         position: relative;
 		    padding: 0 10px;
-
         .cart-btn {
           position: absolute;
           bottom: 10rpx;

pages/index/user.vue

@@ -3,20 +3,10 @@
 	<s-layout title="个人中心" tabbar="/pages/index/user" navbar="normal" :bgStyle="template.page"
 		:navbarStyle="template.navigationBar" onShareAppMessage>
 		
-
-		
-
-		<s-block class="" v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
-			<s-block-item style="" :class="item.id == 'UserOrder'? 'ss': ''" :type="item.id" :data="item.property" :styles="item.property.style" />
-		</s-block>
-		<view class="new-huiy" @click="
-			  sheep.$router.go('/pages/user/user_vip/index')
-			">
 		<image class="seckill" src="@/static/images/seckilbg.png"></image>
-			<view class="new-button">立即开通</view>
+		<s-block class="" v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
-			<img class="seckill1" mode="aspectFit"
+			<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
-				src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png" />
+		</s-block>
-		</view>
 	</s-layout>
 </template>
 
@@ -51,40 +41,13 @@
 	onPageScroll(() => {});
 </script>
 
-<style lang="scss" scoped>
+<style>
-	.new-huiy {
+	.new-main{
-		width: 100%;
-		height: 240px;
-		position: absolute;
-		top: 0;
-		.new-button {
-			background: white;
-			padding: 8px;
-			text-align: center;
-			position: absolute;
-			border-radius: 20px;
-			right: 29px;
-			bottom: 17px;
-			font-size: 14px;
-			color: rgba(148, 109, 45, 1);
-			// z-index: 33;
-		}
-
-		.seckill1 {
-			position: absolute;
-			bottom: 0;
-			// z-index: 22;
-			/* left: 50%; */
-			/* transform: translateX(-50%); */
-			width: 96%;
-			height: 72px;
-		}
-	}
-
-	/* .new-main {} */
 		
+	}
 	.seckill1 {
 		position: absolute;
+		top: 117px;
 		z-index: 22;
 		left: 50%;
 		transform: translateX(-50%);
@@ -99,11 +62,4 @@
 	view {
 		position: relative;
 	}
-	::v-deep .ss{
-		z-index: 99999;
-		&>view{
-			margin-top: 94px;
-		}
-	}
-	
 </style>

sheep/components/s-block-item/s-block-item.vue

@@ -40,8 +40,6 @@
 		<s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
 		<!-- 营销组件：秒杀 -->
 		<s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
-		<!-- 营销组件：积分商城 -->
-		<s-point-block v-if="type === 'PromotionPoint'" :data="data" :styles="styles" />
 		<!-- 营销组件：小程序直播（暂时没有这个功能） -->
 		<s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
 		<!-- 营销组件：优惠券 -->
@@ -68,7 +66,16 @@
 
 		<!-- 用户组件：用户卡片 -->
 		<s-user-card v-if="type === 'UserCard'" />
-		
+		<view v-if="type === 'UserOrder'" class="new-huiy"
+			@click="
+			  sheep.$router.go('/pages/user/user_vip/index')
+			"
+		>
+			<view class="new-button">立即开通</view>
+			<img class="seckill1" mode="aspectFit"
+				src="https://zysc.fjptzykj.com:3000/shangcheng/64776e2edc3c2f15295e7c3976ba301e08f9170f99a2e845d8f33bd65179b177.png"
+			/>
+		</view>
 		<!-- 用户组件：用户订单 -->
 		<s-order-card v-if="type === 'UserOrder'" :data="data" />
 		<!-- 用户组件：用户资产 -->
@@ -124,7 +131,30 @@
 	:deep(.uni-border-bottom){
 		  height:0;
 	}
-	
+	.new-huiy{
+		width:100%;
+		height:100px;
+		.new-button{
+			background:white;
+			padding:4px 8px;
+			text-align:center;
+			position: absolute;
+			border-radius: 20px;
+			right: 29px;
+			top: 37px;
+			font-size:14px;
+			color: rgba(148, 109, 45, 1);
+			z-index: 33;
+		}
+		.seckill1{
+			position: absolute;
+			    top: -71px;
+			    z-index: 22;
+			    /* left: 50%; */
+			    /* transform: translateX(-50%); */
+			    width: 94%;
+		}
+	}
 	
 	
 	.floxt {

sheep/components/s-user-card/s-user-card.vue

@@ -1,6 +1,6 @@
 <!-- 装修用户组件：用户卡片 -->
 <template>
-	<view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;">
+	<view class="ss-user-info-wrap ss-p-t-50" style="z-index: 9999;margin-top: 23px;">
 		<view class="ss-flex ss-col-center ss-row-between ">
 			<view class="left-box ss-flex ss-col-center ss-m-l-36">
 				<view class="avatar-box ss-m-r-24">

sheep/ui/su-navbar/su-navbar.vue

@@ -42,7 +42,7 @@
 					<image class="new-image" src="https://zysc.fjptzykj.com:3000/shangcheng/e0d70e9bac714465b87d22d19e30f3fb008dbcdea21842674b355340d6dedceb.png"></image>
 				</view> -->
 				<view v-if="tools === 'search'" class=""
-					:style="`width:${sheep.$platform.device.windowWidth - sheep.$platform.capsule.width - 37}px;display: flex;align-items: center;`"
+					:style="`width:${sheep.$platform.device.windowWidth - sheep.$platform.capsule.width - 30}px;display: flex;align-items: center;`"
 					@click="onSearch">
 					<slot name="center">
 						<uni-search-bar class="ss-flex-1 search-box" :radius="20" placeholder="请输入关键词"