Administrator 4 سال پیش
والد
کامیت
208d7dcfcb

+ 3 - 3
components/cm-module/productDetails/secondParameters.vue

@@ -17,11 +17,11 @@
 			<view class="content-td">出厂日期</view> 
 			<view class="content-th">{{product.fixedYears}}</view>
 		</view>
-		<view class="content-tr" v-if="product.showContactFlag==2">
+		<view class="content-tr" v-if="product.contactName!=''&& product.contactName!=null">
 			<view class="content-td">联系人</view> 
 			<view class="content-th">{{product.contactName}}</view>
 		</view>
-		<view class="content-tr" v-if="product.showContactFlag==2">
+		<view class="content-tr" v-if="product.contactMobile!=''&&product.contactMobile!=null">
 			<view class="content-td">联系方式</view> 
 			<view class="content-th">{{product.contactMobile}}</view>
 		</view>
@@ -43,7 +43,7 @@
 			<view class="content-th">{{product.maturityYears}}</view>
 		</view>
 		<view class="content-tr" v-if="product.secondHandType==2">
-			<view class="content-td">库存</view>
+			<view class="content-td">数量</view>
 			<view class="content-th">{{product.stock}}</view>
 		</view>
 		<view class="content-tr">

+ 2 - 3
components/cm-module/productDetails/secondRecommend.vue

