pull

270451bc · FE · 65928344 · 270451bc · 270451bc · 270451bc
Commit 270451bc authored Aug 26, 2019 by FE
Showing with 301 additions and 34 deletions

build/precache-manifest.fe9b057a8d401ef6d9164dd04cfef4dd.js
+267 -0

src/components/Index/image/shequ_icon.png
+0 -0

src/components/Index/index.js
+29 -29

src/utils/wechat/base.js
+2 -2

src/utils/wechat/share.js
+3 -3

No files found.
--- a/build/precache-manifest.fe9b057a8d401ef6d9164dd04cfef4dd.js
+++ b/build/precache-manifest.fe9b057a8d401ef6d9164dd04cfef4dd.js
+self.__precacheManifest = [
+  {
+    "revision": "e3d6f56155483b6b41fc",
+    "url": "/static/js/purchased.cdbfc5e9.chunk.js"
+  },
+  {
+    "revision": "0d17d035f5609ab0fcf8",
+    "url": "/static/css/BargainMiddlePage.718dff83.chunk.css"
+  },
+  {
+    "revision": "364fb4b34ba80847b008",
+    "url": "/static/css/Classify.f2f19957.chunk.css"
+  },
+  {
+    "revision": "364fb4b34ba80847b008",
+    "url": "/static/js/Classify.36aa2a1d.chunk.js"
+  },
+  {
+    "revision": "13f0f70ea08e4fa427a2",
+    "url": "/static/css/CourseList.462fc81e.chunk.css"
+  },
+  {
+    "revision": "13f0f70ea08e4fa427a2",
+    "url": "/static/js/CourseList.a16695a8.chunk.js"
+  },
+  {
+    "revision": "1836836afad4de90c96c",
+    "url": "/static/css/DrawDocument.2e7d81ca.chunk.css"
+  },
+  {
+    "revision": "1836836afad4de90c96c",
+    "url": "/static/js/DrawDocument.546a558b.chunk.js"
+  },
+  {
+    "revision": "c36dc1bfa18f51f5dcfb",
+    "url": "/static/css/Examination.f2cc3163.chunk.css"
+  },
+  {
+    "revision": "c36dc1bfa18f51f5dcfb",
+    "url": "/static/js/Examination.9a22829a.chunk.js"
+  },
+  {
+    "revision": "5c166d3bdc579e5ec556",
+    "url": "/static/js/MyEdit.a624b8a5.chunk.js"
+  },
+  {
+    "revision": "287d236215a6e94bb6e6",
+    "url": "/static/css/Order.8bb031ea.chunk.css"
+  },
+  {
+    "revision": "287d236215a6e94bb6e6",
+    "url": "/static/js/Order.e7234e9c.chunk.js"
+  },
+  {
+    "revision": "b68207d168c41de130a0",
+    "url": "/static/js/Orderinfo.de77a53f.chunk.js"
+  },
+  {
+    "revision": "cd4205c91b2f795355be",
+    "url": "/static/css/PayOrder.e5315535.chunk.css"
+  },
+  {
+    "revision": "cd4205c91b2f795355be",
+    "url": "/static/js/PayOrder.3d522bdd.chunk.js"
+  },
+  {
+    "revision": "293016d81903e69d5e3e",
+    "url": "/static/css/Preferential.7456653e.chunk.css"
+  },
+  {
+    "revision": "293016d81903e69d5e3e",
+    "url": "/static/js/Preferential.cd2438ec.chunk.js"
+  },
+  {
+    "revision": "13a001446d87ab482a6a",
+    "url": "/static/css/SearchResult.1ad68937.chunk.css"
+  },
+  {
+    "revision": "13a001446d87ab482a6a",
+    "url": "/static/js/SearchResult.3c7cdece.chunk.js"
+  },
+  {
+    "revision": "9ea1213733712f279233",
+    "url": "/static/css/ShopCart.3a4dbb7a.chunk.css"
+  },
+  {
+    "revision": "9ea1213733712f279233",
+    "url": "/static/js/ShopCart.913ceb56.chunk.js"
+  },
+  {
+    "revision": "7521ca41e224e7b59596",
+    "url": "/static/css/aist-share.bef8c404.chunk.css"
+  },
+  {
+    "revision": "7521ca41e224e7b59596",
+    "url": "/static/js/aist-share.3a73b01d.chunk.js"
+  },
+  {
+    "revision": "e9a0ee71257829bebc85",
+    "url": "/static/css/coupons.9ece7350.chunk.css"
+  },
+  {
+    "revision": "e9a0ee71257829bebc85",
+    "url": "/static/js/coupons.fd4bf9a0.chunk.js"
+  },
+  {
+    "revision": "65d7a61ad0da4734bf18",
+    "url": "/static/css/detail.955f7c3d.chunk.css"
+  },
+  {
+    "revision": "65d7a61ad0da4734bf18",
+    "url": "/static/js/detail.504a4ce2.chunk.js"
+  },
+  {
+    "revision": "e47590ba8b0d49e17996",
+    "url": "/static/css/main.e42ffbbc.chunk.css"
+  },
+  {
+    "revision": "e47590ba8b0d49e17996",
+    "url": "/static/js/main.102283b1.chunk.js"
+  },
+  {
+    "revision": "a233dd9edb52a81b553d",
+    "url": "/static/css/myorders.3ae12dec.chunk.css"
+  },
+  {
+    "revision": "a233dd9edb52a81b553d",
+    "url": "/static/js/myorders.1a11adf4.chunk.js"
+  },
+  {
+    "revision": "e3d6f56155483b6b41fc",
+    "url": "/static/css/purchased.1daf107b.chunk.css"
+  },
+  {
+    "revision": "0d17d035f5609ab0fcf8",
+    "url": "/static/js/BargainMiddlePage.07f79590.chunk.js"
+  },
+  {
+    "revision": "5ea1951ddb698e166f3e",
+    "url": "/static/js/runtime~main.7dd32fcb.js"
+  },
+  {
+    "revision": "a9a02f3ef78db5cb2271",
+    "url": "/static/css/search.fab97849.chunk.css"
+  },
+  {
+    "revision": "a9a02f3ef78db5cb2271",
+    "url": "/static/js/search.1cc06fea.chunk.js"
+  },
+  {
+    "revision": "5c4082cb62487aed3328",
+    "url": "/static/css/shareposter.f09a5959.chunk.css"
+  },
+  {
+    "revision": "5c4082cb62487aed3328",
+    "url": "/static/js/shareposter.69b1f9be.chunk.js"
+  },
+  {
+    "revision": "7671365cec55757f2f31",
+    "url": "/static/css/study.5e9927d1.chunk.css"
+  },
+  {
+    "revision": "7671365cec55757f2f31",
+    "url": "/static/js/study.68957c67.chunk.js"
+  },
+  {
+    "revision": "7f1980f6135a23a01fea",
+    "url": "/static/css/togroup.49988cae.chunk.css"
+  },
+  {
+    "revision": "7f1980f6135a23a01fea",
+    "url": "/static/js/togroup.6999b515.chunk.js"
+  },
+  {
+    "revision": "f82678a6f3c80fafd56e",
+    "url": "/static/css/video.661112b2.chunk.css"
+  },
+  {
+    "revision": "f82678a6f3c80fafd56e",
+    "url": "/static/js/video.e054f591.chunk.js"
+  },
+  {
+    "revision": "80011994e30adf599e5f47fcc81bc06d",
+    "url": "/static/media/progress-share-bg.80011994.png"
+  },
+  {
+    "revision": "e659c9b951322c91c1a3",
+    "url": "/static/js/24.163e8ea4.chunk.js"
+  },
+  {
+    "revision": "52f0d9071ca2ef2374b7",
+    "url": "/static/js/25.4f3038ca.chunk.js"
+  },
+  {
+    "revision": "81a489ac63f2f2df5ab412e0782bd54c",
+    "url": "/static/media/kanjia_cg_icon.81a489ac.png"
+  },
+  {
+    "revision": "15d1a2ca6bdca29f5d40",
+    "url": "/static/js/26.d62d8caf.chunk.js"
+  },
+  {
+    "revision": "73f2491a05e99dfcf822",
+    "url": "/static/js/27.a6ce341d.chunk.js"
+  },
+  {
+    "revision": "f983caa7c06f105373e7e1aec42da261",
+    "url": "/static/media/iconfont.f983caa7.svg"
+  },
+  {
+    "revision": "9b74ada5fadd7d40c7e5",
+    "url": "/static/js/28.c8df493b.chunk.js"
+  },
+  {
+    "revision": "145742789ab409c81f28938b15b5dee7",
+    "url": "/static/media/iconfont.14574278.ttf"
+  },
+  {
+    "revision": "74feb9e2c2c0e409860f",
+    "url": "/static/js/29.09cc6ed3.chunk.js"
+  },
+  {
+    "revision": "cd1c41437a2e35a283e4b16b620a8c9e",
+    "url": "/static/media/iconfont.cd1c4143.eot"
+  },
+  {
+    "revision": "3916021b453d4e1eb877",
+    "url": "/static/js/30.afd78c65.chunk.js"
+  },
+  {
+    "revision": "7b542c778563daa7cc420d21ed1601b3",
+    "url": "/static/media/iconfont.7b542c77.woff"
+  },
+  {
+    "revision": "b15487690386c4cb1af5",
+    "url": "/static/js/31.e78ea090.chunk.js"
+  },
+  {
+    "revision": "b15487690386c4cb1af5",
+    "url": "/static/css/31.bc06dce4.chunk.css"
+  },
+  {
+    "revision": "3916021b453d4e1eb877",
+    "url": "/static/css/30.ecbb6f9a.chunk.css"
+  },
+  {
+    "revision": "74feb9e2c2c0e409860f",
+    "url": "/static/css/29.5ed15c7e.chunk.css"
+  },
+  {
+    "revision": "9b74ada5fadd7d40c7e5",
+    "url": "/static/css/28.694b4628.chunk.css"
+  },
+  {
+    "revision": "15d1a2ca6bdca29f5d40",
+    "url": "/static/css/26.4c706a4e.chunk.css"
+  },
+  {
+    "revision": "e659c9b951322c91c1a3",
+    "url": "/static/css/24.5b7eccdb.chunk.css"
+  },
+  {
+    "revision": "96a51d98659734eab182d98bdb9e1005",
+    "url": "/index.html"
+  }
+];
\ No newline at end of file
--- a/src/components/Index/image/shequ_icon.png
+++ b/src/components/Index/image/shequ_icon.png
--- a/src/components/Index/index.js
+++ b/src/components/Index/index.js
@@ -50,9 +50,9 @@ class Index extends Component {
                    'href': '/examination'
                },
                {
-                    'src': require('./image/qynx_icon.png'),
-                    'name': '企业内训',
-                    'href': 'http://m-active.julyedu.com'
+                    'src': require('./image/shequ_icon.png'),
+                    'name': '社区',
+                    'href': 'https://ask.julyedu.com'
                }
            ]
        }
