AcidificationModel/pages/Regular/Regular.wxml

<view class="container">
<<<<<<< HEAD
  <input class="input" bindinput="inputName" placeholder="请输入用户名" />
  <input class="input" bindinput="inputPassword" placeholder="请输入密码" type="password" />
  <button class="btn" bindtap="register">注册</button>
  <text class="error">{{errorMessage}}</text>
=======
   <!-- 用户名密码登录 -->
   <view >
    <input class="input" bindinput="inputUsername" placeholder="请输入用户名" />
    <input class="input" bindinput="inputPassword" placeholder="请输入密码" type="password" />
    <button class="gologin" bindtap="login">登录</button>
    <text class="error">{{errorMessage}}</text>
  </view>
  <view class="container">
<button bindtap="gologin">微信登录</button>
</view>

  <!-- 登录弹窗 -->
  <view class="pop_root" hidden="{{isHidden}}">
    <view class="pop_content">
      <view class="pot_tip">授权登录弹窗</view>
      
      <!-- 获取头像 -->
      <button class="pop_avatar" open-type="chooseAvatar" bindchooseavatar="getAvatar">
        <image class="pop_img" wx:if="{{avatarUrl}}" src="{{avatarUrl}}" />
        <view wx:else>获取头像</view>
      </button>
      
      <!-- 获取昵称 -->
      <input 
    class="pop_name" 
    type="nickname" 
    bindblur="getName"
    placeholder="获取昵称"/>
      
      <view class="pop_bot">
        <view class="btn" bind:tap="potNo">取消</view>
        <view class="btn1" bind:tap="popYes">确定</view>
      </view>
    </view>
  </view>
>>>>>>> origin/soligd
</view>