auto commit

config/config.js

@@ -1,16 +1,19 @@
 const config = {
 	//dev 
-	apiBaseurl:'http://forest.hw.hongweisoft.com/data/forest-portal',//测试
+	// apiBaseurl:'http://forest.hw.hongweisoft.com/data/forest-portal',//测试
 	// 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',//东东
 	//本地图片
 	// imgUrl:'http://'+window.location.host,
 	// 图片占位
 	placeImg:'http://placekitten.com',
 	
 	// 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://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,

pages/product/product.css

@@ -17,6 +17,7 @@
 .placeoforigin-info-text{flex: 1;font-weight: 400;}
 .placeoforigin-info-text-til{font-size: 34rpx;line-height: 48rpx;color: #333;}
 .placeoforigin-info-text-con{font-size: 28rpx;color: #999;line-height: 40rpx;}
+.placeoforigin-info-text-product{overflow : hidden;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 5;-webkit-box-orient: vertical;}
 
 .placeoforigin-addr{font-size: 34rpx;font-weight: 400;color: #6BBC6D;line-height: 48rpx;}
 

pages/supplier/supplierdetail/supplierdetail.vue

@@ -3,7 +3,7 @@
 		<view class="supplierdetail">
 			
 			<view class="full-img-wrap">
-				<image class="full-img" v-if="firstcompanyimg" :src="firstcompanyimg|miniImg(75)+'/thumbnail/750x'" mode="widthFix"></image>
+				<image class="full-img" v-if="firstcompanyimg" :src="firstcompanyimg|miniImg(60)+'/thumbnail/750x'" mode="widthFix"></image>
 			</view>	
 			<view class="base-info">
 				<view class="base-info-til">{{companyinfo.compName}}</view>
@@ -58,7 +58,7 @@
 						简介：{{companyinfo.compSum}}
 					</view>
 					<view class="supplier-info-certificate">
-						<image v-for="(img,index) in companyimg" :key="index" :src="img.fileUrl|miniImg(75)+'/thumbnail/750x'" mode="widthFix"></image>
+						<image v-for="(img,index) in companyimg" :key="index" :src="img.fileUrl|miniImg(60)+'/thumbnail/750x'" mode="widthFix"></image>
 						<!-- <image class="image" src="../../../static/img/banner-supplierdetail.png" mode="widthFix"></image>
 						<image class="image" src="../../../static/img/banner-supplierdetail.png" mode="widthFix"></image> -->
 					</view>
@@ -72,7 +72,7 @@
 				<scroll-view scroll-x="true" class="scroll-X placeoforigin-scroll-view">
 					<view class="placeoforigin-wrap" :style="origines.length==1?{width:'auto',display:'block'}:''" v-for="(item,index) in origines" :key="index">
 						<view class="placeoforigin-banner">
-							<image class="placeoforigin-banner-img" :src="item.imgUrl||'/static/img/placeoforigin-banner.png'|miniImg(75)" mode="widthFix"></image>
+							<image class="placeoforigin-banner-img" :src="item.imgUrl||'/static/img/placeoforigin-banner.png'|miniImg(50)" mode="widthFix"></image>
 						</view>
 						<view class="placeoforigin-text">
 							<view class="placeoforigin-text-til">{{item.originName}}</view>
@@ -90,7 +90,7 @@
 			<!-- 生产地 end -->
 			<view class="results write-radius" v-if="products.length > 0">
 				<view v-for="(item,index) in products" :key="index" @click="productdetails(item.id)" class="results-item">
-					<view class="results-item-img-wrap"><image :src="item.pic|miniImg(75)" mode="aspectFit" class="results-item-img"></image></view>				
+					<view class="results-item-img-wrap"><image :src="item.pic|miniImg(50)" mode="aspectFit" class="results-item-img"></image></view>				
 					<view class="results-item-info">
 						<view class="results-item-info-til">{{item.name}}</view>
 						<view class="results-item-info-brand">{{item.brandName}}</view>

pages/usercenter/usercenter.vue

@@ -80,9 +80,7 @@
 				
 			}
 		},
-		onShow() {		
-		},
-		onLoad() {
+		onShow() {
 			this.thispage = `/pages/usercenter/usercenter`;
 			let serf = this;
 			let locationLocaturl = window.location.search;
@@ -153,6 +151,9 @@
 			// 	console.log('this.userinfo',JSON.parse(JSON.stringify(this.userinfo)));
 			// }).catch(err => {			
 			// });
+		},
+		onLoad() {
+			
 		},
 		methods: {
 			...mapMutations(['setLogin']),