产品样式兼容

App.vue

@@ -284,7 +284,7 @@
 	  } */
 	  } */
 	  
 	  
 	  /* iPad横屏 */
 	  /* iPad横屏 */
-	 @media (orientation: landscape) {
+	@media (orientation: landscape) {
 	    .container {
 	    .container {
 	      max-width: 1024px;
 	      max-width: 1024px;
 		  display: flex;
 		  display: flex;

components/commonPopup/everyJoinPopup.vue

@@ -76,6 +76,10 @@ export default {
 	maskClick: {
 	maskClick: {
 	  type: Boolean,
 	  type: Boolean,
 	  default: true
 	  default: true
+	},
+	showCanel: {
+	  type: Boolean,
+	  default: false
 	}
 	}
   },
   },
   methods: {
   methods: {

myPackageA/applyFranchise/applyFranchise.vue

@@ -92,6 +92,7 @@
 		  <everyJoinPopup 
 		  <everyJoinPopup 
 		    ref="everyJoinPopup"
 		    ref="everyJoinPopup"
 		    @continue="jumpPage"
 		    @continue="jumpPage"
+			:showCanel="false"
 		  />
 		  />
 		  <!-- 成功加盟为合伙人提示弹窗组件 -->
 		  <!-- 成功加盟为合伙人提示弹窗组件 -->
 		    <everyJoinPopup 
 		    <everyJoinPopup 
@@ -105,6 +106,7 @@
 			  :maskClick="false"
 			  :maskClick="false"
 			  icon="icon-dianzan"
 			  icon="icon-dianzan"
 			  iconSize='80rpx'
 			  iconSize='80rpx'
+			  :showCanel="true"
 		    />
 		    />
 	</view>
 	</view>
 </template>
 </template>

pages/courselist/courselist.vue

 <template>
 <template>
-	<view class="container" :style="{paddingTop: showFlag ? '0' : '60rpx'}">
+	<!-- :style="{paddingTop: showFlag ? '0' : '60rpx'}" -->
+	<view class="container" >
 		<view class="homeHeader" v-if="showFlag">
 		<view class="homeHeader" v-if="showFlag">
 			<view class="one">
 			<view class="one">
 				<text style="font-size: 80rpx;">01</text>
 				<text style="font-size: 80rpx;">01</text>
@@ -486,7 +487,6 @@
 			.productList{
 			.productList{
 				width: 100%;
 				width: 100%;
 				box-sizing: border-box;
 				box-sizing: border-box;
-				// margin-top: -2%;
 				background-color: #fff;
 				background-color: #fff;
 				padding: 20rpx;
 				padding: 20rpx;
 				border-radius: 10rpx;
 				border-radius: 10rpx;
@@ -572,6 +572,12 @@
 					border: none;
 					border: none;
 				}
 				}
 			}
 			}
+			/* 电脑端 */
+			 @media (min-width: 768px) {
+				.productList{
+					// padding-top: 60rpx;
+				}
+			 }
 		}
 		}
 		.descriptionBox {
 		.descriptionBox {
 			width: 510rpx;
 			width: 510rpx;
@@ -693,5 +699,46 @@
 			}
 			}
 		}
 		}
 	}
 	}
+	.container {
+	  padding-top: 60rpx;
+	  
+	  .homeHeader {
+	    padding-bottom: 100rpx;
+	    position: relative;
+	    z-index: 1;
+	  }
+	  
+	  .productBox {
+	    position: relative;
+	    z-index: 2;
+	    
+	    .productList {
+	      padding-top: 30rpx; // 改用padding-top
+	      margin-top: 0;
+	      
+	      .productItem {
+	        &:first-child {
+	          margin-top: 0;
+	        }
+	      }
+	    }
+	  }
+	}
 	
 	
+	/* iPad横屏特定适配 */
+	@media only screen 
+	  and (min-device-width: 768px) 
+	  and (max-device-width: 1024px) 
+	  and (orientation: landscape) {
+	  .container {
+	    .homeHeader {
+	      padding-bottom: 120rpx;
+	    }
+	    .productBox {
+	      .productList {
+	        padding-top: 50rpx;
+	      }
+	    }
+	  }
+	}
 </style>
 </style>
\ No newline at end of file