@@ -35,8 +35,7 @@
 		props:{
 			queryProductid: {
 				// Unistars类型
-				type: Number,
-				default: 0
+				type: String,
 			}
 		},
 		components:{
@@ -58,8 +57,8 @@
 		},
 		methods:{
 			infoRecommend(id){
+				console.log(id)
 				this.SellerService.ProductRecommend({productId:id}).then(response =>{
-					console.log(response)
 					if( response.data && response.data.length > 0){
 						this.isEmpty = false
 						for (var i = 0, j = response.data.length; i < j; i += this.pageSize) {

+ 2 - 2
pages.json

@@ -538,7 +538,7 @@
 				},{
 					"path": "pages/form/form",
 					"style": {
-						"navigationBarTitleText": "发布商品"
+						"navigationBarTitleText": "发布二手"
 					}
 				},
 				{
@@ -551,7 +551,7 @@
 				{
 					"path": "pages/product/product-details",
 					"style": {
-						"navigationBarTitleText": "二手商品详情",
+						"navigationBarTitleText": "商品详情",
 						"enablePullDownRefresh":true
 					}
 				}

+ 19 - 6
second/pages/form/form.vue

@@ -27,7 +27,7 @@
 						  </view>
 						  <view class="linqi_text" v-show="secondParams.secondHandType==2">
 							  <view class="jiaobiao"></view>
-							  <p>临期产品是指临近保质期的产品,距离到期日最好在6个月以上</p>
+							  <p class="p">临期产品是指临近保质期的产品,距离到期日最好在6个月以上</p>
 						  </view>
 					 </view>
 					 <view class="row">
@@ -160,13 +160,13 @@
 						<view class="release-from">
 							<view class="label">商品图片</view>
 								<view class="release-input upload image uploadGoodsImages" >
-									<view class="upload-file" v-show="GoodsImagesList.length<5">
+									<view class="upload-file" v-if="GoodsImagesList.length<5">
 										<i class="iconfont icon-shangchuantupian"></i>
 										<p class="add-text">商品图片</p>
 										<view ref="goodsImages" class="input-file"  @click="uploadGoodsImagesFn"></view>
 									</view>
-									<view class="upload-file"  v-for="(item, index) in GoodsImagesList" :key="index">
-										<img :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" >
+									<view class="upload-file" v-for="(item, index) in GoodsImagesList" :key="index">
+										<image :data-original='item' :src="item" :data-image="item" alt="" class="upload-img" ></image>
 										<i class=" del iconfont icon-shanchu1" @click="removeGoodsImagesFn(index)"></i>
 									</view>
 								</view>
@@ -179,7 +179,14 @@
 						<view class="productinfo">
 							 <view class="label unlogin-label" style="width: 100%;">商品详细信息</view>
 							 <div class="textarea-wrapper">
-								 <textarea maxlength="200" v-model="secondParams.productDetails"  cols="70" class="description" rows="6"  placeholder="请填写商品详细信息,对商品进行更详细的描述"  placeholder-class="placeholder"></textarea>
+								 <textarea 	class="textarea"
+								 			type="text" 
+								 			v-model="secondParams.productDetails" 
+								 			placeholder="请填写商品详细信息,对商品进行更详细的描述" 
+								 			placeholder-class="placeholder"
+								 			maxlength="200"
+								 			@input="onTextareaInputInfo"
+								 />
 								 <span class="word-limit">{{secondParams.productDetails.length}}/200</span>
 							 </div>
 						</view>
@@ -299,6 +306,9 @@
 			}
 		},
 		methods:{
+			onTextareaInputInfo(e){
+			   this.secondParams.productDetails = e.detail.value;
+			},
 			radioChange(e){//品牌
 				this.secondParams.brandID = e.target.value;
 				this.BrandList.forEach((item,index)=>{
@@ -516,7 +526,7 @@
 		.Secondary{margin-left: 161rpx;}
 		.secondradio view.active {color: #e15616;}
 		.placeholder{color: #b2b2b2;}
-		.linqi_text { width: 100%; height: 68rpx;background-color: #1890f9;box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);text-align: center;
+		.linqi_text { width: 607rpx; height: 68rpx;background-color: #1890f9;box-shadow: 0rpx 4rpx 6rpx 0rpx rgba(24, 144, 249, 0.17);text-align: center;
 		    line-height: 68rpx;color: #ffffff;margin: auto;font-size:24rpx;position: relative;}
 		.jiaobiao {width: 0;height: 0;border-left: 20rpx solid transparent;border-right: 20rpx solid transparent;top: -25%;
 		    right: 40%;border-bottom: 20rpx solid #1890f9;position: absolute;}
@@ -542,6 +552,9 @@
 			}
 			.row-input{margin-right: 10rpx;}
 		}
+		.linqi_text .p{
+			font-size: $font-size-20;
+		}
 		.upload-file {
 		    position: relative;
 		    float: left;

+ 25 - 26
second/pages/product/product-details.vue

@@ -65,14 +65,14 @@
 								<view class="label-a tui-skeleton-fillet" v-for="(label,index) in  product.tagsList" :key="index">{{label}}</view>
 							</view>
 						</view>
-					</view>			
-				</view>
-				<view class="product-seve">
-					<text class="title">服务:</text>
-					<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">无忧退货</text></text>
-					<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">快速退款</text></text>
-					<text class="iconfont icon-dui tui-skeleton-rect"><text class="text">正品保证</text></text>
+					</view>	
+						<view class="product-seve">
+							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">无忧退货</text></text>
+							<text class="iconfont icon-wuyoutuihuoi tui-skeleton-rect"><text class="text">快速退款</text></text>
+							<text class="iconfont icon-wuyoutuihuo tui-skeleton-rect"><text class="text">正品保证</text></text>
+						</view>
 				</view>
+				
 				<view class="product-parameter" @click="showPopup">
 					<text class="title">参数:</text>
 					<text class="name">品牌  起订量  分类...</text>
@@ -114,7 +114,7 @@
 					<view class="title-tab">相关推荐</view>
 				</view>
 				<view class="content hot">
-					<recommend :query-productid="product.productID" ></recommend>
+					<recommend :query-productid="product.productID" v-if="isRequest" ></recommend>
 				</view>
 			</view>	
 				</view> 
@@ -234,8 +234,9 @@
 					this.product = response.data
 					//处理商品图片列表
 					this.product.imageList.forEach(item =>{
-						this.productImage.push(item.image);
+						this.productImage.push(item);
 					})
+					this.isRequest = true
 				}).catch(error =>{
 					this.$util.msg(error.msg,2000);
 				})
@@ -378,7 +379,7 @@
 		height: 80rpx;
 		box-sizing: border-box;
 		padding: 0 24rpx;
-		background: #ffe6dc;
+		background: #fff;
 		z-index: 10;
 		display: flex;
 		position: fixed;
@@ -461,14 +462,12 @@
 		height: auto;
 		padding: 24rpx 0 0 0;
 		background-color: #FFFFFF;
-		border-bottom: 20rpx solid #F7F7F7;
 		.wrap-top{
 			width: 702rpx;
 			padding: 0 24rpx;
 			height: auto;
 			float: left;
 			padding-bottom:20rpx;
-			border-bottom: 1px solid #F8F8F8;
 			&.none{
 				.p-title{
 					color:#999999
@@ -480,18 +479,18 @@
 				float: left;
 				.p-title-name{
 					width:602rpx;
-					height: 96rpx;
+					// height: 96rpx;
 					float: left;
-					line-height: 42rpx;
+					line-height: 46rpx;
 					font-size: $font-size-34;
 					color: $text-color;
-					-o-text-overflow: ellipsis;
-					text-overflow: ellipsis;
-					display: -webkit-box;
-					word-break: break-all;
-					-webkit-box-orient: vertical;
-					-webkit-line-clamp: 2;
-					overflow: hidden;
+					// -o-text-overflow: ellipsis;
+					// text-overflow: ellipsis;
+					// display: -webkit-box;
+					// word-break: break-all;
+					// -webkit-box-orient: vertical;
+					// -webkit-line-clamp: 2;
+					// overflow: hidden;
 				}
 				.p-title-share{
 					width: 96rpx;
@@ -733,13 +732,13 @@
 			color: $text-color;
 		}
 		.iconfont{
-			color: #999999;
-			margin-right: 20rpx;
+			color: #fea785;
+			margin-right: 40rpx;
 			font-size: $font-size-26;
 		}
 		.text{
 			font-size: $font-size-26;
-			color: #999999;
+			color: #fea785;
 			margin-left: 10rpx;
 		}
 	}
@@ -756,7 +755,7 @@
 			display: inline-block;
 			float: left;
 			font-size: $font-size-28;
-			color: $text-color;
+			color: #666666;
 		}
 		.name{
 			float: right;
@@ -764,7 +763,7 @@
 			display: inline-block;
 			float: left;
 			font-size: $font-size-28;
-			color: #999999;
+			color: $text-color;
 			float: right;
 			padding-right: 48rpx;
 			overflow: hidden;

+ 5 - 5
second/pages/product/product-list.vue

@@ -72,7 +72,7 @@
 		            <view class="no-content" v-show="showflag" :class="showflag?'show':''">
 		                <image src="http://static-b.caimei365.com/app/img/bg/kong_m.png"  />
 		                <view class="error-message">
-		                    <view>此分类下面没有商品,换其它分类瞅瞅</view>
+		                    <view>该分类下面没有商品,请更换其它分类</view>
 		                </view>
 		            </view>
 		        </view>
@@ -403,12 +403,12 @@
 		text-align: center;
 		top: 50%;
 		position: absolute;
+		image{
+			width: 306rpx;
+			height: 212rpx;
+		}
 
 	}
-	.no-content img{
-		width: 306rpx;
-		height: 212rpx;
-	}
 	.error-message{
 		font-size: 24rpx;
 		color: #b2b2b2;