auto commit

config/config.js

@@ -6,7 +6,7 @@ const config = {
 	// 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/fqb/forest-portal',//东东
+	// apiBaseurl:'http://wx.hw.hongweisoft.com/fqb/forest-portal',//东东
 		
 	//本地图片
 	// imgUrl:'http://'+window.location.host,
@@ -16,13 +16,14 @@ 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=http://forest.hw.hongweisoft.com/#/',//登录后跳转链接
 	// loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',//登录后跳转到测试链接 东东
-	loginUrl:'http://wx.hw.hongweisoft.com/fqb/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',//登录后跳转到测试链接 东东
+	// loginUrl:'http://wx.hw.hongweisoft.com/fqb/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',//登录后跳转到测试链接 东东
 	// loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://foresth5test.hw.hongweisoft.com/#/',//登录后跳转到测试链接 东东
 	// loginUrl:'http://wx.hw.hongweisoft.com/zddtest/forest-portal/wechat/h5/authorize?returnUrl=http://wx.hw.hongweisoft.com/gcz/#/',//登录后跳转到测试链接 东东
 
 	// 公司测试配置
-	// apiBaseurl:'http://forest.hw.hongweisoft.com/data/forest-portal',//测试
-	// loginUrl:'http://forest.hw.hongweisoft.com/data/forest-portal/wechat/h5/authorize?returnUrl=http://forest.hw.hongweisoft.com/#/',//登录后跳转到测试链接
+	apiBaseurl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal',//测试
+	// loginUrl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',
+	loginUrl:'http://wx.hw.hongweisoft.com/forestapi/forest-portal/wechat/h5/authorize?returnUrl=http://wx.hw.hongweisoft.com/hhforest/',//登录后跳转到测试链接
 	
 	
 	//online 线上配置

pages/index/index.vue

@@ -66,7 +66,7 @@
 			<scroll-view class="supplier-list" scroll-x="true">
 				<view class="" style="padding: 0 16rpx 24rpx;">
 				<view class="suppliers">
-					<view class="supplier-list-item" v-for="(item,index) in supplierList" @click="supplierclick(item.id)" >
+					<view class="supplier-list-item" v-for="(item,index) in supplierList" :key="item.id" @click="supplierclick(item.id)" >
 						<view class="supplier-list-item-img">
 							<image v-if="item.files[0]" :src="item.files[0].fileUrl ||'/static/img/defaultsupplierlogo.png'" class="img" mode="aspectFit"></image>
 							<image v-else src="/static/img/defaultsupplierlogo.png" class="img" mode="scaleToFill"></image>
@@ -445,7 +445,8 @@
 					this.rollbuylist = [];
 					for(let item in list){
 						// console.log('item',list[item])
-						this.rollbuylist.push(list[item].memberName.replace(/.(?=.)/g, '*')+' 购买了 '+list[item].productName+' 价值 '+list[item].money+'元')
+						// this.rollbuylist.push(list[item].memberName.replace(/.(?=.)/g, '*')+' 购买了 '+list[item].productName+' 价值 '+list[item].money+'元');
+						this.rollbuylist.push(list[item].memberName.replace(/.(?=.)/g, '*')+' 购买了 '+list[item].productName);
 					}
 					this.showbuy();
 					// console.log('this.rollbuylist',this.rollbuylist)

pages/product/product.vue

@@ -84,12 +84,12 @@
 		</view>
 		<!-- 产品介绍 end -->
 		<!-- 推荐产品 end -->
-		<view class="write-radius recommend wrap">
+		<view class="write-radius recommend wrap" v-if="recommendList.length>0">
 			<view class="block-til">
 				<view class="block-til-left">推荐产品</view>
 			</view>
 			<view class="recommend-list">
-				<view class="recommend-item" v-for="(item,index) in recommendList" @click="productdetails(item.id)">
+				<view class="recommend-item" v-for="(item,index) in recommendList" :key="item.id" @click="productdetails(item.id)">
 					<image class="recommend-item-img" :src="item.pic" mode="aspectFit"></image>
 					<view class="recommend-item-til">{{item.name}}</view>
 					<view class="product-info-price">