供应商认证,发布产品

common/css/common.css

@@ -27,7 +27,7 @@ uni-button[type=primary]{background-color: #6BBC6D;}
 
 /* 浮底按钮 */
 .bottom-btn-wrap{height: 110rpx;margin-top: 80rpx;}
-.bottom-btn{height: 110rpx;line-height: 110rpx;position: fixed;left: 24rpx;bottom: 24rpx;right: 24rpx;}
+.bottom-btn{height: 110rpx;line-height: 110rpx;position: fixed;left: 24rpx;bottom: 24rpx;right: 24rpx;z-index: 99;}
 
 /* 浮底多个按钮 */
 .bottom-flex-btn-wrap{box-sizing: border-box;height: 148rpx;margin-top: 80rpx;;}

config/config.js

@@ -5,7 +5,7 @@ const config = {
 	// 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/zddapi/forest-portal',//东东
 	//本地图片
 	// imgUrl:'http://'+window.location.host,
 	// 图片占位
@@ -13,11 +13,11 @@ 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/zddapi/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8080/#/',//登录后跳转到测试链接 东东
+	loginUrl:'http://wx.hw.hongweisoft.com/zddapi/forest-portal/wechat/h5/authorize?returnUrl=http://172.16.90.25:8081/#/',//登录后跳转到测试链接 东东
 
-	// 测试配置
-	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://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/#/',//登录后跳转到测试链接
 	
 	
 	//online 线上配置

pages/publish/chosetype/chosetype.vue

@@ -18,19 +18,31 @@
 					<view class="select-bar-arrow"></view>
 				</view>
 				<view class="typelist-item-wrap">
-					<view v-for="(product,productindex) in item.children" :key="productindex" @click="publishitem(product)" class="typelist-item">
+					<view v-for="(product,productindex) in item.children" :key="productindex" @click="publishitem(item,product)" class="typelist-item">
 						<view class="productindex">{{productindex + 1}}</view>
 						<view class="product">{{product.name}}</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		
+		<uni-popup ref="popup" type="dialog">
+		    <uni-popup-dialog type="info"  content="成为供应商才能发布,是否去认证?" :duration="2000" :before-close="true" @close="closepopup" @confirm="confirmpopup"></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
 <script>
 	import { bus } from '../../../utils/bus.js';
+	import uniPopup from '@/components/uni-popup/uni-popup.vue'
+	// import uniPopupMessage from '@/components/uni-popup/uni-popup-message.vue'
+	import uniPopupDialog from '@/components/uni-popup/uni-popup-dialog.vue'
 	export default {
+		components: {
+			uniPopup,
+			// uniPopupMessage,
+			uniPopupDialog
+		},
 		data() {
 			return {
 				params:{
@@ -38,11 +50,20 @@
 				},
 				typelist:[],
 				ins:null,
+				hascompany:false,//是否是供应商
 				
 			}
 		},
 		onShow() {
 			let serf = this;
+			uni.getStorage({
+				key:'userInfo',
+				success: function (res) {
+					if(res.data.company.compId){
+						serf.hascompany = true;//是否绑定供应商
+					}
+				}
+			});
 			//检查登录,获取token
 			// let loginRes = this.checkLogin('/pages/index/index', '2');
 			// if(!loginRes){return false;}
@@ -57,8 +78,7 @@
 				this.typelist = res.data.data;
 			}).catch(err => {
 				console.log(err)
-			});
-
+			});		
 		},
 		methods: {
 			// 搜索
@@ -80,8 +100,14 @@
 				this.ins=num;
 			},
 			//选择发布
-			publishitem(product){
-				// console.log(product);
+			publishitem(bigtype,product){
+				console.log('this.hascompany',this.hascompany);
+				if(this.hascompany==false){
+					this.$refs.popup.open();
+					return false;
+				}
+				product.productBigCategoryName = bigtype.name;
+				// console.log('product',product);
 				bus.$emit('toDetailPage', {
 					data: product
 				});
@@ -89,6 +115,18 @@
 					url:`/pages/publish/publish`
 				})
 			},
+			closepopup(done){
+				done()
+			},
+			confirmpopup(done,value){
+				// 输入框的值
+				// console.log(value)
+				// TODO 做一些其他的事情，手动执行 done 才会关闭对话框
+				uni.navigateTo({
+					url:'/pages/usercenter/authentication/authentication'
+				});
+				done()
+			},
 
 		}
 	}

pages/publish/publish.css

