|
|
@@ -1,11 +1,7 @@
|
|
|
<template>
|
|
|
<view class="container">
|
|
|
<view class="container_text">
|
|
|
-<<<<<<< HEAD
|
|
|
- <image class="banner-img" src="/static/img/login.png" mode="scaleToFill">
|
|
|
-=======
|
|
|
<image class="banner-img" src="/static/img/logo.png" mode="scaleToFill">
|
|
|
->>>>>>> 9120b76f6c258133d586d998575baec28e13fae4
|
|
|
</image>
|
|
|
</view>
|
|
|
<view class="loginTitle"><text>登录</text></view>
|
|
|
@@ -27,13 +23,8 @@
|
|
|
<view class="fenge"></view>
|
|
|
</view> -->
|
|
|
<!-- #ifndef APP-PLUS -->
|
|
|
-<<<<<<< HEAD
|
|
|
- <view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
|
|
|
- <!-- <view class="weixin_text" @click="wecahtLogin">微信登录</view> -->
|
|
|
-=======
|
|
|
<!-- <view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
|
|
|
<view class="weixin_text" @click="wecahtLogin">微信登录</view> -->
|
|
|
->>>>>>> 9120b76f6c258133d586d998575baec28e13fae4
|
|
|
<!-- #endif -->
|
|
|
<!-- #ifdef APP-PLUS -->
|
|
|
<!-- <block v-if="!is_ios">
|
|
|
@@ -303,11 +294,7 @@ page {
|
|
|
width: 100%;
|
|
|
height: 500rpx;
|
|
|
top: 0rpx;
|
|
|
-<<<<<<< HEAD
|
|
|
-
|
|
|
-=======
|
|
|
// background-color: #6EAB4E;
|
|
|
->>>>>>> 9120b76f6c258133d586d998575baec28e13fae4
|
|
|
.banner-img {
|
|
|
width: 100%;
|
|
|
height: 100%;
|
