Merge remote-tracking branch 'origin/wx0604' into wx0604

application/api/controller/Register.php

@@ -132,6 +132,9 @@ class Register extends Basic
              "wx_union_id" => "asdfasfasdf",
              "phone"  => 25983,
          );*/
+        if (!isset($params["phone"])) {
+            return $this->response("101", "手机号为必填字段");
+        }
         $checkResult = $this->validate($params, "RegisterValidate.bind");
         if (true !== $checkResult) {
             return $this->response("101", $checkResult);

application/api/validate/RegisterValidate.php

@@ -39,6 +39,6 @@ class RegisterValidate extends Validate
         'verify'     => [ 'phone', 'device_id' ],
         'register'   => [ 'phone', 'device_id', 'code' ],
         'removeBind' => [ 'user_id', 'buyer_id' ],
-        'bind'       => [ 'user_id', 'wx_union_id' ],
+        'bind'       => [ 'wx_union_id','phone' ],
     ];
 }
\ No newline at end of file

application/app/view/index/download_c.html

@@ -38,7 +38,7 @@
 <script>
     window.onload = function() {
 
-        $('#app_ban').attr('src','/app/images/bg_download.png');
+        $('#app_ban').attr('src','/app/images/bg_download_c@2x.png');
         $('title').html('下载');
         $('.xiazai-p-fuju').show();
         //0是c端，2是b端

application/app_broker/view/index/download_b.html

@@ -36,7 +36,7 @@
 <script>
     window.onload = function() {
 
-    		$('#app_ban').attr('src','/app/images/bg_download.png');
+    		$('#app_ban').attr('src','/app/images/bg_download_b@2x.png');
     		$('title').html('下载');
     		$('.xiazai-p-fuju').show();
     		//0是c端，2是b端