wechat

9 years ago · a59f65a455
parent 445bae6de9
commit a59f65a455
5 changed files with 60 additions and 2114 deletions
--- a/2
+++ b/2
@ -18,7 +18,7 @@ gem 'daemons'
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
 gem 'seems_rateable', '~> 1.0.13'
-gem "rails", "3.2.13"
+gem 'rails', '~> 3.2', '>= 3.2.22'
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem 'coderay', '~> 1.1.0'
--- a/app/controllers/wechats_controller.rb
+++ b/app/controllers/wechats_controller.rb
@ -1,4 +1,6 @@
 class WechatsController < ActionController::Base
+  layout 'wechat/layout'
+
  wechat_responder

  include ApplicationHelper
--- a/app/views/wechats/layout.html.erb
+++ b/app/views/wechats/layout.html.erb
@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <%= csrf_meta_tag %>
+  <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+  <title>绑定用户</title>
+  <link rel="stylesheet" href="/stylesheets/weui/weui.min.css"/>
+  <script src="/javascripts/jquery.min.js"></script>
+</head>
+
+<%= yield %>
+
+<!--BEGIN dialog2-->
+<div class="weui_dialog_alert" id="dialog2" style="display: none;">
+  <div class="weui_mask"></div>
+  <div class="weui_dialog">
+    <div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
+    <div class="weui_dialog_bd"><span class="weui_dialog_info">弹窗内容，告知当前页面信息等</span></div>
+    <div class="weui_dialog_ft">
+      <a href="javascript:;" class="weui_btn_dialog primary">确定</a>
+    </div>
+  </div>
+</div>
+<!--END dialog2-->
+
+<!--BEGIN dialog1-->
+<div class="weui_dialog_confirm" id="dialog1" style="display: none;">
+  <div class="weui_mask"></div>
+  <div class="weui_dialog">
+    <div class="weui_dialog_hd"><strong class="weui_dialog_title">弹窗标题</strong></div>
+    <div class="weui_dialog_bd"><span class="weui_dialog_info">自定义弹窗内容，居左对齐显示，告知需要确认的信息等</span></div>
+    <div class="weui_dialog_ft">
+      <a href="javascript:;" class="weui_btn_dialog default cancel">取消</a>
+      <a href="javascript:;" class="weui_btn_dialog primary confirm">确定</a>
+    </div>
+  </div>
+</div>
+<!--END dialog1-->
+
+
+</body>
+</html>
--- a/app/views/wechats/login.html.erb
+++ b/app/views/wechats/login.html.erb
@ -1,13 +1,3 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <%= csrf_meta_tag %>
-  <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
-  <title>绑定用户</title>
-  <link rel="stylesheet" href="/stylesheets/weui/weui.min.css"/>
-  <script src="/javascripts/jquery.min.js"></script>
-</head>

 <div class="loginIn">
  <div>
@ -61,11 +51,10 @@
        url: $("#main_login_form").attr("action"),
        data:data,
        dataType: "json"
+      }).done(function(data){
+
      });

    })
  });
-
-</script>
-</body>
-</html>
+</script>
--- a/db/schema.rb
+++ b/db/schema.rb