@@ -231,11 +237,6 @@ export default {
url: ''//二维码扫码的结果用户发起请求的body体
}
},
- onLoad(e) {
- if (e) {
- this.url = e.url
- }
- },
watch:{
cycleId(newValue){
this.obtainAmount()
@@ -244,7 +245,8 @@ export default {
},
mounted() {
this.getCycle()
- if (this.url){
+ if (this.$mp.query.url){
+ this.url=this.$mp.query.url
this.getDetailUrl()
}
this.getAddress()
@@ -268,9 +270,8 @@ export default {
});
})
},
- // 删除图片
- deletePic(event) {
- this[`fileList${event.name}`].splice(event.index, 1)
+ deletePic() {
+ this.fileList1=[]
},
// 新增图片
async afterRead(event) {
@@ -297,7 +298,22 @@ export default {
}
},
async signContract(){
-
+ const checks = [{
+ value: this.warehouseID,
+ message: '请选择寄存地址'
+ }, {
+ value: this.cycleId,
+ message: '请选择寄存时限'
+ }]
+ for (const check of checks) {
+ if (!check.value) {
+ uni.showToast({
+ title: check.message,
+ icon: 'none'
+ })
+ return
+ }
+ }
const data={
cycleId:this.cycleId,
warehouseID:this.warehouseID,
@@ -492,6 +508,7 @@ picker-view {
padding-top: 28rpx;
padding-left: 30rpx;
padding-right: 30rpx;
+ margin-bottom: 72rpx;
& > .content6 {
margin-top: 26rpx;
@@ -593,6 +610,7 @@ picker-view {
}
.poup {
+ margin-bottom: 72rpx;
padding-top: 28rpx;
padding-left: 30rpx;
padding-right: 30rpx;
diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index 700ecb4..65249e6 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -219,13 +219,22 @@ export default {
}
},
touchMove(e, index) {
+ if (this.mainList[index].artworkStatus!==5){
+ return
+ }
this.mainList[index].distanceX = e.touches[0].clientX - this.startX;
},
touchStart(e, index) {
+ if (this.mainList[index].artworkStatus!==5){
+ return
+ }
this.mainList[index].isRight = true
this.startX = e.touches[0].clientX;
},
touchEnd(index) {
+ if (this.mainList[index].artworkStatus!==5){
+ return
+ }
if (this.mainList[index].distanceX < -((144 / 750) * this.windowWidth)) {
this.mainList[index].distanceX = -((144 / 750) * this.windowWidth);
} else {
diff --git a/pages/order-goods/order-details.vue b/pages/order-goods/order-details.vue
index 79ea4a2..6828276 100644
--- a/pages/order-goods/order-details.vue
+++ b/pages/order-goods/order-details.vue
@@ -1,6 +1,6 @@
-
+
@@ -8,7 +8,7 @@
-
+
diff --git a/pages/paySuccess/paySuccess.vue b/pages/paySuccess/paySuccess.vue
index a3fc7be..8017ad4 100644
--- a/pages/paySuccess/paySuccess.vue
+++ b/pages/paySuccess/paySuccess.vue
@@ -48,10 +48,10 @@
*请携带您的画作在时限之前到达寄存地
-
+
-
+
@@ -72,6 +72,16 @@ export default {
this.getData()
},
methods: {
+ goDetails(){
+ uni.navigateTo({
+ url: "/pages/order-goods/order-details",
+ });
+ },
+ goHome(){
+ uni.switchTab({
+ url: "/pages/home/index",
+ });
+ },
async getData() {
const data1 = {
ID: Number(this.$mp.query.ID)
diff --git a/static/zu142@3x.png b/static/zu142@3x.png
new file mode 100644
index 0000000..9aadea3
Binary files /dev/null and b/static/zu142@3x.png differ