前端：整理首页

前端：修复订单列表和详情价格展示错误
前端：H5 页面的登陆拦截补充
后端 + 前端：增加 refreshToken 刷新 accessToken

mobile-web/src/page/user/order/info.vue

@@ -39,15 +39,16 @@
     </van-cell-group>
     <div style="height:15px;"></div>
     <van-cell-group class="total">
-      <van-cell title="商品总额" :value="orderInfo.price"/>
-      <van-cell title="运费" :value="'+' + orderInfo.logisticsPrice / 100"/>
-      <van-cell title="实付金额" :value="orderInfo.payAmount" style="font-weight: 700;"/>
+      <van-cell title="商品总额" :value="orderInfo.buyPrice / 100.0"/>
+      <van-cell title="运费" :value="'+' + orderInfo.logisticsPrice / 100.0"/>
+      <van-cell title="折扣" :value="- orderInfo.discountPrice / 100.0"/>
+      <van-cell title="实付金额" :value="orderInfo.presentPrice / 100.0" style="font-weight: 700;"/>
     </van-cell-group>
     <div class="footer">
       <div class="munu">
         <van-button v-if="orderInfo.status === 3 " size="small">退货</van-button>
         <van-button v-if="orderInfo.status === 3 " size="small" v-on:click="clickConfirmReceiving(orderId)">确认收货</van-button>
-        <van-button v-if="orderInfo.status === 1 " size="small" type="danger">支付</van-button>
+        <van-button v-if="orderInfo.status === 1 " size="small" type="danger" @click="goPay(orderInfo.id)">支付</van-button>
       </div>
     </div>
   </div>
@@ -88,6 +89,9 @@
           this.queryOrderPage(this.queryParams)
         })
       },
+      goPay(itemId) {
+        this.$router.push('/pay?appId=POd4RC6a&orderId=' + itemId + '&returnUrl=' + encodeURI('/user/order/info/' + itemId));
+      },
     },
     mounted() {
       const { id } = this.$route.params;

mobile-web/src/page/user/order/list.vue

@@ -33,7 +33,7 @@
             </router-link>
           </div>
           <div slot="footer" class="footer">
-            <span class="total">总价：{{item.payAmount / 100}} 元</span>
+            <span class="total">总价：{{item.presentPrice / 100}} 元</span>
             <router-link :to="'/user/order/logistics/'+item.orderid">
               <van-button v-if="[3,4,5].indexOf(item.status) != -1" size="small">查看物流</van-button>
             </router-link>
@@ -114,7 +114,7 @@
               state: `${statusArray[order.status]}`,
               status: order.status,
               products,
-              payAmount: order.payAmount,
+              presentPrice: order.presentPrice,
             };
           });