Merge pull request 'chenxuelian' (#111) from chenxuelian into dev

Reviewed-on: http://git.feashow.cn/feashow/pupil/pulls/111

components/productsByThumb/productsByThumb.vue

@@ -65,14 +65,11 @@
 		methods: {
 			//获取按点赞量排列的产品列表
 			getProductsByThumb() {
-				this.$apiServe.getProductList({
-					cateId: 0,
-					tagIds: 0,
-					sortType: 1,
+				this.$apiServe.getProductsByCateId({
+					cateId: '9',
 					pageSize: this.pageSize,
 					pageNum: this.pageNum
 				}).then(res => {
-
 					let tags = res.data.data
 					console.log('企业需求列表', tags);
 					for (const item of tags) {

pages/detail/productsDetail/productsDetail.vue

@@ -313,9 +313,9 @@
 			align-items: center;
 
 			.title {
-				font-size: 36rpx;
-				font-weight: 400;
-				color: #0EBB5B;
+				font-size: 44rpx;
+				font-weight: blod;
+				color: #134b40;
 				line-height: 50rpx;
 				overflow: hidden;
 				white-space: nowrap;
@@ -336,7 +336,7 @@
 		}
 
 		.desc {
-			font-size: 30rpx;
+			font-size: 38rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #3E3E3E;
@@ -345,11 +345,11 @@
 		}
 
 		.classify {
-			width: 80rpx;
+			width: 100rpx;
 			height: 30rpx;
 			border-radius: 6rpx;
 			border: 1rpx solid #EEEEEE;
-			font-size: 20rpx;
+			font-size: 24rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #666666;
@@ -362,7 +362,7 @@
 			justify-content: space-between;
 			align-items: center;
 			padding-top: 14rpx;
-			font-size: 20rpx;
+			font-size: 24rpx;
 			font-family: PingFangSC-Regular, PingFang SC;
 			font-weight: 400;
 			color: #CCCCCC;

pages/ideasAndNeeds/ideasAndNeeds.vue

@@ -79,7 +79,7 @@
 			</view>
 
 			<view style="background-color: #fff;">
-				<u-form-item label="联系方式" borderBottom>
+				<u-form-item v-if="false" label="联系方式" borderBottom>
 					<u-radio-group v-model="needsPublishForm.contactWay" placement="row">
 						<u-radio :customStyle="{marginRight: '16px'}" label="手机" name="mobile" :disabled="btnDisabled">
 						</u-radio>
@@ -87,11 +87,11 @@
 						</u-radio>
 					</u-radio-group>
 				</u-form-item>
-				<u-form-item v-if="needsPublishForm.contactWay === 'mobile'" label="手机" borderBottom>
+				<u-form-item label="手机" borderBottom>
 					<u--input placeholder="请输入手机号" :border="false" v-model="needsPublishForm.mobile"
 						placeholder-style="color:#CCCCCC" :disabled="btnDisabled" disabledColor="#ffffff"></u--input>
 				</u-form-item>
-				<u-form-item v-if="needsPublishForm.contactWay === 'email'" label="邮箱" borderBottom>
+				<u-form-item label="邮箱" borderBottom>
 					<u--input placeholder="请输入邮箱地址" :border="false" v-model="needsPublishForm.email"
 						:disabled="btnDisabled" placeholder-style="color:#CCCCCC"></u--input>
 				</u-form-item>
@@ -373,12 +373,18 @@
 				})
 			},
 			submitForm() {
-				if (this.needsPublishForm.contactWay === 'mobile' && !/^1[3456789]\d{9}$/.test(this.needsPublishForm
-						.mobile)) {
+				if (!this.needsPublishForm.mobile && !this.needsPublishForm.email) {
+					this.$toast.warn('请输入正确的手机号或者正确的邮箱地址')
+					return false
+				}
+				if (this.tabCurrent === 1 && this.fileList1.length < 1) {
+					this.$toast.warn('请至少上传一张图片')
+					return false
+				}
+				if (this.needsPublishForm.mobile && !/^1[3456789]\d{9}$/.test(this.needsPublishForm.mobile)) {
 					this.$toast.warn('请输入正确的手机号')
 					return false
-				} else if (this.needsPublishForm.contactWay === 'email' && !
-					/^([0-9a-zA-Z_\.\-\])+\@([0-9a-zA-Z_\.\-\])+\.([a-zA-Z]+)$/.test(this.needsPublishForm.email)) {
+				} else if (this.needsPublishForm.email && !/^([0-9a-zA-Z_\.\-\])+\@([0-9a-zA-Z_\.\-\])+\.([a-zA-Z]+)$/.test(this.needsPublishForm.email)) {
 					this.$toast.warn('请输入正确的邮箱地址')
 					return false
 				}
@@ -410,15 +416,19 @@
 					...this.needsPublishForm
 				}
 				apiService.submitIdeasAndNeeds(data).then(res => {
-					this.$toast.success('提交成功')
-					// if (this.needsPublishForm.id) {
-					uni.navigateTo({
-						url: '../../packageMy/myRelease/myRelease?index=' + (this.tabCurrent + 1)
-					})
-					// }
-					this.tabCurrent = 0
-					this.fileList1 = []
-					this.needsPublishForm = {}
+					if (res.data.code === 1) {
+							this.$toast.success('提交成功')
+						// if (this.needsPublishForm.id) {
+						uni.navigateTo({
+							url: '../../packageMy/myRelease/myRelease?index=' + (this.tabCurrent + 1)
+						})
+						// }
+						this.tabCurrent = 0
+						this.fileList1 = []
+						this.needsPublishForm = {}
+					} else{
+						this.$toast.warn(res.data.msg)
+					}
 					// this.$toast.success(res.data.msg)
 				}).catch(error => {
 					this.$toast.warn(error)

service/request.js

@@ -361,6 +361,13 @@ const apiService = {
 			resolve(service.get(url, data))
 		})
 	},
+	// 获取首页分类
+	getProductsByCateId(data) {
+		const url = `/home/plist`
+		return new Promise((resolve, reject) => {
+			resolve(service.get(url, data))
+		})
+	},
 	// 搜索发现   热搜
 	getDiscover() {
 		const url = `/home/discover`