eric_weixin 0.3.3 → 0.4.0

data/config/routes.rb

@@ -7,6 +7,8 @@ EricWeixin::Engine.routes.draw do
 
   get "/weixin/pay" => "wz/pays#prepay"
 
+  get "/weixin/orders" => "wz/xiaodian/orders#index"
+
   namespace :cms do
     namespace :weixin do
       namespace :xiaodian do
@@ -14,6 +16,9 @@ EricWeixin::Engine.routes.draw do
           collection do
             post :save_delivery_info
             get :download_orders
+            get :update_hb_infos
+            get :update_order_infos
+            post :update_delivery_info_by_excel
           end
         end
         resources :products do
@@ -30,6 +35,10 @@ EricWeixin::Engine.routes.draw do
         end
       end
       resources :weixin_users do
+        collection do
+          get :quick_get_user_infos
+          get :batch_update_user_infos
+        end
         member do
           post :modify_remark
         end

data/lib/eric_weixin/modules/snsapi.rb

@@ -10,7 +10,7 @@ module EricWeixin::Snsapi
   # * schema_host 当前项目的域名(包含http://)：如http://www.baidu.com
   # * state 这个参数可以直接带到业务页面。
   # ===调用示例
-  #
+  #EricWeixin::Snsapi.get_snsapi_base_url url:'/eric_weixin/weixin/orders?a=1', app_id: 'wxaa334fd34be16fca', schema_host: "http://www.uguoyuan.cn"
   def self.get_snsapi_base_url options
     require 'base64'
     p_zhongzhuan = []

data/lib/eric_weixin/version.rb

@@ -1,3 +1,3 @@
 module EricWeixin
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eric_weixin
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - 刘晓琦
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 4.1.4
+- !ruby/object:Gem::Dependency
+  name: foundation-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.4.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 5.4.3
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.0.5
 description: 快速开发微信公众账号
 email:
 - ericliu@ikidstv.com
@@ -39,6 +67,7 @@ files:
 - app/assets/stylesheets/eric_weixin/application.css
 - app/assets/stylesheets/eric_weixin/cms/base.css.scss
 - app/assets/stylesheets/eric_weixin/cms/foundation_and_overrides.scss
+- app/assets/stylesheets/eric_weixin/wz/base.css.scss
 - app/controllers/eric_weixin/application_controller.rb
 - app/controllers/eric_weixin/cms/base_controller.rb
 - app/controllers/eric_weixin/cms/weixin/article_datas_controller.rb
@@ -57,6 +86,7 @@ files:
 - app/controllers/eric_weixin/cms/weixin/xiaodian/products_controller.rb
 - app/controllers/eric_weixin/wz/pays_controller.rb
 - app/controllers/eric_weixin/wz/weixin_controller.rb
+- app/controllers/eric_weixin/wz/xiaodian/orders_controller.rb
 - app/helpers/eric_weixin/application_helper.rb
 - app/helpers/eric_weixin/cms/weixin/public_accounts_helper.rb
 - app/models/eric_weixin/access_token.rb
@@ -135,6 +165,7 @@ files:
 - app/views/eric_weixin/wz/pays/pay_fail.html.erb
 - app/views/eric_weixin/wz/pays/pay_ok.html.erb
 - app/views/eric_weixin/wz/pays/prepay.html.erb
+- app/views/eric_weixin/wz/xiaodian/orders/index.html.erb
 - app/views/layouts/eric_weixin/application.html.erb
 - app/views/layouts/eric_weixin/cms/base.html.erb
 - app/views/layouts/eric_weixin/weixin/aa.erb