Merge branch 'master' of http://192.168.10.18:3000/sooka_shop/sooka_consult_uniapp

pages.json

@@ -428,7 +428,7 @@
 			}
 		},
 		{
-			"path": "pages/liveBroadcast/liveBroadcast",
+			"path": "pages/highServer/liveBroadcast/liveBroadcast",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -437,7 +437,7 @@
 			}
 		},
 		{
-			"path": "pages/liveBroadcastDetails/liveBroadcastDetails",
+			"path": "pages/highServer/liveBroadcastDetails/liveBroadcastDetails",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -446,7 +446,7 @@
 			}
 		},
 		{
-			"path": "pages/lifeServices/lifeServices",
+			"path": "pages/highServer/lifeServices/lifeServices",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -455,7 +455,7 @@
 			}
 		},
 		{
-			"path": "pages/lifeServicesDetails/lifeServicesDetails",
+			"path": "pages/highServer/lifeServicesDetails/lifeServicesDetails",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -464,7 +464,7 @@
 			}
 		},
 		{
-			"path": "pages/knowledge/knowledge",
+			"path": "pages/highServer/knowledge/knowledge",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -473,7 +473,7 @@
 			}
 		},
 		{
-			"path": "pages/knowledgeDetails/knowledgeDetails",
+			"path": "pages/highServer/knowledgeDetails/knowledgeDetails",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -482,7 +482,7 @@
 			}
 		},
 		{
-			"path": "pages/knowledge/knowledgeForm",
+			"path": "pages/highServer/knowledge/knowledgeForm",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -491,7 +491,7 @@
 			}
 		},
 		{
-			"path": "pages/travelGuide/travelGuide",
+			"path": "pages/highServer/travelGuide/travelGuide",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -500,7 +500,7 @@
 			}
 		},
 		{
-			"path": "pages/travelGuideDetails/travelGuideDetails",
+			"path": "pages/highServer/travelGuideDetails/travelGuideDetails",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -509,7 +509,7 @@
 			}
 		},
 		{
-			"path": "pages/psychology/psychology",
+			"path": "pages/highServer/psychology/psychology",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -518,7 +518,7 @@
 			}
 		},
 		{
-			"path": "pages/psychologyDetail/psychologyDetails",
+			"path": "pages/highServer/psychologyDetail/psychologyDetails",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -527,7 +527,7 @@
 			}
 		},
 		{
-			"path": "pages/inquiry/inquiry",
+			"path": "pages/highServer/inquiry/inquiry",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -536,7 +536,7 @@
 			}
 		},
 		{
-			"path": "pages/inquiryDetail/inquiryDetails",
+			"path": "pages/highServer/inquiryDetail/inquiryDetails",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -545,7 +545,7 @@
 			}
 		},
 		{
-			"path": "pages/help/help",
+			"path": "pages/highServer/help/help",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",
@@ -554,7 +554,7 @@
 			}
 		},
 		{
-			"path": "pages/helpDetail/helpDetails",
+			"path": "pages/highServer/helpDetail/helpDetails",
 			"style": {
 				"usingComponents": {},
 				"navigationBarBackgroundColor": "#07c160",

pages/help/help.vue

@@ -81,7 +81,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/helpDetail/helpDetails?id=' + id,
+					url: '/pages/highServer/helpDetail/helpDetails?id=' + id,
 				});
 			},
 			// 分页触发

pages/helpDetail/helpDetails.vue

@@ -6,12 +6,11 @@
 			<view class="wenzhangLy">
 				<!-- 头像昵称 -->
 				<view class="txTime">
-					<img class="uni-header-image"
-						:src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
-					<view class="time">
-						<p>{{initInfo.wechatName}}</p>
-						<span>{{fromData.createTime}}</span>
-					</view>
+				    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
+				    <view class="time">
+				        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
+				        <span>{{ detailInfo.createTime }}</span>
+				    </view>
 				</view>
 			</view>
 			<view class="wenzhangCont article">
@@ -29,9 +28,9 @@
 	import {
 		getDetails
 	} from '@/api/help/help.js';
