Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/services/users/shixun_service.rb

@@ -41,6 +41,8 @@ class Users::ShixunService
 
   def user_policy_filter(relations)
     # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能
+    Rails.logger.info("self_or_admin?: #{self_or_admin?}")
+    Rails.logger.info("user: #{user.id}")
     if self_or_admin?
       relations = relations.where.not(status: -1)
       status_filter(relations)

public/react/src/modules/tpm/SiderBar.js

@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import { getImageUrl} from 'educoder';
+import {Tooltip} from 'antd';
 import './TPMIndex.css';
 
 const $ = window.$;
@@ -81,60 +82,70 @@ class SiderBar extends Component {
     }
 
     componentDidMount() {
-      _initSider();
+      _initSider()
 
     }
 
     render() {
 
+
     	// console.log(this.props)
         return (
 
 						<div className="-task-sidebar" >
-							{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div>
-								<div className="gotop"  tooltips="返回顶部">
-									<a>
-										<i className="iconfont icon-shangjiantou color-white"></i>
-									</a>
-								</div>
-
-								<div className="feedback" tooltips="意见反馈">
-									<a target="_blank" className="color_white" href="/help?index=6">
-										<i className="iconfont icon-yijianfankui color-white font-22"></i>
-									</a>
-								</div>
 
+							{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div>
+                <Tooltip placement="right" title={"返回顶部"}>
+                  <div className="gotop">
+                    <a>
+                      <i className="iconfont icon-shangjiantou color-white"></i>
+                    </a>
+                  </div>
+                </Tooltip>
+
+                <Tooltip placement="right" title={"意见反馈"}>
+                  <div className="feedback">
+                    <a target="_blank" className="color_white" href="/help/feedback">
+                      <i className="iconfont icon-yijianfankui color-white font-22"></i>
+                    </a>
+                  </div>
+                </Tooltip>
 
 
 								<div className="scan pr">
-									<span className="inline"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
-									<p className="scan_ewm" style={{display: 'none', right:' 75px',opacity: '0'}}>
-										<p className="pr padding10">
-											<style>
-												{
-													`
-												.WeChatstyle{
-   												 margin-bottom: 0 !important;
-												}
-												`
-												}
-											</style>
-											<img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
-											<p className={"WeChatstyle"}>微信扫一扫</p>
-											<p className={"WeChatstyle"}>关注公众号</p>
-											<span className="trangle_right"></span>
-										</p>
-									</p>
+                  <Tooltip placement="right" title={
+                    <pre>
+                    <p className="scan_ewm">
+                        <p className="pr padding10">
+                          <style>
+                            {
+                              `
+                            .WeChatstyle{
+                               margin-bottom: 0 !important;
+                            }
+                            `
+                            }
+                          </style>
+                          <img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
+                          <p className={"WeChatstyle wechatcenter"}>微信扫一扫</p>
+                          <p className={"WeChatstyle wechatcenter"}>关注公众号</p>
+                        </p>
+                      </p>
+                    </pre>
+                  }>
+                    <span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
+                  </Tooltip>
 								</div>
 
-								<div className="consult" tooltips="在线咨询">
-									<a target="_blank" className="color_white" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">
-										<i className="iconfont icon-qqzaixianzixun color-white font-22"></i>
-									</a>
-								</div>
-							</div>:""}
-
+                <Tooltip placement="right" title={"在线咨询"}>
+                  <div className="consult">
+                    <a target="_blank" className="color_white" href="//shang.qq.com/wpa/qunwpa?idkey=2f2043d88c1bd61d182b98bf1e061c6185e23055bec832c07d8148fe11c5a6cd">
+                      <i className="iconfont icon-qqzaixianzixun color-white font-22"></i>
+                    </a>
+                  </div>
+                </Tooltip>
 
+							</div>:""}
             </div>
 				);
     }

public/react/src/modules/tpm/TPMIndex.css

@@ -226,4 +226,7 @@ body>.-task-title {
 
 .headwith100b{
     width: 100%;
+}
+.wechatcenter{
+    text-align: center;
 }