pages/confirm-order/index.vue

@@ -66,8 +66,9 @@
               <div class="wrap1_1_3">
                 <input disabled placeholder-style="color: #939393;font-size: 24rpx;" :placeholder="orderingInfo.endAt"/>
               </div>
-              <div class="wrap1_1_4"></div>
+
             </div>
+
 <!--            <div class="wrap1_1">
               <div class="wrap1_1_1">订单金额</div>
               <div class="wrap1_1_2"></div>

pages/consignment-painting/index.vue

@@ -264,7 +264,8 @@ export default {
   mounted() {
     const date = new Date();
     date.setHours(0, 0, 0, 0);
-     this.minDate = date.getTime() + 120 * 24 * 60 * 60 * 1000;
+     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

pages/contract/index.vue

@@ -1,29 +1,24 @@
 <template>
-  <div class="contract">
+  <div class="contract" >
     <title-block title="待签署合同">
-      <!--      <template #left>
+<!--      <template #left>
         <div class="wrap3" style="display: flex;align-items: center">
           <image src="../../static/zu567@3x.png"></image>
         </div>
       </template>-->
     </title-block>
-
     <div class="content2">
       <div class="wrap1">合同名称</div>
       <div class="wrap2">合同编号</div>
       <div class="wrap3">签署日期</div>
     </div>
 
-    <div class="content3">
+    <div class="content3" >
       <scroll-view :style="{height:`${elementBottom}rpx`}"  :scroll-y="true" @scrolltolower="loadMore">
-        <div class="wrap1" v-for="(item,index) in mainList" :key="index" @click="previewContract(item)">
+      <div class="wrap1" v-for="(item,index) in mainList" :key="index">
-          <div class="wrap1_1">{{ item.contractTile }}</div>
+        <div class="wrap1_1">{{item.contractTile}}</div>
-          <div class="wrap1_2">
+        <div class="wrap1_2">{{item.contractId.length>10?`${item.contractId.slice(0,10)}...`:item.contractId}}</div>
-            {{ item.contractId.length > 10 ? `${item.contractId.slice(0, 10)}...` : item.contractId }}
+        <div class="wrap1_3"><div class="wrap1_3_1">{{item.signDate}}</div></div>
-          </div>
-          <div class="wrap1_3">
-            <div class="wrap1_3_1">{{ item.signDate }}</div>
-          </div>
       </div>
       </scroll-view>
     </div>
@@ -38,42 +33,29 @@ import {postDataByParams} from "../../http/service";
 export default {
   name: "index",
   components: {tabbar},
-  data() {
+  data(){
-    return {
+    return{
-      show: false,
+      page:1,
-      page: 1,
+      pageSize:999,
-      pageSize: 999,
+      mainList:[],
-      mainList: [],
+      elementBottom:''
-      elementBottom: ''
     }
   },
-  onShow() {
+  onShow(){
     this.getData()
   },
-  mounted() {
+  mounted(){
 
     this.getDistanceFromTopToPageBottom('.content3')
 
   },
-  methods: {
+  methods:{
-  async previewContract(item) {
-    const data={
-      ID:item.ID
-    }
-      const res = await postDataByParams('/api/warehouse/fdd/pdf/url',data )
-    if (res.code===200){
-      uni.setStorageSync("jumpUrl",res.data.jumpUrl)
-      uni.navigateTo({
-        url: `/pages/signwebview/index`,
-      });
-    }
-    },
     async getDistanceFromTopToPageBottom(classValue) {
       const {windowHeight, windowWidth} = await uni.getSystemInfo();
       const [{top}] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
       this.elementBottom = ((windowHeight - top) / windowWidth) * 750 - 175;
     },
-    loadMore() {
+    loadMore(){
 
     },
     async getData() {
@@ -84,10 +66,10 @@ export default {
       const res = await postDataByParams('/api/warehouse/list', data)
       if (res.code === 200) {
         this.mainList = res.data.data
-      } else {
+      }else {
         uni.showToast({
           title: res.msg,
-          icon: 'none'
+          icon:'none'
         })
       }
     },
@@ -95,7 +77,7 @@ export default {
 }
 </script>
 <style scoped lang="scss">
-.contract {
+.contract{
   background-image: url("https://cdns.fontree.cn/fonchain-main/prod/image/default/artwork/4fdc9a0f-d72a-46b6-a04d-ed56d5465213.png");
   box-sizing: border-box;
   overflow: hidden;
@@ -104,20 +86,18 @@ export default {
   background-size: cover;
   width: 100vw;
   height: 100vh;
-
+  .content3{
-  .content3 {
     margin-top: 20rpx;
     margin-bottom: 166rpx;
 
-    .wrap1 {
+    .wrap1{
       margin-bottom: 20rpx;
      border-radius: 20rpx;
       height: 108rpx;
       background: #fff;
       display: flex;
       align-items: center;
-
+      .wrap1_1{
-      .wrap1_1 {
         flex: 1 1 0rpx;
         font-size: 28rpx;
         display: flex;
@@ -125,8 +105,7 @@ export default {
         align-items: center;
         flex-grow: 1;
       }
-
+      .wrap1_2{
-      .wrap1_2 {
         flex: 1 1 0rpx;
         color: #808080;
         font-size: 24rpx;
@@ -135,36 +114,32 @@ export default {
         align-items: center;
         flex-grow: 1;
       }
-
+      .wrap1_3{
-      .wrap1_3 {
         flex: 1 1 0rpx;
         display: flex;
         justify-content: center;
         align-items: center;
-
+        .wrap1_3_1{
-        .wrap1_3_1 {
           display: flex;
           justify-content: center;
           align-items: center;
           width: 208rpx;
           border-radius: 20rpx;
           height: 56rpx;
-          background: #76C458;
+          background:#76C458 ;
           color: #fff;
           font-size: 24rpx;
         }
       }
     }
   }
-
+  .content2{
-  .content2 {
     margin-top: 46rpx;
     display: flex;
-    border-radius: 20rpx;
+border-radius: 20rpx;
     height: 70rpx;
     background: #76C458;
-
+    .wrap1{
-    .wrap1 {
       color: #fff;
       font-size: 28rpx;
       display: flex;
@@ -172,8 +147,7 @@ export default {
       align-items: center;
       flex: 1 1 0rpx;
     }
-
+    .wrap2{
-    .wrap2 {
       color: #fff;
       font-size: 28rpx;
       display: flex;
@@ -181,8 +155,7 @@ export default {
       align-items: center;
       flex: 1 1 0rpx;
     }
-
+    .wrap3{
-    .wrap3 {
       color: #fff;
       font-size: 28rpx;
       display: flex;
@@ -192,23 +165,19 @@ export default {
     }
 
   }
-
+  .content1{
-  .content1 {
     display: flex;
     justify-content: space-between;
-
+    .wrap1{
-    .wrap1 {
       width: 120rpx;
       height: 20rpx;
     }
-
+    .wrap2{
-    .wrap2 {
       color: #4E964D;
       font-size: 32rpx;
     }
-
+    .wrap3{
-    .wrap3 {
+      image{
-      image {
         width: 132rpx;
         height: 52rpx;
       }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -15,8 +15,7 @@
             "ignore": [],
             "disablePlugins": [],
             "outputPath": ""
-        },
+        }
-        "condition": false
     },
     "compileType": "miniprogram",
     "libVersion": "3.1.0",