submit

App.vue

@@ -26,6 +26,9 @@ export default {
   justify-content: center;
   align-items: center;
 }
+.tm-poup-wk{
+  height: initial!important;
+}
 .u-upload__button{
   width: 404rpx!important;
   height: 306rpx!important;

pages/confirm-order/index.vue

@@ -153,8 +153,9 @@ export default {
     console.log(this.orderingInfo,'orderingInfo')
     if (this.$mp.query.ID) {
       this.ID=this.$mp.query.ID
+      this.getData()
     }
-    this.getData()
+
     uni.createSelectorQuery().select('.title-block').boundingClientRect(data => {
       let res = uni.getSystemInfoSync();
       const distance = res.windowHeight - data.bottom;

pages/consignment-painting/index.vue

@@ -17,16 +17,22 @@
           name="6"
           multiple
           :maxCount="1"
-          width="250"
+          width="404rpx"
-          height="150"
+          height="306rpx"
       >
-        <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
+        <div style="width: 404rpx;height: 306rpx;background: #000;border-radius: 20rpx;display: flex;flex-direction: column;align-items: center;justify-content: center">
-               mode="widthFix" style="width: 404rpx;height: 306rpx;"></image>
+          <div style="margin-bottom: 14rpx">
+            <image style="width: 38.32rpx;height: 38.2rpx" src="../../static/zu142@3x.png"></image>
+          </div>
+          <div style="font-size: 32rpx;color: #fff">上传画作图片</div>
+        </div>
+<!--        <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
+               mode="widthFix" style="width: 404rpx;height: 306rpx;"></image>-->
       </u-upload>
 <!--      <image :src="info.artworkImg"></image>-->
     </div>
-    <tm-poup height="700" v-model="show_2" position="bottom">
+    <tm-poup  v-model="show_2" position="bottom">
-      <div class="poup1">
+      <div class="poup1" >
         <div class="content1">
           <div class="wrap1">更换您的寄存地址</div>
           <div @click="show_2=false" class="wrap2">
@@ -149,25 +155,25 @@
     </div>
     <div class="content4">
       <div class="wrap1">
-        <div class="wrap1_1">
+        <div class="wrap1_1" @click="show_2=true">
           <div class="wrap1_1_1">寄存地址</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input   placeholder-style="color: #939393;font-size: 24rpx;"
+            <input disabled  placeholder-style="color: #939393;font-size: 24rpx;"
                    :placeholder="warehouseID?addressList.find(x=>x.ID===warehouseID).address:'寄存地址'"/>
           </div>
           <div class="wrap1_1_4"></div>
-          <div @click="show_2=true" class="wrap1_1_5">
+          <div  class="wrap1_1_5">
             <image src="../../static/zu611@3x.png"></image>
           </div>
         </div>
-        <div class="wrap1_1">
+        <div class="wrap1_1" @click="show_1=true">
           <div class="wrap1_1_1">寄存时限</div>
           <div class="wrap1_1_2"></div>
           <div class="wrap1_1_3">
-            <input placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="cycleId?cycleList.find(x=>x.ID===cycleId).name:'寄存时限'"/>
+            <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="cycleId?cycleList.find(x=>x.ID===cycleId).name:'寄存时限'"/>
           </div>
-          <div @click="show_1=true" class="wrap1_1_5">
+          <div  class="wrap1_1_5">
             <image src="../../static/zu612@3x.png"></image>
           </div>
           <div class="wrap1_1_4">
@@ -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() {
-    deletePic(event) {
+      this.fileList1=[]
-      this[`fileList${event.name}`].splice(event.index, 1)
     },
     // 新增图片
     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;

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 {

pages/order-goods/order-details.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="order-details" >
-    <title-block class="title-block" title="2订单库">
+    <title-block class="title-block" title="订单库">
       <template #left>
         <div> <image style="width: 112rpx;height: 52rpx" src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/785cf885-c4c9-44b3-8155-4b39988c7ef8.png" @click="back"></image></div>
       </template>
@@ -8,7 +8,7 @@
 <div :style="{height:`${distance}px`}" style="overflow-y: auto">
   <div style="padding-bottom: 128rpx">
   <div class="content2">
-    <image src="../../static/zu709@3x.png"></image>
+    <image :src="info.artworkImg"></image>
   </div>
   <div class="content3">
     <div class="wrap1">

pages/paySuccess/paySuccess.vue

@@ -48,10 +48,10 @@
     </view>
     <view class="tips">*请携带您的画作在时限之前到达寄存地</view>
     <view class="btns">
-      <view style="width: 280rpx;height:64rpx;border-radius: 40rpx;">
+      <view @click="goHome" style="width: 280rpx;height:64rpx;border-radius: 40rpx;">
         <u-button text="返回首页" shape="circle" color="#626262"></u-button>
       </view>
-      <view style="width: 280rpx;height:64rpx;border-radius: 40rpx">
+      <view @click="goDetails" style="width: 280rpx;height:64rpx;border-radius: 40rpx">
         <u-button text="查看订单详情" shape="circle" color="#699A70"></u-button>
       </view>
     </view>
@@ -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)