Browse Source

Merge branch 'master' of http://git.ycjcjy.com/honghe/h5-draw-lots

Baozhangchao 3 years ago
parent
commit
d1f59554b6

+ 1
- 0
public/index.html View File

@@ -5,6 +5,7 @@
5 5
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 6
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
7 7
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
8
+    <script src="https://res2.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
8 9
     <title>华侨城</title>
9 10
     <style>
10 11
       .page-loading-wrapper {

BIN
src/assets/monthImg/April4.jpg View File


BIN
src/assets/monthImg/August8.jpg View File


BIN
src/assets/monthImg/December12.jpg View File


BIN
src/assets/monthImg/February2.jpg View File


BIN
src/assets/monthImg/January1.jpg View File


BIN
src/assets/monthImg/July7.jpg View File


BIN
src/assets/monthImg/June6.jpg View File


BIN
src/assets/monthImg/March3.jpg View File


BIN
src/assets/monthImg/May5.jpg View File


BIN
src/assets/monthImg/November11.jpg View File


BIN
src/assets/monthImg/October10.jpg View File


BIN
src/assets/monthImg/September9.jpg View File


+ 6
- 3
src/utils/wx.js View File

@@ -33,14 +33,17 @@ export function share (opt) {
33 33
   const defaultLink = origin + pathname
34 34
   const defaultImg = `${origin}${pathname}images/share.jpg`
35 35
 
36
-  initSDK(opt.link)
36
+  const link = opt.link || defaultLink
37
+  const imgUrl = opt.imgUrl || defaultImg
38
+
39
+  initSDK(link)
37 40
   window.wx.ready(function () {
38 41
     jsApiList.map((apiName) => {
39 42
       const api = window.wx[apiName]
40 43
       api({
41 44
         title: opt.title || '', // 分享标题
42
-        link: opt.link || defaultLink, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
43
-        imgUrl: opt.imgUrl || defaultImg, // 分享图标
45
+        link, // 分享链接,该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
46
+        imgUrl, // 分享图标
44 47
         desc: opt.desc || ''
45 48
       })
46 49
     })