Skip to content

S
sim
Commit bb278459 authored by limeimei's avatar limeimei
Browse files
Options

Merge branch 'master' of http://120.77.240.215:9701/limeimei/sim

parents 85c335c2 eed0078a
Pipeline #2064 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 14 additions and 6 deletions
      public/index.html
      View file @ bb278459
      ...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
      <head> <head>
      <meta charset="utf-8"> <meta charset="utf-8">
      <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
      <meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
      <link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico">
      <title><%= htmlWebpackPlugin.options.title %></title> <title><%= htmlWebpackPlugin.options.title %></title>
      </head> </head>
      ......
      src/views/hotels/info/pay.vue
      View file @ bb278459
      ...@@ -9,15 +9,15 @@ ...@@ -9,15 +9,15 @@
      <div class="price">¥<span>588</span></div> <div class="price">¥<span>588</span></div>
      <div class="price_type"> <div class="price_type">
      <div class="price_wechat"> <div class="price_wechat">
      <img src="" class="price_img" /> <img src="@/assets/wechat.png" class="price_img" />
      <div class="price_tips">使用<span>微信</span>扫一扫进行支付</div> <div class="price_tips">使用<span>微信</span>扫一扫进行支付</div>
      </div> </div>
      <div class="price_alipay"> <div class="price_alipay">
      <img src="" class="price_img" /> <img src="@/assets/pay.png" class="price_img" />
      <div class="price_tips">使用<span>支付宝</span>扫一扫进行支付</div> <div class="price_tips">使用<span>支付宝</span>扫一扫进行支付</div>
      </div> </div>
      </div> </div>
      <div class="success_back" @click="goback">发放房卡</div> <div class="success_back" @click="comfim">发放房卡</div>
      </div> </div>
      </div> </div>
      </template> </template>
      ......
      src/views/sim/pay.vue
      View file @ bb278459
      ...@@ -9,11 +9,11 @@ ...@@ -9,11 +9,11 @@
      <div class="price">¥<span>95</span></div> <div class="price">¥<span>95</span></div>
      <div class="price_type"> <div class="price_type">
      <div class="price_wechat"> <div class="price_wechat">
      <img class="price_img" src="" /> <img src="@/assets/wechat.png" class="price_img" />
      <div class="price_tips">使用<span>微信</span>扫一扫进行支付</div> <div class="price_tips">使用<span>微信</span>扫一扫进行支付</div>
      </div> </div>
      <div class="price_alipay"> <div class="price_alipay">
      <img class="price_img" /> <img src="@/assets/pay.png" class="price_img" />
      <div class="price_tips">使用<span>支付宝</span>扫一扫进行支付</div> <div class="price_tips">使用<span>支付宝</span>扫一扫进行支付</div>
      </div> </div>
      </div> </div>
      ...@@ -149,4 +149,12 @@ ...@@ -149,4 +149,12 @@
      .price_tips span { .price_tips span {
      color: #999999; color: #999999;
      } }
      ::v-deep .el-button--primary {
      width: 132px;
      height: 50px;
      background: #437AE5;
      font-size: 18px;
      border: none;
      }
      </style> </style>
      \ No newline at end of file
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment