Преглед на файлове

Merge remote-tracking branch 'origin/develop' into release

tags/jenkins-front-end-screenad-296-v43^0
caserKing преди 5 години
родител
ревизия
b0cfdae068
променени са 1 файла, в които са добавени 46 реда и са изтрити 5 реда
  1. +46
    -5
      App.js

+ 46
- 5
App.js Целия файл

@@ -485,8 +485,18 @@ getContentViewItem(contentItem, annomation) {

actionText = this.getContentViewItemActionStr(contentItem);
merchantName = this.getContentViewItemMerchantName(contentItem);
//aaa
// contentItem.target.salePriceStr = 234005.8;
// console.warn(annomation)
let curNumStr = contentItem.target.salePriceStr+'';
let curStyleObj = {};
if (curNumStr.length > 5 || Number(curNumStr) > 10000) {
curStyleObj = styles.contentItemTopDetailCurPriceStr02;
} else {
curStyleObj = styles.contentItemTopDetailCurPriceStr01;
}
return (
<Animatable.View animation={annomation} style={styles.contentItem}>

<ImageBackground source={require('./image/item-background.png')} resizeMode='center' style={styles.contentItemDownLayer} >
@@ -500,7 +510,8 @@ getContentViewItem(contentItem, annomation) {
{/* 售价 */}
<View style={styles.contentItemTopDetailCurPrice}>
<Text style={styles.contentItemTopDetailCurPriceStrUnit}>¥</Text>
<Text style={styles.contentItemTopDetailCurPriceStr}>{contentItem.target.salePriceStr}</Text>
<Text style={curStyleObj}>{contentItem.target.salePriceStr}</Text>
{/* <Text style={styles.contentItemTopDetailCurPriceStr}>{contentItem.target.salePriceStr}</Text> */}
</View>
{/* 面额 */}
<View style={styles.contentItemTopDetailSalePrice}>
@@ -557,6 +568,15 @@ setSwiperItemDom(item) {
if (contentItem.subType == 7)
curLogo = require('./image/groupbuy.png');
}
//aaa
// contentItem.target.salePriceStr = 24502228;
let curNumStr = contentItem.target.salePriceStr+'';
let curStyleObj = {};
if (curNumStr.length > 6 || Number(curNumStr) > 100000) {
curStyleObj = styles.contentItemTopDetailCurPriceStr04;
} else {
curStyleObj = styles.contentItemTopDetailCurPriceStr03;
}
return (
<View style={styles.carouselItemWrap}>
{/* <BoxShadow setting={shadowOpt}> */}
@@ -573,7 +593,7 @@ setSwiperItemDom(item) {
{/* 售价 */}
<View style={styles.contentItemTopDetailCurPrice}>
<Text style={styles.contentItemTopDetailCurPriceStrUnit02}>¥</Text>
<Text style={styles.contentItemTopDetailCurPriceStr02}>{contentItem.target.salePriceStr}</Text>
<Text style={curStyleObj}>{contentItem.target.salePriceStr}</Text>
</View>
{/* 面额 */}
<View style={styles.contentItemTopDetailSalePrice02}>
@@ -1110,7 +1130,7 @@ MyPage = CodePush(codePushOptions)(MyPage);
backgroundColor:'transparent',
},

contentItemTopDetailCurPriceStr:{
contentItemTopDetailCurPriceStr01:{
backgroundColor:'transparent',
fontSize:96/PixelRatio.get(),
fontFamily:"PingFangSC-Bold",
@@ -1119,8 +1139,19 @@ MyPage = CodePush(codePushOptions)(MyPage);
textAlignVertical:'bottom',
color : 'red'
},
//金额超10000,字号修改
contentItemTopDetailCurPriceStr02:{
backgroundColor:'transparent',
fontSize:64/PixelRatio.get(),
fontFamily:"PingFangSC-Bold",
fontWeight: "bold",
textAlign :'left',
textAlignVertical:'bottom',
paddingBottom: 8/PixelRatio.get(),
color : 'red'
},

contentItemTopDetailCurPriceStr03:{
backgroundColor:'transparent',
fontSize:72/PixelRatio.get(),
fontFamily:"PingFangSC-Bold",
@@ -1128,6 +1159,16 @@ MyPage = CodePush(codePushOptions)(MyPage);
textAlign :'left',
color : 'red'
},
//金额超10000,字号修改
contentItemTopDetailCurPriceStr04:{
backgroundColor:'transparent',
fontSize:52/PixelRatio.get(),
fontFamily:"PingFangSC-Bold",
fontWeight: "bold",
textAlign :'left',
paddingTop: 16/PixelRatio.get(),
color : 'red'
},

contentItemTopDetailCurPriceStrUnit:{
backgroundColor:'transparent',
@@ -1135,7 +1176,7 @@ MyPage = CodePush(codePushOptions)(MyPage);
textAlignVertical:'bottom',
paddingBottom: 16/PixelRatio.get(),
fontSize: 48/PixelRatio.get(),
color : 'red'
color : 'red',
},

contentItemTopDetailCurPriceStrUnit02:{


Зареждане…
Отказ
Запис