-	import {
-		getUserInfo
-	} from '@/api/me/me.js'
+	// import {
+	// 	getUserInfo
+	// } from '@/api/me/me.js'
 	export default {
 		data() {
 			return {
@@ -56,12 +55,12 @@
 					}
 				})
 			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
+			// getUserInfoByUserId(userId) {
+			// 	getUserInfo(userId).then(res => {
+			// 		this.initInfo = res.data;
+			// 		console.log("this.initInfo", this.initInfo)
+			// 	})
+			// },
 		}
 		/**
 		 * 生命周期函数--监听页面加载

pages/inquiry/inquiry.vue

@@ -81,7 +81,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/inquiryDetail/inquiryDetails?id=' + id,
+					url: '/pages/highServer/inquiryDetail/inquiryDetails?id=' + id,
 				});
 			},
 			// 分页触发

pages/inquiryDetail/inquiryDetails.vue

@@ -1,17 +1,16 @@
 <template>
 	<view>
-		<!-- 直播带货详情 -->
+		<!-- 线上问诊详情 -->
 		<view class="container">
 			<h1 class="title">{{fromData.titleName}}</h1>
 			<view class="wenzhangLy">
 				<!-- 头像昵称 -->
 				<view class="txTime">
-					<img class="uni-header-image"
-						:src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
-					<view class="time">
-						<p>{{initInfo.wechatName}}</p>
-						<span>{{fromData.createTime}}</span>
-					</view>
+				    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
+				    <view class="time">
+				        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
+				        <span>{{ detailInfo.createTime }}</span>
+				    </view>
 				</view>
 			</view>
 			<view class="wenzhangCont article">
@@ -29,9 +28,9 @@
 	import {
 		getDetails
 	} from '@/api/inquiry/inquiry.js';
-	import {
-		getUserInfo
-	} from '@/api/me/me.js'
+	// import {
+	// 	getUserInfo
+	// } from '@/api/me/me.js'
 	export default {
 		data() {
 			return {
@@ -56,12 +55,12 @@
 					}
 				})
 			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
+			// getUserInfoByUserId(userId) {
+			// 	getUserInfo(userId).then(res => {
+			// 		this.initInfo = res.data;
+			// 		console.log("this.initInfo", this.initInfo)
+			// 	})
+			// },
 		}
 		/**
 		 * 生命周期函数--监听页面加载

pages/knowledge/knowledge.vue

@@ -78,7 +78,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/knowledgeDetails/knowledgeDetails?id=' + id,
+					url: '/pages/highServer/knowledgeDetails/knowledgeDetails?id=' + id,
 				});
 			},
 			// 分页触发

pages/knowledgeDetails/knowledgeDetails.vue

@@ -6,12 +6,11 @@
 			<view class="wenzhangLy">
 				<!-- 头像昵称 -->
 				<view class="txTime">
-					<img class="uni-header-image"
-						:src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
-					<view class="time">
-						<p>{{initInfo.wechatName}}</p>
-						<span>{{fromData.createTime}}</span>
-					</view>
+				    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
+				    <view class="time">
+				        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
+				        <span>{{ detailInfo.createTime }}</span>
+				    </view>
 				</view>
 			</view>
 			<view class="wenzhangCont article">
@@ -29,9 +28,9 @@
 	import {
 		getDetails
 	} from '@/api/knowledge/knowledge.js';
-	import {
-		getUserInfo
-	} from '@/api/me/me.js'
+	// import {
+	// 	getUserInfo
+	// } from '@/api/me/me.js'
 	export default {
 		data() {
 			return {
@@ -56,12 +55,12 @@
 					}
 				})
 			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
+			// getUserInfoByUserId(userId) {
+			// 	getUserInfo(userId).then(res => {
+			// 		this.initInfo = res.data;
+			// 		console.log("this.initInfo", this.initInfo)
+			// 	})
+			// },
 		}
 		/**
 		 * 生命周期函数--监听页面加载

pages/lifeServices/lifeServices.vue

@@ -81,7 +81,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/lifeServicesDetails/lifeServicesDetails?id=' + id,
+					url: '/pages/highServer/lifeServicesDetails/lifeServicesDetails?id=' + id,
 				});
 			},
 			// 分页触发

pages/lifeServicesDetails/lifeServicesDetails.vue

@@ -6,12 +6,11 @@
 			<view class="wenzhangLy">
 				<!-- 头像昵称 -->
 				<view class="txTime">
-					<img class="uni-header-image"
-						:src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
-					<view class="time">
-						<p>{{initInfo.wechatName}}</p>
-						<span>{{fromData.createTime}}</span>
-					</view>
+				    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
+				    <view class="time">
+				        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
+				        <span>{{ detailInfo.createTime }}</span>
+				    </view>
 				</view>
 			</view>
 			<view class="wenzhangCont article">
@@ -29,9 +28,9 @@
 	import {
 		getDetails
 	} from '@/api/lifeServices/lifeServices.js';
-	import {
-		getUserInfo
-	} from '@/api/me/me.js'
+	// import {
+	// 	getUserInfo
+	// } from '@/api/me/me.js'
 	export default {
 		data() {
 			return {
@@ -56,11 +55,11 @@
 					}
 				})
 			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-				})
-			},
+			// getUserInfoByUserId(userId) {
+			// 	getUserInfo(userId).then(res => {
+			// 		this.initInfo = res.data;
+			// 	})
+			// },
 		}
 		/**
 		 * 生命周期函数--监听页面加载

pages/liveBroadcast/liveBroadcast.vue

@@ -81,7 +81,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/liveBroadcastDetails/liveBroadcastDetails?id=' + id,
+					url: '/pages/highServer/liveBroadcastDetails/liveBroadcastDetails?id=' + id,
 				});
 			},
 			// 分页触发

pages/liveBroadcastDetails/liveBroadcastDetails.vue

@@ -6,12 +6,11 @@
 			<view class="wenzhangLy">
 				<!-- 头像昵称 -->
 				<view class="txTime">
-					<img class="uni-header-image"
-						:src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
-					<view class="time">
-						<p>{{initInfo.wechatName}}</p>
-						<span>{{fromData.createTime}}</span>
-					</view>
+				    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
+				    <view class="time">
+				        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
+				        <span>{{ detailInfo.createTime }}</span>
+				    </view>
 				</view>
 			</view>
 			<view class="wenzhangCont article">
@@ -29,9 +28,9 @@
 	import {
 		getDetails
 	} from '@/api/liveBroadcast/liveBroadcast.js';
-	import {
-		getUserInfo
-	} from '@/api/me/me.js'
+	// import {
+	// 	getUserInfo
+	// } from '@/api/me/me.js'
 	export default {
 		data() {
 			return {
@@ -56,12 +55,12 @@
 					}
 				})
 			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
+			// getUserInfoByUserId(userId) {
+			// 	getUserInfo(userId).then(res => {
+			// 		this.initInfo = res.data;
+			// 		console.log("this.initInfo", this.initInfo)
+			// 	})
+			// },
 		}
 		/**
 		 * 生命周期函数--监听页面加载

pages/psychology/psychology.vue

@@ -81,7 +81,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/psychologyDetail/psychologyDetails?id=' + id,
+					url: '/pages/highServer/psychologyDetail/psychologyDetails?id=' + id,
 				});
 			},
 			// 分页触发

pages/psychologyDetail/psychologyDetails.vue

@@ -6,12 +6,11 @@
 			<view class="wenzhangLy">
 				<!-- 头像昵称 -->
 				<view class="txTime">
-					<img class="uni-header-image"
-						:src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
-					<view class="time">
-						<p>{{initInfo.wechatName}}</p>
-						<span>{{fromData.createTime}}</span>
-					</view>
+				    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
+				    <view class="time">
+				        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
+				        <span>{{ detailInfo.createTime }}</span>
+				    </view>
 				</view>
 			</view>
 			<view class="wenzhangCont article">
@@ -29,9 +28,9 @@
 	import {
 		getDetails
 	} from '@/api/psychology/psychology.js';
-	import {
-		getUserInfo
-	} from '@/api/me/me.js'
+	// import {
+	// 	getUserInfo
+	// } from '@/api/me/me.js'
 	export default {
 		data() {
 			return {
@@ -56,12 +55,12 @@
 					}
 				})
 			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
+			// getUserInfoByUserId(userId) {
+			// 	getUserInfo(userId).then(res => {
+			// 		this.initInfo = res.data;
+			// 		console.log("this.initInfo", this.initInfo)
+			// 	})
+			// },
 		}
 		/**
 		 * 生命周期函数--监听页面加载

pages/travelGuide/travelGuide.vue

@@ -81,7 +81,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/travelGuideDetails/travelGuideDetails?id=' + id,
+					url: '/pages/highServer/travelGuideDetails/travelGuideDetails?id=' + id,
 				});
 			},
 			// 分页触发

pages/travelGuideDetails/travelGuideDetails.vue

@@ -6,12 +6,11 @@
 			<view class="wenzhangLy">
 				<!-- 头像昵称 -->
 				<view class="txTime">
-					<img class="uni-header-image"
-						:src="initInfo.headImg == null || initInfo.headImg == '' ? 'http://116.142.80.12:9000/10_03.png' : initInfo.headImg" />
-					<view class="time">
-						<p>{{initInfo.wechatName}}</p>
-						<span>{{fromData.createTime}}</span>
-					</view>
+				    <image :src="(detailInfo.headImg!=null)?loadImgSrcLocalhost(detailInfo.headImg):'https://tse4-mm.cn.bing.net/th/id/OIP-C.cYyiJYfTo1SY1cj26FQpAQHaHa?rs=1&pid=ImgDetMain'" style="border-radius: 50px;"></image>
+				    <view class="time">
+				        <p>{{detailInfo.nickName?detailInfo.nickName:'网友'}}</p>
+				        <span>{{ detailInfo.createTime }}</span>
+				    </view>
 				</view>
 			</view>
 			<view class="wenzhangCont">
@@ -29,9 +28,9 @@
 	import {
 		getDetails
 	} from '@/api/travelGuide/travelGuide.js';
-	import {
-		getUserInfo
-	} from '@/api/me/me.js'
+	// import {
+	// 	getUserInfo
+	// } from '@/api/me/me.js'
 	export default {
 		data() {
 			return {
@@ -56,11 +55,11 @@
 					}
 				})
 			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-				})
-			},
+			// getUserInfoByUserId(userId) {
+			// 	getUserInfo(userId).then(res => {
+			// 		this.initInfo = res.data;
+			// 	})
+			// },
 		}
 		/**
 		 * 生命周期函数--监听页面加载

pages/index/index.vue

@@ -512,7 +512,7 @@
 			 */
 			gozbdh() {
 				uni.navigateTo({
-					url: '/pages/liveBroadcast/liveBroadcast'
+					url: '/pages/highServer/liveBroadcast/liveBroadcast'
 				});
 			},
 			/**
@@ -520,7 +520,7 @@
 			 */
 			gozsk() {
 				uni.navigateTo({
-					url: '/pages/knowledge/knowledge'
+					url: '/pages/highServer/knowledge/knowledge'
 				});
 			},
 			/**
@@ -528,7 +528,7 @@
 			 */
 			golyxd() {
 				uni.navigateTo({
-					url: '/pages/travelGuide/travelGuide'
+					url: '/pages/highServer/travelGuide/travelGuide'
 				});
 			},
 			/**
@@ -536,7 +536,7 @@
 			 */
 			goxlzx() {
 				uni.navigateTo({
-					url: '/pages/psychology/psychology'
+					url: '/pages/highServer/psychology/psychology'
 				});
 			},
 			/**
@@ -544,7 +544,7 @@
 			 */
 			goxswz() {
 				uni.navigateTo({
-					url: '/pages/inquiry/inquiry'
+					url: '/pages/highServer/inquiry/inquiry'
 				});
 			},
 			/**
@@ -552,7 +552,7 @@
 			 */
 			gobfjz() {
 				uni.navigateTo({
-					url: '/pages/help/help'
+					url: '/pages/highServer/help/help'
 				});
 			},
 			goKnowledgeDetails(item) {