From bbfe4846047805ddf5df0625781a83909f84605b Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 30 Nov 2022 13:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pidu/AppPointsChange/AppPointsChange.vue  |  5 +++-
 src/project/pidu/AppPointsChange/detail.vue   | 11 +++++++-
 src/project/pidu/AppPointsChange/order.vue    | 27 ++++++++++---------
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/project/pidu/AppPointsChange/AppPointsChange.vue b/src/project/pidu/AppPointsChange/AppPointsChange.vue
index 0feb3033..59bde694 100644
--- a/src/project/pidu/AppPointsChange/AppPointsChange.vue
+++ b/src/project/pidu/AppPointsChange/AppPointsChange.vue
@@ -14,7 +14,7 @@
     <div class="list-content">
       <div class="select">
         <div :class="search.newStatus == 1 ? 'active' : ''" @click="clickNew()">最新上架</div>
-        <div class="price active" @click="clickPrice()">价格<span class="top" :class="search.priceStatus == 1 ? 'active' : ''">⏶</span><span class="bottom" :class="search.priceStatus != 1 ? 'active' : ''">⏷</span></div>
+        <div class="price active" @click="clickPrice()">价格<span class="top mar-l8" :class="search.priceStatus == 1 ? 'active' : ''">⏶</span><span class="bottom mar-l8" :class="search.priceStatus != 1 ? 'active' : ''">⏷</span></div>
         <div class="sure" :class="search.status == 2 ? 'active' : ''" @click="clickStatus()">可兑换的
           <img src="./components/imgs/check-icon.png" alt="" v-if="search.status == 2">
         </div>
@@ -215,6 +215,9 @@ export default {
         .active {
           color: #CA906A;
         }
+        .mar-l8 {
+          margin-left: 8px;
+        }
       }
       .sure {
         img {
diff --git a/src/project/pidu/AppPointsChange/detail.vue b/src/project/pidu/AppPointsChange/detail.vue
index 922c4d0d..b33f7273 100644
--- a/src/project/pidu/AppPointsChange/detail.vue
+++ b/src/project/pidu/AppPointsChange/detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="detail">
     <div class="goods-img">
-      <u-swiper :list="list" mode="none" img-mode="aspectFit" height="750" bg-color="#fff"></u-swiper>
+      <u-swiper :list="list" mode="none" img-mode="aspectFit" height="750" bg-color="#fff" @click="imgClick"></u-swiper>
     </div>
     <div class="goods-title">{{goodsInfo.merchandiseName}}</div>
     <div class="goods-point">
@@ -53,6 +53,15 @@ export default {
         }
       })
     },
+    imgClick(index) {
+      this.previewImages(this.list, this.list[index].image)
+    },
+    previewImages(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.image),
+        current: img
+      })
+    },
   },
 }
 </script>
diff --git a/src/project/pidu/AppPointsChange/order.vue b/src/project/pidu/AppPointsChange/order.vue
index 5c2e7e75..c6ae2a30 100644
--- a/src/project/pidu/AppPointsChange/order.vue
+++ b/src/project/pidu/AppPointsChange/order.vue
@@ -74,19 +74,22 @@ export default {
       })
     },
     submit() {
-      this.$http.post(`/app/appintegralmerchandiseorder/addOrUpdate`, {
-        merchandiseId: this.id,
-        merchandiseNumber: this.number,
-        remark: this.remark
-      }).then((res) => {
-        if (res.code == 0) {
-          this.$u.toast('提交成功')
-          uni.$emit('updateList')
-          setTimeout(() => {
-            uni.navigateBack({delta: 2})
-          }, 600)
-        }
+      this.$confirm('是否确认提交订单？').then(() => {
+        this.$http.post(`/app/appintegralmerchandiseorder/addOrUpdate`, {
+          merchandiseId: this.id,
+          merchandiseNumber: this.number,
+          remark: this.remark
+        }).then((res) => {
+          if (res.code == 0) {
+            this.$u.toast('提交成功')
+            uni.$emit('updateList')
+            setTimeout(() => {
+              uni.navigateBack({delta: 2})
+            }, 600)
+          }
+        })
       })
+      
     },
   },
 }