样式修改

components/cats/style11.vue

@@ -59,8 +59,12 @@
 				</scroll-view>
 			</view>
 		</view>
-		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+			<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		</template>
+		<template v-else>
+			<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		</template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>

components/cats/style4.vue

@@ -9,8 +9,7 @@
 					<image mode="aspectFit" :src="d[tid].advert_url" style="width: 100%; height: 100%;" />
 				</div>
 				<div class="good" v-for="(cx, ci) in g" :key="ci" @click="clickHandler(cx)">
-				<!-- 	新加div -->
-					<view class="cent-box">
+				<!-- 	新加div -->					<view class="cent-box">
 						<div class="good-img" style="position: relative;">
 							<image mode="aspectFit" :src="cx.cover_pic" style="width: 100%; height: 100%;">
 								<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/plugins-out.png" v-if="cx.totalStock==0"
@@ -81,8 +80,12 @@
 				<u-divider v-if="isover" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider>
 			</scroll-view>
 		</div>
-		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+			<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		</template>
+		<template v-else>
+			<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		</template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>

components/cats/style8.vue

@@ -57,8 +57,12 @@
 				</scroll-view>
 			</view>
 		</view>
-		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+			<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		</template>
+		<template v-else>
+			<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		</template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>

components/educationteacher/style1.vue

@@ -42,8 +42,12 @@
 				
 		
 		</view>
-		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+	<template v-if="u&&u.TenantId==27">
+		<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+	</template>
+	<template v-else>
+		<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+	</template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>

components/goods/list.vue

@@ -23,22 +23,49 @@
 						</view>
 						{{ cx.name }}
 					</view>
-					<view class="goodsSubName" v-if="setting&&setting.is_show_korea==1">
-						卖点：<text v-if="cx.subName">{{cx.subName}}</text>
+					<!-- 新增时间次数 -->
+					<view class="good-name2" v-if="cx.edudata.ClassTime&&u.TenantId==27" style="height: auto;">
+						{{cx.edudata.ClassTime}}
 					</view>
-					<view class="good-info" v-if="setting&&setting.is_show_korea==0">
-						<view class="price" :style="{ color: mainColor }">￥{{cx.price}}</view>
-						<view class="sell">{{ cx.sales }}</view>
-						<view v-if="setting.is_show_cart==1" class="cart" @click.stop="showSkuHandler(cx)">
-							<u-icon name="cart-o" size="40" :color="mainColor" />
+					<view class="good-name2" v-if="cx.edudata.ClassNum&&u.TenantId==27" style="height: auto;">
+						{{cx.edudata.ClassNum}}次
+					</view>
+					<view v-if="u.TenantId==27" class="Teachers">
+						<view class="portrait-box">
+							<image v-if="cx.edudata.TeacherIcon" class="portrait" mode="aspectFit" :src="cx.edudata.TeacherIcon"  />
+							   <view v-if="cx.edudata.TeacherName" class="sell2">{{cx.edudata.TeacherName}}</view>
+						</view>
+						<view class="goodsSubName" v-if="setting&&setting.is_show_korea==1">
+							卖点：<text v-if="cx.subName">{{cx.subName}}</text>
+						</view>
+						<view class="good-info2" v-if="setting&&setting.is_show_korea==0">
+							<view class="price2" :style="{ color: mainColor }">￥{{cx.price}}</view>
+							<!-- <view v-if="u.TenantId!=27" class="sell">{{ cx.sales }}</view> -->
+							<view v-if="setting.is_show_cart==1" class="cart2" @click.stop="showSkuHandler(cx)">
+								<u-icon name="cart-o" size="40" :color="mainColor" />
+							</view>
 						</view>
 					</view>
+					<!-- 新增时间次数 -->
+					<template v-if="u.TenantId!=27">
+						<view class="good-info" v-if="setting&&setting.is_show_korea==0">
+							<view class="price" :style="{ color: mainColor }">￥{{cx.price}}</view>
+							<view v-if="u.TenantId!=27" class="sell">{{ cx.sales }}</view>
+							<view v-if="setting.is_show_cart==1" class="cart" @click.stop="showSkuHandler(cx)">
+								<u-icon name="cart-o" size="40" :color="mainColor" />
+							</view>
+						</view>
+					</template>
 				</view>
 			</u-col>
 		</u-row>
 		<!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
-		<good-sku v-if="showSku&&!u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+		            <good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		        </template>
+		        <template v-else>
+		            <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		        </template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>
@@ -123,6 +150,54 @@
 </script>
 
 <style>
