gter.net/HKRentingMiniprogram
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'xiao' of https://x--mo.com:9003/gter.net/HKRentingMiniprogram into xiao

Browse Source 
# Conflicts:
#	template/listOperations/listOperations.wxml
This commit is contained in:
A1300399510 2023-06-30 15:37:21 +08:00
commit d055919bde
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
template/listOperations/listOperations.js
View File

@ -526,6 +526,7 @@ Component({
let obj = this.data.conditionObj
if (!obj['orderby']) return
obj['orderby'].show = data
obj['moreCondition'].show = data
// if(obj['orderby'].show)
// obj.
this.setData({

5
template/listOperations/listOperations.wxml
View File

@ -16,7 +16,12 @@
<image class="page-action-circle-icon" mode="widthFix" src="/img/arrow-gray.png"></image>
</view>
</view>
<<<<<<< HEAD
<view class="longString" wx:if="{{ index != 'floor' && index != 'orderby'&&!item.last }}"></view>
=======
<view class="longString" wx:if="{{ index != 'floor' && index != 'orderby'&&!item.last&&!item.show }}"></view>
>>>>>>> 71b7e23abfa258e9cead5065ea17bfa13d54711e
<!-- <view class="longString" wx:if="{{ index != 'floor' && index != 'orderby' }}"></view> -->
</template>