sunlupeng 2 jaren geleden
bovenliggende
commit
b52d1db101
3 gewijzigde bestanden met toevoegingen van 29 en 16 verwijderingen
  1. 2 0
      src/views/HomeView/EarnPoints.vue
  2. 22 16
      src/views/HomeView/MyCenter.vue
  3. 5 0
      src/views/HomeView/RedeemView.vue

+ 2 - 0
src/views/HomeView/EarnPoints.vue

@@ -19,6 +19,8 @@
                                     
                                 </template>
                             </el-table-column>
+                            <el-table-column width="100" align="center" prop="typeName" label="类型"></el-table-column>
+                            <el-table-column width="60" align="center" prop="statusName" label="状态"></el-table-column>
                             <el-table-column width="150" align="center" prop="createTime" label="上传时间"></el-table-column>
                         </el-table>
                          <!-- 分页 -->

+ 22 - 16
src/views/HomeView/MyCenter.vue

@@ -52,11 +52,18 @@
                                         </div>
                                         <div class="main">
                                             <p class="goods_name">{{ item.name }}</p>
-                                            <p class="date">
-                                                兑换时间
-                                                {{ item.createTime }}
-                                            </p>
-                                            <div class="buttons">
+                                            <div style="display: flex;justify-content: space-between;">
+                                                <p class="date">
+                                                    兑换时间
+                                                    {{ item.createTime }}
+                                                </p>
+                                                <p class="date">
+                                                    订单号
+                                                    {{ item.orderSeq }}
+                                                </p>
+                                            </div>
+                                            
+                                            <div class="buttons" style="display: flex;justify-content: space-between;">
                                                 <button class="button-item actived" @click="handleClickGoods(item.orderId)">
                                                     查看信息
                                                     <svg width="16" height="16" viewBox="0 0 16 16"
@@ -64,14 +71,15 @@
                                                         <path d="M12.5855 5.33203C13.0117 5.33203 13.2425 5.83111 12.9664 6.15586L8.38099 11.5505C8.18132 11.7854 7.81872 11.7854 7.61905 11.5505L3.0336 6.15586C2.75757 5.83111 2.98837 5.33203 3.41457 5.33203L12.5855 5.33203Z" fill="#916BE1"></path>
                                                     </svg>
                                                 </button>
+                                                <div class="status">
+                                                    <span v-if="item.orderType==0">已兑换</span>
+                                                    <span v-if="item.orderType==1">待确认</span>
+                                                    <span v-if="item.orderType==2">作废</span>
+                                                    <span v-if="item.orderType==3">已确认</span>
+                                                    <span v-if="item.orderType==4">反馈确认中</span>
+                                                </div>
                                             </div>
                                         </div>
-                                        <div class="status bottom">
-                                            <span v-if="item.orderType==0">已兑换</span>
-                                            <span v-if="item.orderType==1">待确认</span>
-                                            <span v-if="item.orderType==2">作废</span>
-                                            <span v-if="item.orderType==3">已确认</span>
-                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -150,7 +158,7 @@ export default {
                     name: '已兑换',
                 },
                 {
-                    value: '1',
+                    value: '1,4',
                     name: '待确认',
                 },
                 {
@@ -182,8 +190,6 @@ export default {
         this.getIntegralTypes();
         this.getFirstList();
         this.getIntegralNotice();
-        // this.getSecondList('1,2,3');
-        // this.getThirdList();
     },
     methods: {
         getIntegralNotice(){
@@ -245,7 +251,7 @@ export default {
         },
         handleClickSecondTabs(val) {
             if(val=='all'){
-                val = '0,1,2,3'
+                val = '0,1,2,3,4'
             }
             this.getSecondList(val);
         },
@@ -258,7 +264,7 @@ export default {
                 this.getFirstList();
             }
             if(name=='second'){
-                this.getSecondList('0,1,2,3');
+                this.getSecondList('0,1,2,3,4');
             }
             if(name=='third'){
                 this.getThirdList();

+ 5 - 0
src/views/HomeView/RedeemView.vue

@@ -592,6 +592,11 @@ img {
     font-size: 16px;
     border: 1px solid transparent;
 }
+.wrapper .icon{
+    height: 88px;
+    margin-bottom: 24px;
+    max-width: 300px;
+}
 </style>
 <style>
 .el-dialog__body {