Merge branch 'dev'

view/xcx/api/order.js

@@ -79,7 +79,7 @@ export function orderPay(data){
  * @param string uni 
 */
 export function getOrderDetail(uni){
-  return request.get('order/detail/'+uni);
+  return request.get('order/v2/detail/'+uni);
 }
 
 /**
@@ -173,7 +173,7 @@ export function getCouponsOrderPrice(price, data){
  * 
 */
 export function orderCreate(key,data){
-  return request.post('order/create/'+key,data);
+  return request.post('order/v2/create/'+key,data);
 }
 /**
  * 订单查询物流信息
@@ -190,5 +190,5 @@ export function express(uni) {
  * @returns {*}
  */
 export function postOrderComputed(key, data) {
-  return request.post("/order/computed/" + key, data);
+  return request.post("/order/v2/computed/" + key, data);
 }

view/xcx/pages/index/index.js

@@ -206,6 +206,8 @@ Page({
           }
         }
       });
+      
+      app.setUnread(res.data.notice);
     })
   },
 

view/xcx/pages/leader_board/index.wxss

@@ -12,6 +12,7 @@
     justify-content: center;
     align-items: center;
     width: 100%;
+    height: 100%;
 }
 
 .board .banner image {

view/xcx/pages/order_pay_status/index.js

@@ -15,7 +15,7 @@ Page({
       'title': '支付成功'
     },
     orderId:'',
-    order_pay_info: { paid :1 }
+    order_pay_info: { paid :0 }
   },
   onLoadFun:function(){
     this.getOrderPayInfo();
@@ -62,7 +62,7 @@ Page({
     openOrderSubscribe().then(res => {
       wx.hideLoading();
       wx.navigateTo({
-        url: '/pages/order_details/index?order_id=' + that.data.orderId
+        url: '/pages/order_list/index',
       });
     }).catch(() => {
       wx.hideLoading();