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

5 years ago · ea4b25065e
parent 3caf155a43 473ad69fa3
commit ea4b25065e
4 changed files with 144 additions and 132 deletions
--- a/Application/Mobile/View/Index/business.html
+++ b/Application/Mobile/View/Index/business.html
@ -10,19 +10,19 @@
    <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
    <script type="text/javascript" src="__JS__/getRem.js"></script>
    <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IlhuMR32KKlrV3pR6BuvSLVLQKQeEjwP"></script>
-<script type="text/javascript" src="__JS__/business.js"></script>
+    <script type="text/javascript" src="__JS__/business.js"></script>
    <div class="business">
        <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">
--- a/Application/Mobile/View/User/register.html
+++ b/Application/Mobile/View/User/register.html
@ -1,6 +1,6 @@
 <!DOCTYPE HTML>
 <html>
-  <head>
+<head>
    <meta charset="UTF-8">
    <title></title>
    <meta name="keywords" content="" />
@ -20,10 +20,10 @@
    <link rel="stylesheet" type="text/css" href="__CSS__/foot_tabbar.css">
    <link rel="stylesheet" type="text/css" href="__CSS__/loginPhTwo.css">

-  </head>
-  <body class="unlr">
+</head>
+<body class="unlr">

-      <div class="loginPhTwo">
+<div class="loginPhTwo">
    <!-- 子页公共头部 -->
    <div class="subpage-heard">手机注册
        <a href="javascript:window.history.go(-1);" class="arrows"></a>
@ -43,13 +43,15 @@
            <div class="jsgetcode">获取验证码</div>
        </div>
        <button class="login-btn submit">注册</button>
+        <div class="login-agreement">注册即表示同意<a href="{:U('News/protocol')}">《用户协议》</a></div>
+
    </div>
-      </div>
+</div>

-    <div class="popmsg pop-dialog" style="font-size: .28rem"></div>
-    <script src="__JS__/pop.lwx.min.js"></script>
-    <script src="__JS__/common.js"></script>
-    <script>
+<div class="popmsg pop-dialog" style="font-size: .28rem"></div>
+<script src="__JS__/pop.lwx.min.js"></script>
+<script src="__JS__/common.js"></script>
+<script>
    var pmsg = $('.popmsg').pop();
    $(function() {
        $(".clearStr").click(function(){
@ -123,6 +125,6 @@
            pmsg.msg('请输入手机号码');event.preventDefault();
        }
    });
-    </script>
-  </body>
+</script>
+</body>
 </html>
--- a/Application/Mobile/View/User/usernick.html
+++ b/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">
--- a/Public/Mobile/css/loginPhTwo.css
+++ b/Public/Mobile/css/loginPhTwo.css
@ -77,4 +77,14 @@
    line-height: 0.8rem;
    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;
+}