submit

App.vue

@@ -29,9 +29,7 @@ export default {
 .u-tabbar__content{
   height: 166rpx;
 }
-.tm-poup-wk{
+
-  height: initial!important;
-}
 .u-upload__button{
   width: 404rpx!important;
   height: 306rpx!important;

http/interface.js

@@ -4,7 +4,7 @@
  */
 export default {
   config: {
-    baseUrl: "https://stock.szjixun.cn", //"http://172.16.100.93:8017", //"http://192.168.88.175:9021",//'https://warehouse.szjixun.cn'
+    baseUrl: "https://warehouse.szjixun.cn", //"http://172.16.100.93:8017", //"http://192.168.88.175:9021",//'https://warehouse.szjixun.cn'
     header: {
       "Content-Type": "application/json;charset=UTF-8",
       // 'Content-Type':'application/x-www-form-urlencoded'

pages/confirm-order/index.vue

@@ -179,7 +179,8 @@ export default {
       artworkSizeL:this.orderingInfo.info.artworkSizeL,
       artworkSizeW:this.orderingInfo.info.artworkSizeW,
       artworkSquareSize:Number(this.orderingInfo.info.artworkSquareSize),
-      contractTransactionId:this.orderingInfo.transactionId
+      contractTransactionId:this.orderingInfo.transactionId,
+      endAt:uni.getStorageSync("endAt")
     }
     const res1 = await postDataByParams('/api/warehouse/create',data1)
       if (res1.code===200){

pages/consignment-painting/index.vue

@@ -26,12 +26,11 @@
           </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  v-model="show_2" position="bottom">
+    <u-popup :round="15" :show="show_2" mode="bottom"  @open="()=>{show_2=true}">
       <div class="poup1" >
         <div class="content1">
           <div class="wrap1">更换您的寄存地址</div>
@@ -61,8 +60,9 @@
           <div class="wrap1">确定</div>
         </div>
       </div>
-    </tm-poup>
+    </u-popup>
-    <tm-poup height="1200" v-model="show_1" position="bottom">
+
+    <u-popup :round="15" :show="show_1" mode="bottom"  @open="()=>{show_1=true}">
       <div class="poup">
         <div class="content1">
           <div class="wrap1">请选择您的寄存时限</div>
@@ -83,6 +83,28 @@
                       <div class="wrap4_2">*暂时不可选</div>
                     </div>-->
         </div>
+        <div class="content1" style="margin-top: 20rpx">
+          <div class="wrap1">寄存结束日期</div>
+
+        </div>
+        <div class="content2"></div>
+        <div class="content7" @click="show = true">
+          <u-datetime-picker
+              :show="show"
+              @confirm="confirmDate"
+              mode="date"
+              @cancel="show=false"
+              :minDate="minDate"
+          ></u-datetime-picker>
+          <u--input
+              readonly
+              placeholder="请输入内容"
+              border="surround"
+              v-model="value1"
+          ></u--input>
+        </div>
+
+
         <!--        <div class="content2"></div>
                 <div class="content4">起始日期</div>
                 <div class="content5">
@@ -114,7 +136,8 @@
           <div class="wrap1">确定</div>
         </div>
       </div>
-    </tm-poup>
+    </u-popup>
+
     <div class="content3">
       <div class="prompt">*扫描自动填入</div>
       <div class="wrap1">
@@ -194,6 +217,7 @@
 <script>
 import http from "@/http/api";
 import {postDataByParams} from "../../http/service";
+
 export default {
   name: "order-details",
   data() {
@@ -214,6 +238,9 @@ export default {
       days.push(i)
     }
     return {
+      minDate:'',
+      show: false,
+      value1: '',
       loading:false,
       fileList1:[],
       dayMoney:'',
@@ -250,6 +277,10 @@ export default {
     }
   },
   mounted() {
+    const date = new Date();
+    date.setHours(0, 0, 0, 0);
+     this.minDate = date.getTime() + 24 * 60 * 60 * 1000;
+    this.value1=this.timestampToDateString(date.getTime() + 24 * 60 * 60 * 1000)
     this.getCycle()
     if (this.$mp.query.url){
       this.url=this.$mp.query.url
@@ -261,7 +292,17 @@ export default {
     this.data = [today.getFullYear(), today.getMonth() + 1, today.getDate()]
   },
   methods: {
-
+    timestampToDateString(timestamp) {
+      const date = new Date(timestamp ); // 把时间戳乘以1000转换为Date对象需要的毫秒数
+      const year = date.getFullYear();
+      const month = ("0" + (date.getMonth() + 1)).slice(-2);     // 月份是从0开始的，所以加1，用slice保证格式是2位数
+      const day = ("0" + date.getDate()).slice(-2);              // 用slice保证格式是2位数
+      return year + "-" + month + "-" + day;
+    },
+    confirmDate(data){
+      this.value1=this.timestampToDateString(data.value)
+      this.show=false
+    },
     openShow1(){
       if (!this.info.artworkSquareSize){
         uni.showToast({
@@ -384,9 +425,11 @@ export default {
 
     },
    async obtainAmount(){
+     uni.setStorageSync("endAt", this.value1);
      const data={
        cycleID:this.cycleId,
-       artworkSquareSize:Number(this.info.artworkSquareSize)
+       artworkSquareSize:Number(this.info.artworkSquareSize),
+       endAt:this.value1
      }
       const res = await postDataByParams('/api/warehouse/calculate',data)
      if (res.code===200){
@@ -658,7 +701,9 @@ picker-view {
     padding-top: 28rpx;
     padding-left: 30rpx;
     padding-right: 30rpx;
+    &> .content7{
 
+    }
     & > .content3 {
       display: flex;
       flex-wrap: wrap;