报名限制

components/cats/style44.vue

@@ -90,7 +90,10 @@
 										{{cx.freeShippingFullMoneyPinkage>0 && cx.freeShippingFullNumPinkage==0?cx.freeShippingFullMoneyPinkage+'元包邮':''}}
 										{{cx.freeShippingFullMoneyPinkage==0 && cx.freeShippingFullNumPinkage>0?cx.freeShippingFullNumPinkage+'件包邮':''}}
 									</view>
-									{{ cx.name }}
+									<view class="The-title">
+										{{ cx.name }}
+									</view>
+									
 									<view v-if="cx.edudata.ClassCondition.length>0" class="limit"  @touchstart="mouseover()" @touchend="mouseLeave()">
 										<u-icon name="lock" size="44" :color="mainColor" />
 										<view class="limit-box" v-show="limitShow">
@@ -201,7 +204,7 @@
 							</view>
 						</template>
 					</div>
-					<u-divider v-if="isover" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider>
+					<u-divider class="The-tail" v-if="isover" :margin-top="20" :margin-bottom="20">没有更多商品了</u-divider>
 				</scroll-view>
 			</div>
 			<template v-if="u&&u.TenantId==27">
@@ -303,7 +306,7 @@
 		methods: {
 			// 鼠标移进时间
 			mouseover(){
-				console.log('44444')
+				// console.log('44444')
 				this.limitShow = true
 			},
 			mouseLeave() {
@@ -548,7 +551,15 @@
 	};
 </script>
 
-<style>
+<style >
+	.The-tail .u-divider{
+		background-color: transparent !important;
+	}
+	.The-title{
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 	.limit{
 		/* position: relative; */
 	}
@@ -558,6 +569,8 @@
 		    font-size: 12px;
 		    color: #fff;
 		    background-color: rgba(0, 0, 0, 0.6);
+			padding: 10px;
+			    border-radius: 10rpx;
 	}
 	.good-namee2{
 		display: flex !important;

pages/cart/cart.vue

@@ -73,7 +73,18 @@
 											v-if="item.MarketingLogo.iswords&&item.MarketingLogo.iswords==2&& item.MarketingLogo.ico!=''"
 											mode="heightFix" :src="item.MarketingLogo.ico"
 											style=" height: 12px;margin-right: 5px" />
-										{{ item.GoodsName}}
+											<view class="The-box">
+												<view class="The-title">
+													{{ item.GoodsName}}
+												</view>
+												<view v-if="item.EduData.ClassCondition.length>0" class="limit"  @touchstart="mouseover()" @touchend="mouseLeave()">
+													<u-icon name="lock" size="44" :color="mc" />
+													<view class="limit-box" v-show="limitShow">
+														此课程有报名限制，请点击详情查看
+													</view>
+												</view>
+											</view>
+										
 									</view>
 									<view
 										style="width: 440rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;"
@@ -241,6 +252,7 @@
 	export default {
 		data() {
 			return {
+				limitShow:false,
 				isloading: false,
 				pageTitle: '购物车',
 				navHeight: 0,
@@ -321,6 +333,13 @@
 			});
 		},
 		methods: {
+			mouseover(){
+				// console.log('44444')
+				this.limitShow = true
+			},
+			mouseLeave() {
+				this.limitShow = false
+			},
 			remaining(i) {
 				this.$nextTick(function() {
 					i.show = !i.show
@@ -723,6 +742,26 @@
 </script>
 
 <style>
+	.limit{
+		/* position: relative; */
+	}
+	.limit-box{
+		position: absolute;
+		right: 0px;
+		font-size: 12px;
+		color: #fff;
+		background-color: rgba(0, 0, 0, 0.6);
+		padding: 10px;
+		    border-radius: 10rpx;
+	}
+	.The-box{
+		display: flex;
+	}
+	.The-title{
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
 	.rema {
 		display: flex;
 		flex-wrap: wrap;
@@ -899,6 +938,7 @@
 		width: 440rpx;
 		height: 150rpx;
 		margin-left: 20rpx;
+		position: relative;
 	}
 
 	.cartStyle .item-r-n2 {

pages/goods/goods.vue

@@ -170,7 +170,7 @@
 							 {{ index + 1 }}:{{ item.ItemName }}。
 						</text>
 						<view  v-if="ItemType5 && ItemType5.length > 0" class="box-title">
-							考试成绩:
+							只允许以下考试成绩报名:
 						</view>
 						<text v-for="(item, index) in ItemType5" class="box-name">
 							 {{ index + 1 }}:{{ item.ItemName }}({{item.LowScore}}-{{item.HighScore}})。

pages/order-submit/order-submit2.vue

@@ -536,7 +536,7 @@
 						if (res.data.Code != 1) {
 							that.limits = true
 							this.$refs.uToast.show({
-								title: '当前课程暂无法购买！',
+								title: res.data.Message,
 								type: 'warning'
 							});
 							uni.redirectTo({

pages/order/index/index.vue

@@ -323,6 +323,8 @@
 				this.Cancelmsg.OrderId = e.OrderId;
 				this.Cancelmsg.Type = e.OrderStatus == 1 ? 1 : 2;
 			},
+			
+			// 待付款立即支付
 			payment(e) {
 				let list =[]
 				this.payInfo.OrderId = e.OrderId;