合并冲突

.env

@@ -3,5 +3,3 @@ TARO_APP_API=https://mooc.yaojiankang.top
 #TARO_APP_API=https://shopfix.yaojiankang.top
 #TARO_APP_API=https://playedu.yaojiankang.top
 TARO_APP_LGOIN=true
-
-

src/pages/home/components/feature_recommended.tsx

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

src/pages/preview/profession/profession.tsx

@@ -92,7 +92,7 @@ const Profession = () => {
           data.data.map(d =>
             <View className={styles.killBox} onClick={() => jump(d)}>
               <Image src={d.url_path} mode='widthFix'/>
-              <View className='text-ellipsis flex-1'>{d.resource.name}</View>
+              <View className='text-ellipsis flex-1'>{d?.resource?.name}</View>
             </View>
           )
         }