@@ -1,4 +1,4 @@
-/* 搜索列表也 */
+/* 搜索列表页 */
 .simplepage-wrap{padding-left: 24rpx;height: calc( 100% - 9rpx );}
 .simplepage-item{padding: 24rpx 0;border-bottom: 1px solid #eee;}
 
@@ -12,7 +12,11 @@
 .pecifications-btn-wrap .big-btn{flex: 1;margin: 0;}
 .pecifications-btn-wrap .big-btn.primary{margin-left: 20rpx;}
 
+.form-item-chooseIMGs-wrap{flex: 1;display: flex;}
+.form-item-chooseIMGs-wrap .img-item{position: relative;}
+.form-item-chooseIMGs-wrap .img-item icon{position: absolute;right: 0;top: 0;border-radius: 50%;background-color: #fff;z-index: 10;}
 
+.form-item.required::before{content: '*';position: absolute;left: -15rpx;top: 50%;line-height: 1;margin-top: -12rpx;color: red;}
 
 
 

pages/publish/publish.vue

@@ -2,7 +2,7 @@
 	<view class="pages">				
 		<form @submit="formSubmit" @reset="formReset">
 			<view class="form-item-type nomal-top">				
-				<view class="form-item">
+				<view class="form-item required">
 					<view class="form-item-til">类目</view>
 					<view class="form-item-con">
 						<input type="text" disabled placeholder="商品类目" v-model="params.type" value="" />
@@ -16,76 +16,106 @@
 				</view>	 -->			
 			</view>
 			<view class="form-item-type">
-				<view class="form-item">
-					<view class="form-item-til">标题</view>
+				<view class="form-item required">
+					<view class="form-item-til">名称</view>
 					<view class="form-item-con">
-						<input type="text" placeholder="请输入发布产品标题" v-model="params.title" value="" />
+						<input type="text" placeholder="请输入发布产品名称" v-model="params.name" value="" />
 					</view>
 				</view>
-				<view class="form-item">
+				<view class="form-item required arrow"  @click="openbrand">
 					<view class="form-item-til">品牌</view>
 					<view class="form-item-con">
-						<input type="text" placeholder="请输入品牌" v-model="params.brand" value="" />
+						<input type="text" placeholder="请输入品牌" v-model="params.brandName" value="" />
+					</view>
+				</view>				
+				<view class="form-item required">
+					<view class="form-item-til">供应商</view>
+					<view class="form-item-con">
+						<input type="text" disabled placeholder="" v-model="params.compName" value="" />
 					</view>
 				</view>
-				<view class="form-item">
-					<view class="form-item-til">零售价</view>
+				<view class="form-item required arrow" @click="openplaceoforigin">
+					<view class="form-item-til">生产地</view>
 					<view class="form-item-con">
-						<input type="text" placeholder="请输入零售价" v-model="params.price" value="" />
+						<input type="text" disabled="disabled" placeholder="" v-model="params.placeOfProduction" value="" />
 					</view>
 				</view>
-				<view class="form-item">
-					<view class="form-item-til">供应商</view>
+				<!-- <view class="form-item arrow" @click="openspec"> -->
+				<view class="form-item required">
+					<view class="form-item-til">规格</view>
 					<view class="form-item-con">
-						<input type="text" disabled placeholder="" v-model="params.supplier" value="" />
+						<!-- <text v-for="(item,index) in params.spec">{{item}},</text> -->
+						<input type="text" placeholder="" v-model="params.spec" value="" />
 					</view>
 				</view>
-				<view class="form-item arrow" @click="openplaceoforigin">
-					<view class="form-item-til">生产地</view>
+				<view class="form-item">
+					<view class="form-item-til">零售价</view>
 					<view class="form-item-con">
-						<input type="text" disabled="disabled" placeholder="" v-model="params.placeoforigin" value="" />
+						<input type="text" placeholder="请输入零售价" v-model="params.price" value="" />
 					</view>
 				</view>
-				<view class="form-item arrow" @click="openspecifications">
-					<view class="form-item-til">规格</view>
+				<view class="form-item">
+					<view class="form-item-til">市场价</view>
 					<view class="form-item-con">
-						<text v-for="(item,index) in params.specifications">{{item}},</text>
-						<!-- <input type="text" placeholder="" v-model="params.specifications" value="" /> -->
+						<input type="text" placeholder="请输入市场价" v-model="params.originalPrice" value="" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="form-item-til">保质期</view>
 					<view class="form-item-con">
-						<input type="text" placeholder="请输入保质期" v-model="params.shelflife" value="" />
+						<input type="text" placeholder="请输入保质期" v-model="params.qualityGuaranteePeriod" value="" />
 					</view>
 				</view>
 				<view class="form-item">
 					<view class="form-item-til">生产日期</view>
 					<view class="form-item-con">
-						<picker mode="date" :value="params.date" :start="startDate" :end="endDate" @change="bindDateChange">
-							<view class="uni-input">{{params.date}}</view>
+						<picker mode="date" :value="params.dateOfManufacture" :start="startDate" :end="endDate" @change="bindDateChange">
+							<view class="uni-input">{{params.dateOfManufacture}}</view>
 						</picker>
 					<!-- <input type="text" placeholder="请输入生产日期" v-model="params.productiondate" value="" /> -->
 					</view>
 				</view>
 				<view class="form-item">
-					<view class="form-item-til">包装</view>
+					<view class="form-item-til">商品介绍</view>
+					<view class="form-item-con" style="text-align: left;">
+						 <!-- <editor id="editor" class="ql-container" v-model="params.description" placeholder="请输入商品介绍" ></editor> -->
+						 <textarea placeholder="请输入商品介绍" v-model="params.description" auto-height />
+						<!-- <input type="text" placeholder="请输入商品介绍" v-model="params.description" value="" /> -->
+					</view>
+				</view>
+				<view class="form-item">
+					<view class="form-item-til">商品货号</view>
 					<view class="form-item-con">
-						<input type="text" placeholder="请输入包装" v-model="params.packaging" value="" />
+						<input type="text" placeholder="请输入商品货号" v-model="params.productSn" value="" />
 					</view>
 				</view>
 				<view class="form-item">
+					<view class="form-item-til">计量单位</view>
+					<view class="form-item-con">
+						<input type="text" placeholder="请输入计量单位" v-model="params.unit" value="" />
+					</view>
+				</view>
+				<!-- <view class="form-item">
 					<view class="form-item-til">标签</view>
 					<view class="form-item-con">
 						<input type="text" placeholder="请输入标签，用逗号隔开" v-model="params.productlabel" value="" />
 					</view>
+				</view> -->
+				<view class="form-item">
+					<view class="form-item-til">排序</view>
+					<view class="form-item-con">
+						<input type="text" placeholder="排序数字" v-model="params.sort" value="" />
+					</view>
 				</view>
 			</view>
 			<view class="form-item upfile">
-				<view class="form-item-til">图片视频</view>
+				<view class="form-item-til">上传图片</view>
 				<view class="form-item-con">					
 					<view class="form-item-chooseIMGs-wrap">
-						<image v-for="(item,index) in params.media" :key="index" :src="item" class="choosedIMG" ></image>
+						<view class="img-item" v-for="(item,index) in pics" :key="index" >
+							<icon type="cancel" @click="delImg(index)" size="26"/>
+							<image :src="item" @click="previewPic(index)" class="choosedIMG" ></image>							
+						</view>						
 					</view>
 					<view class="chooseIMG-btn">
 						<image class="chooseIMG-btn-img" @click="chooseimg" src="/static/img/icon-upload.png"></image>
@@ -126,21 +156,36 @@
 			</view>
 			<!-- 搜索 结束 -->
 			<scroll-view class="simplepage-wrap" scroll-y="true">
-				<view v-for="(item,index) in placeoforiginlist" :key="index" @click="placeoforiginclick(item.detailAddress)" class="simplepage-item">{{item.detailAddress}}</view>
+				<view v-for="(item,index) in placeoforiginlist" :key="index" @click="placeoforiginclick(item)" class="simplepage-item">{{item.detailAddress}}</view>
 			</scroll-view>
 		</view>
 		<!-- 产地结束 -->
+		<!-- 品牌开始 -->
+		<view class="placeoforigin-page fix-content translate" :class="{ 'open':brandopen }" >
+			<view class="search-wrap search-left-color">
+				<view class="search">
+					<view class="searchTxt">
+						<uni-search-bar placeholder="搜索品牌关键词" @confirm="searchbrand" @input="searchbrand" ></uni-search-bar>
+					</view>
+				</view>	
+			</view>
+			<!-- 搜索 结束 -->
+			<scroll-view class="simplepage-wrap" scroll-y="true">
+				<view v-for="(item,index) in brandlist" :key="index" @click="brandclick(item)" class="simplepage-item">{{item.brandName}}</view>
+			</scroll-view>
+		</view>
+		<!-- 牌结束 -->
 		<!-- 规格开始 -->
-		<view class="specifications-page fix-content translate" :class="{ 'open': specificationsopen }" >
-			<view class="specifications-wrap wrap">
+		<view class="spec-page fix-content translate" :class="{ 'open': specopen }" >
+			<view class="spec-wrap wrap">
 				 <checkbox-group @change="checkboxChange">
-					<label  v-for="(item,index) in specificationslist" :key="index" class="checkbox-style" >
+					<label  v-for="(item,index) in speclist" :key="index" class="checkbox-style" >
 						<checkbox :value="item.value" :checked="item.checked"   />{{item.name}}
 					</label>
 				</checkbox-group>
 				<view class="pecifications-btn-wrap">
 					<button type="default" class="big-btn big-btn-hollow" @click="resetcheckbox">重置</button>
-					<button type="default" class="big-btn primary" @click="specificationsclick">确定</button>
+					<button type="default" class="big-btn primary" @click="specclick">确定</button>
 				</view>
 			</view>
 		</view>
@@ -184,22 +229,37 @@
 						tip: '暂无相关数据'
 					}
 				},
