Commit 295cad1c authored by 李俊赕's avatar 李俊赕

第二轮测试bug修复

parent edac86b7
......@@ -122,6 +122,7 @@
display: flex;
flex-direction: column;
height: calc(100vh - var(--window-top) - 200rpx);
padding-top:100rpx;
width: 100%;
}
......
......@@ -2,9 +2,9 @@
<view class="backView">
<u-loading style="position: fixed;top: 50%;" :show="loading" size="36" mode="flower"></u-loading>
<view class="topView">
<view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)" v-for="(item,ikey) in dataList" :key="ikey">
<text
:class="['ph-lst-top-index', {'active':activeTop===ikey}]">{{ ikey + 1 }}</text>
<view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)"
v-for="(item,ikey) in dataList" :key="ikey">
<text :class="['ph-lst-top-index', {'active':activeTop===ikey}]">{{ ikey + 1 }}</text>
<text class="topItemTitle">{{item.type}}</text>
</view>
</view>
......@@ -19,8 +19,8 @@
<!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> -->
</view>
<view class="rightImageView" v-if="item.imageList.length > 0">
<image class="rightImage" v-for="(image, index) in item.imageList.slice(0 , 10)" :src="image" :key="index"
@click.stop="handleClickImage(item, index)" mode="aspectFill"></image>
<image class="rightImage" v-for="(image, index) in item.imageList.slice(0 , 10)" :src="image"
:key="index" @click.stop="handleClickImage(item, index)" mode="aspectFill"></image>
</view>
</view>
</template>
......@@ -117,7 +117,7 @@
handleClickImage(item, index) {
uni.previewImage({
urls: item.imageList,
current:index
current: index
})
},
......@@ -127,7 +127,7 @@
photo.currentItem = item
photo.itemIndex = ikey
uni.navigateTo({
url:'/pages/photo/take'
url: '/pages/photo/take'
})
},
......@@ -199,7 +199,7 @@
margin: 0rpx 30rpx 20rpx 30rpx;
padding: 36rpx 30rpx 18rpx 30rpx;
border-radius: 12rpx;
background-color: #FFFFFF;
background-color: #FFFFFF;
min-height: 108rpx;
}
......@@ -213,7 +213,7 @@
text-align: center;
border-width: 1px;
border-style: solid;
margin-right: 10rpx;
margin-right: 10rpx;
margin-top: 4rpx;
}
......@@ -226,6 +226,7 @@
/* flex-direction: column; */
/* border-left: 2rpx solid #F3F3F3; */
}
.rightContentView.active {
color: #666666;
border-color: #666666;
......@@ -259,6 +260,10 @@
width: 116rpx;
height: 116rpx;
margin: 0rpx 12rpx 12rpx 0rpx;
}
.rightImage:nth-child(5n){
margin-right:0;
}
......@@ -283,6 +288,7 @@
background-color: #FFFFFF;
color: #999999;
}
.topItemView.active {
color: #2272FF;
}
......@@ -296,4 +302,4 @@
.greenBackColor {
background-color: #4CD964;
}
</style>
</style>
......@@ -198,11 +198,11 @@
const globalData = getApp().globalData
this.navHeight = globalData.navHeight
this.cameraHeight = parseInt(globalData.safeHeight*2 - globalData.navHeight - 200) ;
console.log(globalData.safeHeight,'globalData.safeHeight')
console.log(this.cameraHeight,'this.cameraHeight')
console.log(globalData.navHeight,'globalData.navHeight')
// console.log(globalData.safeHeight,'globalData.safeHeight')
// console.log(this.cameraHeight,'this.cameraHeight')
// console.log(globalData.navHeight,'globalData.navHeight')
this.ratio = globalData.screenHeight / globalData.rpxScreenHeight
console.log(globalData.screenHeight,globalData.rpxScreenHeight,this.ratio)
// console.log(globalData.screenHeight,globalData.rpxScreenHeight,this.ratio)
this.waterSetting = globalData.photo.waterSetting
// this.cameraHeight = globalData.rpxScreenHeight
},
......@@ -368,9 +368,9 @@
if(txt.indexOf('时间')>=0){
canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
}else{
if(txt.length>14){
canvas.fillText(txt.substr(14,14), 10, canvasHeight - txtHeight * h++);
canvas.fillText(txt.substr(0,14), 10, canvasHeight - txtHeight * h++);
if(txt.length>20){
canvas.fillText(txt.substr(18,20), 10, canvasHeight - txtHeight * h++);
canvas.fillText(txt.substr(0,20), 10, canvasHeight - txtHeight * h++);
}else{
canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
}
......@@ -512,7 +512,7 @@
padding: 20rpx;
.txt {
max-width: 400rpx;
max-width: 500rpx;
max-height: 80rpx;
overflow: hidden;
margin-top: 5rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment