Merge branch 'feature/huiqiyd-173' into 'develop'

Feature/huiqiyd 173

See merge request huiqi/ecshopx-vshop!17

src/doc/point.js

@@ -30,7 +30,7 @@ const JOURNAL_TYPE = {
 
 export const POINT_LIST_ITEM = {
   journalType: ({ journal_type }) => JOURNAL_TYPE[journal_type],
-  outinType: 'outin_type',
+  outinType: ({ income, outcome }) => income ? 'in' : outcome ? 'out' : '',
   point: ({ point }) => thousandthFormat(point),
   orderId: 'order_id',
   created: ({ created }) => formatDateTime(created)

src/pages/home/wgts/imghot-zone.scss

@@ -1,7 +1,6 @@
 .wgt-imghot-zone {
   .img-hotzone {
     position: relative;
-    border-radius: 16px;
     overflow: hidden;
     &_zone {
       position: absolute;

src/pages/item/espier-detail.js

@@ -706,11 +706,11 @@ const getMultipleImageInfo = async (imageUrls) => {
       .catch(error => {
         console.log('获取图片信息失败:', url, error)
         // 返回一个默认高度或 null
-        return { width: 0, height: 750 }
+        return { width: 0, height: 650 }
       })
   )
   const results = await Promise.all(promises)
-  return results.map(info => info.height / 2)
+  return results.map(info => (info.height) / 2 > 650 ? 650 : info.height / 2)
 }
 
   const getRecommendList = async () => {
@@ -775,9 +775,10 @@ const getMultipleImageInfo = async (imageUrls) => {
     return {
       height: '100%',
       width: '100%',
-      backgroundSize: '100% auto',
+      backgroundSize: 'cover',
       backgroundImage: `url(${item})`,
-      backgroundRepeat: 'no-repeat'
+      backgroundRepeat: 'no-repeat',
+      backgroundPosition: 'center'
     }
   }
 

src/subpages/guide/components/wgts/imghot-zone.scss

@@ -1,7 +1,6 @@
 .wgt-imghot-zone {
   .img-hotzone {
     position: relative;
-    border-radius: 16px;
     overflow: hidden;
     &_zone {
       position: absolute;

src/subpages/member/point-detail.js

@@ -7,7 +7,6 @@ import { SpPage, SpScrollView, SpImage } from '@/components'
 import api from '@/api'
 import doc from '@/doc'
 import { classNames, pickBy, thousandthFormat } from '@/utils'
-import { POINT_TYPE } from '@/consts'
 import './point-detail.scss'
 
 const btns = [
@@ -82,9 +81,12 @@ function PointDetail(props) {
               <SpImage src='point.png' width={48} height={48} />
               <Text className='label'>{`可用${pointName}`}</Text>
             </View>
-            <View className='point-rule' onClick={() => {
-              Taro.navigateTo({ url: '/subpages/member/point-rule' })
-            }}>{`${pointName}规则`}</View>
+            <View
+              className='point-rule'
+              onClick={() => {
+                Taro.navigateTo({ url: '/subpages/member/point-rule' })
+              }}
+            >{`${pointName}规则`}</View>
           </View>
           <View className='point-total'>{point}</View>
         </View>