Merge branch 'master' of http://192.168.12.3:3000/xingyy/uni-Identify-quality

pages/confirm-order/index.vue

@@ -61,16 +61,12 @@
               </div>
             </div>
             <div class="wrap1_1" style="position: relative;">
-              <div class="wrap1_1_1" >寄存时限</div>
+              <div class="wrap1_1_1">寄存结束日期</div>
               <div class="wrap1_1_2"></div>
               <div class="wrap1_1_3">
-                <div class="wrap1_1_3_1" style="position: absolute;display: flex;top: 50%;transform: translateY(-50%);">
+                <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="orderingInfo.endAt"/>
-                  <div class="wrap1_1_3_1_1" style="width: 70rpx;color:#fff;height: 30rpx;background: #76C458;font-size: 16rpx;display: flex;justify-content: center;align-items: center;margin-right: 2rpx">{{orderingInfo.cycleName}}</div>
-<!--                  <div class="wrap1_1_3_1_2" style="color: #939393;font-size: 24rpx">{{`${orderingInfo.info.startAt}-${orderingInfo.info.endAt}`}}</div>-->
-                </div>
-              </div>
-              <div class="wrap1_1_4">
               </div>
+
             </div>
 
 <!--            <div class="wrap1_1">

pages/consignment-painting/index.vue

@@ -66,6 +66,10 @@
       <div class="poup">
         <div class="content1" style="margin-top: 20rpx">
           <div class="wrap1">寄存结束日期</div>
+          <div @click="show_1=false" class="wrap2">
+            <image
+                src="https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/d84593b3-10a8-4d86-be8c-b048b03b22c7.png"></image>
+          </div>
 
         </div>
         <div class="content2"></div>
@@ -79,7 +83,7 @@
           ></u-datetime-picker>
           <u--input
               readonly
-              placeholder="请输入内容"
+              placeholder="点击选择"
               border="surround"
               v-model="value1"
           ></u--input>
@@ -376,6 +380,7 @@ export default {
      }
      this.loading=true
      const data={
+       endAt:this.value1,
        warehouseID:this.warehouseID,
        artworkSquareSize:Number(this.info.artworkSquareSize),
        artworkName: this.info.artworkName,
@@ -388,14 +393,13 @@ export default {
        uni.setStorageSync("jumpUrl", res.data.jumpUrl)
        this.info.artworkImg=this.fileList1[0].url
        uni.setStorageSync("orderingInfo", {
-         cycleID:this.cycleId,
+        endAt:this.value1,
          warehouseID:this.warehouseID,
          transactionId:res.data.transactionId,
          dayMoney:this.dayMoney,
          info:this.info,
          expectedPayment:this.expectedPayment,
-         addressName:this.addressList.find(x=>x.ID===this.warehouseID).address,
+         addressName:this.addressList.find(x=>x.ID===this.warehouseID).address
-         cycleName:this.cycleList.find(x=>x.ID===this.cycleId).name
        })
        uni.navigateTo({
          url: `/pages/signwebview/index`,