lilei hai 8 meses
pai
achega
0a0d0a43f4

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pages/login/login.vue


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
pages/login/phoneLogin.vue


+ 5 - 2
pagesB/cart/productitem.vue

@@ -69,7 +69,7 @@
 					 <view class="choose-product-item-info">
 						<view class="choose-product-item-left-info-name flex align_center">
 							<view class="flex align_center rebate-tag">赠品</view>
-							<text :max-lines="1" overflow="ellipsis">{{item.productName}}</text>
+							<text class="text" :max-lines="1" overflow="ellipsis">{{item.productName}}</text>
 						</view>
 						<view class="choose-product-item-left-info-guige">
 							<text :max-lines="1" overflow="ellipsis">{{item.productCode}}</text>
@@ -329,10 +329,13 @@
 					margin: 0 5px 0 2px;
 					background: #ff0000;
 					color: #fff;
-					width: 40px;
 					display: flex;
 					justify-content: center;
 				}
+				.text{
+					width: 80%;
+					flex-grow: 1;
+				}
 			}
 		}
 	}

+ 9 - 13
pagesB/procureOrder.vue

@@ -18,8 +18,8 @@
 					<view class="title">
 						产品列表
 					</view>
-					<view>
-						共<text class="cText">{{total}}</text>款
+					<view v-if="info">
+						共<text class="cText">{{info.totalCategory}}</text>款
 					</view>
 				</view>
 				<view v-for="(item,dix) in partList" :key="item.id" class="item-list-box">
@@ -62,11 +62,11 @@
 							<u-image :src="item.giftObj.product.images+'?x-oss-process=image/resize,p_50'" border-radius="16" width="120" height="120" bg-color="#EBEBEB" ></u-image>
 						</view>
 						<view>
-							<view class="item-name flex align_center ellipsis-one">
+							<view class="item-name flex align_center">
 							  <view class="flex align_center rebate-tag">
 							  	赠品
 							  </view>
-							  <text>{{item.giftObj.product.productName}}</text>
+							  <text class="ellipsis-one">{{item.giftObj.product.productName}}</text>
 							</view>
 							<view class="item-nums ellipsis-one" v-if="item.giftObj.product&&item.giftObj.product.origCode">
 								<text style="color: #666;">{{item.giftObj.product.origCode}}</text>
@@ -182,16 +182,9 @@
 		  })
 	   },
 	   onUnload() {
-	   	this.$store.state.vuex_tempData = null
+			this.$store.state.vuex_tempData = null
 	   },
 	   computed: {
-		   totalNums(){
-			   let ret = 0
-			   this.partList.map(item => {
-				   ret += item.qty
-			   })
-			   return ret
-		   },
 		   totalPages(){
 			   return Math.ceil(this.total / this.pageSize)
 		   }
@@ -450,10 +443,13 @@
 				}
 			}
 			.rebate-tag{
-				width: 40px;
 				margin-left: 0;
 				margin-right: 5px;
 			}
+			.ellipsis-one{
+				flex-grow: 1;
+				width:80%;
+			}
 		}
 		.footer{
 			padding: 20upx 60upx;

+ 13 - 7
pagesB/shopiing/productDetail.vue

@@ -134,14 +134,14 @@
 				</view>
 				<view class="pupu-box gift-box" v-if="giftNum">
 					<view class="popu-content-img">
-						<image style="width: 50px; height: 50px;" mode="aspectFit" :src="detail.productMsg||'/static/def_imgs.png'"></image>
+						<image style="width: 58px; height: 58px;" mode="aspectFit" :src="detail.productMsg||'/static/def_imgs.png'"></image>
 					</view>
 					<view class="popu-content-info">
 						<view class="popu-content-info-title flex align_center">
 							<view class="flex align_center rebate-tag">
 								赠品
 							</view>
-							<text class="ellipsis-two">{{detail.productName}}</text>
+							<view class="ellipsis-two">{{detail.productName}}</view>
 						</view>
 						<view class="popu-content-box justify_between">
 							<view></view>
@@ -721,29 +721,35 @@
 				}
 				.gift-box{
 					padding-left: 8%;
-					margin-top: 10px;
+					margin-top: 0;
 					border-top: 1px solid #eee;
 					padding-top: 10px;
 					.popu-content-img{
-						width: 50px;
-						height: 50px;
+						width: 58px;
+						height: 58px;
 					}
 					.popu-content-info-title{
 						font-size: 12px;
 						color: #666;
 					}
 					.popu-content-box{
-						margin-top: 6px;
+						margin-top: 0;
+					}
+					.popu-content-num{
+						padding:5px 0;
 					}
 					.rebate-tag{
 						margin: 0 5px 0 0;
 						background: #ff0000;
 						color: #fff;
-						width: 40px;
 						flex-grow: 1;
 						display: flex;
 						justify-content: center;
 					}
+					.ellipsis-two{
+						width: 80%;
+						flex-grow: 1;
+					}
 				}
 				.popu-content-box{
 					display: flex;

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio