Merge pull request '修改部分细节' (#105) from dengjie into dev

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

package-lock.json

@@ -3,9 +3,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "uview-ui": {
-      "version": "2.0.35",
+      "version": "2.0.36",
-      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.35.tgz",
+      "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-2.0.36.tgz",
-      "integrity": "sha512-OfMttN3XkHvQosXfd8bjz8ASTvypPoGzBWmQZBJ871bYMCA7t2bDFPlzjbxUj/5ykAjKnZ8zMUapSwSisVt99g=="
+      "integrity": "sha512-ASSZT6M8w3GTO1eFPbsgEFV0U5UujK+8pTNr+MSUbRNcRMC1u63DDTLJVeArV91kWM0bfAexK3SK9pnTqF9TtA=="
     }
   }
 }

package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "uview-ui": "^2.0.35"
+    "uview-ui": "^2.0.36"
   }
 }

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

pages/detail/productsDetail/productsDetail.vue

@@ -83,7 +83,7 @@
 			</u-modal>
 			<view style="margin:0 20rpx;">
 				<u-overlay :show="!isLoad">
-					<login @success="reOnLoad()" @fail="failToLoad()"></login>
+					<login :timoutText="timoutText" @success="reOnLoad()" @fail="failToLoad()"></login>
 				</u-overlay>
 			</view>
 			<u-modal :show="showUpdate" :content='content' closeOnClickOverlay="false" showCancelButton="true"
@@ -123,6 +123,7 @@
 				mobile: '',
 				updateContent: '您暂无权限访问，请升级VIP访问',
 				updatingContent: '升级VIP，正在审核中',
+				timoutText: 1
 			}
 		},
 		onLoad(option) {
@@ -144,7 +145,7 @@
 					console.log('产品详情', res);
 					let detail = res.data.data
 					let dataCode = res.data.code
-					if (dataCode === -1) {
+					if (dataCode === -1 || res.statusCode == 500) {
 						this.isLoad = false
 					}
 					//授权登录拦截
@@ -165,7 +166,15 @@
 						if (detail.tags) {
 							detail.tags = detail.tags.split(',')
 						}
+
+						// if (detail.is_thumb == 1 && parseInt(detail.thumb) == 1 && parseInt(detail
+						// 		.thumbcount) == 1) {
+						// 	console.log('222');
+						// 	detail.thumb = parseInt(detail.thumbcount)
+						// } else {
 						detail.thumb = parseInt(detail.thumb) + parseInt(detail.thumbcount)
+						// }
+
 						this.detailList = detail
 					}
 				}).finally(_ => {})

pages/index/index.vue

@@ -56,10 +56,10 @@
 				classifyList: [],
 				tabCurrent: 0,
 				tabList: [{
-						name: '上架时间'
+						name: '新品发布'
 					},
 					{
-						name: '点赞量'
+						name: '新创意'
 					},
 				],
 				imgUrl: '',

pages/report/report.vue

@@ -21,12 +21,12 @@
 			<news></news>
 		</view>
 
-		<!-- 新品发布 -->
+		<!-- 企业需求 -->
 		<view>
 			<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>
@@ -64,7 +64,7 @@
 					},
 					{
 						src: '/static/report/hy_icon_fu.png',
-						title: '新品发布'
+						title: '企业需求'
 					},
 					{
 						src: '/static/report/hy_icon_cj.png',