+				thetoken:'',
 				params: {
 					token: '',
 					type:'',
 					myposition:'',					
-					title:'',
-					brand:'',
+					name:'',
+					brandName:'',
+					brandId:'',
 					price:'',
-					supplier:'默认的供应商',//供应商
-					placeoforigin:'',//产地
-					specifications:[],//规格
-					shelflife:'',//保质期					
-					date: currentDate,//生产日期 // productiondate:'',//生产日期
-					packaging:'',//包装
+					originalPrice:'',//市场价
+					compName:'默认的供应商',//供应商
+					compId:'',
+					placeOfProduction:'',//产地
+					spec:'',//规格
+					qualityGuaranteePeriod:'',//保质期					
+					dateOfManufacture: currentDate,//生产日期 // productiondate:'',//生产日期
+					unit:'',//包装
 					productlabel:'',//标签
-					media:[],//图片视频
+					albumPics:'',//图片视频
+					pic:'',
+					productBigCategoryId:'',//大类ID
+					productCategoryId:'',//类别id
+					productCategoryName:'',//类别名称
+					productBigCategoryName:'',//大类名称
+					placeOfProductionId:0,
+					publishStatus:"0",
+					productSn:'',//商品货号
+					sort:'',//排序
+					description:'',
 				},
+				pics:[],
 				//表单检查结果
 				checkStatus:false,
 				//供应商
