auto commit

common/css/common.css

@@ -112,6 +112,7 @@ uni-button[type=primary]{background-color: #6BBC6D;}
 .product-item-addr{font-size: 26rpx;font-weight: 400;color: #999;line-height: 37rpx;margin-bottom: 8rpx;}
 .product-item-price {font-size: 24rpx;font-weight: 400;color: #999;line-height: 33rpx;}
 .product-item-price .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;margin-right: 5rpx;}
+.product-item-price .price.noprice{font-size: 28rpx;}
 .product-item-price .rmb{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;margin-right: 8rpx;}
 .product-item-price {font-size: 24rpx;font-weight: 400;color: #999;line-height: 33rpx;}
 

config/config.js

@@ -4,8 +4,8 @@ const config = {
 	// apiBaseurl:'http://172.16.90.64:9098/forest-portal',//测试
 	// apiBaseurl:'http://172.16.90.50:9098/forest-portal',//邱波
 	// apiBaseurl:'http://172.16.90.3:9098/forest-portal',//邱波
-	apiBaseurl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal',//东东
-	// apiBaseurl:'http://wx.hw.hongweisoft.com/zddapi/forest-portal',//东东
+	// apiBaseurl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal',//东东
+	apiBaseurl:'http://wx.hw.hongweisoft.com/zddapi/forest-portal',//东东
 	//本地图片
 	// imgUrl:'http://'+window.location.host,
 	// 图片占位
@@ -13,14 +13,9 @@ const config = {
 	
 	// loginUrl:'http://tanhui.hongweisoft.com/forest-portal/wechat/h5/authorize?returnUrl=/',//登录后跳转到测试链接
 	// loginUrl:'http://forest.hw.hongweisoft.com/data/forest-portal/wechat/h5/authorize?returnUrl=/',//登录后跳转到测试链接
-	loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8081/#/',//登录后跳转到测试链接 东东
-	
-	// 密码授权令牌
-	// client_id:4,
-	// client_secret:'jO1XHQu0GytEdxJzNRFwcIeWmS57yCMBuA5P9yDo',
+	loginUrl:'http://wx.hw.hongweisoft.com/zddapi/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',//登录后跳转到测试链接 东东
 
 	
-	
 	//online 线上地址
 	// apiBaseurl:'http://hd.phpim.cn/',//线上
 	

pages/index/index.css

@@ -53,6 +53,7 @@
 .indexproduct .item-addr{font-size: 24rpx;font-weight: 400;color: #666;line-height: 33rpx;margin-bottom: 5rpx;}
 .indexproduct .item-price-info .rmb{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
 .indexproduct .item-price-info .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
+.indexproduct .item-price-info .price.noprice{font-size: 28rpx;}
 .indexproduct .item-price-info .unit{font-size: 24rpx;font-weight: 400;color: #999999;line-height: 33rpx;}
 
 

pages/index/index.vue

@@ -68,7 +68,11 @@
 							</view>
 							<view class="item-til f-ellipsis">{{item.name}}</view>							
 							<view class="item-addr f-ellipsis">{{item.umsCompanyInfo}}</view>
-							<view class="item-price-info"><text class="rmb">¥</text><text class="price">{{item.price}}</text><text class="unit" v-if="item.unit">/{{item.unit}}</text></view>
+							<view class="item-price-info">
+								<text class="rmb" v-if="item.price">¥</text>
+								<text class="price" :class="!item.price?'noprice':''">{{item.price||"暂无价格"}}</text>
+								<text class="unit" v-if="item.unit">/{{item.unit}}</text>
+								</view>
 						</view>						
 					</view> 
 				 </view>

pages/product/product.css

@@ -2,10 +2,12 @@
 .product-info-til{margin-bottom: 13rpx;font-size: 32rpx;font-weight: 500;color: #333333;line-height: 45rpx;font-weight: bold;}
 .product-info-brand{margin-bottom: 8rpx;font-size: 24rpx;font-weight: 400;color: #6BBC6D;line-height: 33rpx;}
 .product-info-brand .postage{margin-left: 16rpx;padding: 2rpx 14rpx;border-radius: 24rpx;font-size: 20rpx;font-weight: 400;color: #6BBC6D;line-height: 28rpx;background-color: #E1F2E2;}
-.product-info-item{display: flex;align-items: center;justify-content: space-between;margin-bottom: 8rpx;font-size: 26rpx;font-weight: 400;color: #999;line-height: 37rpx;}
+.product-info-item{/* display: flex; */align-items: center;justify-content: space-between;margin-bottom: 8rpx;font-size: 26rpx;font-weight: 400;color: #999;line-height: 37rpx;}
+.product-info-item .item{margin-bottom: 10rpx;margin-right: 20rpx;}
 .product-info-price{font-size: 24rpx;font-weight: 400;color: #999;line-height: 33rpx;}
 .product-info-price .rmb{margin-right: 10rpx;font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
 .product-info-price .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
+.product-info-price .price.noprice{font-size: 28rpx;}
 
 .block-til{display: flex;margin-bottom: 24rpx;justify-content: space-between;align-items: center;height: 90rpx;border-bottom: 1px solid #eee;}
 .block-til-left{font-size: 30rpx;font-weight: bold;line-height: 42rpx;color: #333;}

pages/product/product.vue

@@ -13,14 +13,14 @@
 			<view class="product-info-til">{{product.name}}</view>
 			<view class="product-info-brand">{{product.brandName}}<!-- <text class="postage">包邮</text> --></view>
 			<view class="product-info-item">
-				<text class="item">保质期：{{product.qualityGuaranteePeriod}}</text>
+				<text class="item">保质期：{{product.qualityGuaranteePeriod||"参考包装"}}</text>
 				<text class="item">生产日期：{{createTime}}</text>
-				<text class="item">包装：{{product.unit}}</text>
+				<text class="item" v-if="product.unit">包装：{{product.unit}}</text>
 			</view>
 			<view class="product-info-price">
-				<text class="rmb">¥</text>
-				<text class="price">{{product.price}}</text>
-				<text class="unit" v-if="product.unit">/{{product.unit}}</text>
+				<text class="rmb" v-if="product.price">¥</text>
+				<text class="price" :class="!product.price?'noprice':''">{{product.price||"暂无价格"}}</text>
+				<text class="unit" v-if="product.price&&product.unit">/{{product.unit}}</text>
 			</view>
 		</view>
 		<!-- 产品基本信息结束 -->

pages/supplier/supplierdetail/supplierdetail.css

@@ -43,6 +43,7 @@
 .results-item-info-label .postage{height: 24rpx;padding: 0 14rpx;margin-left: 16rpx;line-height: 24rpx;display: inline-block;font-size: 20rpx;background-color: #E1F2E2;border-radius: 12rpx;}
 .results-item-info-price .rmb{font-size: 28rpx;font-weight: 500;color: #FF5030;line-height: 40rpx;}
 .results-item-info-price .price{font-size: 36rpx;font-weight: 500;color: #FF5030;line-height: 50rpx;}
+.results-item-info-price .price.noprice{font-size: 28rpx;}
 .results-item-info-price .minsell{font-size: 24rpx;font-weight: 400;color: #999999;line-height: 33rpx;}
 
 

pages/supplier/supplierdetail/supplierdetail.vue

@@ -100,9 +100,9 @@
 						</view>
 						<view class="results-item-info-company">{{item.umsCompanyInfo}}</view>
 						<view class="results-item-info-price">
-							<text class="rmb">¥</text>
-							<text class="price">{{item.price}}</text>
-							<text class="unit">/{{item.unit}}</text>
+							<text class="rmb" v-if="item.price">¥</text>
+							<text class="price" :class="!item.price?'noprice':''">{{item.price||"暂无价格"}}</text>
+							<text class="unit" v-if="item.price&&item.unit">/{{item.unit}}</text>
 							<!-- <text class="minsell">4000斤起售</text> -->
 						</view>						
 					</view>

pages/usercenter/myfocus/myfocus.vue

@@ -13,7 +13,9 @@
 								<view class="product-item-brand">{{item.productBrand}} <text class="postage" v-if="item.postage">包邮</text></view>
 								<view class="product-item-addr">{{item.addr}}</view>
 								<view class="product-item-company">{{item.companyName}}</view>
-								<view class="product-item-price"><text class="rmb">¥</text> <text class="price">{{item.pmsProduct.price}}</text> / {{item.pmsProduct.unit}}</view>
+								<view class="product-item-price">
+									<text class="rmb" v-if="item.pmsProduct.price">¥</text> 
+									<text class="price" :class="!item.price?'noprice':''">{{item.pmsProduct.price||"暂无价格"}} / </text>{{item.pmsProduct.unit}}</view>
 							</view>
 						<!-- </uni-swipe-action-item> -->
 					</view>