Merge branch 'master' of http://140.143.224.240:8100/hooloo/mp/user

components/menuAssembly/index.vue

@@ -356,7 +356,7 @@ export default {
 					font-size: 20rpx;
 					color: #999999;
 					font-family: Futura-Medium, Futura;
-					line-height: 26rpx;
+					line-height: 13rpx;
 					
 					.num {
 						text-decoration: line-through;

components/tabBar/tabBar.vue

@@ -91,7 +91,7 @@
 		display: flex;
 		align-items: center;
 		flex-direction: column;
-		width: 50rpx;
+		width: 100%;
 		height: 100%;
 	}
  

menuSubPackage/pages/goodsDetail/goodsDetail.vue

@@ -23,12 +23,11 @@
 					<view v-for="specItem in goodInfo.specs" :key="specItem.specId">
 						<view class="good-spec-name">{{ specItem.specName }}</view>
 						<view class="good-spec-rule">
-							<div v-for="specItemRule in specItem.rules" class="div_item" :key="specItemRule.ruleId">
+							<div v-for="specItemRule in specItem.rules" class="div_item" :key="specItemRule.ruleId" @click="selectRoles(specItemRule, specItem)">
 								<div v-if="specItemRule.isRecommend=='1'" :class="[UseIt(specItemRule.ruleId)?'disabledStyle':'']" class="default"></div>
 								<button class="good-spec-rule-item" :disabled="UseIt(specItemRule.ruleId)"
-									@click="selectRoles(specItemRule, specItem)"
 									:class="{ active: isActvie(specItemRule) }">
-									{{ specItemRule.ruleName }}
+									<view @click.prevent="checkSku(specItemRule)">{{ specItemRule.ruleName }}</view>
 								</button>
 							</div>
 						</view>
@@ -202,7 +201,19 @@ export default {
 
 			return selected
 		},
+		checkSku(specItemRule) {
+			const value = this.UseIt(specItemRule.ruleId)
+			if(value) {
+				this.showToast({ title: '该选项已售罄', icon: 'none' });
+				return
+			}
+		},
 		selectRoles(specItemRule, parent) {
+			const value = this.UseIt(specItemRule.ruleId)
+			if(value) {
+				this.showToast({ title: '该选项已售罄', icon: 'none' });
+				return
+			}
 			const { selected } = this;
 			selected.forEach((item, index) => {
 				if (item.specId == parent.specId) {
@@ -443,6 +454,7 @@ export default {
 			margin-right: 32rpx;
 			line-height: 48rpx;
 			min-width: 120rpx;
+			z-index: 999999;
 
 
 			.default {
@@ -477,6 +489,7 @@ export default {
 	border: none;
 	font-family: PingFangSC-Regular, PingFang SC;
 	background: #EAEAEA;
+	pointer-events: none;
 	&.active {
 		font-weight: 400;
 		padding: 7rpx 48rpx 6rpx 48rpx;
@@ -486,6 +499,9 @@ export default {
 		border: 0rpx;
 		font-family: PingFangSC-Regular, PingFang SC;
 	}
+	view {
+		pointer-events: none;
+	}
 }
 
 .good-spec-rule-item::after{

orderSubPackage/pages/orderInfo/index.vue

@@ -753,6 +753,12 @@ export default {
 			display: flex;
 			justify-content: flex-start;
 			align-items: center;
+			
+			span {
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #333333;
+			}
 		}
 		.icno-arrow{
 			width: 15.27rpx;