瀏覽代碼

高频服务 文章详情页面提取为articleDetail

付宇航 1 年之前
父節點
當前提交
11fcef6322
共有 28 個文件被更改,包括 79 次插入3707 次删除
  1. 0 81
      pages.json
  2. 9 4
      pages/highServer/help/help.vue
  3. 0 160
      pages/highServer/helpDetail/helpDetails.css
  4. 0 240
      pages/highServer/helpDetail/helpDetails.vue
  5. 9 4
      pages/highServer/inquiry/inquiry.vue
  6. 0 161
      pages/highServer/inquiryDetail/inquiryDetails.css
  7. 0 239
      pages/highServer/inquiryDetail/inquiryDetails.vue
  8. 9 4
      pages/highServer/lifeServices/lifeServices.vue
  9. 0 160
      pages/highServer/lifeServicesDetails/lifeServicesDetails.css
  10. 0 241
      pages/highServer/lifeServicesDetails/lifeServicesDetails.vue
  11. 9 4
      pages/highServer/liveBroadcast/liveBroadcast.vue
  12. 0 160
      pages/highServer/liveBroadcastDetails/liveBroadcastDetails.css
  13. 0 240
      pages/highServer/liveBroadcastDetails/liveBroadcastDetails.vue
  14. 9 4
      pages/highServer/psychology/psychology.vue
  15. 0 160
      pages/highServer/psychologyDetail/psychologyDetails.css
  16. 0 240
      pages/highServer/psychologyDetail/psychologyDetails.vue
  17. 9 4
      pages/highServer/travelGuide/travelGuide.vue
  18. 0 160
      pages/highServer/travelGuideDetails/travelGuideDetails.css
  19. 0 239
      pages/highServer/travelGuideDetails/travelGuideDetails.vue
  20. 0 159
      pages/specialService/financialInfrastructure/details.css
  21. 0 237
      pages/specialService/financialInfrastructure/details.vue
  22. 8 4
      pages/specialService/financialInfrastructure/financialInfrastructure.vue
  23. 0 159
      pages/specialService/legalService/details.css
  24. 0 237
      pages/specialService/legalService/details.vue
  25. 8 4
      pages/specialService/legalService/legalService.vue
  26. 0 159
      pages/specialService/loveAtVillage/details.css
  27. 0 238
      pages/specialService/loveAtVillage/details.vue
  28. 9 5
      pages/specialService/loveAtVillage/loveAtVillage.vue

+ 0 - 81
pages.json

