From 139ac36ddf59e1ac67279d3be209a6ae3d1118ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Dchenxuelian=E2=80=9C?=
 <“chenxuelian@cjiedata.com”>
Date: Tue, 18 Apr 2023 21:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=91=E5=B8=83=EF=BC=8C=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E4=BA=8C=E9=80=89=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                             | 24 ++++++--
 .../goods-category-search/category-index.vue  |  4 +-
 pages.json                                    | 10 ++--
 pages/ideasAndNeeds/ideasAndNeeds.vue         | 57 ++++++++++++++-----
 pages/index/index.vue                         |  4 +-
 pages/report/report.vue                       |  4 +-
 6 files changed, 75 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b23d8bd..138868d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,27 @@
 {
+  "name": "pupil",
+  "lockfileVersion": 2,
   "requires": true,
-  "lockfileVersion": 1,
+  "packages": {
+    "": {
+      "dependencies": {
+        "uview-ui": "^2.0.35"
+      }
+    },
+    "node_modules/uview-ui": {
+      "version": "2.0.36",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.36.tgz",
+      "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA==",
+      "engines": {
+        "HBuilderX": "^3.1.0"
+      }
+    }
+  },
   "dependencies": {
     "uview-ui": {
-      "version": "2.0.35",
-      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.35.tgz",
-      "integrity": "sha512-OfMttN3XkHvQosXfd8bjz8ASTvypPoGzBWmQZBJ871bYMCA7t2bDFPlzjbxUj/5ykAjKnZ8zMUapSwSisVt99g=="
+      "version": "2.0.36",
+      "resolved": "https://registry.npmmirror.com/uview-ui/-/uview-ui-2.0.36.tgz",
+      "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA=="
     }
   }
 }
diff --git a/packageSearch/goods-category-search/category-index.vue b/packageSearch/goods-category-search/category-index.vue
index fd096fc..f6c7311 100644
--- a/packageSearch/goods-category-search/category-index.vue
+++ b/packageSearch/goods-category-search/category-index.vue
@@ -184,9 +184,9 @@
 				},
 				goodsList: [],
 				tabsList: [{
-					name: '上架时间'
+					name: '新品发布' // 上架时间（改）
 				}, {
-					name: '点赞量'
+					name: '新创意' // 点赞量（改）
 				}],
 				tagsList: [],
 				scrollTop: 0, //tab标题的滚动条位置
