lchao 1 anno fa
parent
commit
a5389c725c

+ 2 - 2
api/help/help.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function list(query) {
   return request({
-    url: '/high/server/liveBroadcastList',
+    url: '/high/server/helpList',
     method: 'get',
 	params:query
   })
 }
 export function getDetails(id) {
   return request({
-    url: '/high/server/liveBroadcastDetails/' + id,
+    url: '/high/server/helpDetails/' + id,
     method: 'get',
   })
 }

+ 2 - 2
api/inquiry/inquiry.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function list(query) {
   return request({
-    url: '/high/server/liveBroadcastList',
+    url: '/high/server/inquiryList',
     method: 'get',
 	params:query
   })
 }
 export function getDetails(id) {
   return request({
-    url: '/high/server/liveBroadcastDetails/' + id,
+    url: '/high/server/inquiryDetails/' + id,
     method: 'get',
   })
 }

+ 2 - 2
api/psychology/psychology.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function list(query) {
   return request({
-    url: '/high/server/liveBroadcastList',
+    url: '/high/server/psychologyList',
     method: 'get',
 	params:query
   })
 }
 export function getDetails(id) {
   return request({
-    url: '/high/server/liveBroadcastDetails/' + id,
+    url: '/high/server/psychologyDetails/' + id,
     method: 'get',
   })
 }

+ 54 - 0
pages.json