@@ -34,15 +34,6 @@
 			}
 		},
 		{
-			"path": "pages/specialService/loveAtVillage/details",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "乡村婚恋详情"
-			}
-		},
-		{
 			"path": "pages/specialService/legalService/legalService",
 			"style": {
 				"usingComponents": {},
@@ -52,15 +43,6 @@
 			}
 		},
 		{
-			"path": "pages/specialService/legalService/details",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "法律服务详情"
-			}
-		},
-		{
 			"path": "pages/specialService/financialInfrastructure/financialInfrastructure",
 			"style": {
 				"usingComponents": {},
@@ -70,15 +52,6 @@
 			}
 		},
 		{
-			"path": "pages/specialService/financialInfrastructure/details",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "金融基建详情"
-			}
-		},
-		{
 			"path": "pages/highServer/cooperative/details",
 			"style": {
 				"usingComponents": {},
@@ -458,15 +431,6 @@
 			}
 		},
 		{
-			"path": "pages/highServer/liveBroadcastDetails/liveBroadcastDetails",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "直播带货详情"
-			}
-		},
-		{
 			"path": "pages/highServer/lifeServices/lifeServices",
 			"style": {
 				"usingComponents": {},
@@ -476,15 +440,6 @@
 			}
 		},
 		{
-			"path": "pages/highServer/lifeServicesDetails/lifeServicesDetails",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "生活服务详情"
-			}
-		},
-		{
 			"path": "pages/highServer/knowledge/knowledge",
 			"style": {
 				"usingComponents": {},
@@ -512,15 +467,6 @@
 			}
 		},
 		{
-			"path": "pages/highServer/travelGuideDetails/travelGuideDetails",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "旅游向导详情"
-			}
-		},
-		{
 			"path": "pages/highServer/psychology/psychology",
 			"style": {
 				"usingComponents": {},
@@ -530,15 +476,6 @@
 			}
 		},
 		{
-			"path": "pages/highServer/psychologyDetail/psychologyDetails",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "心理咨询详情"
-			}
-		},
-		{
 			"path": "pages/highServer/inquiry/inquiry",
 			"style": {
 				"usingComponents": {},
@@ -548,15 +485,6 @@
 			}
 		},
 		{
-			"path": "pages/highServer/inquiryDetail/inquiryDetails",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "线上问诊详情"
-			}
-		},
-		{
 			"path": "pages/highServer/help/help",
 			"style": {
 				"usingComponents": {},
@@ -566,15 +494,6 @@
 			}
 		},
 		{
-			"path": "pages/highServer/helpDetail/helpDetails",
-			"style": {
-				"usingComponents": {},
-				"navigationBarBackgroundColor": "#07c160",
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "帮扶救助详情"
-			}
-		},
-		{
 			"path": "pages/handleAffairs/topic/topic",
 			"style": {
 				"usingComponents": {},

+ 9 - 4
pages/highServer/help/help.vue

@@ -41,7 +41,8 @@
 
 <script>
 	import {
-		list
+		list,
+		getDetails
 	} from '@/api/help/help.js';
 	export default {
 		data() {
@@ -80,9 +81,13 @@
 		},
 		methods: {
 			goDetails(id) {
-				uni.navigateTo({
-					url: '/pages/highServer/helpDetail/helpDetails?id=' + id,
-				});
+				getDetails(id).then(res => {
+					let data = res.data
+					data.urls = data.pictureList
+					uni.navigateTo({
+						url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+					});
+				})
 			},
 			// 分页触发
 			change(e) {

+ 0 - 160
pages/highServer/helpDetail/helpDetails.css

@@ -1,160 +0,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;
-}
-
-.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: 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: #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;
-}

+ 0 - 240
pages/highServer/helpDetail/helpDetails.vue

@@ -1,240 +0,0 @@
-<template>
-	<view>
-		<!-- 直播带货详情 -->
-		<view class="container">
-			<h1 class="title">{{fromData.titleName}}</h1>
-<!--			<view class="wenzhangLy">-->
-<!--				&lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--				<view class="txTime">-->
-<!--          <img-->
-<!--              class="uni-header-image"-->
-<!--              :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--          />-->
-<!--				    <view class="time">-->
-<!--              <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--				        <span>{{ fromData.createTime }}</span>-->
-<!--				    </view>-->
-<!--				</view>-->
-<!--			</view>-->
-			<view class="wenzhangCont article">
-				<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>
-	import {
-		getDetails
-	} from '@/api/help/help.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;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
-		}
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		,
-		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 lang="scss">
-	@import './helpDetails.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>

+ 9 - 4
pages/highServer/inquiry/inquiry.vue

@@ -41,7 +41,8 @@
 
 <script>
 	import {
-		list
+		list,
+		getDetails
 	} from '@/api/inquiry/inquiry.js';
 	export default {
 		data() {
@@ -80,9 +81,13 @@
 		},
 		methods: {
 			goDetails(id) {
-				uni.navigateTo({
-					url: '/pages/highServer/inquiryDetail/inquiryDetails?id=' + id,
-				});
+				getDetails(id).then(res => {
+					let data = res.data
+					data.urls = data.pictureList
+					uni.navigateTo({
+						url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+					});
+				})
 			},
 			// 分页触发
 			change(e) {

+ 0 - 161
pages/highServer/inquiryDetail/inquiryDetails.css

@@ -1,161 +0,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;
-}
-
-.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: 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: #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;
-}

+ 0 - 239
pages/highServer/inquiryDetail/inquiryDetails.vue

@@ -1,239 +0,0 @@
-<template>
-	<view>
-		<!-- 线上问诊详情 -->
-		<view class="container">
-			<h1 class="title">{{fromData.titleName}}</h1>
-<!--      <view class="wenzhangLy">-->
-<!--        &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--        <view class="txTime">-->
-<!--          <img-->
-<!--              class="uni-header-image"-->
-<!--              :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--          />-->
-<!--          <view class="time">-->
-<!--            <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--            <span>{{ fromData.createTime }}</span>-->
-<!--          </view>-->
-<!--        </view>-->
-<!--      </view>-->
-			<view class="wenzhangCont article">
-				<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>
-	import {
-		getDetails
-	} from '@/api/inquiry/inquiry.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;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
-		}
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		,
-		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 lang="scss">
-	@import './inquiryDetails.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>

+ 9 - 4
pages/highServer/lifeServices/lifeServices.vue

@@ -45,7 +45,8 @@
 
 <script>
 	import {
-		list
+		list,
+		getDetails
 	} from '@/api/lifeServices/lifeServices.js';
 	export default {
 		data() {
@@ -84,9 +85,13 @@
 		},
 		methods: {
 			goDetails(id) {
-				uni.navigateTo({
-					url: '/pages/highServer/lifeServicesDetails/lifeServicesDetails?id=' + id,
-				});
+				getDetails(id).then(res => {
+					let data = res.data
+					data.urls = data.pictureList
+					uni.navigateTo({
+						url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+					});
+				})
 			},
 			// 分页触发
 			change(e) {

+ 0 - 160
pages/highServer/lifeServicesDetails/lifeServicesDetails.css

@@ -1,160 +0,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;
-}
-
-.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: 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: #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;
-}

+ 0 - 241
pages/highServer/lifeServicesDetails/lifeServicesDetails.vue

@@ -1,241 +0,0 @@
-<template>
-	<view>
-		<!-- 生活服务详情 -->
-		<view class="container">
-			<h1 class="title">{{fromData.titleName}}</h1>
-<!--      <view class="wenzhangLy">-->
-<!--        &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--        <view class="txTime">-->
-<!--          <img-->
-<!--              class="uni-header-image"-->
-<!--              :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--          />-->
-<!--          <view class="time">-->
-<!--            <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--            <span>{{ fromData.createTime }}</span>-->
-<!--          </view>-->
-<!--        </view>-->
-<!--      </view>-->
-			<view class="wenzhangCont article">
-				<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>
-	import {
-		getDetails
-	} from '@/api/lifeServices/lifeServices.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
-            debugger
-            this.getUserInfoByUserId(res.data.createBy)
-					}
-				})
-			},
-			getUserInfoByUserId(userId) {
-				getUserInfo(userId).then(res => {
-					this.initInfo = res.data;
-				})
-			},
-		}
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		,
-		onLoad(options) {
-			this.parentId = options.id
-			this.getDetails()
-		},
-		/**
-		 * 生命周期函数--监听页面初次渲染完成
-		 */
-		onReady() {
-			this.userId = getApp().globalData.userId
-
-		},
-		/**
-		 * 生命周期函数--监听页面显示
-		 */
-		onShow() {},
-		/**
-		 * 生命周期函数--监听页面隐藏
-		 */
-		onHide() {},
-		/**
-		 * 生命周期函数--监听页面卸载
-		 */
-		onUnload() {},
-		/**
-		 * 页面相关事件处理函数--监听用户下拉动作
-		 */
-		onPullDownRefresh() {},
-		/**
-		 * 页面上拉触底事件的处理函数
-		 */
-		onReachBottom() {},
-		/**
-		 * 用户点击右上角分享
-		 */
-		onShareAppMessage() {},
-	};
-</script>
-<style lang="scss">
-	@import './lifeServicesDetails.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>