+	.Teachers{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+ .cart2 {
+		width: 40rpx;
+		text-align: right;
+	}
+	.price2 {
+		font-size: 14px;
+		color: #ff4544;
+		flex: 1;
+		margin-right: 20rpx;
+	}
+	.good-info2{
+		display: flex;
+		    /* margin: 7px 10px; */
+		    margin-top: 0;
+		    align-items: flex-end;
+			align-items: center;
+		    /* padding-bottom: 5px; */
+		  /*  max-width: 88rpx; */
+	}
+	.portrait-box{
+		display: flex;
+		align-items: center;
+	}
+	.portrait{
+		width: 50rpx;
+		height: 50rpx;
+		border-radius: 50%;
+		margin-right: 20rpx;
+	}
+	.sell2{
+		font-size: 12px;
+		color: gray;
+	}
+	.good-name2{
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+		margin-bottom: 3px;
+		font-size: 13px;
+		margin: 7px 10px;
+	}
 	.u-good-list .good {
 		background: #fff;
 		border-radius: 10px;
@@ -161,7 +236,7 @@
 	}
 
 	.u-good-list .good .good-name {
-		height: 37px;
+		max-height: 37px;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;

pages/goods/goods.vue

@@ -416,9 +416,17 @@
 			<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku" :mask-close-able="true"
 				:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
 			</goodsku>
-			<goodsku2 v-if="!loading && showSku&&u.TenantId==27" border-radius="10" v-model="showSku" :mask-close-able="true"
-				:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
-			</goodsku2>
+	
+			<template v-if="u&&u.TenantId==27">
+					<goodsku2 v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
+						:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
+					</goodsku2>
+					</template>
+					<template v-else>
+						<goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
+							:safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen">
+						</goodsku>
+					</template>
 		</view>
 		<u-empty text="没有找到商品，或商品已下架" mode="favor" v-if="!isExsitGoods"></u-empty>
 		<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising"

pages/order-submit/order-submit2.vue

@@ -455,7 +455,6 @@
 							this.Thename2 =  res.data.Data[0].StuName
 							this.JJSWStuId = res.data.Data[0].StuId
 						}
-
 					}
 				);
 			},

pages/pintuan/components/pingtuan/style1.vue

@@ -65,8 +65,12 @@
       </div>
     </div>
     <!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
-	<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-	<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+	<template v-if="u&&u.TenantId==27">
+		<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+	</template>
+	<template v-else>
+		<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+	</template>
     <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
   </div>
 </template>

pages/pintuan/components/pingtuan/style2.vue

@@ -75,8 +75,12 @@
     </u-row>
 
     <!-- <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> -->
-	<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-	<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+	<template v-if="u&&u.TenantId==27">
+		<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+	</template>
+	<template v-else>
+		<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+	</template>
     <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
   </view>
 </template>

pages/pintuan/components/pingtuan/style3.vue

@@ -74,8 +74,12 @@
       </u-col>
     </u-row>
     <!-- <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> -->
-	<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-	<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+	<template v-if="u&&u.TenantId==27">
+		<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+	</template>
+	<template v-else>
+		<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+	</template>
     <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
   </div>
 </template>

pages/pintuan/components/pingtuan/style4.vue

@@ -48,8 +48,12 @@
 			</view>
 		</view>
 		<!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
-		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+			<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		</template>
+		<template v-else>
+			<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		</template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>

pages/pintuan/components/pingtuan/style5.vue

@@ -52,8 +52,12 @@
 			</view>
 		</view>
 		<!-- <good-sku v-if="showSku" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku> -->
-		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+			<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		</template>
+		<template v-else>
+			<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		</template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>

pages/pintuan/components/pingtuan/style6.vue

@@ -48,8 +48,12 @@
 			</view>
 		</view>
 		<!-- <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku> -->
-		<good-sku v-if="showSku&&u.TenantId!=27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" :option-type="2" borderRadius="20" v-model="showSku" :good="sku"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+			<good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		</template>
+		<template v-else>
+			<good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
+		</template>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
 	</view>
 </template>

pages/pintuan/tuangood.vue

@@ -134,10 +134,17 @@
 			<u-skeleton v-if="loading" :loading="true" :animation="true" bgcolor="#FFF"></u-skeleton>
 			<goodsaction v-if="!loading" :good-name="g.name" :cover-pic="g.cover_pic" :favorite="g.favorite" :good-id="id"
 			 :total-stock="g.totalStock" :status="g.status" @joincar="joinCar" @buy="buy"></goodsaction>
