Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

07b99ed7 · lihuihui · c89040d4 · b442a3ad · 07b99ed7 · 07b99ed7
--- a/src/index.html
+++ b/src/index.html
@@ -8,7 +8,7 @@
  <meta http-equiv="Pragma" content="no-cache" />
  <meta http-equiv="Expires" content="0" />
  <title></title>
-  <meta name="viewport" id="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no">
+  <meta name="viewport" id="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no, viewport-fit=cover">
 </head>
 <body>
  <div id="app"></div>

--- a/src/pages/my/buyCourses.vue
+++ b/src/pages/my/buyCourses.vue
@@ -15,7 +15,7 @@
          <div class="val">{{item.total_fee}}</div>
        </div>
        <div class="deti">
-          <div class="val col" v-if="item.status === '-1'" @click="goBuy">继续支付</div>
+          <div class="val col" v-if="item.status === '-1'" @click="goBuy(item)">继续支付</div>
          <div class="val col" v-else>{{item.status | orderStatusText}}</div>
        </div>
      </li>

--- a/src/pages/pay/index.vue
+++ b/src/pages/pay/index.vue
@@ -94,13 +94,13 @@ export default {
  position: fixed;
  bottom: 0;
  left: 0;
-  width: 7.5rem;
-  height: 1rem;
-  background: rgba(255, 255, 255, 1);
+  right: 0;
+  background: #fff;
  box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.05);
  display: flex;
  align-items: center;
-  padding: 0 0.4rem;
+  justify-content: space-between;
+  padding: 0 0.4rem env(safe-area-inset-bottom);
  .num {
    font-size: 0.26rem;
    color: #ff6767;
@@ -113,11 +113,11 @@ export default {
    height: 0.7rem;
    background: rgba(255, 103, 103, 1);
    border-radius: 0.12rem;
-    margin-left: auto;
    text-align: center;
    line-height: 0.7rem;
    color: #fff;
    font-size: 0.3rem;
+    margin: 0.15rem 0;
  }
  .active {
    background: #ccc;