@@ -354,6 +354,60 @@
 			}
 		},
 		{
+			"path": "pages/psychology/psychology",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "心理咨询"
+			}
+		},
+		{
+			"path": "pages/psychologyDetails/psychologyDetails",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "心理咨询详情"
+			}
+		},
+		{
+			"path": "pages/inquiry/inquiry",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "线上问诊"
+			}
+		},
+		{
+			"path": "pages/inquiryDetails/inquiryDetails",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "线上问诊详情"
+			}
+		},
+		{
+			"path": "pages/help/help",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "帮扶救助"
+			}
+		},
+		{
+			"path": "pages/helpDetails/helpDetails",
+			"style": {
+				"usingComponents": {},
+				"navigationBarBackgroundColor": "#07c160",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "帮扶救助详情"
+			}
+		},
+		{
 			"path" : "pages/topic/topic",
 			"style": {
 				"usingComponents": {},

+ 130 - 98
pages/travelGuide/travelGuide.css

@@ -1,110 +1,44 @@
-/* pages/wenda/wenda.wxss */
-.wendaFL {
+/* pages/wenbaxiangqing.wxss */
+.title {
+    font-size: 44rpx;
+    text-align: center;
+    line-height: 70rpx;
+    color: #333;
+    margin: 30rpx 0;
+}
+.wenzhangLy {
     width: 100%;
     display: flex;
     justify-content: space-between;
-    margin: 30rpx 0 0 0;
-}
-.wendaFL li {
-    width: 48%;
-    height: 168rpx;
-    position: relative;
-}
-.cooperativeBox{
-    position: relative;
-    left: 30rpx;
-    top: 10rpx;
-    z-index: 0;
-    width: 800rpx;
-    height: 100rpx;
-}
-.cooperativeImgBox{
-    position: relative;
-    left: 0;
-    top: 0;
-    z-index: 0;
-    width: 330rpx;
-    height: 100rpx;
-}
-.cooperativeImg{
-    position: relative;
-    left: 0;
-    top: 0;
-    z-index: 0;
-    width: 100%;
-    height: 100%;
-}
-
-.lbBj {
-    position: absolute;
-    left: 0;
-    top: 0;
-    z-index: 0;
-    width: 100%;
-    height: 100%;
-}
-.wendaFL li h2 {
-    font-size: 36rpx;
-    position: absolute;
-    left: 30rpx;
-    top: 40rpx;
-    z-index: 1;
-    font-weight: bold;
-}
-.wendaFL li span {
-    font-size: 30rpx;
-    position: absolute;
-    left: 30rpx;
-    top: 88rpx;
-    z-index: 1;
-}
-.wendaFL li.sanNong {
-    color: #0d9970;
-}
-.wendaFL li.jiuYe {
-    color: #1e8fb4;
-}
-.wendaFL li.faLv {
-    color: #1e5dab;
-}
-.wendaFL li.jiuZhen {
-    color: #4a700d;
+    border-bottom: solid 2rpx #e8e8e8;
+    padding: 0 0 14rpx 0;
 }
-/* 列表 */
-.rnwdList {
-    width: 100%;
+.txTime {
     display: flex;
-    justify-content: space-between;
-    margin: 20rpx 0;
+    flex-direction: row;
 }
-.list {
-    width: 79%;
+.txTime image {
+    width: 80rpx;
+    height: 80rpx;
 }
-.lb {
-    background: #0d9970;
-    color: #fff;
-    font-size: 24rpx;
-    width: 12%;
-    text-align: center;
-    padding: 2rpx 0;
-    line-height: 40rpx;
-    height: 40rpx;
-    border-radius: 10rpx;
+.time {
+    display: flex;
+    flex-direction: column;
+    padding: 10rpx 0 0 8px;
 }
-.listTitle {
-    font-size: 32rpx;
-    color: #333;
-    line-height: 40rpx;
+.time p {
+    font-size: 28rpx;
+    color: #9c9c9c;
 }
-.jlSj {
-    height: 40rpx;
-    display: flex;
-    justify-content: space-between;
+.time span {
     font-size: 24rpx;
-    margin: 20rpx 0 0 0;
+    color: #c4c4c4;
 }
+
 .jf {
     color: #07c160;
+    line-height: 80rpx;
+    font-size: 24rpx;
 }
 .icon-jifen {
     font-size: 28rpx;
@@ -113,16 +47,114 @@
 }
 .ck {
     color: #c4c4c4;
+    font-size: 28rpx;
 }
 .icon-pinglun,
 .icon-chakan,
-.icon-shoucang {
+.ck .icon-shoucang {
     font-size: 28rpx;
     margin: 0 6rpx 0 20rpx;
     color: #c4c4c4;
+    line-height: 0;
 }
-.icon-xiangyoujiantou {
+.wenzhangCont {
+    font-size: 34rpx;
+    margin: 30rpx 0;
+}
+.wenzhangCont image {
+    width: 100%;
+    height: 320rpx;
+    margin: 20rpx auto;
+}
+.pinglunTj {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin: 30rpx 0;
+}
+.pinglunTitle {
+    font-size: 34rpx;
+    color: #2e2e2e;
+    font-weight: 600;
+}
+.pinglunTitle em {
+    font-size: 34rpx;
+    color: #9b9b9b;
+    font-weight: normal;
+    margin: 0 0 0 10rpx;
+}
+.pinglunList {
+    width: 100%;
+    padding: 0 0 120rpx 0;
+}
+.pinglunList li {
+    margin: 20rpx 0;
+    border-bottom: solid 2rpx #e8e8e8;
+    padding: 0 0 20rpx 0;
+    display: flex;
+    flex-direction: column;
+}
+.plListcont {
     font-size: 30rpx;
-    color: #c4c4c4;
-    line-height: 60rpx;
+    color: #696868;
+    margin: 20rpx 0;
+}
+.pinglunList li button {
+    width: 80%;
+    border-radius: 10rpx;
+    background: #07c160;
+    color: #fff;
+    font-size: 28rpx;
+    font-weight: normal;
+    margin: 16rpx auto;
+}
+.fabiaoPl {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 112rpx;
+    background: #e8e8e8;
+    box-shadow: 0rpx 0rpx 16rpx #999;
+}
+.shuRu {
+    width: 72%;
+    display: flex;
+    flex-direction: row;
+    height: 76rpx;
+    background: #e0e0e0;
+    border-radius: 60rpx;
+    margin: 20rpx 0 0 20rpx;
+}
+.shuRu input {
+    line-height: 38px;
+    height: 76rpx;
+    font-size: 30rpx;
+    width: 83%;
+}
+.icon-bianji {
+    font-size: 38rpx;
+    line-height: 76rpx;
+    margin: 0 10rpx 0 20rpx;
+    color: #828181;
+}
+.icon-shoucang {
+    font-size: 50rpx;
+    line-height: 112rpx;
+    color: #828181;
+}
+.fasong {
+    width: 58rpx;
+    height: 58rpx;
+    border-radius: 50rpx;
+    background: #07c160;
+    margin: 26rpx 20rpx 0 10rpx;
+    text-align: center;
+    line-height: 58rpx;
+}
+.icon-fasong {
+    font-size: 40rpx;
+    color: #fff;
 }

+ 2 - 2
pages/travelGuide/travelGuide.vue

@@ -81,7 +81,7 @@
 		methods: {
 			goDetails(id) {
 				uni.navigateTo({
-					url: '/pages/liveBroadcastDetails/liveBroadcastDetails?id=' + id,
+					url: '/pages/travelGuideDetails/travelGuideDetails?id=' + id,
 				});
 			},
 			// 分页触发
@@ -106,5 +106,5 @@
 </script>
 
 <style>
-	@import './liveBroadcast.css';
+	@import './travelGuide.css';
 </style>

+ 149 - 25
pages/travelGuideDetails/travelGuideDetails.css

@@ -1,36 +1,160 @@
-.container{
-    padding: 0;
+/* pages/wenbaxiangqing.wxss */
+.title {
+    font-size: 44rpx;
+    text-align: center;
+    line-height: 70rpx;
+    color: #333;
+    margin: 30rpx 0;
+}
+.wenzhangLy {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    border-bottom: solid 2rpx #e8e8e8;
+    padding: 0 0 14rpx 0;
+}
+.txTime {
+    display: flex;
+    flex-direction: row;
+}
+.txTime image {
+    width: 80rpx;
+    height: 80rpx;
+}
+.time {
+    display: flex;
+    flex-direction: column;
+    padding: 10rpx 0 0 8px;
+}
+.time p {
+    font-size: 28rpx;
+    color: #9c9c9c;
+}
+.time span {
+    font-size: 24rpx;
+    color: #c4c4c4;
 }
 
-.cooperativeImgBox{
-    position: static;
-    left: 0;
-    top: 0;
-    z-index: 0;
+.jf {
+    color: #07c160;
+    line-height: 80rpx;
+    font-size: 24rpx;
+}
+.icon-jifen {
+    font-size: 28rpx;
+    color: #07c160;
+    margin: 0 0 0 6rpx;
+}
+.ck {
+    color: #c4c4c4;
+    font-size: 28rpx;
+}
+.icon-pinglun,
+.icon-chakan,
+.ck .icon-shoucang {
+    font-size: 28rpx;
+    margin: 0 6rpx 0 20rpx;
+    color: #c4c4c4;
+    line-height: 0;
+}
+.wenzhangCont {
+    font-size: 34rpx;
+    margin: 30rpx 0;
+}
+.wenzhangCont image {
     width: 100%;
-    height: 480rpx;
+    height: 320rpx;
+    margin: 20rpx auto;
 }
-.cooperativeImg{
-    position: static;
-    left: 0;
-    top: 0;
-    z-index: 0;
+.pinglunTj {
     width: 100%;
-    height: 100%;
+    display: flex;
+    justify-content: space-between;
+    margin: 30rpx 0;
 }
-
-.itemBox {
+.pinglunTitle {
+    font-size: 34rpx;
+    color: #2e2e2e;
+    font-weight: 600;
+}
+.pinglunTitle em {
+    font-size: 34rpx;
+    color: #9b9b9b;
+    font-weight: normal;
+    margin: 0 0 0 10rpx;
+}
+.pinglunList {
     width: 100%;
-    font-size: 50rpx;
+    padding: 0 0 120rpx 0;
 }
-.itemBox:nth-child(2n-1){
-    background: #ccc;
+.pinglunList li {
+    margin: 20rpx 0;
+    border-bottom: solid 2rpx #e8e8e8;
+    padding: 0 0 20rpx 0;
+    display: flex;
+    flex-direction: column;
 }
-.itemBox:nth-child(2n){
-    background: #ddd;
+.plListcont {
+    font-size: 30rpx;
+    color: #696868;
+    margin: 20rpx 0;
 }
-
-.item{
-    /*width: 100%;*/
-    /*background-color: #57f5a1;*/
+.pinglunList li button {
+    width: 80%;
+    border-radius: 10rpx;
+    background: #07c160;
+    color: #fff;
+    font-size: 28rpx;
+    font-weight: normal;
+    margin: 16rpx auto;
+}
+.fabiaoPl {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    height: 112rpx;
+    background: #e8e8e8;
+    box-shadow: 0rpx 0rpx 16rpx #999;
+}
+.shuRu {
+    width: 72%;
+    display: flex;
+    flex-direction: row;
+    height: 76rpx;
+    background: #e0e0e0;
+    border-radius: 60rpx;
+    margin: 20rpx 0 0 20rpx;
+}
+.shuRu input {
+    line-height: 38px;
+    height: 76rpx;
+    font-size: 30rpx;
+    width: 83%;
+}
+.icon-bianji {
+    font-size: 38rpx;
+    line-height: 76rpx;
+    margin: 0 10rpx 0 20rpx;
+    color: #828181;
+}
+.icon-shoucang {
+    font-size: 50rpx;
+    line-height: 112rpx;
+    color: #828181;
+}
+.fasong {
+    width: 58rpx;
+    height: 58rpx;
+    border-radius: 50rpx;
+    background: #07c160;
+    margin: 26rpx 20rpx 0 10rpx;
+    text-align: center;
+    line-height: 58rpx;
+}
+.icon-fasong {
+    font-size: 40rpx;
+    color: #fff;
 }

+ 232 - 59
pages/travelGuideDetails/travelGuideDetails.vue

@@ -1,64 +1,237 @@
 <template>
-    <view class="container">
-        <!-- 旅游向导详情 -->
-        <view class="cooperativeImgBox">
-            <image :src="loadImgSrc('/snbj.png')" class="cooperativeImg"></image>
-        </view>
-        <view class="itemBox" v-for="(item, index) in list" :key="index">
-            <view class="item">
-                <span>
-                    {{ item.title }}:
-                </span>
-                <span>
-                    {{ item.content }}
-                </span>
-            </view>
-        </view>
-    </view>
+	<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>
+				</view>
+			</view>
+			<view class="wenzhangCont">
+				<view v-html="fromData.textDetails"></view>
+				<view v-for="(item, index) in fromData.pictureList" :key="index">
+					<image :src="loadImgSrcLocalhost(item)"></image>
+				</view>
+			</view>
+			<view class="fengexian"></view>
+		</view>
+	</view>
 </template>
 
 <script>
-export default {
-    data() {
-        return {
-            list: [
-                {
-                    title: "名称",
-                    content: "第十三号旅游向导",
-                },
-                {
-                    title: "地址",
-                    content: "十三号街区地下研究所",
-                },
-                {
-                    title: "负责人",
-                    content: "高耀",
-                },
-                {
-                    title: "负责人电话",
-                    content: "13178945612",
-                }
-            ],
-            cooperative: {
-                name:"旅游向导1",
-                address:"旅游向导地址1",
-                chargePeople:"负责人1",
-                chargePhone:"13103215236",
-                imgUrl:"/profile/upload/2024/03/01/nacos_20240301145836A002.png"
-            }
-        }
-    }
-    /**
-     * 生命周期函数--监听页面加载
-     */,
-    onLoad(options) {
-        console.log(666)
-    },
-    methods: {
-
-    }
-};
+	import {
+		getDetails
+	} from '@/api/travelGuide/travelGuide.js';
+	import {
+		getUserInfo
+	} from '@/api/me/me.js'
+	export default {
+		data() {
+			return {
+				parentId: "",
+				fromData: {},
+				content: "",
+				initInfo: {
+					userId: null,
+					scoreNum: 0,
+					wechatName: "微信用户",
+					name: null,
+					headImg: null,
+				},
+			};
+		},
+		methods: {
+			// 获取数据
+			getDetails() {
+				getDetails(this.parentId).then(res => {
+					if (res.code == 200) {
+						this.fromData = res.data
+					}
+				})
+			},
+			getUserInfoByUserId(userId) {
+				getUserInfo(userId).then(res => {
+					this.initInfo = res.data;
+				})
+			},
+		}
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		,
+		onLoad(options) {
+			this.parentId = options.id
+			this.getDetails()
+		},
+		/**
+		 * 生命周期函数--监听页面初次渲染完成
+		 */
+		onReady() {
+			this.userId = getApp().globalData.userId
+			this.getUserInfoByUserId(this.userId)
+		},
+		/**
+		 * 生命周期函数--监听页面显示
+		 */
+		onShow() {},
+		/**
+		 * 生命周期函数--监听页面隐藏
+		 */
+		onHide() {},
+		/**
+		 * 生命周期函数--监听页面卸载
+		 */
+		onUnload() {},
+		/**
+		 * 页面相关事件处理函数--监听用户下拉动作
+		 */
+		onPullDownRefresh() {},
+		/**
+		 * 页面上拉触底事件的处理函数
+		 */
+		onReachBottom() {},
+		/**
+		 * 用户点击右上角分享
+		 */
+		onShareAppMessage() {},
+	};
 </script>
-<style>
-@import './details.css';
-</style>
+<style lang="scss">
+	@import './travelGuideDetails.css';
+
+	.collect {
+		.icon-shoucang:before {
+			color: red;
+		}
+	}
+
+	.not-collect {}
+
+	.effectBix {
+		width: 56px;
+		height: 56px;
+		border-radius: 50px;
+		font-family: 'Bebas Neue', cursive;
+		background: linear-gradient(45deg, transparent 5%, #FF013C 5%);
+		border: 0;
+		color: #fff;
+		text-align: center;
+		line-height: 56px;
+		outline: transparent;
+		position: absolute;
+		transform: rotate(-30deg);
+		right: 3%;
+		top: -5%;
+	}
+
+	.effectBox,
+	.effectBox::after {
+		width: 56px;
+		height: 56px;
+		border-radius: 50px;
+		font-size: 16px;
+		font-family: 'Bebas Neue', cursive;
+		background: linear-gradient(45deg, transparent 5%, #FF013C 5%);
+		border: 0;
+		color: #fff;
+		opacity: 1;
+		letter-spacing: 3px;
+		text-align: center;
+		line-height: 56px;
+		outline: transparent;
+		position: relative;
+		left: 78%;
+		top: 113%;
+		transform: rotate(-30deg);
+		z-index: 1;
+	}
+
+	.effectBox::after {
+		--slice-0: inset(50% 50% 50% 50%);
+		--slice-1: inset(80% -6px 0 0);
+		--slice-2: inset(50% -6px 30% 0);
+		--slice-3: inset(10% -6px 85% 0);
+		--slice-4: inset(40% -6px 43% 0);
+		--slice-5: inset(80% -6px 5% 0);
+
+		content: 'AVAILABLE NOW';
+		display: block;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: linear-gradient(45deg, transparent 3%, #00E6F6 3%, #00E6F6 5%, #FF013C 5%);
+		text-shadow: -3px -3px 0px #F8F005, 3px 3px 0px #00E6F6;
+		clip-path: var(--slice-0);
+	}
+
+	.effectBox:hover::after {
+		animation: 1s glitch;
+		animation-timing-function: steps(2, end);
+	}
+
+	@keyframes glitch {
+		0% {
+			clip-path: var(--slice-1);
+			transform: translate(-20px, -10px);
+		}
+
+		10% {
+			clip-path: var(--slice-3);
+			transform: translate(10px, 10px);
+		}
+
+		20% {
+			clip-path: var(--slice-1);
+			transform: translate(-10px, 10px);
+		}
+
+		30% {
+			clip-path: var(--slice-3);
+			transform: translate(0px, 5px);
+		}
+
+		40% {
+			clip-path: var(--slice-2);
+			transform: translate(-5px, 0px);
+		}
+
+		50% {
+			clip-path: var(--slice-3);
+			transform: translate(5px, 0px);
+		}
+
+		60% {
+			clip-path: var(--slice-4);
+			transform: translate(5px, 10px);
+		}
+
+		70% {
+			clip-path: var(--slice-2);
+			transform: translate(-10px, 10px);
+		}
+
+		80% {
+			clip-path: var(--slice-5);
+			transform: translate(20px, -10px);
+		}
+
+		90% {
+			clip-path: var(--slice-1);
+			transform: translate(-10px, 0px);
+		}
+
+		100% {
+			clip-path: var(--slice-1);
+			transform: translate(0);
+		}
+	}
+</style>