+ 9 - 4
pages/highServer/liveBroadcast/liveBroadcast.vue

@@ -45,7 +45,8 @@
 
 <script>
 	import {
-		list
+		list,
+		getDetails
 	} from '@/api/liveBroadcast/liveBroadcast.js';
 	export default {
 		data() {
@@ -84,9 +85,13 @@
 		},
 		methods: {
 			goDetails(id) {
-				uni.navigateTo({
-					url: '/pages/highServer/liveBroadcastDetails/liveBroadcastDetails?id=' + id,
-				});
+				getDetails(id).then(res => {
+					let data = res.data
+					data.urls = data.pictureList
+					uni.navigateTo({
+						url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+					});
+				})
 			},
 			// 分页触发
 			change(e) {

+ 0 - 160
pages/highServer/liveBroadcastDetails/liveBroadcastDetails.css

@@ -1,160 +0,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;
-}
-
-.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: 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: #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;
-}

+ 0 - 240
pages/highServer/liveBroadcastDetails/liveBroadcastDetails.vue

@@ -1,240 +0,0 @@
-<template>
-	<view>
-		<!-- 直播带货详情 -->
-		<view class="container">
-			<h1 class="title">{{fromData.titleName}}</h1>
-<!--			<view class="wenzhangLy">-->
-<!--      &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--      <view class="txTime">-->
-<!--        <img-->
-<!--            class="uni-header-image"-->
-<!--            :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--        />-->
-<!--        <view class="time">-->
-<!--          <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--          <span>{{ fromData.createTime }}</span>-->
-<!--        </view>-->
-<!--      </view>-->
-<!--    </view>-->
-			<view class="wenzhangCont article">
-				<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>
-	import {
-		getDetails
-	} from '@/api/liveBroadcast/liveBroadcast.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;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
-		}
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		,
-		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 lang="scss">
-	@import './liveBroadcastDetails.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>

+ 9 - 4
pages/highServer/psychology/psychology.vue

