兑换记录页优化

zhiyangdu
1 parent b05abca1
Showing 3 changed files with 23 additions and 5 deletions
src/pages/pointsExchangeRecords/pointsExchangeRecords.less
src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
src/pages/pointsMall/pointsMall.vue
@@ -6,10 +6,10 @@
     background: #FFFFFF;
     border-radius: 24px;
     .item_box{
-      padding: 30px;
+      margin: 0 30px;
       border-bottom: solid 2px #EAEAEA;
       display: flex;
-      padding-bottom: 28px;
+      padding: 30px 0;
       img{
         display: flex;
         width: 190px;
@@ -80,6 +80,16 @@
             align-items: center;
             justify-content: center;
           }
+          .look_logistics{
+            width: 160px;
+            height: 60px;
+            border: 1px solid #3EB781;
+            border-radius: 30px;
+            font-size: 30px;
+            font-weight: 400;
+            color: #3EB781;
+            line-height: 60px;
+          }
           img{
             display: block;
             width: 22px;
@@ -26,17 +26,24 @@
             收货人: {{item.address_name}}{{item.address_phone}}{{item.address_address}}
           </div>
-          <div class="exchange_type">
-            <!-- 500积分+9.9元             -->
+          <div v-show="item.price || item.total" class="exchange_type">
+            <span v-show="item.total && $route.query.type==3">{{item.total}}积分</span>
+            <span class="灰色" v-show="item.total && $route.query.type==7">{{item.total}}健康值</span>
+            <span v-show="parseInt(item.price)>0">+{{item.price}}元</span>          
           </div>
           <div class="exchange_time">
             兑换时间 {{item.create_time*1000 | datetime('yyyy-MM-dd hh:mm:ss')}}
           </div>
           <div v-show="item.shop_type == 1 && !item.address_name && !item.address_address && !item.address_phone" class="btn-box">
+            <!-- 需要填写地址状态 -->
             <div @click.stop="addAddressInfo(item)" class="btn">
               填写地址 
               <img src="static/img/red_right_icon.png" alt=""/>
             </div>
+            <!-- 已填写地址等待发货状态 -->
+            <div v-show="item.sendtime && item.sendtime>0" class="look_logistics">
+              查看物流
+            </div>
           </div>
         </div>
       </div>
@@ -167,7 +174,7 @@ export default {
           {
             uid: this.getStore("uid"),
             page: page,
-            type: "3" // 1亲子嘉年华 2 康疫健步 3 积分商城
+            type: this.$route.query.type // 1亲子嘉年华 2 康疫健步 3 积分商城 4 脐橙 7 健康商城
           },
           this.myLuckDrawCallback,
           {
@@ -193,6 +193,7 @@ export default {
           path: '/pointsExchangeRecords',
           query: {
             uid: this.getStore("uid"),
+            type: 3 // 1亲子嘉年华 2 康疫健步 3 积分商城 4 脐橙 7 健康商城
           }
         })
       } else {