@@ -208,10 +268,13 @@
 				// 产地
 				placeoforiginopen:false,
 				placeoforiginlist:[],
+				brandopen:false,
+				brandlist:[],
 				places:[],//临时暂存
+				brands:[],
 				// 规格
-				specificationsopen:false,
-				specificationslist:[
+				specopen:false,
+				speclist:[
 					{value: '500g/提(250g/盒*2)',name: '500g/提(250g/盒*2)',checked: false},
 					{value: '10g/罐',name: '10g/罐',checked: false},
 					{value: '30g/盒',name: '30g/盒',checked: false},
@@ -240,6 +303,10 @@
 			if(Object.keys(bus.data).length>0){
 				console.log('bus.data',bus.data)
 				this.params.type = bus.data.name;
+				this.params.productBigCategoryId = bus.data.parentId;
+				this.params.productCategoryId = bus.data.id;
+				this.params.productBigCategoryName = bus.data.productBigCategoryName;
+				this.params.productCategoryName = bus.data.name;
 				// console.log(this.params.type);
 			};
 			// console.log(option);
@@ -261,12 +328,22 @@
 			});
 			
 			//供应商详情
-			let thetoken = this.params.tokenhead+this.params.token;
-			this.$api.http.get(this.config.apiBaseurl+'/company/cp/detail',{header: {Authorization:thetoken},params:{compId:72}}).then(res =>{
+			this.thetoken = this.params.tokenhead+this.params.token;
+			uni.getStorage({
+				key:'userInfo',
+				success: function (res) {
+					self.params.compId = res.data.company.compId;
+					self.params.compName = res.data.company.compName;
+				   // console.log(res.data);
+				}
+			});
+			this.$api.http.get(this.config.apiBaseurl+'/company/cp/detail',{header: {Authorization:this.thetoken},params:{compId:this.params.compId}}).then(res =>{
 				console.log('res',JSON.parse(JSON.stringify(res)));
 				this.placeoforiginlist = res.data.data.origines;
+				this.brandlist = res.data.data.products;
+				this.brands = res.data.data.products;
 				this.places = res.data.data.origines;
-				this.params.supplier= res.data.data.compName;
+				this.params.compName= res.data.data.compName;
 			}).catch( err => {
 				console.log(err)				
 			});
@@ -297,8 +374,8 @@
 				return `${year}-${month}-${day}`;
 			},
 			bindDateChange: function(e) {
-				this.params.date = e.target.value
-				// console.log(this.params.date);
+				this.params.dateOfManufacture = e.target.value
+				// console.log(this.params.dateOfManufacture);
 			},
 			/*mescroll组件初始化的回调,可获取到mescroll对象 (此处可删,mixins已默认)*/
 			mescrollInit(mescroll) {
@@ -358,94 +435,171 @@
 			chooseimg() {
 				let _self = this;
 				uni.chooseImage({
-					count: 3,
+					// count: 3,
 					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
 					sourceType: ['album', 'camera'], //从相册选择
 					success: function(res) {
+						console.log('res111',res);
 						const tempFilePaths = res.tempFilePaths;
 						_self.image = tempFilePaths[0];
 						console.log("tempFilePaths[0]", tempFilePaths[0]) //能够打印出选中的图片
 						_self.iconcheck = 1; //点击后图片更改状态由0变成1
 						console.log('111', JSON.stringify(res.tempFilePaths));
-						_self.params.media = res.tempFilePaths;
-						console.log(_self.params.media);
+						// _self.pics = res.tempFilePaths;
+						// console.log(_self.pics);
 						
-						// 预览图片
-						// uni.previewImage({
-						// 	urls: res.tempFilePaths,
-						// 	longPressActions: {
-						// 		// itemList: [],
-						// 		success: function(data) {
-						// 			console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
-						// 		},
-						// 		fail: function(err) {
-						// 			console.log(err.errMsg);
-						// 		}
-						// 	}
-						// });
-								
+						const isLt10M = res.tempFiles[0].size / 1024 / 1024 < 10;
+						if(!isLt10M) {
+							uni.showToast({
+								title: "上传文件大小不能超过 10MB!",
+								icon:'none'
+							})
+							return false;
+						};
+						const imgNumber = _self.pics.length<5;
+						if(!imgNumber) {
+							uni.showToast({
+								title: "图片不能超过5张!",
+								icon:'none'
+							})
+							return false;
+						};
+						
+						//上传图片
+						let obj = new Object();  
+						let file=[];
+					    obj.name = "file";  
+					    obj.uri = res.tempFiles[0].path;  
+					    file.push(obj);
+						_self.uploadTheImg(file);								
 					},
 					error: function(e) {
 						console.log(e);
 					}
 				});
 			},
+			uploadTheImg(imgFiles){
+				let _self = this;
+				//上传图片
+				uni.uploadFile({							
+					url: _self.config.apiBaseurl + '/upload/fileImg', // 后端api接口
+					fileType: "image",
+					files:imgFiles,
+					// filePath: imgFiles[0], // uni.chooseImage函数调用后获取的本地文件路劲
+					name: 'file', //后端通过'file'获取上传的文件对象(字段)
+					formData: {
+						// file:_self.image, 
+						// openid:_self.openid,  //剩下的字段
+					},
+					header: {
+						// "Content-Type":"multipart/form-data",
+						// Accept:'application/json',
+						Accept:'*/*',
+						Authorization: 'Bearer '+ _self.params.token, //注意Bearer后面有一空格
+					},
+					success: (res) => {
+						console.log(JSON.parse(res.data))
+						let data = JSON.parse(res.data);
+						_self.pics.push(data.data);
+						if (res.statusCode == 200) {
+							uni.showToast({
+								icon: 'success',
+								title: "添加成功...",
+							})
+						}
+				
+					},
+					error(error) {
+						uni.showToast({
+							title: "添加失败...",
+						})
+					}
+				});				
+			},
+			previewPic(index){
+				// 预览图片
+				uni.previewImage({
+					urls: this.pics,
+					current:index,
+					longPressActions: {//长按图片显示操作菜单，如不填默认为保存相册
+						success: function(data) {
+							console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+				
+			},
+			//删除图片
+			delImg(index){
+				console.log('index',index);
+				console.log('t',this.pics);
+				this.pics.splice(index,1);
+				console.log('t',this.pics);
+			},
 			//发布
 			publish() {
+				this.params.albumPics = this.pics.toString();
+				this.params.pic = this.pics[0];
 				this.checkStatus = this.check_form();
 				if(this.checkStatus){					
 					let _self = this;
-					//上传图片
-					// uni.uploadFile({
-					// 	url: _self.httpUrl + '', // 后端api接口
-					// 	filePath: _self.image, // uni.chooseImage函数调用后获取的本地文件路劲
-					// 	name: 'EmployeeImage', //后端通过'file'获取上传的文件对象(字段)
-					// 	formData: {
-					// 		// openid:_self.openid,  //剩下的字段
-					// 	},
-					// 	header: {
-					// 		"Content-Type": "multipart/form-data"
-					// 	},
-					// 	success: (res) => {
-					// 		console.log(res)
-					// 		if (res.statusCode == 200) {
-					// 			uni.showToast({
-					// 				icon: 'success',
-					// 				title: "添加成功...",
-					// 			})
-					// 		}
-					// 		setTimeout(() => {
-					// 			uni.navigateTo({
-					// 				url: ''
-					// 			})
-					// 		}, 2000)
-
-					// 	},
-					// 	error(error) {
-					// 		uni.showToast({
-					// 			title: "添加失败...",
-					// 		})
-					// 	}
-					// });
 					uni.showLoading({
 					    title: '请稍等'
-					});					
-					setTimeout(function () {
-					    uni.hideLoading();
-					}, 2000);
+					});
+					this.$api.http.post(this.config.apiBaseurl+'/prod/pub/add',this.params,{
+						header: {
+							Accept:'application/json',
+							Authorization: 'Bearer '+ this.params.token, //注意Bearer后面有一空格
+						}
+					}).then(res => {
+						uni.hideLoading();
+						console.log('res',res);
+						if(res.data.message =='暂未登录或token已经过期'){
+							// let loginurl = `${this.config.apiBaseurl}/wechat/h5/authorize?returnUrl=/pages/publish/publish`
+							// console.log('loginurl',loginurl);
+							uni.showToast({
+								title:res.data.message,
+								duration: 2000
+							});
+							setTimeout(() => {
+								window.location.replace(this.config.loginUrl);
+							}, 2000);
+						};
+						uni.showToast({
+							icon:'success',
+							title:`发布成功,请等待审核!`,
+							duration: 2000
+						});
+						setTimeout(() => {
+							uni.redirectTo({
+								url:'/pages/publish/publishsuccess/publishsuccess'
+							})
+						}, 2000);
+					}).catch(err => {
+						uni.hideLoading();						
+						console.log(err)
+					});
+					
+								
+					// setTimeout(function () {
+					//     uni.hideLoading();
+					// }, 2000);
 					// setTimeout(()=>{
-					// 	uni.showToast({
-					// 		icon:'success',
-					// 		title:`发布成功,请等待审核!`,
-					// 		duration: 2000
-					// 	});						
+						// uni.showToast({
+						// 	icon:'success',
+						// 	title:`发布成功,请等待审核!`,
+						// 	duration: 2000
+						// });						
 					// },2000);
 					
-					setTimeout(() => {
-						uni.redirectTo({
-							url:'/pages/publish/publishsuccess/publishsuccess'
-						})
-					}, 2000);
+					// setTimeout(() => {
+					// 	uni.redirectTo({
+					// 		url:'/pages/publish/publishsuccess/publishsuccess'
+					// 	})
+					// }, 2000);
 				}
 
 			},
@@ -453,7 +607,7 @@
 			check_form() {
 				console.log('this.params',this.params);
 				if(this.params.type.length <= 0) {					
-					uni.showToast({icon:'none',title:`请填写类别!`,duration: 2000});					
+					uni.showToast({icon:'none',title:`请到'我要发布页'选择类别!`,duration: 2000});					
 					return false;
 				}
 				// if(this.params.myposition.length <= 0) {
@@ -461,47 +615,47 @@
 				// 	uni.showToast({icon:'none',title:`请填写地理位置!`,duration: 2000});					
 				// 	return false;
 				// }
-				if(this.params.title.length <= 0) {
-					uni.showToast({icon:'none',title:`请填写标题!`,duration: 2000});					
+				if(this.params.name.length <= 0) {
+					uni.showToast({icon:'none',title:`请填写商品名称!`,duration: 2000});					
 					return false;
 				}
-				if(this.params.brand.length <= 0) {
+				if(this.params.brandName.length <= 0) {
 					uni.showToast({icon:'none',title:`请填写品牌!`,duration: 2000});					
 					return false;
 				}
-				if(this.params.price.length <= 0) {
-					uni.showToast({icon:'none',title:`请填写零售价!`,duration: 2000});					
-					return false;
-				}
-				if(this.params.supplier.length <= 0) {
+				// if(this.params.price.length <= 0) {
+				// 	uni.showToast({icon:'none',title:`请填写零售价!`,duration: 2000});					
+				// 	return false;
+				// }
+				if(this.params.compName.length <= 0) {
 					uni.showToast({icon:'none',title:`请填写供应商!`,duration: 2000});					
 					return false;
 				}
-				if(this.params.placeoforigin.length <= 0) {
+				if(this.params.placeOfProduction.length <= 0) {
 					uni.showToast({icon:'none',title:`请填写生产地!`,duration: 2000});					
 					return false;
 				}
-				if(this.params.specifications.length <= 0) {
+				if(this.params.spec.length <= 0) {
 					uni.showToast({icon:'none',title:`请填写规格!`,duration: 2000});					
 					return false;
 				}
-				if(this.params.shelflife.length <= 0) {
-					uni.showToast({icon:'none',title:`请填写保质期!`,duration: 2000});					
-					return false;
-				}
-				if(this.params.date.length <= 0) {
-					uni.showToast({icon:'none',title:`请填写生产日期!`,duration: 2000});					
-					return false;
-				}
-				if(this.params.packaging.length <= 0) {
-					uni.showToast({icon:'none',title:`请填写包装!`,duration: 2000});					
-					return false;
-				}
-				if(this.params.productlabel.length <= 0) {
-					uni.showToast({icon:'none',title:`请填写标签!`,duration: 2000});					
-					return false;
-				}
-				if(this.params.media.length <= 0) {
+				// if(this.params.qualityGuaranteePeriod.length <= 0) {
+				// 	uni.showToast({icon:'none',title:`请填写保质期!`,duration: 2000});					
+				// 	return false;
+				// }
+				// if(this.params.dateOfManufacture.length <= 0) {
+				// 	uni.showToast({icon:'none',title:`请填写生产日期!`,duration: 2000});					
+				// 	return false;
+				// }
+				// if(this.params.unit.length <= 0) {
+				// 	uni.showToast({icon:'none',title:`请填写计量单位!`,duration: 2000});					
+				// 	return false;
+				// }
+				// if(this.params.productlabel.length <= 0) {
+				// 	uni.showToast({icon:'none',title:`请填写标签!`,duration: 2000});					
+				// 	return false;
+				// }
+				if(this.params.albumPics.length <= 0) {
 					uni.showToast({icon:'none',title:`请上传图片!`,duration: 2000});					
 					return false;
 				}				
@@ -509,7 +663,7 @@
 			},
 			//选择供应商
 			// supplierclick(name){
-			// 	this.params.supplier = name;
+			// 	this.params.compName = name;
 			// 	this.supplieropen = false;
 			// 	this.showback();
 			// },
@@ -523,8 +677,10 @@
 			// 	console.log(e);
 			// },
 			//选择生产地
-			placeoforiginclick(name){
-				this.params.placeoforigin = name;
+			placeoforiginclick(item){
+				console.log('placeoforiginclick',item);
+				this.params.placeOfProduction = item.detailAddress;
+				this.params.placeOfProductionId = item.id;
 				this.placeoforiginopen = false;
 				this.showback();
 			},
@@ -533,20 +689,33 @@
 				this.placeoforiginopen = true;
 				this.hideback();
 			},
+			//选择品牌
+			brandclick(brand){
+				// console.log('brand',brand);
+				this.params.brandName = brand.brandName;
+				this.params.brandId = brand.brandId;				
+				this.brandopen = false;
+				this.showback();
+			},
+			//打开品牌弹出框
+			openbrand(){
+				this.brandopen = true;
+				this.hideback();
+			},
 			//选择规格
-			specificationsclick(e){
-				// this.params.specifications = name;
-				this.specificationsopen = false;
+			specclick(e){
+				// this.params.spec = name;
+				this.specopen = false;
 				this.showback();
 			},
 			//打开规格弹出框
-			openspecifications(){
-				this.specificationsopen = true;
+			openspec(){
+				this.specopen = true;
 				this.hideback();
 			},
 			// 规格checkbox
 			checkboxChange: function (e) {
-				var items = this.specificationslist,
+				var items = this.speclist,
 					values = e.detail.value;
 				for (var i = 0, lenI = items.length; i < lenI; ++i) {
 					const item = items[i]
@@ -556,17 +725,17 @@
 						this.$set(item,'checked',false)
 					}
 				}
-				this.params.specifications = e.detail.value;
-				console.log(this.params.specifications);
+				this.params.spec = e.detail.value;
+				console.log(this.params.spec);
 			},
 			resetcheckbox(){
-				var items = this.specificationslist;
+				var items = this.speclist;
 				for (var i = 0, lenI = items.length; i < lenI; ++i) {
 					const item = items[i];
 					this.$set(item,'checked',false)				
 				}
-				this.params.specifications = [];
-				// console.log(this.params.specifications);
+				this.params.spec = [];
+				// console.log(this.params.spec);
 			},
 			//隐藏返回按钮
 			hideback(){
@@ -580,11 +749,11 @@
 				// let backbtn = document.getElementsByClassName('uni-page-head-hd')[0];
 				// backbtn.style.display = 'block';
 				this.backtyep = 1;
-				console.log(this.backtyep)
+				// console.log(this.backtyep)
 			},
 			// 导航返回按钮
 			onBackPress(e){
-				console.log(this.backtyep)
+				// console.log(this.backtyep)
 				if(this.backtyep == 2){
 					this.placeoforiginopen = false;
 					this.backtyep = 1;
@@ -616,6 +785,20 @@
 				}else{
 					this.placeoforiginlist = this.places;
 				}
+			},
+			// 搜索品牌
+			searchbrand(e){
+				console.log('品牌',e);
+				if(e.value){
+				let brand = this.brandlist.filter(function (value) {						
+						console.log(value);	
+					  return value.brandName.includes(e.value);
+				});
+				console.log('brand',brand);
+				this.brandlist = brand;
+				}else{
+					this.brandlist = this.brands;
+				}
 			}
 			
 			

pages/supplier/supplierdetail/supplierdetail.css

@@ -19,6 +19,7 @@
 .supplier-info-til{font-size: 34rpx;font-weight: 500;color: #333;line-height: 48rpx;margin-bottom: 8rpx;}
 .supplier-info-item{margin-bottom: 8rpx;color: #999;}
 .supplier-info-item .text + .text{margin-left: 50rpx;}
+.supplier-info-item.compSum /deep/ p{text-indent: 2em;margin-bottom: 8rpx;}
 .supplier-info-certificate{display: flex;flex-wrap: wrap;margin-top: 24rpx;justify-content: center;}
 .supplier-info-certificate .image{width: 50%;flex: 1;}
 .supplier-info-certificate .image + .image{margin-left: 20rpx;}

pages/supplier/supplierdetail/supplierdetail.vue

@@ -54,8 +54,9 @@
 					<view class="supplier-info-item">
 						生产许可证号：{{companyinfo.compManageLicenseNum}}
 					</view>
-					<view class="supplier-info-item">
-						简介：{{companyinfo.compSum}}
+					<view class="supplier-info-item compSum">
+						简介：<rich-text :nodes="companyinfo.compSum"></rich-text>
+						<!-- 简介：{{companyinfo.compSum}} -->
 					</view>
 					<view class="supplier-info-certificate">
 						<image v-for="(img,index) in companyimg" :key="index" :src="img.fileUrl|miniImg(60)+'/thumbnail/750x'" mode="widthFix"></image>

pages/usercenter/authentication/authentication.vue

@@ -19,7 +19,7 @@
 			<view class="form-item"  v-if="typeindex==0">
 				<view class="form-item-til">邀请码</view>
 				<view class="form-item-con">
-					<input type="text" placeholder="请输入邀请码" v-model="params.code" value="" />
+					<input type="text" placeholder="请输入邀请码" v-model="params.certNo" value="" />
 				</view>
 			</view>		
 			<view class="form-item">
@@ -86,7 +86,7 @@
 					address:'',
 					// media:[],
 					typeindex:0,
-					code:'',
+					certNo:'',
 				},
 				typeindex:0,
 				typearray:['供应商','农户'],
@@ -164,7 +164,7 @@
 			saveclick(){
 				// console.log(this.params.type);
 				// console.log(this.params.typeindex);
-				// console.log(this.params.code);
+				// console.log(this.params.certNo);
 				
 				
 				this.checkStatus = this.check_form();
@@ -215,7 +215,7 @@
 					uni.showToast({icon:'none',title:`请输入单位/企业名称!`,duration: 2000});					
 					return false;
 				}
-				if(this.params.code.length <= 0 && this.params.typeindex == 0) {
+				if(this.params.certNo.length <= 0 && this.params.typeindex == 0) {
 					uni.showToast({icon:'none',title:`请输入邀请码!`,duration: 2000});					
 					return false;
 				}

pages/usercenter/focusme/focusme.vue

@@ -117,7 +117,7 @@
 				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});				
 				let thetoken = this.params.tokenhead + this.params.token;
 				console.log('thetoken',thetoken);
-				this.$api.http.get(this.config.apiBaseurl+'/pre/own',{header: {Authorization:thetoken}}).then(data => {
+				this.$api.http.get(this.config.apiBaseurl+'/pre/own',{params:this.params,header: {Authorization:thetoken}}).then(data => {
 					console.log('1111111111',data);
 					if(data.data.code=='1001'){
 						// uni.redirectTo({

pages/usercenter/mypublish/mypublish.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="pages">
 		<mescroll-body class="wrap" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :down="downOption" :up="upOption">
-			<view class="product-wrap">
+			<view class="product-wrap" v-if="productlist.length>0">
 				<view v-for="(item,index) in productlist" :key="index" @click="productclick" class="product-item">
 					<view class="product-item-img-wrap">
 						<image class="product-item-img" :src="item.img" mode="widthFix"></image>
@@ -115,7 +115,7 @@
 				this.params = Object.assign(this.params,{pageNum:pageNum,pageSize:pageSize});				
 				let thetoken = this.params.tokenhead + this.params.token;
 				console.log('thetoken',thetoken);
-				this.$api.http.get(this.config.apiBaseurl+'/pre/own',{header: {Authorization:thetoken}}).then(data => {
+				this.$api.http.get(this.config.apiBaseurl+'/pre/own',{params:this.params,header: {Authorization:thetoken}}).then(data => {
 					console.log('1111111111',data);
 					if(data.data.code=='1001'){
 						// uni.redirectTo({

pages/usercenter/usercenter.vue

@@ -7,7 +7,7 @@
 				</view>
 				<view class="myinfo-text">
 					<view class="myinfo-text-name">{{user.nickname || '登录/注册'}}</view>
-					<view class="myinfo-text-identity">{{user.type}} <text v-if="user.companyInfo">| {{user.companyInfo}}</text></view>
+					<view class="myinfo-text-identity"><!-- {{company.type}} --><text v-if="company.compName">供应商 | {{company.compName}}</text></view>
 				</view>
 			</view>		
 			<view class="myinfo-focus">
@@ -36,7 +36,7 @@
 					<view class="select-bar-arrow"></view>
 				</view>
 			</navigator>
-			<navigator url="/pages/usercenter/authentication/authentication">
+			<navigator url="/pages/usercenter/authentication/authentication" v-if="!company.compName">
 				<view class="select-bar">
 					<svg class="icon select-bar-icon" aria-hidden="true">
 						<use xlink:href="#iconwodetuandui"></use>
@@ -75,6 +75,7 @@
 				focusme:1,
 				pre:[],
 				user:[],
+				company:[],
 				wxuser:[],
 				thispage:'',
 				
@@ -127,8 +128,9 @@
 				this.$api.http.get(this.config.apiBaseurl+'/wechat/h5/info', {header: {Authorization:thetoken}}).then(res => {					
 					let userInfo = res.data;
 					this.info = userInfo;
-					this.pre = this.info.data.pre;
-					this.user = this.info.data.user;
+					this.pre = this.info.data.pre || '';
+					this.user = this.info.data.user || '';
+					this.company = this.info.data.company || '';
 					this.wxuser = this.info.data.wxUsers;
 					console.log('this.info',JSON.parse(JSON.stringify(this.info)));
 					userInfo.accessToken = this.params.token;