diff --git a/pages.json b/pages.json
index 44b9936..86ae28b 100644
--- a/pages.json
+++ b/pages.json
@@ -22,7 +22,7 @@
 		{
 			"path": "pages/report/report",
 			"style": {
-				"navigationBarTitleText": "行业报告",
+				"navigationBarTitleText": "行业&需求",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
@@ -31,7 +31,7 @@
 		{
 			"path": "pages/ideasAndNeeds/ideasAndNeeds",
 			"style": {
-				"navigationBarTitleText": "创意&需求",
+				"navigationBarTitleText": "创需发布",
 				"navigationBarTextStyle": "white",
 				"navigationBarBackgroundColor": "#12CA64",
 				"enablePullDownRefresh": false
@@ -190,7 +190,7 @@
 				}, {
 					"path": "newProductRelease/newProductRelease",
 					"style": {
-						"navigationBarTitleText": "新品发布",
+						"navigationBarTitleText": "企业需求",
 						"navigationBarTextStyle": "white",
 						"navigationBarBackgroundColor": "#12CA64",
 						"enablePullDownRefresh": false
@@ -213,13 +213,13 @@
 			},
 			{
 				"pagePath": "pages/report/report",
-				"text": "行业报告",
+				"text": "行业&需求",
 				"iconPath": "static/tabBar/sy_icon_hyh.png",
 				"selectedIconPath": "static/tabBar/sy_icon_sy.png"
 			},
 			{
 				"pagePath": "pages/ideasAndNeeds/ideasAndNeeds",
-				"text": "创意&需求",
+				"text": "创需发布",
 				"iconPath": "static/tabBar/sy_icon_cyh.png",
 				"selectedIconPath": "static/tabBar/sy_icon_cy.png"
 			},
diff --git a/pages/ideasAndNeeds/ideasAndNeeds.vue b/pages/ideasAndNeeds/ideasAndNeeds.vue
index ecddecc..bbc945c 100644
--- a/pages/ideasAndNeeds/ideasAndNeeds.vue
+++ b/pages/ideasAndNeeds/ideasAndNeeds.vue
@@ -72,10 +72,37 @@
 			</view>
 
 			<view style="background-color: #fff;">
-				<u-form-item label="手机" borderBottom>
+				<u-form-item label="联系方式" borderBottom>
+					 <u-radio-group
+					    v-model="needsPublishForm.contactWay"
+					    placement="row"
+					  >
+					    <u-radio
+								:customStyle="{marginRight: '16px'}"
+					      label="手机"
+					      name="mobile"
+					    >
+					    </u-radio>
+					    <u-radio
+					      label="邮箱"
+					      name="email"
+					    >
+					    </u-radio>
+					  </u-radio-group>
+				</u-form-item>
+				<u-form-item v-if="needsPublishForm.contactWay === 'mobile'" label="手机" borderBottom>
 					<u--input placeholder="请输入手机号" :border="false" v-model="needsPublishForm.mobile"
 						placeholder-style="color:#CCCCCC"></u--input>
 				</u-form-item>
+				<u-form-item v-if="needsPublishForm.contactWay === 'email'" label="邮箱" borderBottom>
+					<u--input placeholder="请输入邮箱地址" :border="false" v-model="needsPublishForm.email"
+						placeholder-style="color:#CCCCCC"></u--input>
+				</u-form-item>
+				<view style="padding: 6rpx 20rpx 0;text-align: left;background-color: #fff;">
+					<text style="font-size: 24rpx;font-family: PingFangSC-Regular, PingFang SC;font-weight: 400;color: #C8C8C8;line-height: 28rpx;">
+						联系方式将不对外发布。如有相关意向，平台会以您留下的联系方式通知您。
+					</text>
+				</view>
 				<!-- <u-form-item label="验证" borderBottom>
 					<view style="display: flex;padding-right: 20rpx;align-items: center;">
 						<u--input placeholder="请输入验证码" :border="false" v-model="needsPublishForm.invalidCode"
@@ -89,9 +116,10 @@
 				<view style="padding: 30rpx;background-color: #fff;">
 					<u-button color="#0EBB5B" text="确定发布" @tap.stop="submitForm"></u-button>
 				</view>
-				<view style="padding: 20rpx;text-align: center;background-color: #fff;">
-					<text
-						style="font-size: 24rpx;font-family: PingFangSC-Regular, PingFang SC;font-weight: 400;color: #C8C8C8;line-height: 28rpx;">承诺声明预留文字位置承诺声明预留文字位置</text>
+				<view style="padding: 10rpx 20rpx;text-align: center;background-color: #fff;">
+					<text style="font-size: 24rpx;font-family: PingFangSC-Regular, PingFang SC;font-weight: 400;color: #C8C8C8;line-height: 28rpx;">
+						您在确认发布后，会由平台管理方经行审核。审核通过后，予以发布。对于用户在本站发表的信息，由用户个人承担对应责任，本平台不承担任何法律责任。
+					</text>
 				</view>
 			</view>
 		</u--form>
@@ -156,14 +184,14 @@
 		},
 		onTabItemTap() {
 			console.log('----onShow')
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				console.log(uni.getStorageSync('loginToken'))
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
+			// if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+			// 	console.log(uni.getStorageSync('loginToken'))
+			// 	this.isLoad = false
+			// 	// uni.navigateTo({
+			// 	// 	url: '../../pages/my/login/login'
+			// 	// })
+			// 	return
+			// }
 			this.imgUrl = uni.getStorageSync('img_url')
 			console.log(this.imgUrl)
 			this.isLoad = true
@@ -369,9 +397,12 @@
 			},
 			submitForm() {
 				console.log(this.fileList1)
-				if (!/^1[3456789]\d{9}$/.test(this.needsPublishForm.mobile)) {
+				if (this.needsPublishForm.contactWay === '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)) {
+					this.$toast.warn('请输入正确的邮箱地址')
+					return false
 				}
 				this.needsPublishForm.type = Number(this.tabCurrent + 1)
 				this.needsPublishForm.pub_time = this.needsPublishForm.pub_time ? this.needsPublishForm.pub_time :
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7672fa0..24e0aff 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -54,10 +54,10 @@
 				classifyList: [],
 				tabCurrent: 0,
 				tabList: [{
-						name: '上架时间'
+						name: '新品发布' // 上架时间（改）
 					},
 					{
-						name: '点赞量'
+						name: '新创意' // 点赞量（改）
 					},
 				],
 				imgUrl: '',
diff --git a/pages/report/report.vue b/pages/report/report.vue
index f97c93f..e9c995f 100644
--- a/pages/report/report.vue
+++ b/pages/report/report.vue
@@ -26,7 +26,7 @@
 			<view class="subtitle">
 				<u--image src="/static/report/hy_icon_fux.png" width="24rpx" height="24rpx" :lazy-load="true">
 				</u--image>
-				<text class="xpfb_text text">新品发布</text>
+				<text class="xpfb_text text">企业需求</text>
 			</view>
 			<productsByTime></productsByTime>
 		</view>
@@ -53,7 +53,7 @@
 					},
 					{
 						src: '/static/report/hy_icon_fu.png',
-						title: '新品发布'
+						title: '企业需求'
 					},
 					{
 						src: '/static/report/hy_icon_cj.png',