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

fix: 修复订单列表积分不显示现金

See merge request huiqi/ecshopx-vshop!29

src/components/sp-trade-item/index.js

@@ -32,7 +32,7 @@ function SpTradeItem(props) {
             {itemName}
           </View>
           {
-            orderClass == 'pointsmall' && <Text>{`${pointName}: ${itemPoint}`}</Text>
+            orderClass == 'pointsmall' && <Text>{`${pointName}: ${itemPoint}`} {price? <SpPrice value={price} /> : null}</Text>
           }
           {
             orderClass == 'normal' && <SpPrice value={price} />

src/subpages/trade/comps/comp-tradeitem.js

@@ -97,10 +97,10 @@ function CompTradeItem(props) {
           {orderClass == 'pointsmall' && (
             <View>
               <Text className='num'>{`共${totalNum}件`}</Text>
+             <Text>
               <Text className='label'>{pointName}</Text>
-              <Text className='point-value' style='font-size: 20px;'>
-                {point}
-              </Text>
+              <Text className='point-value' style='font-size: 20px;'>{point}</Text> {totalFee && <SpPrice value={totalFee} size={38} />}
+             </Text>
             </View>
           )}
           {orderClass != 'pointsmall' && (

src/subpages/trade/detail.js

@@ -224,11 +224,15 @@ function TradeDetail(props) {
     }
   }
 
-  const onClickItem = ({ itemId, distributorId,activityId,orderClass }) => {
+  const onClickItem = ({ itemId, distributorId,activityId,orderClass,point }) => {
     if(orderClass == 'employee_purchase'){
       Taro.navigateTo({
         url:`/subpages/purchase/espier-detail?id=${itemId}&dtid=${distributorId || 0}&activity_id=${activityId}&enterprise_id=${info.enterpriseId}`
       })
+    }  else if(point > 0){
+      Taro.navigateTo({
+        url:`/subpages/pointshop/espier-detail?id=${itemId}&dtid=${distributorId || 0}&activity_id=${activityId}&enterprise_id=${info.enterpriseId}`
+      })
     }else{
       Taro.navigateTo({
         url: `/pages/item/espier-detail?id=${itemId}&dtid=${distributorId}&_original=1`