Merge branch '00' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 00

src/components/activity/newyear-2019/landing/index.js

@@ -7,10 +7,8 @@ import Prizes from "@components/activity/newyear-2019/common/prizes"
 import BulletScreen from "@components/activity/newyear-2019/common/user-bullet-screen"
 import './landing.scss'
 import { browser, getParam, http, wxShare, SendMessageToApp } from "@/utils"
-import { Link } from "react-router-dom"
 import QRCode from "qrcode"
 import YearCourse from '../preheat/YearCourse'
-import jsCookie from "js-cookie"
 
 
 class Landing extends Component {
@@ -174,7 +172,7 @@ class Landing extends Component {
       let data = {
         title: `@${user.data.username} 邀您一起组队拿豪礼！`,
         desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
-        link: `${window.location.origin}/${location.pathname}?treasure_code=${treasure_code}&origin=2`,
+        link: `${window.location.origin}${location.pathname}?treasure_code=${treasure_code}&origin=2`,
         imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
       }
       SendMessageToApp("toShare", data)
@@ -183,7 +181,7 @@ class Landing extends Component {
       wxShare({
         title: `@${user.data.username} 邀您一起组队拿豪礼！`,
         desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
-        link: `${window.location.origin}/${location.pathname}?treasure_code=${treasure_code}&origin=2`,
+        link: `${window.location.origin}${location.pathname}?treasure_code=${treasure_code}&origin=2`,
         imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
       })
     }
@@ -292,20 +290,25 @@ class Landing extends Component {
   }
 
   showShareTip = () => {
-    const {user} = this.props
+    const {user, location} = this.props
     if (browser.isAndroidApp || browser.isIOSApp) {
 
       SendMessageToApp('toShare', {
         title: `@${user.data.username} 邀您一起组队拿豪礼！`,
         desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
-        link: `${window.location.origin}/${location.pathname}?treasure_code=${getParam('treasure_code')}&origin=2`,
+        link: `${window.location.origin}${location.pathname}?treasure_code=${getParam('treasure_code')}&origin=2`,
         imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
       })
 
     } else {
-      const {history, match} = this.props
       if (browser.isWeixin && getParam('origin') == 1) {
-        history.replace(`${match.url}?treasure_code=${getParam('treasure_code')}&origin=2`)
+        wxShare({
+          title: `@${user.data.username} 邀您一起组队拿豪礼！`,
+          desc: `加入我的队伍，机械键盘，纸质书籍等超多奖品等你拿！`,
+          link: `${window.location.origin}${location.pathname}?treasure_code=${getParam('treasure_code')}&origin=2`,
+          imgUrl: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/wx-share-icon.png'
+        })
+        // history.replace(`${match.url}?treasure_code=${getParam('treasure_code')}&origin=2`)
       }
       Popup({
         title: <div>还差<span>{this.state.teamData.lack_member}</span>名队友即可获得宝箱 快分享给好友吧~</div>,

src/components/activity/newyear-2019/preheat/YearCourse/index.js

@@ -391,6 +391,16 @@ class YearCourse extends Component {
             SendMessageToApp('generateQRCode', QRCodeUrl)
         }
     }
+    saveImage2 = () => {
+        let version = getParam('version')
+        version = typeof version === 'string' ? version.replace('.', '').replace('.', '').slice(0, 3) : ''
+        const QRCodeUrl = 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/2018christyear/h5/qrcode.jpg'
+        if (version && parseInt(version) < 451) {
+            Toast.info('当前不支持此功能，升级到最新版本app可以点击保存二维码！', 3, null, false)
+        } else {
+            SendMessageToApp('saveImage', QRCodeUrl)
+        }
+    }
 
     // 获取队伍信息
     getTeamInfo = () => {
@@ -988,7 +998,7 @@ class YearCourse extends Component {
                                  src='//julyedu-cdn.oss-cn-beijing.aliyuncs.com/2018christyear/h5/qrcode.jpg' alt=""/>
                             {
                                 browser.isAndroidApp ? (
-                                    <button className={'save-image'} onClick={this.saveImage}>保存二维码</button>
+                                    <button className={'save-image'} onClick={this.saveImage2}>保存二维码</button>
                                 ) : <p className='sub__tip'>长按识别/扫码 关注【七月在线】服务号</p>
                             }
                         </div>