@@ -45,7 +45,8 @@
 
 <script>
 	import {
-		list
+		list,
+		getDetails
 	} from '@/api/psychology/psychology.js';
 	export default {
 		data() {
@@ -84,9 +85,13 @@
 		},
 		methods: {
 			goDetails(id) {
-				uni.navigateTo({
-					url: '/pages/highServer/psychologyDetail/psychologyDetails?id=' + id,
-				});
+				getDetails(id).then(res => {
+					let data = res.data
+					data.urls = data.pictureList
+					uni.navigateTo({
+						url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+					});
+				})
 			},
 			// 分页触发
 			change(e) {

+ 0 - 160
pages/highServer/psychologyDetail/psychologyDetails.css

@@ -1,160 +0,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;
-}
-
-.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: 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: #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;
-}

+ 0 - 240
pages/highServer/psychologyDetail/psychologyDetails.vue

@@ -1,240 +0,0 @@
-<template>
-	<view>
-		<!-- 心理咨询详情 -->
-		<view class="container">
-			<h1 class="title">{{fromData.titleName}}</h1>
-<!--			<view class="wenzhangLy">-->
-<!--        &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--        <view class="txTime">-->
-<!--          <img-->
-<!--              class="uni-header-image"-->
-<!--              :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--          />-->
-<!--          <view class="time">-->
-<!--            <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--            <span>{{ fromData.createTime }}</span>-->
-<!--          </view>-->
-<!--        </view>-->
-<!--			</view>-->
-			<view class="wenzhangCont article">
-				<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>
-	import {
-		getDetails
-	} from '@/api/psychology/psychology.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;
-					console.log("this.initInfo", this.initInfo)
-				})
-			},
-		}
-		/**
-		 * 生命周期函数--监听页面加载
-		 */
-		,
-		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 lang="scss">
-	@import './psychologyDetails.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>

+ 9 - 4
pages/highServer/travelGuide/travelGuide.vue

@@ -45,7 +45,8 @@
 
 <script>
 	import {
-		list
+		list,
+		getDetails
 	} from '@/api/travelGuide/travelGuide.js';
 	export default {
 		data() {
@@ -84,9 +85,13 @@
 		},
 		methods: {
 			goDetails(id) {
-				uni.navigateTo({
-					url: '/pages/highServer/travelGuideDetails/travelGuideDetails?id=' + id,
-				});
+				getDetails(id).then(res => {
+					let data = res.data
+					data.urls = data.pictureList
+					uni.navigateTo({
+						url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+					});
+				})
 			},
 			// 分页触发
 			change(e) {

+ 0 - 160
pages/highServer/travelGuideDetails/travelGuideDetails.css

@@ -1,160 +0,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;
-}
-
-.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: 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: #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;
-}

+ 0 - 239
pages/highServer/travelGuideDetails/travelGuideDetails.vue

@@ -1,239 +0,0 @@
-<template>
-	<view>
-		<!-- 旅游向导详情 -->
-		<view class="container">
-			<h1 class="title">{{fromData.titleName}}</h1>
-<!--      <view class="wenzhangLy">-->
-<!--        &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--        <view class="txTime">-->
-<!--          <img-->
-<!--              class="uni-header-image"-->
-<!--              :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--          />-->
-<!--          <view class="time">-->
-<!--            <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--            <span>{{ fromData.createTime }}</span>-->
-<!--          </view>-->
-<!--        </view>-->
-<!--      </view>-->
-			<view class="wenzhangCont article">
-				<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>
-	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 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>

+ 0 - 159
pages/specialService/financialInfrastructure/details.css

@@ -1,159 +0,0 @@
-.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;
-}
-
-.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: 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: #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;
-}

+ 0 - 237
pages/specialService/financialInfrastructure/details.vue

@@ -1,237 +0,0 @@
-<template>
-    <view>
-        <!-- 金融基建详情 -->
-        <view class="container">
-            <h1 class="title">{{fromData.titleName}}</h1>
-<!--          <view class="wenzhangLy">-->
-<!--            &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--            <view class="txTime">-->
-<!--              <img-->
-<!--                  class="uni-header-image"-->
-<!--                  :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--              />-->
-<!--              <view class="time">-->
-<!--                <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--                <span>{{ fromData.createTime }}</span>-->
-<!--              </view>-->
-<!--            </view>-->
-<!--          </view>-->
-            <view class="wenzhangCont article">
-                <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>
-    import { getDetails } from '@/api/specialService/financialInfrastructure.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 lang="scss">
-    @import './details.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>

