shish 3 лет назад
Родитель
Сommit
df4558e1d1
3 измененных файлов с 9 добавлено и 16 удалено
  1. 1 1
      mallApp/src/pages/home/recent.vue
  2. 0 5
      mallApp/src/pages/order/detail.vue
  3. 8 10
      mallApp/src/pages/order/list.vue

+ 1 - 1
mallApp/src/pages/home/recent.vue

@@ -317,7 +317,7 @@ export default {
           border-radius: 8px;
           border-radius: 8px;
           height: 60upx;
           height: 60upx;
           line-height:60upx;
           line-height:60upx;
-          border: 1px solid rgba(221, 221, 221, 1);
+          border: 2px solid rgba(221, 221, 221, 1);
           color: rgba(51, 51, 51, 1);
           color: rgba(51, 51, 51, 1);
           font-size: 30upx;
           font-size: 30upx;
           margin:0 50upx 0 0;
           margin:0 50upx 0 0;

+ 0 - 5
mallApp/src/pages/order/detail.vue

@@ -117,11 +117,6 @@
       <template v-if="data.status == 1">
       <template v-if="data.status == 1">
         <button class="button-com red" @click="payFn">立即支付</button>
         <button class="button-com red" @click="payFn">立即支付</button>
       </template>
       </template>
-      <template v-else-if="data.status == 5">
-        <template v-if="data.grade == 0">
-          <button class="button-com middle" @click="evealFn">评价</button>
-        </template>
-      </template>
     </div>
     </div>
   </div>
   </div>
 </template>
 </template>

+ 8 - 10
mallApp/src/pages/order/list.vue

@@ -6,27 +6,25 @@
           <div class="app-color-3">编号:{{ item.sendNum }}</div>
           <div class="app-color-3">编号:{{ item.sendNum }}</div>
           <div class="app-price">{{ item.status | constantfilter('ORDER_STATUS') }}</div>
           <div class="app-price">{{ item.status | constantfilter('ORDER_STATUS') }}</div>
         </div>
         </div>
-        <div class="list-blo">
-          <block v-if="!$util.isEmpty(item.goodsInfoList)">
-            <list-module v-for="(items, subIndex) in item.goodsInfoList" :key="subIndex" :info="items" />
-          </block>
+        <div class="list-bottom flex-center-between">
+          <div>
+            <span class="app-color-3">日期:</span>
+            <span class="app-size-30">{{ item.addTime ? item.addTime.substring(5,16) : '' }}</span>
+          </div>
         </div>
         </div>
         <div class="list-bottom flex-center-between">
         <div class="list-bottom flex-center-between">
           <div>
           <div>
-            <span>金额:</span>
-            <span class="app-size-30 app-bold">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</span>
+            <span class="app-color-3">金额:</span>
+            <span class="app-size-30">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</span>
           </div>
           </div>
           <block v-if="item.status == 0">
           <block v-if="item.status == 0">
             <button class="button-com red" @click.stop="pageTo({ url: '/pages/callback/index', query: { pageStatus: 1, orderSn: item.orderSn, totalPrice: item.orderPrice, couponId: item.couponId } })" >立即付款</button>
             <button class="button-com red" @click.stop="pageTo({ url: '/pages/callback/index', query: { pageStatus: 1, orderSn: item.orderSn, totalPrice: item.orderPrice, couponId: item.couponId } })" >立即付款</button>
           </block>
           </block>
-          <block v-if="item.status == 5">
-            <button v-if="data.grade == 0" class="button-com red defalut" @click.stop="pageTo({ url: '/pages/order/comment', query: { id: item.id } })" >评价</button>
-          </block>
         </div>
         </div>
       </div>
       </div>
     </block>
     </block>
     <block v-else>
     <block v-else>
-      <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+      <app-wrapper-empty title="暂无记录" :is-empty="$util.isEmpty(list.data)" />
     </block>
     </block>
   </div>
   </div>
 </template>
 </template>