Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/views/goodsDetail/components/bottomNav.vue

@@ -141,7 +141,7 @@ export default {
   padding-left: 12px;
   padding-right: 12px;
   box-sizing: border-box;
-  z-index: 2;
+  z-index: 99;
   button {
     flex: 1;
     font-size: 16px;

src/views/pay/payWaiting.vue

@@ -16,8 +16,10 @@
     <p class="tips">
       努力返回支付结果中，请留心查看！
     </p>
-    <div :class="['actions', !isOrder && 'no-order']">
-      <cr-button type="primary" class="btn-primary" @click="navigateBack">返回</cr-button>
+    <div v-if="isApp" :class="['actions', !isOrder && 'no-order']">
+      <cr-button type="primary" shape="circle" class="btn-primary" @click="navigateBack"
+        >返回订单列表</cr-button
+      >
     </div>
   </div>
 </template>
@@ -37,7 +39,8 @@ export default {
       time: 10,
       init: false,
       returnUrl: '',
-      isOrder: true
+      isOrder: true,
+      isApp
     };
   },
   created() {
@@ -69,7 +72,7 @@ export default {
   },
   methods: {
     navigateBack() {
-      this.$router.go(-1);
+      this.$router.replace({ name: 'orderList', params: { status: 0 } });
     },
     getQuery() {
       this.returnUrl = cookies.get('returnUrl') || '';
@@ -175,8 +178,9 @@ export default {
     }
 
     button {
-      .text-17;
-      width: 161px;
+      .text-16;
+      width: 100%;
+      // width: 161px;
     }
   }
   .info_button {