Merge remote-tracking branch 'origin/master'

src/pages/home/components/feature_recommended.tsx

@@ -116,7 +116,7 @@ const FeatureRecommended: FC<Props> = (props) => {
       return props.illness.map<DataContent>(d => ({
         id: d.id,
         imageUrl: '',
-        description: d.description?.replace(/[^\u4e00-\u9fa5]/gi,"") ?? '暂无描述',
+        description: d.description || '暂无简介',
         title: d.name,
         path: `?id=${d.id}`
       }))

src/pages/preview/brand/info/info.module.scss

@@ -55,7 +55,7 @@ page{
       .image{
         width: 172rpx;
         height:128rpx;
-        background-color: pink;
+        background-color: #eee;
         border-radius: 8rpx;
       }
       .leftBox{

src/pages/preview/brand/info/info.tsx

@@ -5,6 +5,8 @@ import styles from './info.module.scss'
 import Taro, {useReachBottom, useRouter} from "@tarojs/taro";
 import LineEllipsis from "@/components/textCollapse/collapse";
 import Empty from "@/components/empty/empty";
+import Img from "@/components/image/image";
+import {rfc33392time} from "@/utils/day";
 
 type Params = {
   id: number
@@ -116,9 +118,11 @@ const BrandInfo: FC = () => {
                   <View className={styles.inner}>
                     <View className={styles.leftBox}>
                       <View className='font-weight mb-2 font-28 lh-40'>{i.title}</View>
-                      <View className={styles.desc}>{i.created_at} {i.page_view}阅读</View>
+                      <View className={styles.desc}>{rfc33392time(i.created_at)} {i.page_view}阅读</View>
+                    </View>
+                    <View className={styles.image}>
+                      <Img width={172} height={128} src={'dd'}/>
                     </View>
-                    {/*<Image mode='aspectFill' className={styles.image} src={'dd'}/>*/}
                   </View>
                 </View>
               )

src/pages/preview/illness/article/article.tsx

@@ -1,4 +1,4 @@
-import {FC, useEffect, useMemo, useState} from "react";
+import {FC, useEffect, useMemo, useRef, useState} from "react";
 import {Image, PageContainer, Text, View} from "@tarojs/components";
 import Taro, {useRouter} from "@tarojs/taro";
 import {ArticleRecord, brandApi} from "@/api";
@@ -13,6 +13,7 @@ const article:FC = () => {
   const [show,setShow] = useState(false)
   const [articleInfo,setArticleInfo] = useState<ArticleRecord>()
   const { children, headings } = useMemo(() => parse(articleInfo?.content || ''), [articleInfo])
+
   const query = Taro.createSelectorQuery()
 
 

src/utils/day.ts

@@ -0,0 +1,48 @@
+/**
+ * 将 RFC3339 标准转成常用时间格式
+ *
+ * ```js
+ * rfc33392time('2020-07-31T14:27:10.035542+08:00')
+ * // 2020-07-31 14:28:12
+ * ```
+ *
+ * @param {string} dateStr RFC3339 标准时间字符串
+ * @returns {string} 常用时间格式
+ */
+export const rfc33392time = (dateStr: string): string => {
+  const date = new Date(dateStr).toJSON()
+  return (new Date(+new Date(date) + 8 * 3600 * 1000))
+    .toISOString()
+    .replace(/T/g, ' ')
+    .replace(/\.[\d]{3}Z/, '')
+}
+
+const TIME_OFFSET = (() => {
+  const info = (new Date().toString()).match(/GMT\+(\d{2})(\d{2})/)
+  return `+${info![1]} : ${info![2]}`
+})()
+
+/**
+ * 将常用时间格式转为 RFC3339 标准
+ *
+ * ```js
+ * time2rfc3339('2020-07-31 14:28:12')
+ * // 2020-07-31T14:27:10.035542+08:00
+ * ```
+ *
+ * @param {string} date 常用时间格式
+ * @returns {string} RFC3339 标准时间
+ */
+export function time2rfc3339(date: string) {
+  const time = new Date(date)
+  const y = time.getFullYear()
+  const m = time.getMonth() + 1 < 10 ? `0${time.getMonth() + 1}` : (time.getMonth() + 1)
+  const d = time.getDate() < 10 ? `0${time.getDate()}` : time.getDate()
+  const hh = time.getHours() < 10 ? `0${time.getHours()}` : time.getHours()
+  const mm = time.getMinutes() < 10 ? `0${time.getMinutes()}` : time.getMinutes()
+  const ss = time.getSeconds() < 10 ? `0${time.getSeconds()}` : time.getSeconds()
+  // const endDate = y + '-' + m + '-' + d + ' ' + hh + ':' + mm + ':' + ss
+  // endDate = endDate.replace(/\s+/g, 'T') + '+08:00'
+  // return endDate
+  return `${y}-${m}-${d}T${hh}:${mm}:${ss}${TIME_OFFSET}`
+}