Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

components/goods/style7.vue

@@ -33,7 +33,8 @@
 					  ></u-rate>
 					  <text class="good-rb-text">{{item.courseScore!=null &&item.courseScore>0?item.courseScore.toFixed(1):'5.0'}}分</text>
 					</view>
-					<view class="price" :style="{ color: mainColor }">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
+					<view class="price" :style="{ color: mainColor }" v-if="item.price>0">{{ goodsInfo.showGoodsPrice ? getPrice(item.price) : '' }}</view>
+					<view class="price" v-else style="font-size:13px;color:#999999">免费</view>
 					<view class="buy" v-if="goodsInfo.showBuyBtn" @click.stop="showSkuHandler(item)">
 						<u-icon name="cart-o" size="40" :color="mainColor" v-if="goodsInfo.buyBtn == 'cart'" />
 						<u-icon name="add-o" size="40" :color="mainColor" v-else-if="goodsInfo.buyBtn == 'add'" />
@@ -76,15 +77,23 @@ export default {
 			showSku: false,
 			sku: {},
 			showAuth: false,
-			u: {}
+			u: {},
+			IsEducation:1
 		};
 	},
 	created() {
 		this.mainColor = this.$uiConfig.mainColor;
+		this.IsEducation = uni.getStorageSync('basedata')
+		? (uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation?uni.getStorageSync('basedata').mall.setting.mallStyle.IsEducation:0) 
+		:0;
 	},
 	methods: {
 		openGood(item) {
-			uni.navigateTo({ url: '/pages/goods/goods?GoodsId=' + item.id });
+			if(this.IsEducation==1){
+				uni.navigateTo({ url: '/pages/school/courseInfo?GoodsId='+item.id });
+			}else{
+				uni.navigateTo({ url: '/pages/goods/goods?GoodsId='+item.id });
+			}
 		},
 		showSkuHandler(g) {
 			this.sku = g;

components/study/style1.vue

@@ -7,7 +7,7 @@
 			'paddingBottom':goodsInfo.PaddingBottom+'px'
 		}">
 		<div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{
-				borderRadius:goodsInfo.SearchFilletPX+'px'
+				borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'
 			}">
 			<image style="
           width: calc(100vw - 24px);
@@ -81,7 +81,6 @@
 		position: relative;
 		border: 1rpx solid transparent;
 		border-radius: 10rpx;
-		border: 1px solid rgb(226, 226, 226);
 		overflow: hidden;
 	}
 

components/study/style2.vue

@@ -10,7 +10,7 @@
 		}">
 			<u-row gutter="24">
 				<u-col span="6" v-for="(item, gli) in goodsInfo.list" :key="gli">
-					<view class="good_study_two" @click="openGood(item)" :style="{borderRadius:goodsInfo.SearchFilletPX+'px'}">
+					<view class="good_study_two" @click="openGood(item)" :style="{borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'}">
 						<view class="img-box">
 							<view class="img-show">
 								<image style="
@@ -86,7 +86,6 @@
 		border: 1rpx solid transparent;
 		border-radius: 10rpx;
 		overflow: hidden;
-		border: 1px solid rgb(226, 226, 226);
 		box-shadow: 0 4px 10px 1px #e6e5e5;
 		background-color: #fff;
 	}

components/study/style5.vue

@@ -9,7 +9,7 @@
 			'padding-bottom':goodsInfo.PaddingBottom+'px',
 			'padding-left':goodsInfo.PaddingLeft+'px',
 		}">
-			<view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX+'px'}" :key="gli">
+			<view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'}" :key="gli">
 				<view class="img-box">
 					<view class="img-show">
 						<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
@@ -88,7 +88,6 @@
 	width: 30%;
 	border-radius: 10rpx;
 	padding-bottom: 10rpx;
-	border:1px solid rgb(226, 226, 226);
 	overflow: hidden;
 }
 .her-scoller-study .good-five .tips {

components/study/style6.vue

@@ -14,8 +14,8 @@
 				</view>
 				<view class="good-info">
 					<view class="good-name" v-if="item.name">{{ item.name }}</view>
-					<view class="good-price-info" v-if="item.lableName">
-						<span class="price">{{ item.lableName }}</span>
+					<view v-if="item.lableName">
+						<span style="font-size:12px;">{{ item.lableName }}</span>
 					</view>
 				</view>
 			</view>
@@ -77,14 +77,14 @@
 		position: relative;
 		margin-bottom: 14px;
 		display: flex;
-		height: 102px;
-		border: 1px solid rgb(226, 226, 226);
 		border-radius: 10rpx;
 		box-sizing: border-box;
 		padding: 0 1px 1px 0;
 		overflow: hidden;
 	}
