Merge remote-tracking branch 'origin/dev' into dev_lww

Application/Mobile/View/Index/business.html

@@ -15,14 +15,14 @@
         <div class="business_box">
             <div class="heard_img"><img src="__IMG__/new/lunbo2.png" alt=""></div>
             <div class="heard_title">商务合作</div>
-      <div class="heard_en">COMPANY PROFILE</div>
+            <div class="heard_en">Business cooperation</div>
             <div class="introduce">《海南万盟天下科技有限公司》，致力于引进和传播手机游戏，我们愿与广大开发者一同成长，将快乐分享给每一个玩家。欢迎广大开发者与工作人员联系，让您的游戏为我们平台锦上添花。</div>
             <div class="bazaar">
                 <div class="title">市场合作</div>
                 <div class="info">万盟天下一直坚持开放诚信高效的业务合作，欢迎各位业界同仁前来联系，互利共赢。</div>
             </div>
             <div class="bazaar">
-        <div class="title">媒体合作</div>
+                <div class="title">商务合作</div>
                 <div class="info">万盟天下一直希望通过广泛的市场及品牌合作，为用户提供更全面的产品与服务。</div>
             </div>
             <div class="bazaar">

Application/Mobile/View/User/register.html

@@ -43,6 +43,8 @@
             <div class="jsgetcode">获取验证码</div>
         </div>
         <button class="login-btn submit">注册</button>
+        <div class="login-agreement">注册即表示同意<a href="{:U('News/protocol')}">《用户协议》</a></div>
+
     </div>
 </div>
 

Application/Mobile/View/User/usernick.html

@@ -10,7 +10,7 @@
     <form id="form"  action="" method="post" onsubmit="return false" class="">
       <div class="name">
         <!-- 子页公共头部 -->
-        <div class="subpage-heard">修改名字
+        <div class="subpage-heard">修改昵称
           <a href="javascript:window.history.go(-1);" class="arrows"></a>
         </div>
         <div class="name-info">

Public/Mobile/css/loginPhTwo.css

@@ -78,3 +78,13 @@
     outline: 0;
     border: 0;
 }
+
+.login-agreement {
+    font-size: 0.24rem;
+    color: #292929;
+    margin-top: 0.32rem;
+}
+.login-agreement>a {
+    color: #389AED;
+    font-size: 0.24rem;
+}