-			<goodsku v-if="!loading && showSku&&u.TenantId!=27" border-radius="10" v-model="showSku" :mask-close-able="true"
-			 :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen"></goodsku>
-			 <goodsku2 v-if="!loading && showSku&&u.TenantId==27" border-radius="10" v-model="showSku" :mask-close-able="true"
-			  :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen"></goodsku2>
+			 
+			 <template v-if='u&&u.TenantId==27'>
+				 <goodsku2 v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
+				  :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen"></goodsku2>
+			 </template>
+			 <template v-else>
+				 <goodsku v-if="!loading && showSku" border-radius="10" v-model="showSku" :mask-close-able="true"
+				  :safe-area-inset-bottom="true" :good="g" :option-type="ot" :skued="currentSku" @close="closeSkuChosen"></goodsku>
+			 </template>
+			
+			
 		</view>
 		<u-empty text="没有找到商品，或商品已下架" mode="favor" v-if="!isExsitGoods"></u-empty>
 		<share :good-id="id" v-if="showShare" :good-name="g.name" :images="g.pic_url" :advertising="g.advertising" @close="closeShare"></share>

pages/video/index.vue

@@ -140,16 +140,19 @@
 				<u-icon name="arrow-left" size="48" color="#fff"></u-icon>
 			</view>
 		</view>
-		<swiper :indicator-dots="false" :duration="200" :vertical="true" :current="videoIndex" @change="handleSlider" :style="{'height':swiperHeight}">
+		<swiper :indicator-dots="false" :duration="200" :vertical="true" :current="videoIndex" @change="handleSlider"
+			:style="{'height':swiperHeight}">
 			<block v-for="(item,index) in vlist" :key="index">
 				<swiper-item>
 					<view class="uni_vdplayer">
-						<video :id="'myVideo' + index" :ref="'myVideo' + index" class="player-video" :loop="true" :show-progress="true"
-						 :controls="false" :show-center-play-btn="false" :src="item.video_url" :autoplay="index==videoIndex" :objectFit="getVideoHeight(item.VideoType)" />
+						<video :id="'myVideo' + index" :ref="'myVideo' + index" class="player-video" :loop="true"
+							:show-progress="true" :controls="false" :show-center-play-btn="false" :src="item.video_url"
+							:autoplay="index==videoIndex" :objectFit="getVideoHeight(item.VideoType)" />
 					</view>
 					<!-- 中间播放按钮 -->
 					<view class="vd-cover flexbox" @click="handleClicked(index)">
-						<image v-if="!isPlay" style="width:74px;height:74px;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_pause.png"></image>
+						<image v-if="!isPlay" style="width:74px;height:74px;"
+							src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_pause.png"></image>
 					</view>
 				</swiper-item>
 			</block>
@@ -171,23 +174,35 @@
 								</view>
 							</view>
 							<view class="video_cha" @click="isShowInfo=false">
-								<image style="width:100%;height:100%;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_close.png"></image>
+								<image style="width:100%;height:100%;"
+									src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_close.png">
+								</image>
 							</view>
 						</view>
 					</view>
 					<view class="video_Tra"></view>
 				</template>
-				<image class="good_Detail" @click="getShowInfo()" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_goods.png"></image>
+				<image class="good_Detail" @click="getShowInfo()"
+					src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_goods.png"></image>
 			</view>
-			<image class="good_other" @click="goHome()" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_home.png"></image>
-			<image class="good_other" @click="getBuy()" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_buy.png"></image>
+			<image class="good_other" @click="goHome()"
+				src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_home.png"></image>
+			<image class="good_other" @click="getBuy()"
+				src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_buy.png"></image>
 			<button class="v_fx" open-type="share">
-				<image style="height:100%;width: 100%;" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_share.png"></image>
+				<image style="height:100%;width: 100%;"
+					src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/v_share.png"></image>
 			</button>
 		</view>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth="gbAuth"></auth>
-		<good-sku v-if="showSku&&u.TenantId!=27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku>
-		<good-sku2 v-if="showSku&&u.TenantId==27" borderRadius="20" v-model="showSku" :good="sku" :option-type="2"></good-sku2>
+		<template v-if="u&&u.TenantId==27">
+			            <good-sku2 v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2">
+			</good-sku2>
+			        </template>
+		        <template v-else>
+			            <good-sku v-if="showSku" borderRadius="20" v-model="showSku" :good="sku" :option-type="2">
+			</good-sku>
+			        </template>
 	</view>
 </template>
 <script>
@@ -433,4 +448,4 @@
 			this.nav = uni.getMenuButtonBoundingClientRect().top;
 		},
 	}
-</script>
\ No newline at end of file
+</script>