-
+	.good-four-study:last-child{
+		margin-bottom:0!important;
+	}
 	.good-four-study .tips {
 		width: 64rpx;
 		height: 64rpx;
@@ -95,12 +95,15 @@
 	}
 
 	.good-four-study .img-box {
-		width: 100px;
-		height: 100px;
+		width: 125px;
+		height: 70px;
+		border-radius: 4px;
+		overflow: hidden;
+		box-shadow: 0 4px 10px 1px #D2D2D2;
 	}
 
 	.good-four-study .good-info {
-		padding: 12px;
+		padding: 0 12px 12px 12px;
 		flex: 1;
 		width: 1rpx;
 		border: 10rpx;
@@ -112,7 +115,7 @@
 
 	.good-four-study .good-info .good-name {
 		font-size: 13px;
-		height: 34px;
+		margin-bottom:5px;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		display: -webkit-box;

components/studyArticle/style1.vue

@@ -7,7 +7,7 @@
 			'paddingBottom':goodsInfo.PaddingBottom+'px'
 		}">
 		<div v-for="(item, gli) in goodsInfo.list" :key="gli" class="good_study_one" @click="openGood(item)" :style="{
-				borderRadius:goodsInfo.SearchFilletPX+'px'
+				borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'
 			}">
 			<image style="
           width: calc(100vw - 24px);
@@ -79,7 +79,7 @@
 		position: relative;
 		border: 1rpx solid transparent;
 		border-radius: 10rpx;
-		border: 1px solid rgb(226, 226, 226);
+		/* border: 1px solid rgb(226, 226, 226); */
 		overflow: hidden;
 	}
 

components/studyArticle/style5.vue

@@ -9,7 +9,7 @@
 			'padding-bottom':goodsInfo.PaddingBottom+'px',
 			'padding-left':goodsInfo.PaddingLeft+'px',
 		}">
-			<view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX+'px'}" :key="gli">
+			<view class="good-five" @click="openGood(item)" v-for="(item, gli) in goodsInfo.list" :style="{borderRadius:goodsInfo.SearchFilletPX==0?10:goodsInfo.SearchFilletPX+'px'}" :key="gli">
 				<view class="img-box">
 					<view class="img-show">
 						<image style="width: 100%; height: 100%;" mode="aspectFill" :src="item.picUrl" />
@@ -85,9 +85,8 @@
 	position: relative;
 	margin-right: 12px;
 	width: 30%;
-	border-radius: 10rpx;
 	padding-bottom: 10rpx;
-	border:1px solid rgb(226, 226, 226);
+	/* border:1px solid rgb(226, 226, 226); */
 	overflow: hidden;
 }
 .her-scoller-study .good-five .tips {

components/studyArticle/style6.vue

@@ -80,30 +80,23 @@
 		position: relative;
 		margin-bottom: 14px;
 		display: flex;
-		height: 102px;
-		border: 1px solid rgb(226, 226, 226);
-		border-radius: 10rpx;
 		box-sizing: border-box;
 		padding: 0 1px 1px 0;
 		overflow: hidden;
 	}
-
-	.good-four-study .tips {
-		width: 64rpx;
-		height: 64rpx;
-		position: absolute;
-		top: 0;
-		left: 0;
-		z-index: 4;
+	.good-four-study:last-child{
+		margin-bottom:0!important;
 	}
-
 	.good-four-study .img-box {
-		width: 100px;
-		height: 100px;
+		width: 125px;
+		height: 70px;
+		border-radius: 4px;
+		overflow: hidden;
+		box-shadow: 0 4px 10px 1px #D2D2D2;
 	}
 
 	.good-four-study .good-info {
-		padding: 12px;
+		padding: 0 12px 12px 12px;
 		flex: 1;
 		width: 1rpx;
 		border: 10rpx;