修改部分样式

components/goods/order-good-list.vue

@@ -35,7 +35,7 @@
 			v-if="y.marketingLogo.iswords&&y.marketingLogo.iswords==2&& y.marketingLogo.ico!=''"
 			  mode="heightFix"
 			  :src="y.marketingLogo.ico"
-			  style=" height: 14px;line-height: 14px;"
+			  style=" height: 11px"
 			/>
 		  {{ y.name }}</view>
 		  <view  style="margin-bottom: 5px;height: 20px;" v-if="y.freeShippingDescription!=null&&y.freeShippingDescription!=''">
@@ -140,4 +140,11 @@ export default {
 	line-clamp: 1;
 	-webkit-box-orient: vertical;
 }
+.ordergoodlist .Logo{
+	padding: 1px 5px;
+	display: inline-block;
+	font-size: 22rpx;
+	margin-right: 5rpx;
+	border-radius: 4px;
+}
 </style>

pages/cart/cart.vue

@@ -91,7 +91,7 @@
 									v-if="item.MarketingLogo.iswords&&item.MarketingLogo.iswords==2&& item.MarketingLogo.ico!=''"
 									  mode="heightFix"
 									  :src="item.MarketingLogo.ico"
-									  style=" height: 14px;line-height: 14px;"
+									  style=" height: 11px;"
 									/>
 									{{ item.GoodsName}}
 								</view>
@@ -329,7 +329,6 @@ export default {
 								x.GoodsList.forEach(j => {
 									
 									j.MarketingLogo = JSON.parse(j.MarketingLogo)
-									console.log(j.MarketingLogo)
 									j.checked = false;
 									j.id=j.Id;
 								});
@@ -437,10 +436,13 @@ export default {
 			this.TotalPrice = parseFloat(this.TotalPrice.toFixed(2));
 		},
 		mch_SelectAll(checked, i) {
+			console.log(this.list[i].GoodsList)
 			if (checked == true) {
 				let add_cartlist = [];
 				let new_statusnum = 0;
+				
 				this.list[i].GoodsList.forEach(x => {
+					
 					if (x.GoodsStatus == 1) {
 						if (x.checked == false) {
 							this.TotalPrice += parseFloat((x.Price * x.Number).toFixed(2));
@@ -485,10 +487,11 @@ export default {
 				let new_statusnum = 0;
 				this.list[i].GoodsList.forEach(x => {
 					if (x.GoodsStatus == 1) {
-						x.checked = false;
-						this.TotalPrice -= parseFloat((x.Price * x.Number).toFixed(2));
-
-						new_statusnum++;
+						if(x.checked == true){
+							this.TotalPrice -= parseFloat((x.Price * x.Number).toFixed(2));
+							new_statusnum++;
+							x.checked = false;
+						}
 					}
 					//编辑时候的商城全选
 					this.cart_id_list.forEach((z, m) => {
@@ -783,6 +786,10 @@ export default {
 	border-radius: 10px;
 }
 .cartStyle .Logo{
-	padding: 0 5px;display: inline-block;height: 40rpx;font-size: 20rpx;margin-right: 10rpx;line-height: 40rpx;
+	padding: 1px 5px;
+	display: inline-block;
+	font-size: 22rpx;
+	margin-right: 5rpx;
+	border-radius: 4px;
 }
 </style>

pages/goods/goods.vue

@@ -48,7 +48,7 @@
 					v-if="g.marketingLogo.iswords&&g.marketingLogo.iswords==2&& g.marketingLogo.ico!=''"
 					  mode="heightFix"
 					  :src="g.marketingLogo.ico"
-					  style=" height: 14px;"
+					  style=" height: 11px;"
 					/>
 				{{ g.name }}
 				</view>
@@ -787,6 +787,11 @@ export default {
 	right: 0;
 }
 .goods .Logo{
-	padding: 0 5px;display: inline-block;height: 40rpx;font-size: 20rpx;margin-right: 10rpx;line-height: 40rpx;
+	
+	padding: 1px 5px;
+	display: inline-block;
+	font-size: 22rpx;
+	margin-right: 5rpx;
+	border-radius: 4px;
 }
 </style>

pages/order-submit/order-submit.vue

@@ -38,7 +38,7 @@
 								v-if="y.marketingLogo.iswords&&y.marketingLogo.iswords==2&& y.marketingLogo.ico!=''"
 								  mode="heightFix"
 								  :src="y.marketingLogo.ico"
-								  style=" height: 14px;"
+								  style=" height: 11px;"
 								/>
 							{{ y.name }}</view>
 							<view class="attr">已选择：
@@ -874,6 +874,10 @@ button[disabled]{
 	width: 120px;
 }
 .ordersubmit .Logo{
-	padding: 0 5px;display: inline-block;height: 40rpx;font-size: 20rpx;margin-right: 10rpx;line-height: 40rpx;
+	padding: 1px 5px;
+	display: inline-block;
+	font-size: 22rpx;
+	margin-right: 5rpx;
+	border-radius: 4px;
 }
 </style>