Merge branch 'master' of http://192.168.0.75:3000/bonus/jyy-smart-canteen-h5

pages/mine/healthScience/detail.vue

@@ -1,55 +1,20 @@
-<template><page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
+<template>
+  <page-meta :page-font-size="fontValue+'px'" :root-font-size="fontValue+'px'"></page-meta>
   <view class="page">
-    <view>
-	<div v-html="detailData.articleContent"></div>
-	</view>
+    <rich-text :nodes="detailData.articleContent || ''"></rich-text>
   </view>
 </template>
 
 <script>
-import { getHealthScienceDetailApi } from '@/api/mine/health.js';
-	  
 export default {
 	data() {
 		return {
-			fontValue:uni.getStorageSync('fontSize') || 8,
-			orderId:"", 
-			// 详情页数据
-			detailData: {
-				
-			}
+			fontValue: uni.getStorageSync('fontSize') || 16,
+			detailData: {}
 		}
 	},
 	onLoad(options) {
 		this.detailData = JSON.parse(options.params)
-		// this.orderId = options.orderId;
-		// this.getOrderDetail() 
-	},
-	methods: {  
-		async getOrderDetail() {
-			try {
-				let param = {
-					"orderId":this.orderId
-				}
-				const res = await getHealthScienceDetailApi(param)
-				console.log('?? ~ getList ~ res:', res)
-				this.detailData = res.data;
-				// this.generate(res.data.macOrderId)
-				this.payTypeList.forEach((item=>{
-					if(item.key==this.detailData.payType){
-						this.detailData.payTypeStr = item.value
-					}
-				}))
-				this.typeList.forEach((item=>{
-					if(item.id==this.detailData.orderType){
-						this.detailData.orderTypeStr = item.name
-					}
-				}))
-			} catch (error) {
-				console.log(error)
-			}
-		},
-		 
 	}
 }
 </script>
@@ -60,12 +25,29 @@ export default {
   padding: 16px;
   min-height: 95vh;
   color: #0f274b;
-} 
-.m-8 {
-  margin: 0 8px;
+  font-family: 'Helvetica Neue', Arial, sans-serif;
 }
-.bt {
-  margin-bottom: 16px;
+
+rich-text {
+  font-size: 16px;
+  line-height: 1.8;
+  color: #333;
+}
+
+rich-text strong,
+rich-text b {
+  font-weight: bold;
+  color: #0f274b;
+}
+
+rich-text p {
+  margin: 0 0 12px;
+}
+
+rich-text img {
+  max-width: 100%;
+  display: block;
+  margin: 12px auto;
+  border-radius: 4px;
 }
- 
 </style>

pages/weeklyMenu/menuDetail.vue

@@ -91,7 +91,7 @@
 						<view v-for="(item,index) in evaluaList" :key="index" v-if="index<3" style="width: 100%;height: auto;border-bottom: 1px solid #ccc;">
 							<view style="width: 94%;margin: 10rpx auto;display: flex;">
 								<view style="width: 100rpx;height: 100rpx;margin: 10rpx;">
-									<image :src="item.custPhotoUrl? item.custPhotoUrl:'../../static/images/user.png'" mode="" style="width: 100rpx;height: 100rpx;"></image>
+									<image :src="item.photoUrl? item.photoUrl:'../../static/images/user.png'" mode="" style="width: 100rpx;height: 100rpx;"></image>
 								</view>
 								<view style="width: 80%;height: 100rpx;">
 									<view style="width: 100%;display: flex;align-items: center;justify-content: space-between;margin-bottom: 20rpx;padding-top: 10rpx;">