@@ -120,18 +120,18 @@ class Index extends Component {
        return (
            <div className='index-box'>
                <div className='header'>
-                    <img 
+                    <img
                        className="logo"
-                        src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/img/index/logo.png" 
+                        src="http://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/img/index/logo.png"
                        alt=""
                    />
-                    <CallApp 
-                        className='to-app' 
-                        text='在APP打开' 
+                    <CallApp
+                        className='to-app'
+                        text='在APP打开'
                    />
-                    <i 
-                        className='iconfont iconiconfront- search' 
-                        onClick={this.toSearch.bind(this)} 
+                    <i
+                        className='iconfont iconiconfront- search'
+                        onClick={this.toSearch.bind(this)}
                    />
                </div>

@@ -166,8 +166,8 @@ class Index extends Component {
                    (this.state.lives && this.state.lives.length > 0) ?
                        <div className='lives'>
                            <h2 className="title">近期直播</h2>
-                            <ScrollBox 
-                                livesList={this.state.lives} 
+                            <ScrollBox
+                                livesList={this.state.lives}
                                liveCourse={this.liveCourse}
                            />
                        </div> : null
@@ -177,8 +177,8 @@ class Index extends Component {
                    (this.state.modules && this.state.modules.length > 0) ? this.state.modules.map((item, index) => {
                        return (
                            <div key={index}>
-                                <CourseList 
-                                    modules={item} 
+                                <CourseList
+                                    modules={item}
                                    toDetail={this.toCourseDetail}
                                />
                                <p className="borderTop" />
@@ -197,10 +197,10 @@ class Index extends Component {
                {/* 直播间预约 */}
                {
                    this.state.islive &&
-                    <LiveRoom 
-                        isShow={this.state.isShow} 
+                    <LiveRoom
+                        isShow={this.state.isShow}
                        colseBox={this.colseBox}
-                        roomMess={this.state.roomMess} 
+                        roomMess={this.state.roomMess}
                        getIndexData={this.getIndexData}
                    />
                }
@@ -213,12 +213,12 @@ class Index extends Component {

 function TopSwiper({bannerList}) {
    return (
-        <Swiper 
-            type={animateTypes.CARD} 
-            loop={true} 
-            height={168} 
-            autoPlay={true} 
-            typePro 
+        <Swiper
+            type={animateTypes.CARD}
+            loop={true}
+            height={168}
+            autoPlay={true}
+            typePro
            createStyle={createStyle}
        >
            {bannerList && bannerList.length > 0 && bannerList.map((item, index) => {
@@ -229,16 +229,16 @@ function TopSwiper({bannerList}) {
                            <img className="item" src={item.name} alt="" />
                            {/* </Link> */}
                        </a> :
-                        <Link 
+                        <Link
                            to={{
                                pathname: '/detail',
                                search: `?id=${item.jump_url}`
-                            }} 
+                            }}
                            key={index}
                        >
-                            <img 
-                                className="item" 
-                                src={item.name} 
+                            <img
+                                className="item"
+                                src={item.name}
                                alt=""
                            />
                        </Link>

--- a/src/utils/wechat/base.js
+++ b/src/utils/wechat/base.js
-import { http } from "@/utils/index"
+import { http, browser } from "@/utils"


 const url = `https://res.wx.qq.com/open/js/jweixin-1.4.0.js`
@@ -7,7 +7,7 @@ const jsApiList = ['updateAppMessageShareData','updateTimelineShareData','onMenu

 export const getSignature = async (config = {}) => {
    let res = await http.post(`${API['base-api']}/m/sale/signature`, {
-        url: window.location.href.split('#')[0]
+        url: browser.isWeixin && browser.isIOS ? sessionStorage.getItem('enter_url') : window.location.href.split('#')[0],
    })
    return wx.config({
        debug: false, // 开启调试模式,

--- a/src/utils/wechat/share.js
+++ b/src/utils/wechat/share.js
 import { getWXObject, getSignature } from './base'

-const shareApiList = ['updateAppMessageShareData','updateTimelineShareData','onMenuShareAppMessage', 'onMenuShareTimeline']
+const shareApiList = ['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareAppMessage', 'onMenuShareTimeline']

-export default async function (data = {title: '',desc: '', link: '', imgUrl: ''}) {
+export default async function (data = {title: '', desc: '', link: '', imgUrl: ''}, config = {}) {
    await getWXObject()
-    await getSignature()
+    await getSignature(config)

    wx.ready(function () {
        console.log('ready');