jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
huang 2016-11-10 10:31:40 +08:00
parent 1403ebc987 9598174180
commit 3dcd38a059
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -24,7 +24,7 @@ gem 'rubyzip'
gem 'delayed_job_active_record'#, :group => :production
gem 'daemons'
gem 'grape', '~> 0.9.0'
gem 'grape-entity'
gem 'grape-entity', '= 0.4.5'
gem 'rack-cors', :require => 'rack/cors'
gem 'seems_rateable', '~> 1.0.13'
gem 'rails', '~> 3.2'

4
app/controllers/wechats_controller.rb
View File

@ -13,7 +13,7 @@ class WechatsController < ActionController::Base
# elsif join_project_request(request)
# sendBindProject(request, {invite_code: content})
# else
request.reply.text "您的意见已收到，非常感谢~ \n更多问题可以通过以下方式联系我们：\n官方QQ群：173184401\n我们会认真聆听您的意见和建议。"
request.reply.text "您的意见已收到，非常感谢~ \n更多问题可以通过以下方式联系我们：\n官方QQ群：373967360\n我们会认真聆听您的意见和建议。"
# end
end
@ -137,7 +137,7 @@ class WechatsController < ActionController::Base
on :fallback, respond: 'fallback message'
on :click, with: 'FEEDBACK' do |request, key|
request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：173184401，直接互动。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321"
request.reply.text "如有问题反馈，请您：\n1、直接切换至输入框，发微信给我们。\n2、加入QQ群：373967360，直接互动。\n\n如您有合作事宜洽谈，请联系：\n王林春 老师\n手机：13467631747\nQQ：494496321"
end
on :click, with: 'MY_NEWS' do |request, key|

2
app/views/layouts/_forbidden_new_feedback.html.erb
View File

@ -31,7 +31,7 @@
<!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
<!--<p style="text-align: center"> 请加入师姐师兄答疑群</p> <p style="text-align: center"></p>-->
<!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
<a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=b16ba20827767a9fc40bd120191a02a6e3d6356c137e523ac2ccccd1c63e10b1"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
<a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=064e805dac955b8aea158c4b0dd3f033b8841bcee175fd619613f0e4ac4d8151"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
<p class="fontGrey3" style="padding-bottom:10px; padding-top:3px;">加入QQ群</p>
</div>
<div class="fr mr10 tac">

2
app/views/layouts/_new_feedback.html.erb
View File

@ -30,7 +30,7 @@
<!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
<!--<p style="text-align: center"> 请加入师姐师兄答疑群</p> <p style="text-align: center"></p>-->
<!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
<a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=b16ba20827767a9fc40bd120191a02a6e3d6356c137e523ac2ccccd1c63e10b1"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
<a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=064e805dac955b8aea158c4b0dd3f033b8841bcee175fd619613f0e4ac4d8151"><img src="/images/QQ_Logo.png" width="30" style="cursor:default; border:1px solid #ddd; padding:20px; cursor:pointer;" /></a>
<p class="fontGrey3" style="padding-bottom:10px; padding-top:3px;">加入QQ群</p>
</div>
<div class="fr mr10 tac">