-
{{ item.address }}
*剩余{{ item.leftNum }}位置
@@ -399,6 +399,10 @@ export default {
})
},
methods: {
+ show2Click(index){
+ this.currentIndex=index
+ this.show_2=true
+ },
closeClick(){
this.show_1=false
},
@@ -444,9 +448,10 @@ export default {
picker.setColumnValues(this.columns.length-1, [this.columns[2][e.index]*this.columns[0][0]])
}
},
- itemDelete(){
- this.listPaintings.splice(this.currentIndex,1)
+ itemDelete(index){
+ this.listPaintings.splice(index,1)
this.currentIndex=0
+ this.scrollId=`item-0`
if (this.listPaintings.length===1){
this.contentListHeight=0
}
@@ -509,10 +514,15 @@ export default {
},
confirmDate(data){
this.listPaintings[this.currentIndex].endAt=data.value[data.value.length-1]
+ if (this.currentIndex===0){
+ for (let listPainting of this.listPaintings) {
+ listPainting.endAt=data.value[data.value.length-1]
+ }
+ }
this.obtainAmount()
this.show_1=false
},
- openShow1(){
+ openShow1(index){
if (!this.listPaintings[this.currentIndex].artworkSquareSize){
uni.showToast({
title: "请先填写画作平尺数",
@@ -521,6 +531,7 @@ export default {
});
return
}
+ this.currentIndex=index
this.show_1=true
},
uploadFilePromise(url, type = null) {
@@ -656,7 +667,15 @@ export default {
this.show_2 = false
},
selectAddress(item) {
+
this.listPaintings[this.currentIndex].warehouseID = item.ID
+ if (this.currentIndex===0){
+ console.log(this.listPaintings,'this.listPaintings')
+ this.listPaintings.forEach((x)=>{
+ x.warehouseID=item.ID
+ })
+ }
+ this.$forceUpdate()
},
selectionPeriod(item) {
this.cycleId = item.ID
diff --git a/pages/paySuccess/paySuccess.vue b/pages/paySuccess/paySuccess.vue
index 5e88031..ff7caa6 100644
--- a/pages/paySuccess/paySuccess.vue
+++ b/pages/paySuccess/paySuccess.vue
@@ -102,14 +102,16 @@ export default {
flex-direction: column;
.content{
margin-top: 110rpx;
- max-height: 768rpx;
+ max-height: 800rpx;
overflow-y: scroll;
.content1{
box-sizing: border-box;
width: 686rpx;
- height: 374rpx;
+ height: 390rpx;
background-color: #fff;
border-radius: 20rpx;
+ padding-bottom: 20rpx;
+ padding-top: 15rpx;
padding-left: 18rpx;
padding-right: 24rpx;
&:not(:first-child){