From 26caacc42ce2c05af6eb11bdf32e9d2a4b3a4f14 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 29 Nov 2022 11:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/pidu/AppPointsChange/myOrder.vue | 52 ++++++++++----------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/project/pidu/AppPointsChange/myOrder.vue b/src/project/pidu/AppPointsChange/myOrder.vue
index 91766763..d76ff11c 100644
--- a/src/project/pidu/AppPointsChange/myOrder.vue
+++ b/src/project/pidu/AppPointsChange/myOrder.vue
@@ -4,44 +4,38 @@
     <div class="tab-select">
       <div class="item" :class="tabIndex == index? 'active': ''" v-for="(item,index) in tabList" :key="index" @click="toCheck(index)">{{ item }}<span></span></div>
     </div>
-    <!--  v-if="orderList.length" -->
-    <div class="card-List">
-      <!-- v-for="(item,index) in orderList" :key="index" -->
-      <div class="item" >
+    <div class="card-List" v-if="orderList.length">
+      <div class="item" v-for="(item,index) in orderList" :key="index">
         <!--  @click="$linkTo(`./detail?id=${item.id}`)" -->
         <div>  
           <div class="title">
-            <div>2020-12-11 10:10</div>
-            <!-- :style="{color: item.orderStatus==0? '#FF883C':item.orderStatus==1? '#42D784': '#999999'}" -->
-            <div>待收货</div>
+            <div>{{ item.createTime }}</div>
+            <!--  -->
+            <div><span :style="{color: item.orderStatus==0? '#FF883C':item.orderStatus==1? '#42D784': '#999999'}">{{item.orderStatus}}</span></div>
           </div>
-          <!--  v-for="(e,indexs) in item.merchandiseList" :key="indexs" -->
           <div class="list">
             <div class="list-item">
               <div class="picture">
-                <img src="./components/imgs/check-icon.png" alt="">
+                <img :src="item.imageUrl" alt="">
               </div>
               <div class="info">
-                <div class="name">天薇抽纸天然无香纸巾天薇抽纸天然无香纸巾天薇抽纸可湿水面巾…</div>
+                <div class="name">{{ item.merchandiseName }}</div>
                 <div class="info-num">
-                  <div class="num">数量：2<span></span></div>
-                  <div class="integral">共<span>10</span>积分</div>
+                  <div class="num">数量：<span>{{ item.merchandiseNumber }}</span></div>
+                  <div class="integral">共<span>{{ item.merchandiseNumber * item.merchandiseIntegral}}</span>积分</div>
                 </div>
               </div>
             </div>
           </div>
-          <div class="remark">
-            备注：明天自己上门取货
-          </div>
-                  <!--  v-if="item.orderStatus == 0" -->
-          <div class="btn">
+          <div class="remark" v-if="item.remark.length">备注：{{ item.remark }}</div>
+          <div class="btn" v-if="item.orderStatus==1 || item.orderStatus==2">
             <div class="cancel" @click="cancelBtn(item.id)">取消订单</div>
-            <div class="confirm">核销码：<span>293049</span></div>
+            <div class="confirm">核销码：<span>{{ item.auditCode }}</span></div>
           </div>
         </div>
       </div>
     </div>
-    <!-- <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty> -->
+    <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
   </div>
 </template>
 
@@ -57,7 +51,7 @@ export default {
     }
   },
   onLoad() {
-    // this.getOrderList()
+    this.getOrderList()
     document.title = '我的订单'
   },
   methods: {
@@ -65,10 +59,10 @@ export default {
       this.orderList = []
       this.current = 1
       this.tabIndex = index
-      // this.getOrderList()
+      this.getOrderList()
     },
     getOrderList() {
-      this.$instance.post('/appvillagerintegralshoporder/listForWx',null,{
+      this.$http.post('/app/appintegralmerchandiseorder/listByGirdMember',null,{
         params: {
           current: this.current,
           orderStatus: this.tabIndex == 0 ? '' : this.tabIndex == 1? 0 : this.tabIndex ==2? 1:2
@@ -81,7 +75,7 @@ export default {
     },
     cancelBtn(id) {
       this.$dialog.confirm({ content: '确定要关闭该订单吗？' }).then(() => {
-        this.$instance.post('/appvillagerintegralshoporder/overOrderForWx',null,{
+        this.$http.post('/appvillagerintegralshoporder/overOrderForWx',null,{
           params: {
             orderId: id
           }
@@ -188,6 +182,13 @@ export default {
           }
           .info {
             width: calc(100% - 192px);
+            .name {
+              overflow: hidden; 
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 2;
+            }
             .info-num {
               margin-top: 24px;
               display: flex;
@@ -229,8 +230,9 @@ export default {
         }
         div:first-child {
           margin-right: 32px;
-          border: 1px solid #DDDDDD;
-          border-radius: 52px;
+          // border: 1px solid #DDDDDD;
+          // border-radius: 52px;
+          color: #687DA6;
         }
         div:last-child {
           color: #999999;