wangfei 6 år sedan
förälder
incheckning
d4d2f4fbba

+ 1
- 1
src/pages/bodyCheck/app.js Visa fil

@@ -1,7 +1,7 @@
1 1
 import Vue from 'vue'
2 2
 import App from './App.vue'
3 3
 import Vant from 'vant'
4
-import 'vant/lib/vant-css/index.css'
4
+import 'vant/lib/index.css'
5 5
 import router from './router'
6 6
 import store from '../../store/index'
7 7
 import Vuex from 'vuex'

+ 1
- 1
src/pages/sales/app.js Visa fil

@@ -1,7 +1,7 @@
1 1
 import Vue from 'vue'
2 2
 import App from './App.vue'
3 3
 import Vant from 'vant'
4
-import 'vant/lib/vant-css/index.css'
4
+import 'vant/lib/index.css'
5 5
 import router from './router'
6 6
 import store from '../../store/index'
7 7
 import Vuex from 'vuex'

+ 8
- 8
src/pages/user/App.vue Visa fil

@@ -23,14 +23,14 @@ export default {
23 23
     })
24 24
   },
25 25
   created () {
26
-    if (location.search && this.toolClass.UrlSearch(location.search).code) {
27
-      this.code = this.toolClass.UrlSearch(location.search).code
28
-    } else {
29
-      this.code = null
30
-    }
31
-    this.getUserInfo({ org: this.org, code: this.code }).then(() => {
32
-      this.showPage = true
33
-    })
26
+    // if (location.search && this.toolClass.UrlSearch(location.search).code) {
27
+    //   this.code = this.toolClass.UrlSearch(location.search).code
28
+    // } else {
29
+    //   this.code = null
30
+    // }
31
+    // this.getUserInfo({ org: this.org, code: this.code }).then(() => {
32
+    //   this.showPage = true
33
+    // })
34 34
   },
35 35
   methods: {
36 36
     ...actions(['getUserInfo'])

+ 1
- 1
src/pages/user/app.js Visa fil

@@ -1,7 +1,7 @@
1 1
 import Vue from 'vue'
2 2
 import App from './App.vue'
3 3
 import Vant from 'vant'
4
-import 'vant/lib/vant-css/index.css'
4
+import 'vant/lib/index.css'
5 5
 import router from './router'
6 6
 import store from '../../store/index'
7 7
 import Vuex from 'vuex'

+ 3
- 3
src/pages/user/rush/index.vue Visa fil

@@ -90,10 +90,10 @@ export default {
90 90
         let end = new Date(this.detail.EndDate).getTime()
91 91
         this.timing(start, end)
92 92
         wxsdk({ url: encodeURIComponent(window.location.href.split('#')[0]) }, {
93
-          title: this.detail.FlashBuyName,
94
-          desc: '限时抢购中,名额有限,速来参与~',
93
+          title: res.flashBuy.ActivityTitle || this.detail.FlashBuyName,
94
+          desc: res.flashBuy.ShareContent || '限时抢购中,名额有限,速来参与~',
95 95
           link: `${window.location.origin}${window.location.pathname}#/rush/?flashBuyId=${this.$route.query.flashBuyId}`,
96
-          thu_image: `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
96
+          thu_image: res.flashBuy.ShareImg || `https://spaceofcheng.oss-cn-beijing.aliyuncs.com/indexlogo.jpg?x-oss-process=style/wxicon`
97 97
         })
98 98
       })
99 99
     })

+ 2
- 2
vue.config.js Visa fil

@@ -23,8 +23,8 @@ module.exports = {
23 23
     proxy: {
24 24
       '/api': {
25 25
         // target: 'https://dp.huiju360.com.cn/hj_operations',
26
-        target: 'http://192.168.0.62:8080', // wf
27
-        // target: 'http://192.168.0.125:8080', // hyq
26
+        // target: 'http://192.168.0.62:8080', // wf
27
+        target: 'http://192.168.0.102:8080', // hyq
28 28
         // target: 'http://192.168.0.11', // ys
29 29
         // target: 'http://dev.ycjcjy.com', // frp
30 30
         changeOrigin: true, // 如果接口跨域,需要进行这个参数配置