+ 8 - 4
pages/specialService/financialInfrastructure/financialInfrastructure.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-    import { list } from '@/api/specialService/financialInfrastructure.js';
+    import { list ,getDetails} from '@/api/specialService/financialInfrastructure.js';
     export default {
         data() {
             return {
@@ -78,9 +78,13 @@
         },
         methods: {
             goDetails(id) {
-                uni.navigateTo({
-                    url: '/pages/specialService/financialInfrastructure/details?id=' + id,
-                });
+                getDetails(id).then(res => {
+                	let data = res.data
+                	data.urls = data.pictureList
+                	uni.navigateTo({
+                		url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+                	});
+                })
             },
             // 分页触发
             change(e) {

+ 0 - 159
pages/specialService/legalService/details.css

@@ -1,159 +0,0 @@
-.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;
-}
-
-.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: 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: #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;
-}

+ 0 - 237
pages/specialService/legalService/details.vue

@@ -1,237 +0,0 @@
-<template>
-    <view>
-        <!-- 法律服务详情 -->
-        <view class="container">
-            <h1 class="title">{{fromData.titleName}}</h1>
-<!--          <view class="wenzhangLy">-->
-<!--            &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--            <view class="txTime">-->
-<!--              <img-->
-<!--                  class="uni-header-image"-->
-<!--                  :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--              />-->
-<!--              <view class="time">-->
-<!--                <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--                <span>{{ fromData.createTime }}</span>-->
-<!--              </view>-->
-<!--            </view>-->
-<!--          </view>-->
-            <view class="wenzhangCont article">
-                <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>
-    import { getDetails } from '@/api/specialService/legalService.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 lang="scss">
-    @import './details.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>

+ 8 - 4
pages/specialService/legalService/legalService.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-    import { list } from '@/api/specialService/legalService.js';
+    import { list ,getDetails} from '@/api/specialService/legalService.js';
     export default {
         data() {
             return {
@@ -78,9 +78,13 @@
         },
         methods: {
             goDetails(id) {
-                uni.navigateTo({
-                    url: '/pages/specialService/legalService/details?id=' + id,
-                });
+               getDetails(id).then(res => {
+               	let data = res.data
+               	data.urls = data.pictureList
+               	uni.navigateTo({
+               		url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+               	});
+               })
             },
             // 分页触发
             change(e) {

+ 0 - 159
pages/specialService/loveAtVillage/details.css

@@ -1,159 +0,0 @@
-.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;
-}
-
-.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: 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: #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;
-}

+ 0 - 238
pages/specialService/loveAtVillage/details.vue

@@ -1,238 +0,0 @@
-<template>
-    <view>
-        <!-- 乡村婚恋详情 -->
-        <view class="container">
-            <h1 class="title">{{fromData.titleName}}</h1>
-          <!-- 头像昵称 -->
-<!--          <view class="wenzhangLy">-->
-<!--            &lt;!&ndash; 头像昵称 &ndash;&gt;-->
-<!--            <view class="txTime">-->
-<!--              <img-->
-<!--                  class="uni-header-image"-->
-<!--                  :src="initInfo.headImg == null || initInfo.headImg == '' ? initImgPath : loadImgSrcLocalhost(initInfo.headImg)"-->
-<!--              />-->
-<!--              <view class="time">-->
-<!--                <p>{{initInfo.name == null || initInfo.name == '' ? initInfo.wechatName : initInfo.name}}</p>-->
-<!--                <span>{{ fromData.createTime }}</span>-->
-<!--              </view>-->
-<!--            </view>-->
-<!--          </view>-->
-            <view class="wenzhangCont article">
-                <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>
-    import { getDetails } from '@/api/specialService/loveAtVillage.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 lang="scss">
-    @import './details.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>

+ 9 - 5
pages/specialService/loveAtVillage/loveAtVillage.vue

@@ -40,7 +40,7 @@
 </template>
 
 <script>
-    import { list } from '@/api/specialService/loveAtVillage.js';
+    import { list ,getDetails } from '@/api/specialService/loveAtVillage.js';
     export default {
         data() {
             return {
@@ -77,10 +77,14 @@
             }
         },
         methods: {
-            goDetails(id) {
-                uni.navigateTo({
-                    url: '/pages/specialService/loveAtVillage/details?id=' + id,
-                });
+			goDetails(id) {
+            	getDetails(id).then(res => {
+            		let data = res.data
+            		data.urls = data.pictureList
+            		uni.navigateTo({
+            			url: `/pages/common/articleDetail/articleDetail?data=${this.encodify(data)}`
+            		});
+            	})
             },
             // 分页触发
             change(e) {