wangfei 6 年前
父节点
当前提交
69fd4288b0
共有 6 个文件被更改,包括 25 次插入10 次删除
  1. 2
    2
      src/App.vue
  2. 1
    1
      src/util/ajax.js
  3. 1
    1
      src/util/api.js
  4. 1
    1
      src/views/vote/detail.vue
  5. 15
    1
      src/views/vote/index.vue
  6. 5
    4
      src/views/vote/list.vue

+ 2
- 2
src/App.vue 查看文件

17
     return {
17
     return {
18
       showPage: false,
18
       showPage: false,
19
       appid: {
19
       appid: {
20
-        production: 'wx776f26b70b03902b',
20
+        // production: 'wx776f26b70b03902b',
21
         test: 'wx776f26b70b03902b',
21
         test: 'wx776f26b70b03902b',
22
-        // production: 'wx32e2e8c81f66070e',
22
+        production: 'wx32e2e8c81f66070e',
23
         development: 'wx776f26b70b03902b',
23
         development: 'wx776f26b70b03902b',
24
         // development: 'wx776f26b70b03902b',
24
         // development: 'wx776f26b70b03902b',
25
       }
25
       }

+ 1
- 1
src/util/ajax.js 查看文件

91
         // }
91
         // }
92
       } else {
92
       } else {
93
         if (message.indexOf("40163") != -1) {
93
         if (message.indexOf("40163") != -1) {
94
-          toolClass.getCode('wx776f26b70b03902b')
94
+          toolClass.getCode('wx32e2e8c81f66070e')
95
         } else {
95
         } else {
96
           Dialog.alert({ message: message })
96
           Dialog.alert({ message: message })
97
         }
97
         }

+ 1
- 1
src/util/api.js 查看文件

1
-const baseUrl = '/voteapi'
1
+const baseUrl = '/api'
2
 
2
 
3
 const $api = {
3
 const $api = {
4
   file: {
4
   file: {

+ 1
- 1
src/views/vote/detail.vue 查看文件

66
       }
66
       }
67
 
67
 
68
       wxsdk(
68
       wxsdk(
69
-        { url: window.encodeURIComponent(`${window.location.origin}${pathname}`) },
69
+        { url: encodeURIComponent(window.location.href.split('#')[0]) },
70
         {
70
         {
71
           title: act.ShareTitle,
71
           title: act.ShareTitle,
72
           desc: act.ShareDesc,
72
           desc: act.ShareDesc,

+ 15
- 1
src/views/vote/index.vue 查看文件

30
     }
30
     }
31
     this.getActivity({
31
     this.getActivity({
32
       actid: this.actid,
32
       actid: this.actid,
33
+    }).then(act => {
34
+      wxsdk(
35
+        {
36
+          // url: window.encodeURIComponent(
37
+          //   `${window.location.origin}${pathname}`
38
+          // )
39
+          url: encodeURIComponent(window.location.href.split('#')[0])
40
+        },
41
+        {
42
+          title: act.ShareTitle,
43
+          desc: act.ShareDesc,
44
+          link: `${window.location.origin}${window.location.pathname}${hash}`,
45
+          thu_image: act.ShareIcon
46
+        }
47
+      );
33
     })
48
     })
34
-    
35
     // this.getMine({
49
     // this.getMine({
36
     //   actid: this.actid,
50
     //   actid: this.actid,
37
     //   openid: this.user,
51
     //   openid: this.user,

+ 5
- 4
src/views/vote/list.vue 查看文件

199
 
199
 
200
       wxsdk(
200
       wxsdk(
201
         {
201
         {
202
-          url: window.encodeURIComponent(
203
-            `${window.location.origin}${pathname}`
204
-          )
202
+          // url: window.encodeURIComponent(
203
+          //   `${window.location.origin}${pathname}`
204
+          // )
205
+          url: encodeURIComponent(window.location.href.split('#')[0])
205
         },
206
         },
206
         {
207
         {
207
           title: act.ShareTitle,
208
           title: act.ShareTitle,
208
           desc: act.ShareDesc,
209
           desc: act.ShareDesc,
209
-          link: `${window.location.origin}${window.location.pathname}${hash}`,
210
+          link: `${window.location.origin}${window.location.pathname}#/?actid=${act.ActivityId}`,
210
           thu_image: act.ShareIcon
211
           thu_image: act.ShareIcon
211
         }
212
         }
212
       );
213
       );