From 581a84bb9c646ac35d73edb509c39990cba2582f Mon Sep 17 00:00:00 2001
From: xingyy <373639591@qq.com>
Date: Mon, 25 Sep 2023 12:00:57 +0800
Subject: [PATCH] submit

---
 pages.json                           |  1 +
 pages/consignment-painting/index.vue | 21 ++++++++++-
 pages/order-goods/index.vue          | 54 +++++++++++++++++++---------
 3 files changed, 58 insertions(+), 18 deletions(-)

diff --git a/pages.json b/pages.json
index 8f2581b..a0ac878 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,6 @@
 {
 	"easycom": {
+
 		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
 		"^tm-(.*)": "@/tm-vuetify/components/tm-$1/tm-$1.vue"
 	},
diff --git a/pages/consignment-painting/index.vue b/pages/consignment-painting/index.vue
index 0a82d20..631d29f 100644
--- a/pages/consignment-painting/index.vue
+++ b/pages/consignment-painting/index.vue
@@ -166,7 +166,7 @@
     <div class="content5">
       <div class="wrap1">
         <div class="wrap1_1">*仅微信付款</div>
-        <div class="wrap1_2">预计 ¥600.00</div>
+        <div class="wrap1_2">预计 ¥{{expectedPayment}}</div>
       </div>
       <div class="wrap2">确认金额并签署合同</div>
     </div>
@@ -195,6 +195,7 @@ export default {
       days.push(i)
     }
     return {
+      expectedPayment:'',
       warehouseID: '',
       cycleId: '',
       cycleList: [],
@@ -220,7 +221,14 @@ export default {
       this.url = e.url
     }
   },
+  watch:{
+    cycleId(newValue){
+      this.obtainAmount()
+
+    }
+  },
   mounted() {
+
     this.getCycle()
     this.getDetailUrl()
     this.getAddress()
@@ -229,6 +237,17 @@ export default {
     this.data = [today.getFullYear(), today.getMonth() + 1, today.getDate()]
   },
   methods: {
+   async obtainAmount(){
+     const data={
+       cycleID:this.cycleId,
+       artworkSquareSize:this.info.artworkSquareSize
+     }
+      const res = await postDataByParams('/api/warehouse/calculate',data)
+     if (res.code===200){
+       this.expectedPayment=res.data.money
+     }
+     console.log(res,'obtainAmount')
+    },
     confirmCycle() {
       this.show_1 = false
     },
diff --git a/pages/order-goods/index.vue b/pages/order-goods/index.vue
index f237175..00aee66 100644
--- a/pages/order-goods/index.vue
+++ b/pages/order-goods/index.vue
@@ -33,8 +33,8 @@
 
     </div>
 
-      <div class="content3">
-        <scroll-view :style="{height:`${elementBottom}rpx`}" class="scrollbox" :scroll-y="true" @scrolltolower="loadMore">
+    <div class="content3">
+      <scroll-view :style="{height:`${elementBottom}rpx`}" class="scrollbox" :scroll-y="true" @scrolltolower="loadMore">
         <div
             v-for="(item,index) in mainList" :key="index"
             @touchstart="(e)=>{touchStart(e,index)}"
@@ -53,9 +53,9 @@
           </div>
           <div class="wrap1_3" :class="[`status${item.artworkStatus}`]">
             <div class="wrap1_3_1" v-if="item.artworkStatus===4">
-              <div class="wrap1_3_1_1">2023.09.28</div>
+              <div class="wrap1_3_1_1">{{ item.endAt }}</div>
               <div class="wrap1_3_1_2">已延期</div>
-              <div class="wrap1_3_1_3">点击补款</div>
+              <div class="wrap1_3_1_3" @click.stop="openShow2(item)">点击补款</div>
             </div>
             <div class="wrap1_3_3" v-if="item.artworkStatus!==4">
               <div class="wrap1_3_3_1">{{ statusValue.find(x => x.value === item.artworkStatus).label }}</div>
@@ -70,11 +70,13 @@
             <image style="width: 80rpx;height: 80rpx" src="../../static/zu154@3x.png"></image>
           </div>
         </div>
-        </scroll-view>
-      </div>
-
-    <u-modal :show="show_1" title="确认删除吗" @cancel="show_1=false" @confirm="deleteClick" confirmText="确认"
-             cancelText="取消" showCancelButton></u-modal>
+      </scroll-view>
+    </div>
+    <uni-popup ref="alertDialog" type="dialog">
+      <uni-popup-dialog :type="'info'" cancelText="关闭" confirmText="确认" title="提示" :content="messageText"
+                        @confirm="popForward"
+      ></uni-popup-dialog>
+    </uni-popup>
     <tabbar :current="1"></tabbar>
   </div>
 </template>
@@ -87,13 +89,14 @@ export default {
   name: "index",
   data() {
     return {
+      messageText: '',
       show_1: false,
       show: false,
       mobileKey: '',
       startX: 0,
       windowWidth: 0,
       page: 1,
-      elementBottom:'',
+      elementBottom: '',
       item: null,
       artworkStatus: 0,
       pageSize: 999,
@@ -114,17 +117,34 @@ export default {
     })
     this.getDistanceFromTopToPageBottom('.content3')
   },
-  computed:{
-
-  },
+  computed: {},
   methods: {
+    popForward() {
+      if (this.messageText === '确认补款吗') {
+        this.supplementaryPayment()
+      } else if (this.messageText === '确认删除吗') {
+        this.deleteClick()
+      }
+    },
+    openShow2() {
+      this.messageText = `确认补款吗`
+      this.$refs.alertDialog.open()
+    },
+    async supplementaryPayment(item) {
+      const data = {
+        ID: item.ID
+      }
+      const res = await postDataByParams('/api/warehouse/remove', data)
+      console.log(res, 'supplementaryPayment')
+    },
     async getDistanceFromTopToPageBottom(classValue) {
-      const { windowHeight, windowWidth } = await uni.getSystemInfo();
-      const [{ top }] = await new Promise(resolve => uni.createSelectorQuery().select(classValue).boundingClientRect().exec(resolve));
+      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;
     },
     openDelete(item) {
-      this.show_1 = true
+      this.messageText = `确认删除吗`
+      this.$refs.alertDialog.open()
       this.item = item
     },
     async deleteClick() {
@@ -219,7 +239,7 @@ export default {
   height: 100vh;
 
   .content3 {
-  margin-top: 20rpx;
+    margin-top: 20rpx;
 
     margin-bottom: 300rpx;