浏览代码

change import alias

张延森 5 年前
父节点
当前提交
b53c521f1f
共有 100 个文件被更改,包括 403 次插入15685 次删除
  1. 1
    1
      config/dev.js
  2. 10
    10
      config/index.js
  3. 10
    0
      jsconfig.json
  4. 0
    15246
      package-lock.json
  5. 3
    3
      src/actions/activity.js
  6. 3
    3
      src/actions/card.js
  7. 3
    3
      src/actions/city.js
  8. 3
    3
      src/actions/news.js
  9. 3
    3
      src/actions/project.js
  10. 3
    3
      src/actions/shop.js
  11. 3
    3
      src/actions/user.js
  12. 42
    12
      src/app.js
  13. 1
    1
      src/app.scss
  14. 1
    1
      src/components/BackHomeBtn/index.js
  15. 1
    1
      src/components/BackHomeBtn/index.scss
  16. 2
    2
      src/components/ListView/index.js
  17. 1
    1
      src/components/Notice/index.js
  18. 1
    1
      src/components/Notice/index.scss
  19. 1
    1
      src/components/Poster/index.js
  20. 1
    1
      src/components/Poster/style.scss
  21. 1
    1
      src/components/TimeTicker/utils.js
  22. 1
    1
      src/components/achieveAvatar/index.js
  23. 3
    3
      src/components/achievePhone/index.js
  24. 1
    1
      src/components/amap/PoiAround.js
  25. 50
    50
      src/components/amap/icons.js
  26. 4
    4
      src/components/authorizationComponent/index.js
  27. 1
    1
      src/components/authorizationComponent/index.scss
  28. 3
    3
      src/components/authorize/index.js
  29. 1
    1
      src/components/authorize/index.scss
  30. 9
    9
      src/components/consultant/index.js
  31. 1
    1
      src/components/consultant/index.scss
  32. 1
    1
      src/components/empty-page/index.js
  33. 1
    1
      src/components/empty-page/index.scss
  34. 0
    57
      src/components/formIdCollector/index.js
  35. 0
    7
      src/components/formIdCollector/index.scss
  36. 1
    1
      src/components/loadmore/index.scss
  37. 1
    1
      src/components/search/index.scss
  38. 1
    1
      src/components/star/index.scss
  39. 1
    1
      src/components/tag/index.scss
  40. 1
    1
      src/components/wxParse/showdown.js
  41. 3
    0
      src/constants/common.js
  42. 4
    7
      src/pages/activity/activity.js
  43. 3
    3
      src/pages/activity/assembleItem/index.js
  44. 2
    2
      src/pages/activity/assembleItem/index.scss
  45. 3
    3
      src/pages/activity/assemblePage.js
  46. 2
    2
      src/pages/activity/assistanceItem/index.js
  47. 2
    2
      src/pages/activity/assistanceItem/index.scss
  48. 3
    3
      src/pages/activity/assistancePage.js
  49. 24
    29
      src/pages/activity/detail/assemble.js
  50. 22
    25
      src/pages/activity/detail/assistance.js
  51. 16
    16
      src/pages/activity/detail/index.js
  52. 1
    1
      src/pages/activity/detail/index.scss
  53. 2
    2
      src/pages/activity/detail/poster.js
  54. 1
    1
      src/pages/activity/detail/poster.scss
  55. 3
    3
      src/pages/activity/index.js
  56. 1
    1
      src/pages/activity/index.scss
  57. 2
    2
      src/pages/activity/item/index.js
  58. 2
    2
      src/pages/activity/item/index.scss
  59. 3
    3
      src/pages/activity/myActivity.js
  60. 5
    5
      src/pages/agent/become/index.js
  61. 7
    7
      src/pages/agent/client/index.js
  62. 1
    1
      src/pages/agent/client/index.scss
  63. 4
    4
      src/pages/agent/index.js
  64. 2
    2
      src/pages/agent/invitation/index.js
  65. 1
    1
      src/pages/agent/invitation/item.js
  66. 1
    1
      src/pages/agent/invitation/item.scss
  67. 2
    2
      src/pages/agent/poster/index.js
  68. 7
    7
      src/pages/agent/progress/index.js
  69. 1
    1
      src/pages/agent/progress/index.scss
  70. 5
    5
      src/pages/agent/recommend/index.js
  71. 1
    1
      src/pages/agent/recommend/index.scss
  72. 2
    2
      src/pages/auth/index.js
  73. 1
    1
      src/pages/auth/index.scss
  74. 5
    5
      src/pages/card/fans/index.js
  75. 1
    1
      src/pages/card/fans/item.js
  76. 1
    1
      src/pages/card/fans/item.scss
  77. 17
    17
      src/pages/card/index.js
  78. 1
    1
      src/pages/card/index.scss
  79. 8
    8
      src/pages/card/list/index.js
  80. 1
    1
      src/pages/card/list/index.scss
  81. 2
    2
      src/pages/card/notice/index.js
  82. 1
    1
      src/pages/card/notice/index.scss
  83. 4
    4
      src/pages/card/poster.js
  84. 1
    1
      src/pages/card/poster.scss
  85. 6
    6
      src/pages/card/register/index.js
  86. 1
    1
      src/pages/card/register/index.scss
  87. 1
    1
      src/pages/card/report/index.js
  88. 1
    1
      src/pages/checkin/checkinsuccess/index.js
  89. 8
    8
      src/pages/checkin/index.js
  90. 1
    1
      src/pages/checkin/index.scss
  91. 2
    2
      src/pages/city/index.js
  92. 1
    1
      src/pages/city/index.scss
  93. 14
    18
      src/pages/im/index.js
  94. 1
    1
      src/pages/im/index.scss
  95. 6
    6
      src/pages/im/list/index.js
  96. 1
    1
      src/pages/im/list/index.scss
  97. 1
    1
      src/pages/im/list/item.js
  98. 1
    1
      src/pages/im/list/item.scss
  99. 2
    2
      src/pages/im/msgItem/index.js
  100. 0
    0
      src/pages/im/msgItem/index.scss

+ 1
- 1
config/dev.js 查看文件

11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
     // HOST: '"http://192.168.2.51:8080"',
12
     // HOST: '"http://192.168.2.51:8080"',
13
     // WSS_HOST: '"ws://192.168.2.51:8080"',
13
     // WSS_HOST: '"ws://192.168.2.51:8080"',
14
-    Version: 'V3.5.5'
14
+    Version: 'V3.5.6'
15
   },
15
   },
16
   weapp: {},
16
   weapp: {},
17
   h5: {}
17
   h5: {}

+ 10
- 10
config/index.js 查看文件

1
 
1
 
2
 const path = require('path')
2
 const path = require('path')
3
 const sassImportor = function (url) {
3
 const sassImportor = function (url) {
4
-  const reg = /^@styles\/(.*)/
4
+  const reg = /^@\/styles\/(.*)/
5
   return {
5
   return {
6
     file: reg.test(url) ? path.resolve(__dirname, '..', 'src/styles', url.match(reg)[1]) : url
6
     file: reg.test(url) ? path.resolve(__dirname, '..', 'src/styles', url.match(reg)[1]) : url
7
   }
7
   }
37
     }
37
     }
38
   },
38
   },
39
   alias: {
39
   alias: {
40
-    '@actions': path.resolve(__dirname, '..', 'src/actions'),
41
-    '@assets': path.resolve(__dirname, '..', 'src/assets'),
42
-    '@components': path.resolve(__dirname, '..', 'src/components'),
43
-    '@constants': path.resolve(__dirname, '..', 'src/constants'),
44
-    '@reducers': path.resolve(__dirname, '..', 'src/reducers'),
45
-    '@styles': path.resolve(__dirname, '..', 'src/styles'),
46
-    '@utils': path.resolve(__dirname, '..', 'src/utils'),
47
-    '@services': path.resolve(__dirname, '..', 'src/services'),
48
-    '@lib': path.resolve(__dirname, '..', 'src/lib'),
40
+    '@/actions': path.resolve(__dirname, '..', 'src/actions'),
41
+    '@/assets': path.resolve(__dirname, '..', 'src/assets'),
42
+    '@/components': path.resolve(__dirname, '..', 'src/components'),
43
+    '@/constants': path.resolve(__dirname, '..', 'src/constants'),
44
+    '@/reducers': path.resolve(__dirname, '..', 'src/reducers'),
45
+    '@/styles': path.resolve(__dirname, '..', 'src/styles'),
46
+    '@/utils': path.resolve(__dirname, '..', 'src/utils'),
47
+    '@/services': path.resolve(__dirname, '..', 'src/services'),
48
+    '@/lib': path.resolve(__dirname, '..', 'src/lib'),
49
   },
49
   },
50
   copy: {
50
   copy: {
51
     patterns: [
51
     patterns: [

+ 10
- 0
jsconfig.json 查看文件

1
+// 本文件, 仅仅是为了支持 IDE 跳转, 与项目打包没有任何关系
2
+
3
+{
4
+  "compilerOptions": {
5
+    "baseUrl": ".",
6
+    "paths": {
7
+      "@/*": ["./src/*"],
8
+    }
9
+  }
10
+}

+ 0
- 15246
package-lock.json
文件差异内容过多而无法显示
查看文件


+ 3
- 3
src/actions/activity.js 查看文件

1
 import {
1
 import {
2
   ACTIVITY_SIGNIN
2
   ACTIVITY_SIGNIN
3
-} from '@constants/activity'
3
+} from '@/constants/activity'
4
 
4
 
5
 import {
5
 import {
6
   API_ACTIVITY_SIGNIN
6
   API_ACTIVITY_SIGNIN
7
-} from '@constants/api'
7
+} from '@/constants/api'
8
 
8
 
9
-import { createAction } from '@utils/redux'
9
+import { createAction } from '@/utils/redux'
10
 
10
 
11
 /**
11
 /**
12
  * 个人签到
12
  * 个人签到

+ 3
- 3
src/actions/card.js 查看文件

3
   CARD_LIST,
3
   CARD_LIST,
4
   CARD_LIKE,
4
   CARD_LIKE,
5
   CARD_UNLIKE
5
   CARD_UNLIKE
6
-} from '@constants/card'
6
+} from '@/constants/card'
7
 
7
 
8
 import {
8
 import {
9
   API_CARDS_LIST,
9
   API_CARDS_LIST,
10
   API_CARDS_LIKE
10
   API_CARDS_LIKE
11
-} from '@constants/api'
11
+} from '@/constants/api'
12
 
12
 
13
-import { createAction } from '@utils/redux'
13
+import { createAction } from '@/utils/redux'
14
 
14
 
15
 
15
 
16
 /**
16
 /**

+ 3
- 3
src/actions/city.js 查看文件

1
 import {
1
 import {
2
   CITY_LIST,
2
   CITY_LIST,
3
   CITY_SELECTED
3
   CITY_SELECTED
4
-} from '@constants/city'
4
+} from '@/constants/city'
5
 
5
 
6
 import {
6
 import {
7
   API_CITY_LIST
7
   API_CITY_LIST
8
-} from '@constants/api'
8
+} from '@/constants/api'
9
 
9
 
10
-import { createAction, createActionNormal } from '@utils/redux'
10
+import { createAction, createActionNormal } from '@/utils/redux'
11
 
11
 
12
 /**
12
 /**
13
  * 获取城市列表
13
  * 获取城市列表

+ 3
- 3
src/actions/news.js 查看文件

1
 import {
1
 import {
2
   NEWS_LIST
2
   NEWS_LIST
3
-} from '@constants/news'
3
+} from '@/constants/news'
4
 
4
 
5
 import {
5
 import {
6
   API_NEWS_LIST,
6
   API_NEWS_LIST,
7
 
7
 
8
-} from '@constants/api'
8
+} from '@/constants/api'
9
 
9
 
10
-import { createAction } from '@utils/redux'
10
+import { createAction } from '@/utils/redux'
11
 
11
 
12
 
12
 
13
 /**
13
 /**

+ 3
- 3
src/actions/project.js 查看文件

2
   PROJECT_DETAIL,
2
   PROJECT_DETAIL,
3
   PROJECT_LIST,
3
   PROJECT_LIST,
4
   PROJECT_SCREEN
4
   PROJECT_SCREEN
5
-} from '@constants/project'
5
+} from '@/constants/project'
6
 
6
 
7
 import {
7
 import {
8
   API_ITEMS_DETAIL,
8
   API_ITEMS_DETAIL,
9
   API_ITEMS_LIST,
9
   API_ITEMS_LIST,
10
   API_BANNER_LIST
10
   API_BANNER_LIST
11
-} from '@constants/api'
11
+} from '@/constants/api'
12
 
12
 
13
-import { createAction } from '@utils/redux'
13
+import { createAction } from '@/utils/redux'
14
 
14
 
15
 
15
 
16
 /**
16
 /**

+ 3
- 3
src/actions/shop.js 查看文件

6
   POINTS_RECORDS,
6
   POINTS_RECORDS,
7
   POINTS_RULE,
7
   POINTS_RULE,
8
   POINTS_ADRESS
8
   POINTS_ADRESS
9
-} from '@constants/shop'
9
+} from '@/constants/shop'
10
 
10
 
11
 import {
11
 import {
12
   API_GOODS_LIST,
12
   API_GOODS_LIST,
15
   API_POINTS_RECORDS,
15
   API_POINTS_RECORDS,
16
   API_POINTS_RULE,
16
   API_POINTS_RULE,
17
   API_POINTS_ADRESS
17
   API_POINTS_ADRESS
18
-} from '@constants/api'
18
+} from '@/constants/api'
19
 
19
 
20
-import { createAction } from '@utils/redux'
20
+import { createAction } from '@/utils/redux'
21
 
21
 
22
 
22
 
23
 
23
 

+ 3
- 3
src/actions/user.js 查看文件

4
   USER_SIGNIN,
4
   USER_SIGNIN,
5
   USER_GOODS,
5
   USER_GOODS,
6
   UPDATE_USER_INFO
6
   UPDATE_USER_INFO
7
-} from '@constants/user'
7
+} from '@/constants/user'
8
 
8
 
9
 import {
9
 import {
10
   API_USER_INFO,
10
   API_USER_INFO,
14
   API_QUERY_MYREPORT,
14
   API_QUERY_MYREPORT,
15
   API_QUERY_USERINFO_BYID,
15
   API_QUERY_USERINFO_BYID,
16
   API_QUERY_DOCUMENTVERIFY
16
   API_QUERY_DOCUMENTVERIFY
17
-} from '@constants/api'
17
+} from '@/constants/api'
18
 
18
 
19
-import { createAction,createActionNormal } from '@utils/redux'
19
+import { createAction,createActionNormal } from '@/utils/redux'
20
 
20
 
21
 /**
21
 /**
22
  * 获取用户信息
22
  * 获取用户信息

+ 42
- 12
src/app.js 查看文件

1
 import '@tarojs/async-await'
1
 import '@tarojs/async-await'
2
 import Taro, { Component } from '@tarojs/taro'
2
 import Taro, { Component } from '@tarojs/taro'
3
 import './app.scss'
3
 import './app.scss'
4
-import "@styles/icon.scss";
5
-import "@components/wxParse/wxParse.scss";
4
+import "@/styles/icon.scss";
5
+import "@/components/wxParse/wxParse.scss";
6
 import Index from './pages/auth/index'
6
 import Index from './pages/auth/index'
7
 import { Provider } from '@tarojs/redux'
7
 import { Provider } from '@tarojs/redux'
8
-import { parseQueryString } from '@utils/tools'
8
+import { parseQueryString } from '@/utils/tools'
9
+import { trackUserSource } from '@/utils/track'
9
 
10
 
10
 import {
11
 import {
11
   getCodeScene,
12
   getCodeScene,
12
   savePoint,
13
   savePoint,
13
   queryCityList
14
   queryCityList
14
-} from '@services/common'
15
+} from '@/services/common'
15
 
16
 
16
 import {
17
 import {
17
   queryUserInfo
18
   queryUserInfo
18
-} from '@services/user'
19
+} from '@/services/user'
19
 
20
 
20
 import {
21
 import {
21
   CITY_LIST
22
   CITY_LIST
22
-} from '@constants/city'
23
+} from '@/constants/city'
23
 import {
24
 import {
24
   ASSIGN_UNREADNUM,
25
   ASSIGN_UNREADNUM,
25
   INCREASE_UNREADNUM
26
   INCREASE_UNREADNUM
26
-} from '@constants/user'
27
-import ready from '@utils/ready'
28
-import login from '@utils/login'
27
+} from '@/constants/user'
28
+import { UPDATE_PRELOAD } from '@/constants/common'
29
+import ready from '@/utils/ready'
30
+import login from '@/utils/login'
29
 import store  from './store'
31
 import store  from './store'
30
-import socket from '@utils/im'
32
+import socket from '@/utils/im'
31
 
33
 
32
 // const store = configStore()
34
 // const store = configStore()
33
 
35
 
34
 class App extends Component {
36
 class App extends Component {
35
   config = {
37
   config = {
36
-    debug: false,
38
+    debug: process.env.NODE_ENV === 'development',
37
     permission: {
39
     permission: {
38
       "scope.userLocation": {
40
       "scope.userLocation": {
39
         "desc": "你的位置信息将用于显示当前区域信息"
41
         "desc": "你的位置信息将用于显示当前区域信息"
150
     },
152
     },
151
   }
153
   }
152
 
154
 
155
+  // 更新埋点时长
156
+  updateTrack;
157
+
153
   componentDidHide() {
158
   componentDidHide() {
159
+    if (this.updateTrack) {
160
+      this.updateTrack()
161
+    }
162
+
154
     // ready.close()
163
     // ready.close()
155
     socket.closeSocket()
164
     socket.closeSocket()
156
   }
165
   }
157
 
166
 
158
   componentDidShow() {
167
   componentDidShow() {
168
+    // 埋点
169
+    trackUserSource(this.$router.params).then(res => this.updateTrack = res)
170
+
159
     const updateManager = wx.getUpdateManager()
171
     const updateManager = wx.getUpdateManager()
160
     updateManager.onCheckForUpdate(function (res) {
172
     updateManager.onCheckForUpdate(function (res) {
161
       // 请求完新版本信息的回调
173
       // 请求完新版本信息的回调
182
     // console.info('app componentDidMount')
194
     // console.info('app componentDidMount')
183
   }
195
   }
184
 
196
 
185
-  componentWillMount(params) {
197
+  componentWillMount() {
198
+    // 预加载数据
199
+    this.wxPreloadData()
200
+
186
     // console.info('app componentWillMount', params)
201
     // console.info('app componentWillMount', params)
187
     this.initData()
202
     this.initData()
188
   }
203
   }
189
 
204
 
205
+  wxPreloadData () {
206
+    wx.setBackgroundFetchToken()
207
+    wx.getBackgroundFetchData({
208
+      fetchType: 'pre',
209
+      success: (res) => {
210
+        console.log('[preload]: ', res)
211
+        store.dispatch({
212
+          type: UPDATE_PRELOAD,
213
+          payload: res.fetchedData,
214
+        })
215
+      }
216
+    })
217
+  }
218
+
190
   initData () {
219
   initData () {
191
     // console.info('app componentDidShow')
220
     // console.info('app componentDidShow')
192
     console.info('router1', this.$router)
221
     console.info('router1', this.$router)
232
 
261
 
233
   getRouterParams() {
262
   getRouterParams() {
234
     return new Promise(resolve => {
263
     return new Promise(resolve => {
264
+      console.log('------getRouterParams------>', this.$router)
235
       const router = this.$router.params
265
       const router = this.$router.params
236
       const originQuery = { ...router.query };
266
       const originQuery = { ...router.query };
237
       let { query: { scene: paramsId }, scene } = router
267
       let { query: { scene: paramsId }, scene } = router

+ 1
- 1
src/app.scss 查看文件

1
-@import "@styles/reset.scss";
1
+@import "./styles/reset.scss";
2
 
2
 
3
 
3
 
4
 .flex-h {
4
 .flex-h {

+ 1
- 1
src/components/BackHomeBtn/index.js 查看文件

16
   render() {
16
   render() {
17
     return (
17
     return (
18
       <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
18
       <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
19
-        <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
19
+        <Image src={require('@/assets/homeicon.png')} className='home-img'></Image>
20
         <Text className="text">首页</Text>
20
         <Text className="text">首页</Text>
21
       </View>
21
       </View>
22
     );
22
     );

+ 1
- 1
src/components/BackHomeBtn/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .back-home {
2
 .back-home {
3
   position: fixed;
3
   position: fixed;
4
   bottom: 16%;
4
   bottom: 16%;

+ 2
- 2
src/components/ListView/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import { ScrollView, View, Image } from '@tarojs/components';
2
 import { ScrollView, View, Image } from '@tarojs/components';
3
-import { throttle } from '@utils/tools'
4
-import emptyImg from '@assets/empty.png'
3
+import { throttle } from '@/utils/tools'
4
+import emptyImg from '@/assets/empty.png'
5
 import './index.scss'
5
 import './index.scss'
6
 
6
 
7
 /**
7
 /**

+ 1
- 1
src/components/Notice/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import { DECREASE_UNREADNUM } from '@constants/user'
3
+import { DECREASE_UNREADNUM } from '@/constants/user'
4
 import { getStore, connect } from '@tarojs/redux'
4
 import { getStore, connect } from '@tarojs/redux'
5
 
5
 
6
 @connect(state => state.user)
6
 @connect(state => state.user)

+ 1
- 1
src/components/Notice/index.scss 查看文件

1
 
1
 
2
-@import "@styles/theme.scss";
2
+@import "@/styles/theme.scss";
3
 .notice {
3
 .notice {
4
   position: fixed;
4
   position: fixed;
5
   top: 20px;
5
   top: 20px;

+ 1
- 1
src/components/Poster/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import { ScrollView, View, Block } from '@tarojs/components';
2
 import { ScrollView, View, Block } from '@tarojs/components';
3
-import { TaroCanvasDrawer } from '@components/taro-plugin-canvas';
3
+import { TaroCanvasDrawer } from '@/components/taro-plugin-canvas';
4
 import './style.scss';
4
 import './style.scss';
5
 
5
 
6
 export default class Poster extends Component {
6
 export default class Poster extends Component {

+ 1
- 1
src/components/Poster/style.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .poster {
2
 .poster {
3
   position: fixed;
3
   position: fixed;
4
   width: 100vw;
4
   width: 100vw;

+ 1
- 1
src/components/TimeTicker/utils.js 查看文件

1
 
1
 
2
-import { formateLeftTime } from '@utils/tools'
2
+import { formateLeftTime } from '@/utils/tools'
3
 
3
 
4
 // 未开始
4
 // 未开始
5
 export const STATUS_READY = -1
5
 export const STATUS_READY = -1

+ 1
- 1
src/components/achieveAvatar/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import { connect } from '@tarojs/redux'
2
 import { connect } from '@tarojs/redux'
3
-import * as actions from '@actions/user'
3
+import * as actions from '@/actions/user'
4
 import './index.scss'
4
 import './index.scss'
5
 
5
 
6
 @connect(state => state.user, { ...actions })
6
 @connect(state => state.user, { ...actions })

+ 3
- 3
src/components/achievePhone/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
-import getUserPhone from '@utils/getUserPhone'
2
+import getUserPhone from '@/utils/getUserPhone'
3
 import './index.scss'
3
 import './index.scss'
4
 
4
 
5
-const grantIcon = require('@assets/helpgroup/shouquan.png')
6
-const logoImg = require('@assets/index/logo.png')
5
+const grantIcon = require('@/assets/helpgroup/shouquan.png')
6
+const logoImg = require('@/assets/index/logo.png')
7
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
7
 const bgImg = "https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
8
 
8
 
9
 export default class Index extends Component {
9
 export default class Index extends Component {

+ 1
- 1
src/components/amap/PoiAround.js 查看文件

2
 import { Map } from '@tarojs/components'
2
 import { Map } from '@tarojs/components'
3
 import icons from './icons'
3
 import icons from './icons'
4
 
4
 
5
-const centerIcon = require('@assets/dingwei.png')
5
+const centerIcon = require('@/assets/dingwei.png')
6
 const centerProject = 'project-999'
6
 const centerProject = 'project-999'
7
 
7
 
8
 function ObjEqual(a = {}, b = {}) { return JSON.stringify(a) === JSON.stringify(b) }
8
 function ObjEqual(a = {}, b = {}) { return JSON.stringify(a) === JSON.stringify(b) }

+ 50
- 50
src/components/amap/icons.js 查看文件

1
 
1
 
2
 const icons = [
2
 const icons = [
3
   {
3
   {
4
-    normal: require('@assets/icons/amap/nums/number1.png'),
5
-    active: require('@assets/icons/amap/active_nums/number1.png'),
4
+    normal: require('@/assets/icons/amap/nums/number1.png'),
5
+    active: require('@/assets/icons/amap/active_nums/number1.png'),
6
   },
6
   },
7
   {
7
   {
8
-    normal: require('@assets/icons/amap/nums/number2.png'),
9
-    active: require('@assets/icons/amap/active_nums/number2.png'),
8
+    normal: require('@/assets/icons/amap/nums/number2.png'),
9
+    active: require('@/assets/icons/amap/active_nums/number2.png'),
10
   },
10
   },
11
   {
11
   {
12
-    normal: require('@assets/icons/amap/nums/number3.png'),
13
-    active: require('@assets/icons/amap/active_nums/number3.png'),
12
+    normal: require('@/assets/icons/amap/nums/number3.png'),
13
+    active: require('@/assets/icons/amap/active_nums/number3.png'),
14
   },
14
   },
15
   {
15
   {
16
-    normal: require('@assets/icons/amap/nums/number4.png'),
17
-    active: require('@assets/icons/amap/active_nums/number4.png'),
16
+    normal: require('@/assets/icons/amap/nums/number4.png'),
17
+    active: require('@/assets/icons/amap/active_nums/number4.png'),
18
   },
18
   },
19
   {
19
   {
20
-    normal: require('@assets/icons/amap/nums/number5.png'),
21
-    active: require('@assets/icons/amap/active_nums/number5.png'),
20
+    normal: require('@/assets/icons/amap/nums/number5.png'),
21
+    active: require('@/assets/icons/amap/active_nums/number5.png'),
22
   },
22
   },
23
   {
23
   {
24
-    normal: require('@assets/icons/amap/nums/number6.png'),
25
-    active: require('@assets/icons/amap/active_nums/number6.png'),
24
+    normal: require('@/assets/icons/amap/nums/number6.png'),
25
+    active: require('@/assets/icons/amap/active_nums/number6.png'),
26
   },
26
   },
27
   {
27
   {
28
-    normal: require('@assets/icons/amap/nums/number7.png'),
29
-    active: require('@assets/icons/amap/active_nums/number7.png'),
28
+    normal: require('@/assets/icons/amap/nums/number7.png'),
29
+    active: require('@/assets/icons/amap/active_nums/number7.png'),
30
   },
30
   },
31
   {
31
   {
32
-    normal: require('@assets/icons/amap/nums/number8.png'),
33
-    active: require('@assets/icons/amap/active_nums/number8.png'),
32
+    normal: require('@/assets/icons/amap/nums/number8.png'),
33
+    active: require('@/assets/icons/amap/active_nums/number8.png'),
34
   },
34
   },
35
   {
35
   {
36
-    normal: require('@assets/icons/amap/nums/number9.png'),
37
-    active: require('@assets/icons/amap/active_nums/number9.png'),
36
+    normal: require('@/assets/icons/amap/nums/number9.png'),
37
+    active: require('@/assets/icons/amap/active_nums/number9.png'),
38
   },
38
   },
39
   {
39
   {
40
-    normal: require('@assets/icons/amap/nums/number10.png'),
41
-    active: require('@assets/icons/amap/active_nums/number10.png'),
40
+    normal: require('@/assets/icons/amap/nums/number10.png'),
41
+    active: require('@/assets/icons/amap/active_nums/number10.png'),
42
   },
42
   },
43
   {
43
   {
44
-    normal: require('@assets/icons/amap/nums/number11.png'),
45
-    active: require('@assets/icons/amap/active_nums/number11.png'),
44
+    normal: require('@/assets/icons/amap/nums/number11.png'),
45
+    active: require('@/assets/icons/amap/active_nums/number11.png'),
46
   },
46
   },
47
   {
47
   {
48
-    normal: require('@assets/icons/amap/nums/number12.png'),
49
-    active: require('@assets/icons/amap/active_nums/number12.png'),
48
+    normal: require('@/assets/icons/amap/nums/number12.png'),
49
+    active: require('@/assets/icons/amap/active_nums/number12.png'),
50
   },
50
   },
51
   {
51
   {
52
-    normal: require('@assets/icons/amap/nums/number13.png'),
53
-    active: require('@assets/icons/amap/active_nums/number13.png'),
52
+    normal: require('@/assets/icons/amap/nums/number13.png'),
53
+    active: require('@/assets/icons/amap/active_nums/number13.png'),
54
   },
54
   },
55
   {
55
   {
56
-    normal: require('@assets/icons/amap/nums/number14.png'),
57
-    active: require('@assets/icons/amap/active_nums/number14.png'),
56
+    normal: require('@/assets/icons/amap/nums/number14.png'),
57
+    active: require('@/assets/icons/amap/active_nums/number14.png'),
58
   },
58
   },
59
   {
59
   {
60
-    normal: require('@assets/icons/amap/nums/number15.png'),
61
-    active: require('@assets/icons/amap/active_nums/number15.png'),
60
+    normal: require('@/assets/icons/amap/nums/number15.png'),
61
+    active: require('@/assets/icons/amap/active_nums/number15.png'),
62
   },
62
   },
63
   {
63
   {
64
-    normal: require('@assets/icons/amap/nums/number16.png'),
65
-    active: require('@assets/icons/amap/active_nums/number16.png'),
64
+    normal: require('@/assets/icons/amap/nums/number16.png'),
65
+    active: require('@/assets/icons/amap/active_nums/number16.png'),
66
   },
66
   },
67
   {
67
   {
68
-    normal: require('@assets/icons/amap/nums/number17.png'),
69
-    active: require('@assets/icons/amap/active_nums/number17.png'),
68
+    normal: require('@/assets/icons/amap/nums/number17.png'),
69
+    active: require('@/assets/icons/amap/active_nums/number17.png'),
70
   },
70
   },
71
   {
71
   {
72
-    normal: require('@assets/icons/amap/nums/number18.png'),
73
-    active: require('@assets/icons/amap/active_nums/number18.png'),
72
+    normal: require('@/assets/icons/amap/nums/number18.png'),
73
+    active: require('@/assets/icons/amap/active_nums/number18.png'),
74
   },
74
   },
75
   {
75
   {
76
-    normal: require('@assets/icons/amap/nums/number19.png'),
77
-    active: require('@assets/icons/amap/active_nums/number19.png'),
76
+    normal: require('@/assets/icons/amap/nums/number19.png'),
77
+    active: require('@/assets/icons/amap/active_nums/number19.png'),
78
   },
78
   },
79
   {
79
   {
80
-    normal: require('@assets/icons/amap/nums/number20.png'),
81
-    active: require('@assets/icons/amap/active_nums/number20.png'),
80
+    normal: require('@/assets/icons/amap/nums/number20.png'),
81
+    active: require('@/assets/icons/amap/active_nums/number20.png'),
82
   },
82
   },
83
   {
83
   {
84
-    normal: require('@assets/icons/amap/nums/number21.png'),
85
-    active: require('@assets/icons/amap/active_nums/number21.png'),
84
+    normal: require('@/assets/icons/amap/nums/number21.png'),
85
+    active: require('@/assets/icons/amap/active_nums/number21.png'),
86
   },
86
   },
87
   {
87
   {
88
-    normal: require('@assets/icons/amap/nums/number22.png'),
89
-    active: require('@assets/icons/amap/active_nums/number22.png'),
88
+    normal: require('@/assets/icons/amap/nums/number22.png'),
89
+    active: require('@/assets/icons/amap/active_nums/number22.png'),
90
   },
90
   },
91
   {
91
   {
92
-    normal: require('@assets/icons/amap/nums/number23.png'),
93
-    active: require('@assets/icons/amap/active_nums/number23.png'),
92
+    normal: require('@/assets/icons/amap/nums/number23.png'),
93
+    active: require('@/assets/icons/amap/active_nums/number23.png'),
94
   },
94
   },
95
   {
95
   {
96
-    normal: require('@assets/icons/amap/nums/number24.png'),
97
-    active: require('@assets/icons/amap/active_nums/number24.png'),
96
+    normal: require('@/assets/icons/amap/nums/number24.png'),
97
+    active: require('@/assets/icons/amap/active_nums/number24.png'),
98
   },
98
   },
99
   {
99
   {
100
-    normal: require('@assets/icons/amap/nums/number25.png'),
101
-    active: require('@assets/icons/amap/active_nums/number25.png'),
100
+    normal: require('@/assets/icons/amap/nums/number25.png'),
101
+    active: require('@/assets/icons/amap/active_nums/number25.png'),
102
   },
102
   },
103
 ]
103
 ]
104
 
104
 

+ 4
- 4
src/components/authorizationComponent/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import { connect } from '@tarojs/redux'
2
 import { connect } from '@tarojs/redux'
3
-import * as actions from '@actions/user'
3
+import * as actions from '@/actions/user'
4
 import './index.scss'
4
 import './index.scss'
5
-import getUserPhone from '@utils/getUserPhone'
6
-import { queryUserInfo, doUserSignin } from '@services/user'
5
+import getUserPhone from '@/utils/getUserPhone'
6
+import { queryUserInfo, doUserSignin } from '@/services/user'
7
 
7
 
8
 @connect(state => state.user, { ...actions })
8
 @connect(state => state.user, { ...actions })
9
 export default class Index extends Component {
9
 export default class Index extends Component {
94
         <View className="avatar-page">
94
         <View className="avatar-page">
95
           <View className="content">
95
           <View className="content">
96
             <View className="title">请允许获取昵称、头像、地区及性别</View>
96
             <View className="title">请允许获取昵称、头像、地区及性别</View>
97
-            <Image className="touxiang" src={require('@assets/default-avatar.png')}></Image>
97
+            <Image className="touxiang" src={require('@/assets/default-avatar.png')}></Image>
98
             <View className="name">用户昵称</View>
98
             <View className="name">用户昵称</View>
99
             <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
99
             <Button className="btn" open-type="getUserInfo" lang="zh_CN" onGetUserInfo={this.getUserInfo}>好</Button>
100
           </View>
100
           </View>

+ 1
- 1
src/components/authorizationComponent/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .auth-page{
3
 .auth-page{
4
   position: relative;
4
   position: relative;

+ 3
- 3
src/components/authorize/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import { connect } from '@tarojs/redux'
2
 import { connect } from '@tarojs/redux'
3
-import * as actions from '@actions/user'
3
+import * as actions from '@/actions/user'
4
 import './index.scss'
4
 import './index.scss'
5
-import getUserPhone from '@utils/getUserPhone'
6
-import { queryUserInfo, doUserSignin } from '@services/user'
5
+import getUserPhone from '@/utils/getUserPhone'
6
+import { queryUserInfo, doUserSignin } from '@/services/user'
7
 
7
 
8
 @connect(state => state.user, { ...actions })
8
 @connect(state => state.user, { ...actions })
9
 export default class Index extends Component {
9
 export default class Index extends Component {

+ 1
- 1
src/components/authorize/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .auth-page{
3
 .auth-page{
4
   position: relative;
4
   position: relative;

+ 9
- 9
src/components/consultant/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import { connect } from '@tarojs/redux'
2
 import { connect } from '@tarojs/redux'
3
-import * as actions from '@actions/user'
3
+import * as actions from '@/actions/user'
4
 import './index.scss'
4
 import './index.scss'
5
-import { transferImage } from '@utils/tools'
6
-import * as noticeType from '@constants/common.js'
5
+import { transferImage } from '@/utils/tools'
6
+import * as noticeType from '@/constants/common.js'
7
 
7
 
8
 @connect(state => state.user, { ...actions })
8
 @connect(state => state.user, { ...actions })
9
 
9
 
76
         return (
76
         return (
77
             <View >
77
             <View >
78
                 <View className={show ? "consultant show" : "consultant hide"} style={smallStyle} onClick={this.handleClick}  >
78
                 <View className={show ? "consultant show" : "consultant hide"} style={smallStyle} onClick={this.handleClick}  >
79
-                    <Image src={require('@assets/person/left.png')} className='left-img'></Image>
80
-                    <Image src={transferImage(data.picture || require('@assets/default-avatar.png'))} className='img'></Image>
79
+                    <Image src={require('@/assets/person/left.png')} className='left-img'></Image>
80
+                    <Image src={transferImage(data.picture || require('@/assets/default-avatar.png'))} className='img'></Image>
81
                     <View className="text">{data.name || ''}</View>
81
                     <View className="text">{data.name || ''}</View>
82
                 </View>
82
                 </View>
83
                 <View className={show ? "consultant-more hide " : "consultant-more more-show "} style={style} >
83
                 <View className={show ? "consultant-more hide " : "consultant-more more-show "} style={style} >
84
-                    <Image src={require('@assets/person/cancel.png')} onClick={this.handleClickTwo} className='cancel-img'></Image>
85
-                    <Image src={transferImage(data.picture || require('@assets/default-avatar.png'))} className='touxiang' onClick={this.handleConsuItemClick.bind(this, data)}></Image>
84
+                    <Image src={require('@/assets/person/cancel.png')} onClick={this.handleClickTwo} className='cancel-img'></Image>
85
+                    <Image src={transferImage(data.picture || require('@/assets/default-avatar.png'))} className='touxiang' onClick={this.handleConsuItemClick.bind(this, data)}></Image>
86
                     <View className="text" onClick={this.handleConsuItemClick.bind(this, data)}>
86
                     <View className="text" onClick={this.handleConsuItemClick.bind(this, data)}>
87
                         <View className="name">{data.name || ''}</View>
87
                         <View className="name">{data.name || ''}</View>
88
                         <View className="company">{data.buildingName || ''}</View>
88
                         <View className="company">{data.buildingName || ''}</View>
89
                     </View>
89
                     </View>
90
-                    <Image src={require('@assets/person/phone.png')} onClick={this.handleTelClick.bind(this, data)} className='phone-img'></Image>
91
-                    <Image src={require('@assets/person/message.png')} onClick={this.handleChatClick.bind(this, data)} className='message-img'></Image>
90
+                    <Image src={require('@/assets/person/phone.png')} onClick={this.handleTelClick.bind(this, data)} className='phone-img'></Image>
91
+                    <Image src={require('@/assets/person/message.png')} onClick={this.handleChatClick.bind(this, data)} className='message-img'></Image>
92
                 </View>
92
                 </View>
93
             </View>
93
             </View>
94
         );
94
         );

+ 1
- 1
src/components/consultant/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .consultant {
2
 .consultant {
3
   position: fixed;
3
   position: fixed;
4
   bottom: 169px;
4
   bottom: 169px;

+ 1
- 1
src/components/empty-page/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import './index.scss'
2
 import './index.scss'
3
-import emptyImg  from '@assets/empty.png'
3
+import emptyImg  from '@/assets/empty.png'
4
 export default class EmptyPage extends Component {
4
 export default class EmptyPage extends Component {
5
   static defaultProps = {
5
   static defaultProps = {
6
     text: '暂无数据~'
6
     text: '暂无数据~'

+ 1
- 1
src/components/empty-page/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .empty{
2
 .empty{
3
   width:100%;
3
   width:100%;
4
   height:80vh;
4
   height:80vh;

+ 0
- 57
src/components/formIdCollector/index.js 查看文件

1
-import Taro, { Component } from '@tarojs/taro'
2
-import { postFormId } from '@services/card'
3
-
4
-/**
5
- * 微信小程序 FormId 收集器。
6
- *
7
- * @example
8
- *
9
- * ```jsx
10
- * <MFormIdCollector
11
- *   count={5}
12
- *   onCollect={formIds => console.log(formIds)}>
13
- *   <View>任意内容</View>
14
- * </MFormIdCollector>
15
- * ```
16
- */
17
-export default class Index extends Component {
18
-  static options = {
19
-    addGlobalClass: true,
20
-  };
21
-  
22
-  static defaultProps = {
23
-    count: 7,
24
-    disabled: false,
25
-    onCollect: function () { }
26
-  }
27
-
28
-  state = {
29
-    formIds: []
30
-  }
31
-
32
-  handleCollect = e => {
33
-    // 发送到服务器
34
-    postFormId({ formids: [e.detail.formId] })
35
-  }
36
-
37
-  render() {
38
-    const { disabled } = this.props
39
-
40
-    return disabled ? this.props.children : (
41
-      <Block>
42
-        <Label for='button_0'>
43
-          {this.props.children}
44
-        </Label>
45
-        <Form
46
-          className='m-form-id-collector_form'
47
-          reportSubmit={true}
48
-          onSubmit={this.handleCollect}>
49
-          <Button
50
-            id={`button_0`}
51
-            formType='submit'
52
-          />
53
-        </Form>
54
-      </Block>
55
-    )
56
-  }
57
-}

+ 0
- 7
src/components/formIdCollector/index.scss 查看文件

1
-.m-form-id-collector_form {
2
-  display: none;
3
-  width: 0;
4
-  height: 0;
5
-  overflow: hidden;
6
-  pointer-events: none;
7
-}

+ 1
- 1
src/components/loadmore/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .load{
2
 .load{
3
     width:100%;
3
     width:100%;
4
     text-align: center;
4
     text-align: center;

+ 1
- 1
src/components/search/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .search {
2
 .search {
3
   width: 92%;
3
   width: 92%;
4
   padding: 20px 30px;
4
   padding: 20px 30px;

+ 1
- 1
src/components/star/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .star {
3
 .star {
4
   display: flex;
4
   display: flex;

+ 1
- 1
src/components/tag/index.scss 查看文件

1
-@import '@styles/theme.scss';
1
+@import '@/styles/theme.scss';
2
 
2
 
3
 .comp-tag {
3
 .comp-tag {
4
   display: inline-block;
4
   display: inline-block;

+ 1
- 1
src/components/wxParse/showdown.js 查看文件

1600
   addr = 'mailto:' + addr;
1600
   addr = 'mailto:' + addr;
1601
 
1601
 
1602
   addr = addr.replace(/./g, function (ch) {
1602
   addr = addr.replace(/./g, function (ch) {
1603
-    if (ch === '@') {
1603
+    if (ch === '@/') {
1604
       // this *must* be encoded. I insist.
1604
       // this *must* be encoded. I insist.
1605
       ch = encode[Math.floor(Math.random() * 2)](ch);
1605
       ch = encode[Math.floor(Math.random() * 2)](ch);
1606
     } else if (ch !== ':') {
1606
     } else if (ch !== ':') {

+ 3
- 0
src/constants/common.js 查看文件

6
 
6
 
7
 // 拼团消息
7
 // 拼团消息
8
 export const TPL_GROUP = "group-result";
8
 export const TPL_GROUP = "group-result";
9
+
10
+// 更新预拉取数据
11
+export const UPDATE_PRELOAD = 'UPDATE_PRELOAD';

+ 4
- 7
src/pages/activity/activity.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import Authorize from '@components/authorize'
3
-import FormIdCollector from '@components/formIdCollector'
2
+import Authorize from '@/components/authorize'
4
 import './index.scss'
3
 import './index.scss'
5
 import { AtTabs, AtTabsPane } from 'taro-ui'
4
 import { AtTabs, AtTabsPane } from 'taro-ui'
6
 import "taro-ui/dist/style/components/tabs.scss"
5
 import "taro-ui/dist/style/components/tabs.scss"
7
-// import { queryActivityList } from '@services/activity'
6
+// import { queryActivityList } from '@/services/activity'
8
 import Activity from './index'
7
 import Activity from './index'
9
 import News from '../news/index'
8
 import News from '../news/index'
10
-import { savePoint, updatePoint } from '@services/common'
9
+import { savePoint, updatePoint } from '@/services/common'
11
 import { connect } from '@tarojs/redux'
10
 import { connect } from '@tarojs/redux'
12
 
11
 
13
 let pageIndex = 1
12
 let pageIndex = 1
74
       <View style="height:100vh">
73
       <View style="height:100vh">
75
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
74
         <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
76
           <AtTabsPane current={this.state.current} index={0} >
75
           <AtTabsPane current={this.state.current} index={0} >
77
-            <FormIdCollector>
78
-              <Activity ></Activity >
79
-            </FormIdCollector>
76
+            <Activity />
80
           </AtTabsPane>
77
           </AtTabsPane>
81
           <AtTabsPane current={this.state.current} index={1}>
78
           <AtTabsPane current={this.state.current} index={1}>
82
             <View >
79
             <View >

+ 3
- 3
src/pages/activity/assembleItem/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
-import { transferImage } from '@utils/tools'
4
+import { transferImage } from '@/utils/tools'
5
 
5
 
6
-const groupSuccess = require('@assets/helpgroup/group/already.png')
7
-const groupFail = require('@assets/helpgroup/fail.png')
6
+const groupSuccess = require('@/assets/helpgroup/group/already.png')
7
+const groupFail = require('@/assets/helpgroup/fail.png')
8
 
8
 
9
 export default class Item extends Component {
9
 export default class Item extends Component {
10
   static defaultProps = {
10
   static defaultProps = {

+ 2
- 2
src/pages/activity/assembleItem/index.scss 查看文件

1
-@import "@styles/theme.scss";
2
-@import "@styles/mixins.scss";
1
+@import "@/styles/theme.scss";
2
+@import "@/styles/mixins.scss";
3
 
3
 
4
 .flex {
4
 .flex {
5
   display: flex;
5
   display: flex;

+ 3
- 3
src/pages/activity/assemblePage.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import ListView from '@components/ListView'
2
+import ListView from '@/components/ListView'
3
 import './index.scss'
3
 import './index.scss'
4
-import { queryGroupList } from '@services/activity'
4
+import { queryGroupList } from '@/services/activity'
5
 import AssembleItem from './assembleItem'
5
 import AssembleItem from './assembleItem'
6
-import { savePoint, updatePoint } from '@services/common'
6
+import { savePoint, updatePoint } from '@/services/common'
7
 import { connect } from '@tarojs/redux'
7
 import { connect } from '@tarojs/redux'
8
 
8
 
9
 @connect(state => state.city)
9
 @connect(state => state.city)

+ 2
- 2
src/pages/activity/assistanceItem/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
-import { transferImage } from '@utils/tools'
4
+import { transferImage } from '@/utils/tools'
5
 
5
 
6
 const helpSuccess = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success1.png'
6
 const helpSuccess = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success1.png'
7
-const helpFail = require('@assets/helpgroup/fail.png')
7
+const helpFail = require('@/assets/helpgroup/fail.png')
8
 
8
 
9
 export default class Item extends Component {
9
 export default class Item extends Component {
10
   static defaultProps = {
10
   static defaultProps = {

+ 2
- 2
src/pages/activity/assistanceItem/index.scss 查看文件

1
-@import "@styles/theme.scss";
2
-@import "@styles/mixins.scss";
1
+@import "@/styles/theme.scss";
2
+@import "@/styles/mixins.scss";
3
 
3
 
4
 .flex {
4
 .flex {
5
   display: flex;
5
   display: flex;

+ 3
- 3
src/pages/activity/assistancePage.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import ListView from '@components/ListView'
2
+import ListView from '@/components/ListView'
3
 import './index.scss'
3
 import './index.scss'
4
-import { queryHelpList } from '@services/activity'
4
+import { queryHelpList } from '@/services/activity'
5
 import AssistanceItem from './assistanceItem'
5
 import AssistanceItem from './assistanceItem'
6
-import { savePoint, updatePoint } from '@services/common'
6
+import { savePoint, updatePoint } from '@/services/common'
7
 import { connect } from '@tarojs/redux'
7
 import { connect } from '@tarojs/redux'
8
 
8
 
9
 @connect(state => state.city)
9
 @connect(state => state.city)

+ 24
- 29
src/pages/activity/detail/assemble.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import Notice from '@components/Notice'
4
-import BackHomeBtn from '@components/BackHomeBtn'
5
-import AchievePhone from '@components/achievePhone'
6
-import AchieveAvatar from '@components/achieveAvatar'
7
-import Poster from '@components/Poster'
8
-import FormIdCollector from '@components/formIdCollector'
3
+import Notice from '@/components/Notice'
4
+import BackHomeBtn from '@/components/BackHomeBtn'
5
+import AchievePhone from '@/components/achievePhone'
6
+import AchieveAvatar from '@/components/achieveAvatar'
7
+import Poster from '@/components/Poster'
9
 import dayjs from 'dayjs'
8
 import dayjs from 'dayjs'
10
-// import WxParse from '@components/wxParse/wxParse'
11
-import ready from '@utils/ready'
12
-import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
13
-import { getQrCodeParams } from '@utils/qrcode'
9
+// import WxParse from '@/components/wxParse/wxParse'
10
+import ready from '@/utils/ready'
11
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@/utils/tools'
12
+import { getQrCodeParams } from '@/utils/qrcode'
14
 import {
13
 import {
15
   getGroupDetail,
14
   getGroupDetail,
16
   createGroupActivity,
15
   createGroupActivity,
17
   joinGroupBuy,
16
   joinGroupBuy,
18
-} from '@services/activity'
17
+} from '@/services/activity'
19
 import {
18
 import {
20
   getMiniQrcode,
19
   getMiniQrcode,
21
   savePoint,
20
   savePoint,
22
   updatePoint
21
   updatePoint
23
-} from '@services/common'
22
+} from '@/services/common'
24
 import { connect } from '@tarojs/redux'
23
 import { connect } from '@tarojs/redux'
25
-import { getCardDetail } from '@services/card'
26
-import { ROLE_CODE } from '@constants/user'
27
-import Consultant from '@components/consultant'
28
-import * as noticeType from '@constants/common.js'
29
-import { report as reportCustomer } from '@utils/customer'
30
-
31
-const waitImg = require('@assets/helpgroup/wait.png')
32
-const memberImg = require('@assets/helpgroup/group/member.png')
24
+import { getCardDetail } from '@/services/card'
25
+import { ROLE_CODE } from '@/constants/user'
26
+import Consultant from '@/components/consultant'
27
+import * as noticeType from '@/constants/common.js'
28
+import { report as reportCustomer } from '@/utils/customer'
29
+
30
+const waitImg = require('@/assets/helpgroup/wait.png')
31
+const memberImg = require('@/assets/helpgroup/group/member.png')
33
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/group/success.png'
32
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/group/success.png'
34
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/group/fail.png'
33
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/group/fail.png'
35
 const quoteImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/quota.png'
34
 const quoteImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/quota.png'
764
                   <View className="btn-fixed">
763
                   <View className="btn-fixed">
765
                     {
764
                     {
766
                       actState === ActBeforeStart &&
765
                       actState === ActBeforeStart &&
767
-                      (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn" style="margin: auto">未开始</Button></FormIdCollector></View>)
766
+                      (<View className="nostart-btn"><Button className="nostart-btn" style="margin: auto">未开始</Button></View>)
768
                     }
767
                     }
769
                     {
768
                     {
770
                       isStarter && actState === ActInProcess && groupState === GroupInProcess &&
769
                       isStarter && actState === ActInProcess && groupState === GroupInProcess &&
771
-                      (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button></FormIdCollector></View>)
770
+                      (<View className="assistance-btn"><Button className="assistance-btn" style="margin: auto" onClick={this.groupBuyInvite}>邀请好友拼团</Button></View>)
772
                     }
771
                     }
773
                     {
772
                     {
774
                       !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
773
                       !isStarter && actState === ActInProcess && groupState != GroupInProcess &&
775
 
774
 
776
                       <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} style="border:none">
775
                       <View className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} style="border:none">
777
-                        <FormIdCollector>
778
-                          <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
779
-                        </FormIdCollector>
776
+                        <Button className={groupState === GroupInProcess ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
780
                       </View>
777
                       </View>
781
                     }
778
                     }
782
                     {
779
                     {
785
                       <View className="btn-box" style="margin: auto; padding: 0;">
782
                       <View className="btn-box" style="margin: auto; padding: 0;">
786
                         {
783
                         {
787
                           (groupState === GroupInProcess && !isJoin) &&
784
                           (groupState === GroupInProcess && !isJoin) &&
788
-                          (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></FormIdCollector></View>)
785
+                          (<View className="assistance-btn"><Button className="assistance-btn" onClick={this.joinGroup}>立即参团</Button></View>)
789
                         }
786
                         }
790
                         <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
787
                         <View className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} style="border:none">
791
-                          <FormIdCollector>
792
-                            <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
793
-                          </FormIdCollector>
788
+                          <Button className={groupState === GroupInProcess && !isJoin ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的拼团</Button>
794
                         </View>
789
                         </View>
795
                       </View>
790
                       </View>
796
 
791
 

+ 22
- 25
src/pages/activity/detail/assistance.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import Notice from '@components/Notice'
4
-import BackHomeBtn from '@components/BackHomeBtn'
5
-import AchievePhone from '@components/achievePhone'
6
-import AchieveAvatar from '@components/achieveAvatar'
7
-import Poster from '@components/Poster'
8
-import FormIdCollector from '@components/formIdCollector'
3
+import Notice from '@/components/Notice'
4
+import BackHomeBtn from '@/components/BackHomeBtn'
5
+import AchievePhone from '@/components/achievePhone'
6
+import AchieveAvatar from '@/components/achieveAvatar'
7
+import Poster from '@/components/Poster'
9
 import dayjs from 'dayjs'
8
 import dayjs from 'dayjs'
10
-// import WxParse from '@components/wxParse/wxParse'
11
-// import getUserPhone from '@utils/getUserPhone'
12
-import ready from '@utils/ready'
13
-import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@utils/tools'
14
-import { getQrCodeParams } from '@utils/qrcode'
9
+// import WxParse from '@/components/wxParse/wxParse'
10
+// import getUserPhone from '@/utils/getUserPhone'
11
+import ready from '@/utils/ready'
12
+import { getDownloadURL, times, formateLeftTime, getCanvasConfig, transferImage } from '@/utils/tools'
13
+import { getQrCodeParams } from '@/utils/qrcode'
15
 import {
14
 import {
16
   getHelpDetail,
15
   getHelpDetail,
17
   createHelpActivity,
16
   createHelpActivity,
18
   giveFriendHelp,
17
   giveFriendHelp,
19
-} from '@services/activity'
18
+} from '@/services/activity'
20
 import {
19
 import {
21
   getMiniQrcode,
20
   getMiniQrcode,
22
   savePoint,
21
   savePoint,
23
   updatePoint
22
   updatePoint
24
-} from '@services/common'
23
+} from '@/services/common'
25
 import { connect } from '@tarojs/redux'
24
 import { connect } from '@tarojs/redux'
26
-import { getCardDetail } from '@services/card'
27
-import { ROLE_CODE } from '@constants/user'
28
-import Consultant from '@components/consultant'
29
-import * as noticeType from '@constants/common.js'
30
-import { report as reportCustomer } from '@utils/customer'
25
+import { getCardDetail } from '@/services/card'
26
+import { ROLE_CODE } from '@/constants/user'
27
+import Consultant from '@/components/consultant'
28
+import * as noticeType from '@/constants/common.js'
29
+import { report as reportCustomer } from '@/utils/customer'
31
 
30
 
32
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
31
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
33
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
32
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
34
 const quoteImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/quota.png';
33
 const quoteImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/quota.png';
35
-const waitImg = require('@assets/helpgroup/wait.png')
34
+const waitImg = require('@/assets/helpgroup/wait.png')
36
 
35
 
37
 // 活动状态
36
 // 活动状态
38
 const ActBeforeStart = 0;
37
 const ActBeforeStart = 0;
715
                 <View style="display:flex;justify-content: space-between;padding:0 15px">
714
                 <View style="display:flex;justify-content: space-between;padding:0 15px">
716
                   {
715
                   {
717
                     actState === ActBeforeStart &&
716
                     actState === ActBeforeStart &&
718
-                    (<View className="nostart-btn"><FormIdCollector><Button className="nostart-btn">未开始</Button></FormIdCollector></View>)
717
+                    (<View className="nostart-btn"><Button className="nostart-btn">未开始</Button></View>)
719
                   }
718
                   }
720
                   {
719
                   {
721
                     isStarter && actState === ActInProcess && helpState === HelpInProcess &&
720
                     isStarter && actState === ActInProcess && helpState === HelpInProcess &&
722
                     // (<Block>
721
                     // (<Block>
723
                     //   <View className="set-btn">生成海报</View>
722
                     //   <View className="set-btn">生成海报</View>
724
-                    <View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button></FormIdCollector></View>
723
+                    <View className="assistance-btn"><Button className="assistance-btn" onClick={this.askForHelp}>邀请好友助力</Button></View>
725
                     // </Block>)
724
                     // </Block>)
726
                   }
725
                   }
727
                   {
726
                   {
732
 
731
 
733
                         {
732
                         {
734
                           (helpState === HelpInProcess && !isJoin) &&
733
                           (helpState === HelpInProcess && !isJoin) &&
735
-                          (<View className="assistance-btn"><FormIdCollector><Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button></FormIdCollector></View>)
734
+                          (<View className="assistance-btn"><Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button></View>)
736
                         }
735
                         }
737
                         <View className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} style="border:none">
736
                         <View className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} style="border:none">
738
-                          <FormIdCollector>
739
-                            <Button className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的助力</Button>
740
-                          </FormIdCollector>
737
+                          <Button className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的助力</Button>
741
                         </View>
738
                         </View>
742
                       </View>
739
                       </View>
743
                     )
740
                     )

+ 16
- 16
src/pages/activity/detail/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import Notice from '@components/Notice'
4
-import BackHomeBtn from '@components/BackHomeBtn'
3
+import Notice from '@/components/Notice'
4
+import BackHomeBtn from '@/components/BackHomeBtn'
5
 import Poster from './poster'
5
 import Poster from './poster'
6
 import dayjs from 'dayjs'
6
 import dayjs from 'dayjs'
7
-import WxParse from '@components/wxParse/wxParse'
8
-import getUserPhone from '@utils/getUserPhone'
9
-import AchievePhone from '@components/achievePhone'
10
-import ready from '@utils/ready'
11
-import { getDownloadURL, times, transferImage } from '@utils/tools'
12
-import { getQrCodeParams } from '@utils/qrcode'
13
-import { getCardDetail } from '@services/card'
14
-import { ROLE_CODE } from '@constants/user'
15
-import Consultant from '@components/consultant'
7
+import WxParse from '@/components/wxParse/wxParse'
8
+import getUserPhone from '@/utils/getUserPhone'
9
+import AchievePhone from '@/components/achievePhone'
10
+import ready from '@/utils/ready'
11
+import { getDownloadURL, times, transferImage } from '@/utils/tools'
12
+import { getQrCodeParams } from '@/utils/qrcode'
13
+import { getCardDetail } from '@/services/card'
14
+import { ROLE_CODE } from '@/constants/user'
15
+import Consultant from '@/components/consultant'
16
 import {
16
 import {
17
   addActivityShareNum,
17
   addActivityShareNum,
18
   signupActivity,
18
   signupActivity,
19
   favorActivity,
19
   favorActivity,
20
   cancelFavorActivity,
20
   cancelFavorActivity,
21
   queryActivityDetail
21
   queryActivityDetail
22
-} from '@services/activity'
22
+} from '@/services/activity'
23
 import {
23
 import {
24
   getMiniQrcode,
24
   getMiniQrcode,
25
   savePoint,
25
   savePoint,
26
   updatePoint
26
   updatePoint
27
-} from '@services/common'
27
+} from '@/services/common'
28
 import { connect } from '@tarojs/redux'
28
 import { connect } from '@tarojs/redux'
29
-import { report as reportCustomer } from '@utils/customer'
29
+import { report as reportCustomer } from '@/utils/customer'
30
 
30
 
31
 @connect(state => state.user)
31
 @connect(state => state.user)
32
 export default class Detail extends Component {
32
 export default class Detail extends Component {
472
                 {
472
                 {
473
                   posterShow && (
473
                   posterShow && (
474
                     <Button className='btn poster-btn' onClick={() => { this.togglePosterStatus(true) }}>
474
                     <Button className='btn poster-btn' onClick={() => { this.togglePosterStatus(true) }}>
475
-                      <Image mode="aspectFill" src={require('@assets/tupian_3@3x.png')} className="btn-icon"></Image>
475
+                      <Image mode="aspectFill" src={require('@/assets/tupian_3@3x.png')} className="btn-icon"></Image>
476
                       <Text className="txt">海报</Text>
476
                       <Text className="txt">海报</Text>
477
                     </Button>
477
                     </Button>
478
                   )
478
                   )
479
                 }
479
                 }
480
                 <Button className="btn share-btn" open-type="share">
480
                 <Button className="btn share-btn" open-type="share">
481
-                  <Image mode="aspectFill" src={require('@assets/fasong@3x.png')} className="btn-icon"></Image>
481
+                  <Image mode="aspectFill" src={require('@/assets/fasong@3x.png')} className="btn-icon"></Image>
482
                   <Text className="txt">分享</Text>
482
                   <Text className="txt">分享</Text>
483
                 </Button>
483
                 </Button>
484
 
484
 

+ 1
- 1
src/pages/activity/detail/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 // .wxParse-img {
3
 // .wxParse-img {
4
 //   width: 100% !important;
4
 //   width: 100% !important;

+ 2
- 2
src/pages/activity/detail/poster.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import { TaroCanvasDrawer } from '@components/taro-plugin-canvas';
2
+import { TaroCanvasDrawer } from '@/components/taro-plugin-canvas';
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
 import './poster.scss'
4
 import './poster.scss'
5
 /**
5
 /**
147
         zIndex: 999
147
         zIndex: 999
148
       },
148
       },
149
       {
149
       {
150
-        url: data.avatarurl || require('@assets/default-avatar.png'),
150
+        url: data.avatarurl || require('@/assets/default-avatar.png'),
151
         width: 130,
151
         width: 130,
152
         height: 130,
152
         height: 130,
153
         y: 630,
153
         y: 630,

+ 1
- 1
src/pages/activity/detail/poster.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .poster {
2
 .poster {
3
   position: fixed;
3
   position: fixed;
4
   width: 100vw;
4
   width: 100vw;

+ 3
- 3
src/pages/activity/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import ListView from '@components/ListView'
2
+import ListView from '@/components/ListView'
3
 import './index.scss'
3
 import './index.scss'
4
-import { queryActivityList, getActNewList } from '@services/activity'
4
+import { queryActivityList, getActNewList } from '@/services/activity'
5
 import ActivityItem from './item'
5
 import ActivityItem from './item'
6
-import { savePoint, updatePoint } from '@services/common'
6
+import { savePoint, updatePoint } from '@/services/common'
7
 import { connect } from '@tarojs/redux'
7
 import { connect } from '@tarojs/redux'
8
 
8
 
9
 @connect(state => state.city)
9
 @connect(state => state.city)

+ 1
- 1
src/pages/activity/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .wrap {
3
 .wrap {
4
   background: white;
4
   background: white;

+ 2
- 2
src/pages/activity/item/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
-import { transferImage } from '@utils/tools'
4
+import { transferImage } from '@/utils/tools'
5
 
5
 
6
 export default class Item extends Component {
6
 export default class Item extends Component {
7
   static defaultProps = {
7
   static defaultProps = {
21
           <View className="title">{data.title}</View>
21
           <View className="title">{data.title}</View>
22
           {
22
           {
23
             data.weight == '1' &&
23
             data.weight == '1' &&
24
-            <Image className="hot-tip" src={require('@assets/shop/hottip.png')}></Image>
24
+            <Image className="hot-tip" src={require('@/assets/shop/hottip.png')}></Image>
25
           }
25
           }
26
           {(data.type == 'help' || data.type == 'group') &&
26
           {(data.type == 'help' || data.type == 'group') &&
27
             <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>
27
             <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>

+ 2
- 2
src/pages/activity/item/index.scss 查看文件

1
-@import "@styles/theme.scss";
2
-@import "@styles/mixins.scss";
1
+@import "@/styles/theme.scss";
2
+@import "@/styles/mixins.scss";
3
 
3
 
4
 .flex {
4
 .flex {
5
   display: flex;
5
   display: flex;

+ 3
- 3
src/pages/activity/myActivity.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import ListView from '@components/ListView'
2
+import ListView from '@/components/ListView'
3
 import './index.scss'
3
 import './index.scss'
4
-import { queryActivityList } from '@services/activity'
4
+import { queryActivityList } from '@/services/activity'
5
 import ActivityItem from './item'
5
 import ActivityItem from './item'
6
-import { savePoint, updatePoint } from '@services/common'
6
+import { savePoint, updatePoint } from '@/services/common'
7
 import { connect } from '@tarojs/redux'
7
 import { connect } from '@tarojs/redux'
8
 
8
 
9
 let pageIndex = 1
9
 let pageIndex = 1

+ 5
- 5
src/pages/agent/become/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import './index.scss'
2
 import './index.scss'
3
 
3
 
4
-import { registerAgent } from '@services/agent'
4
+import { registerAgent } from '@/services/agent'
5
 import { connect } from '@tarojs/redux'
5
 import { connect } from '@tarojs/redux'
6
-import * as actions from '@actions/user'
7
-import getUserPhone from '@utils/getUserPhone'
8
-import { ROLE_CODE } from '@constants/user'
9
-import { queryUserInfo } from '@services/user'
6
+import * as actions from '@/actions/user'
7
+import getUserPhone from '@/utils/getUserPhone'
8
+import { ROLE_CODE } from '@/constants/user'
9
+import { queryUserInfo } from '@/services/user'
10
 const bannerImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/banner.jpg'
10
 const bannerImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/banner.jpg'
11
 @connect(state => state.user, { ...actions })
11
 @connect(state => state.user, { ...actions })
12
 export default class Index extends Component {
12
 export default class Index extends Component {

+ 7
- 7
src/pages/agent/client/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import { getClientList } from '@services/client'
4
-import { getItemList } from '@services/item'
5
-import emptyImg from '@assets/empty.png'
3
+import { getClientList } from '@/services/client'
4
+import { getItemList } from '@/services/item'
5
+import emptyImg from '@/assets/empty.png'
6
 import dayjs from 'dayjs'
6
 import dayjs from 'dayjs'
7
-import { savePoint, updatePoint } from '@services/common'
7
+import { savePoint, updatePoint } from '@/services/common'
8
 export default class Index extends Component {
8
 export default class Index extends Component {
9
 
9
 
10
   config = {
10
   config = {
120
                 list.map((item, index) => {
120
                 list.map((item, index) => {
121
                   return (
121
                   return (
122
                     <View className='client__list' key={index + 'client'} onClick={this.navigateTo.bind(this, item.customerId)}>
122
                     <View className='client__list' key={index + 'client'} onClick={this.navigateTo.bind(this, item.customerId)}>
123
-                      <Image className='bg' src={item.verifyStatus == 2 ? require('@assets/person/card1.png') : require('@assets/person/card2.png')}></Image>
123
+                      <Image className='bg' src={item.verifyStatus == 2 ? require('@/assets/person/card1.png') : require('@/assets/person/card2.png')}></Image>
124
                       <View className='client'>
124
                       <View className='client'>
125
                         <View className='client__status2'>
125
                         <View className='client__status2'>
126
                           {
126
                           {
132
                         <View className='client__top'>
132
                         <View className='client__top'>
133
                           <View className='client__infor'>
133
                           <View className='client__infor'>
134
                             <Text className='client__name'>{item.name} </Text>
134
                             <Text className='client__name'>{item.name} </Text>
135
-                            <Image className='sex' src={item.sex == 1 ? require('@assets/person/guest/man.png') : require('@assets/person/guest/women.png')} mode='widthFix'></Image>
135
+                            <Image className='sex' src={item.sex == 1 ? require('@/assets/person/guest/man.png') : require('@/assets/person/guest/women.png')} mode='widthFix'></Image>
136
                           </View>
136
                           </View>
137
 
137
 
138
 
138
 
153
 
153
 
154
         {/* <View className='recommend' onClick={this.toRecomonedPage}>123</View> */}
154
         {/* <View className='recommend' onClick={this.toRecomonedPage}>123</View> */}
155
         <View className="recommend"  onClick={this.toRecomonedPage}  >
155
         <View className="recommend"  onClick={this.toRecomonedPage}  >
156
-        <Image src={require('@assets/tuijiankehu.png')} className='home-img'></Image>
156
+        <Image src={require('@/assets/tuijiankehu.png')} className='home-img'></Image>
157
         <Text className="text">推荐</Text>
157
         <Text className="text">推荐</Text>
158
       </View>
158
       </View>
159
       </View>
159
       </View>

+ 1
- 1
src/pages/agent/client/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .myClient {
3
 .myClient {
4
   position: relative;
4
   position: relative;

+ 4
- 4
src/pages/agent/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import { connect } from '@tarojs/redux'
2
 import { connect } from '@tarojs/redux'
3
-import * as actions from '@actions/user'
3
+import * as actions from '@/actions/user'
4
 import './index.scss'
4
 import './index.scss'
5
 import Poster from './poster'
5
 import Poster from './poster'
6
-import { agentCurrent } from '@services/agent'
7
-import BackHomeBtn from '@components/BackHomeBtn'
8
-import { getMiniQrcode } from '@services/common'
6
+import { agentCurrent } from '@/services/agent'
7
+import BackHomeBtn from '@/components/BackHomeBtn'
8
+import { getMiniQrcode } from '@/services/common'
9
 const topImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/top.jpg'
9
 const topImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/index/top.jpg'
10
 @connect(state => state.user, { ...actions })
10
 @connect(state => state.user, { ...actions })
11
 
11
 

+ 2
- 2
src/pages/agent/invitation/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import { getAgentList } from '@services/agent'
3
+import { getAgentList } from '@/services/agent'
4
 
4
 
5
 import AgentItem from './item'
5
 import AgentItem from './item'
6
-import ListView from '@components/ListView'
6
+import ListView from '@/components/ListView'
7
 let pageIndex = 1
7
 let pageIndex = 1
8
 export default class Index extends Component {
8
 export default class Index extends Component {
9
   config = {
9
   config = {

+ 1
- 1
src/pages/agent/invitation/item.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import getDateFormat from '@utils/chatDate'
2
+import getDateFormat from '@/utils/chatDate'
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
 
4
 
5
 import './item.scss'
5
 import './item.scss'

+ 1
- 1
src/pages/agent/invitation/item.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .list__item {
3
 .list__item {
4
   display: flex;
4
   display: flex;

+ 2
- 2
src/pages/agent/poster/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import { TaroCanvasDrawer } from '@components/taro-plugin-canvas';
2
+import { TaroCanvasDrawer } from '@/components/taro-plugin-canvas';
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
 /**
4
 /**
5
  * 文档参考
5
  * 文档参考
93
         x: 500
93
         x: 500
94
       },
94
       },
95
       {
95
       {
96
-        url: data.avatarurl || require('@assets/default-avatar.png'),
96
+        url: data.avatarurl || require('@/assets/default-avatar.png'),
97
         width: 120,
97
         width: 120,
98
         height: 120,
98
         height: 120,
99
         y: 915,
99
         y: 915,

+ 7
- 7
src/pages/agent/progress/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import buildImg from '@assets/agent/build.png'
4
-import phoneImg from '@assets/agent/Iphone.png'
5
-import { clientProgress } from '@services/client'
6
-import { getItemList } from '@services/item'
7
-import { getCardList } from '@services/card'
8
-import { savePoint, updatePoint } from '@services/common'
9
-// import { zhuge } from '@utils/zhuge-wx-mpvue.min'
3
+import buildImg from '@/assets/agent/build.png'
4
+import phoneImg from '@/assets/agent/Iphone.png'
5
+import { clientProgress } from '@/services/client'
6
+import { getItemList } from '@/services/item'
7
+import { getCardList } from '@/services/card'
8
+import { savePoint, updatePoint } from '@/services/common'
9
+// import { zhuge } from '@/utils/zhuge-wx-mpvue.min'
10
 
10
 
11
 export default class Index extends Component {
11
 export default class Index extends Component {
12
 
12
 

+ 1
- 1
src/pages/agent/progress/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .client__progress {
2
 .client__progress {
3
   position: relative;
3
   position: relative;
4
   width: 100%;
4
   width: 100%;

+ 5
- 5
src/pages/agent/recommend/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import { recommendClient, getTypeData } from '@services/client'
4
-import { getItemList } from '@services/item'
5
-import { getCardList } from '@services/card'
6
-import { savePoint, updatePoint } from '@services/common'
3
+import { recommendClient, getTypeData } from '@/services/client'
4
+import { getItemList } from '@/services/item'
5
+import { getCardList } from '@/services/card'
6
+import { savePoint, updatePoint } from '@/services/common'
7
 
7
 
8
-import Authorize from '@components/authorize'
8
+import Authorize from '@/components/authorize'
9
 
9
 
10
 import { connect } from '@tarojs/redux'
10
 import { connect } from '@tarojs/redux'
11
 @connect(({ user, card, project }) => ({ ...user, ...card, ...project }))
11
 @connect(({ user, card, project }) => ({ ...user, ...card, ...project }))

+ 1
- 1
src/pages/agent/recommend/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .ani {
2
 .ani {
3
   position: absolute;
3
   position: absolute;
4
 }
4
 }

+ 2
- 2
src/pages/auth/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import { connect } from '@tarojs/redux'
2
 import { connect } from '@tarojs/redux'
3
-import { mergeNotNull } from '@utils/tools'
4
-import * as actions from '@actions/user'
3
+import { mergeNotNull } from '@/utils/tools'
4
+import * as actions from '@/actions/user'
5
 import './index.scss'
5
 import './index.scss'
6
 
6
 
7
 @connect(state => state.user, { ...actions })
7
 @connect(state => state.user, { ...actions })

+ 1
- 1
src/pages/auth/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .header {
3
 .header {
4
   margin: 90px 0 90px 50px;
4
   margin: 90px 0 90px 50px;

+ 5
- 5
src/pages/card/fans/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import { queryCardFansList } from '@services/card'
3
-import { queryItemFansList } from '@services/item'
4
-import EmptyPage from '@components/empty-page'
2
+import { queryCardFansList } from '@/services/card'
3
+import { queryItemFansList } from '@/services/item'
4
+import EmptyPage from '@/components/empty-page'
5
 import FansItem from './item'
5
 import FansItem from './item'
6
-import ListView from '@components/ListView'
7
-import { savePoint, updatePoint } from '@services/common'
6
+import ListView from '@/components/ListView'
7
+import { savePoint, updatePoint } from '@/services/common'
8
 let pageIndex = 1
8
 let pageIndex = 1
9
 export default class Index extends Component {
9
 export default class Index extends Component {
10
   config = {
10
   config = {

+ 1
- 1
src/pages/card/fans/item.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import getDateFormat from '@utils/chatDate'
2
+import getDateFormat from '@/utils/chatDate'
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
 
4
 
5
 import './item.scss'
5
 import './item.scss'

+ 1
- 1
src/pages/card/fans/item.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .list__item {
3
 .list__item {
4
   display: flex;
4
   display: flex;

+ 17
- 17
src/pages/card/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import './index.scss'
2
 import './index.scss'
3
-import Notice from '@components/Notice'
3
+import Notice from '@/components/Notice'
4
 import Poster from './poster'
4
 import Poster from './poster'
5
 import ProjectItem from '../project/item'
5
 import ProjectItem from '../project/item'
6
-import BackHomeBtn from '@components/BackHomeBtn'
7
-import getUserPhone from '@utils/getUserPhone'
8
-import ready from '@utils/ready'
9
-import AchievePhone from '@components/achievePhone'
10
-import { sceneInShare } from '@utils/tools'
11
-import { ROLE_CODE } from '@constants/user'
12
-import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@services/card'
13
-import { getMiniQrcode, savePoint, updatePoint } from '@services/common'
6
+import BackHomeBtn from '@/components/BackHomeBtn'
7
+import getUserPhone from '@/utils/getUserPhone'
8
+import ready from '@/utils/ready'
9
+import AchievePhone from '@/components/achievePhone'
10
+import { sceneInShare } from '@/utils/tools'
11
+import { ROLE_CODE } from '@/constants/user'
12
+import { addCardUv, addCardShareNum, favorCard, cancelFavorCard } from '@/services/card'
13
+import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
14
 import { connect } from '@tarojs/redux'
14
 import { connect } from '@tarojs/redux'
15
-import { reportClient } from '@services/report'
15
+import { reportClient } from '@/services/report'
16
 
16
 
17
-import * as actions from '@actions/card'
18
-import { dispatchProjectDetail } from '@actions/project'
17
+import * as actions from '@/actions/card'
18
+import { dispatchProjectDetail } from '@/actions/project'
19
 
19
 
20
 
20
 
21
 @connect(
21
 @connect(
486
                   <Image className='mycard__user__img' src={picture} mode="widthFix"></Image>
486
                   <Image className='mycard__user__img' src={picture} mode="widthFix"></Image>
487
                   <Image src={picture} mode="aspectFill" className='head__img'></Image>
487
                   <Image src={picture} mode="aspectFill" className='head__img'></Image>
488
                 </View>
488
                 </View>
489
-                <Image src={require('@assets/person/top.png')} className='top-img' mode="aspectFill"></Image>
489
+                <Image src={require('@/assets/person/top.png')} className='top-img' mode="aspectFill"></Image>
490
               </View>
490
               </View>
491
 
491
 
492
               <View className='mycard__user__information'>
492
               <View className='mycard__user__information'>
501
                     visibleChatBtn && (
501
                     visibleChatBtn && (
502
                       hadPhone ? (
502
                       hadPhone ? (
503
                         <View onClick={this.toChatPage}>
503
                         <View onClick={this.toChatPage}>
504
-                          <Image src={require('@assets/person/zixun.png')} className='chat-img'></Image>
504
+                          <Image src={require('@/assets/person/zixun.png')} className='chat-img'></Image>
505
                           {unReadNum > 0 && <Text className="unread-num">{unReadNum}</Text>}
505
                           {unReadNum > 0 && <Text className="unread-num">{unReadNum}</Text>}
506
                         </View>
506
                         </View>
507
                       ) : (
507
                       ) : (
508
                           <Button className="clear-btn" open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>
508
                           <Button className="clear-btn" open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber}>
509
-                            <Image src={require('@assets/person/zixun.png')} className='chat-img'></Image>
509
+                            <Image src={require('@/assets/person/zixun.png')} className='chat-img'></Image>
510
                             {unReadNum > 0 && <Text className="unread-num">{unReadNum}</Text>}
510
                             {unReadNum > 0 && <Text className="unread-num">{unReadNum}</Text>}
511
                           </Button>
511
                           </Button>
512
                         )
512
                         )
515
 
515
 
516
                 </View>
516
                 </View>
517
                 <View className='row medal'>
517
                 <View className='row medal'>
518
-                  <Image mode="widthFix" className="img" src={require('@assets/person/jinpai.png')}></Image>
518
+                  <Image mode="widthFix" className="img" src={require('@/assets/person/jinpai.png')}></Image>
519
                   <Text>金牌置业顾问</Text>
519
                   <Text>金牌置业顾问</Text>
520
                 </View>
520
                 </View>
521
 
521
 
538
                       {visitors.length >= 5 && <Text className="iconfont icon-shenglvehao"></Text>}
538
                       {visitors.length >= 5 && <Text className="iconfont icon-shenglvehao"></Text>}
539
                     </View>
539
                     </View>
540
                     <View className="fans__num">
540
                     <View className="fans__num">
541
-                      <Image className='nb' src={require('@assets/person/nb.png')}></Image>
541
+                      <Image className='nb' src={require('@/assets/person/nb.png')}></Image>
542
                       <Text>人气</Text>
542
                       <Text>人气</Text>
543
                       <Text>{visitors.length}</Text>
543
                       <Text>{visitors.length}</Text>
544
                     </View>
544
                     </View>

+ 1
- 1
src/pages/card/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .hide {
3
 .hide {
4
   display: none;
4
   display: none;

+ 8
- 8
src/pages/card/list/index.js 查看文件

1
 import Taro, { Component, requirePlugin } from '@tarojs/taro';
1
 import Taro, { Component, requirePlugin } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
 
3
 
4
-import ListView from '@components/ListView'
5
-import getUserPhone from '@utils/getUserPhone'
6
-import { getCardList } from '@services/card'
4
+import ListView from '@/components/ListView'
5
+import getUserPhone from '@/utils/getUserPhone'
6
+import { getCardList } from '@/services/card'
7
 import { connect } from '@tarojs/redux'
7
 import { connect } from '@tarojs/redux'
8
-import { savePoint, updatePoint } from '@services/common'
9
-import * as noticeType from '@constants/common.js'
8
+import { savePoint, updatePoint } from '@/services/common'
9
+import * as noticeType from '@/constants/common.js'
10
 let pageIndex = 1
10
 let pageIndex = 1
11
 @connect(({ user }) => ({ ...user }))
11
 @connect(({ user }) => ({ ...user }))
12
 export default class Index extends Component {
12
 export default class Index extends Component {
162
                     <View className='info'>
162
                     <View className='info'>
163
                       <View className='name-info'>
163
                       <View className='name-info'>
164
                         <Text className="name">{item.name}</Text>
164
                         <Text className="name">{item.name}</Text>
165
-                        <Image src={require('@assets/person/card.png')} className='card' ></Image>
165
+                        <Image src={require('@/assets/person/card.png')} className='card' ></Image>
166
                       </View>
166
                       </View>
167
                       <View className="phone">{item.phone}</View>
167
                       <View className="phone">{item.phone}</View>
168
                     </View>
168
                     </View>
173
                     {
173
                     {
174
                       hadPhone ? (
174
                       hadPhone ? (
175
                         <Button className="item-btn chat" onClick={this.handleChatClick.bind(this, item)}>
175
                         <Button className="item-btn chat" onClick={this.handleChatClick.bind(this, item)}>
176
-                          <Image src={require('@assets/person/zixun.png')} className='chat-img'></Image>
176
+                          <Image src={require('@/assets/person/zixun.png')} className='chat-img'></Image>
177
                         </Button>
177
                         </Button>
178
                       ) : (
178
                       ) : (
179
                           <Button className="item-btn chat" onClick={this.handleStopPropagation} open-type="getPhoneNumber" onGetphonenumber={e => { this.getPhoneNumber(e, item) }}>
179
                           <Button className="item-btn chat" onClick={this.handleStopPropagation} open-type="getPhoneNumber" onGetphonenumber={e => { this.getPhoneNumber(e, item) }}>
181
                         )
181
                         )
182
                     }
182
                     }
183
                     <Button className="item-btn tel" onClick={this.handleTelClick.bind(this, item)}>
183
                     <Button className="item-btn tel" onClick={this.handleTelClick.bind(this, item)}>
184
-                      <Image src={require('@assets/person/dianhua.png')} className='tel-img'></Image>
184
+                      <Image src={require('@/assets/person/dianhua.png')} className='tel-img'></Image>
185
                     </Button>
185
                     </Button>
186
                   </View>
186
                   </View>
187
 
187
 

+ 1
- 1
src/pages/card/list/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .top-tip {
2
 .top-tip {
3
   background: rgba(245, 245, 245, 1);
3
   background: rgba(245, 245, 245, 1);
4
   height: 90px;
4
   height: 90px;

+ 2
- 2
src/pages/card/notice/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-// import "@styles/icon.scss";
3
+// import "@/styles/icon.scss";
4
 export default class Index extends Component {
4
 export default class Index extends Component {
5
   static defaultProps = {
5
   static defaultProps = {
6
     num: 0,
6
     num: 0,
7
-    avatar: require('@assets/default-avatar.png')
7
+    avatar: require('@/assets/default-avatar.png')
8
   }
8
   }
9
   static options = {
9
   static options = {
10
     addGlobalClass: true
10
     addGlobalClass: true

+ 1
- 1
src/pages/card/notice/index.scss 查看文件

1
 
1
 
2
-@import "@styles/theme.scss";
2
+@import "@/styles/theme.scss";
3
 
3
 
4
 .notice {
4
 .notice {
5
   position: fixed;
5
   position: fixed;

+ 4
- 4
src/pages/card/poster.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import { TaroCanvasDrawer } from '@components/taro-plugin-canvas';
2
+import { TaroCanvasDrawer } from '@/components/taro-plugin-canvas';
3
 import './poster.scss'
3
 import './poster.scss'
4
 /**
4
 /**
5
  * 文档参考
5
  * 文档参考
171
     ]
171
     ]
172
     const images = [
172
     const images = [
173
       {
173
       {
174
-        url: require('@assets/person/jinpai.png'),
174
+        url: require('@/assets/person/jinpai.png'),
175
         width: 42,
175
         width: 42,
176
         height: 48,
176
         height: 48,
177
         y: 440,
177
         y: 440,
179
         zIndex: 99
179
         zIndex: 99
180
       },
180
       },
181
       {
181
       {
182
-        url: require('@assets/person/tel2.png'),
182
+        url: require('@/assets/person/tel2.png'),
183
         width: 30,
183
         width: 30,
184
         height: 30,
184
         height: 30,
185
         y: 240,
185
         y: 240,
187
         zIndex: 99
187
         zIndex: 99
188
       },
188
       },
189
       {
189
       {
190
-        url: require('@assets/person/bottom.png'),
190
+        url: require('@/assets/person/bottom.png'),
191
         width: 600,
191
         width: 600,
192
         height: 150,
192
         height: 150,
193
         y: 870,
193
         y: 870,

+ 1
- 1
src/pages/card/poster.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .poster {
2
 .poster {
3
   position: fixed;
3
   position: fixed;
4
   width: 100vw;
4
   width: 100vw;

+ 6
- 6
src/pages/card/register/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
-import { isChineseMobilePhoneNumber } from '@utils/tools'
3
-import { applyCard } from '@services/card'
2
+import { isChineseMobilePhoneNumber } from '@/utils/tools'
3
+import { applyCard } from '@/services/card'
4
 import { connect } from '@tarojs/redux'
4
 import { connect } from '@tarojs/redux'
5
-import { ROLE_CODE } from '@constants/user'
5
+import { ROLE_CODE } from '@/constants/user'
6
 import './index.scss'
6
 import './index.scss'
7
 
7
 
8
 @connect(state => state.user)
8
 @connect(state => state.user)
34
     if (!phone) {
34
     if (!phone) {
35
       Taro.showToast({
35
       Taro.showToast({
36
         title: '电话不能为空',
36
         title: '电话不能为空',
37
-        image: require('@assets/icons/warn.png')
37
+        image: require('@/assets/icons/warn.png')
38
       })
38
       })
39
       return false
39
       return false
40
     }
40
     }
42
     if (!isChineseMobilePhoneNumber(phone)) {
42
     if (!isChineseMobilePhoneNumber(phone)) {
43
       Taro.showToast({
43
       Taro.showToast({
44
         title: '电话格式不正确',
44
         title: '电话格式不正确',
45
-        image: require('@assets/icons/warn.png')
45
+        image: require('@/assets/icons/warn.png')
46
       })
46
       })
47
       return false
47
       return false
48
     }
48
     }
50
     if (!pass) {
50
     if (!pass) {
51
       Taro.showToast({
51
       Taro.showToast({
52
         title: '密码不能为空',
52
         title: '密码不能为空',
53
-        image: require('@assets/icons/warn.png')
53
+        image: require('@/assets/icons/warn.png')
54
       })
54
       })
55
       return false
55
       return false
56
     }
56
     }

+ 1
- 1
src/pages/card/register/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 .login {
2
 .login {
3
   padding: 50px 50px 0;
3
   padding: 50px 50px 0;
4
   padding-top: 200px;
4
   padding-top: 200px;

+ 1
- 1
src/pages/card/report/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import { getCodeScene  } from '@services/common'
3
+import { getCodeScene  } from '@/services/common'
4
 export default class Index extends Component {
4
 export default class Index extends Component {
5
   config = {
5
   config = {
6
     navigationBarTitleText: '报备'
6
     navigationBarTitleText: '报备'

+ 1
- 1
src/pages/checkin/checkinsuccess/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import {transferImage } from '@utils/tools'
3
+import {transferImage } from '@/utils/tools'
4
 
4
 
5
 
5
 
6
 
6
 

+ 8
- 8
src/pages/checkin/index.js 查看文件

2
 import './index.scss'
2
 import './index.scss'
3
 import { AtDivider, AtList, AtListItem, AtGrid, AtButton } from 'taro-ui'
3
 import { AtDivider, AtList, AtListItem, AtGrid, AtButton } from 'taro-ui'
4
 
4
 
5
-// import achievePhone from '@components/achievePhone'
6
-import { checkinDetails, checkinActive } from '@services/checkin'
5
+// import achievePhone from '@/components/achievePhone'
6
+import { checkinDetails, checkinActive } from '@/services/checkin'
7
 import {
7
 import {
8
   getCodeScene,
8
   getCodeScene,
9
 
9
 
10
-} from '@services/common'
11
-import { parseQueryString, getQueryString } from '@utils/tools'
10
+} from '@/services/common'
11
+import { parseQueryString, getQueryString } from '@/utils/tools'
12
 import { NONAME } from 'dns';
12
 import { NONAME } from 'dns';
13
-import ready from '@utils/ready'
13
+import ready from '@/utils/ready'
14
 export default class checkin extends Component {
14
 export default class checkin extends Component {
15
 
15
 
16
   state = {
16
   state = {
156
             </View>
156
             </View>
157
           </View>
157
           </View>
158
 
158
 
159
-          {!enlist.isCheckin && <Image className="checkinImg" src={require('@assets/checkin/checkin.png')} onClick={this.checkinActive}></Image>}
160
-          {enlist.isCheckin === 1 && <Image className="checkinImg" src={require('@assets/checkin/checkined.png')}></Image>}
159
+          {!enlist.isCheckin && <Image className="checkinImg" src={require('@/assets/checkin/checkin.png')} onClick={this.checkinActive}></Image>}
160
+          {enlist.isCheckin === 1 && <Image className="checkinImg" src={require('@/assets/checkin/checkined.png')}></Image>}
161
           {/* {console.log(data.person.status)} */}
161
           {/* {console.log(data.person.status)} */}
162
         </View>}
162
         </View>}
163
         {enlist.enlistId == null && <View className="unregistered">
163
         {enlist.enlistId == null && <View className="unregistered">
173
           {activityStatus===0 &&
173
           {activityStatus===0 &&
174
             <View>
174
             <View>
175
               <View>
175
               <View>
176
-                <Image className="img1" src={require('@assets/checkin/noentry.png')} ></Image>
176
+                <Image className="img1" src={require('@/assets/checkin/noentry.png')} ></Image>
177
               </View>
177
               </View>
178
               <View className="message">
178
               <View className="message">
179
                 <Text className="messageText" >您还未报名当前活动,请先前往活动报名页报名成功后再进行扫码签到~ </Text>
179
                 <Text className="messageText" >您还未报名当前活动,请先前往活动报名页报名成功后再进行扫码签到~ </Text>

+ 1
- 1
src/pages/checkin/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 @import "~taro-ui/dist/style/components/flex.scss";
2
 @import "~taro-ui/dist/style/components/flex.scss";
3
 @import "~taro-ui/dist/style/components/list.scss";
3
 @import "~taro-ui/dist/style/components/list.scss";
4
 @import "~taro-ui/dist/style/components/icon.scss";
4
 @import "~taro-ui/dist/style/components/icon.scss";

+ 2
- 2
src/pages/city/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import { connect } from '@tarojs/redux'
2
 import { connect } from '@tarojs/redux'
3
-import * as actions from '@actions/city'
3
+import * as actions from '@/actions/city'
4
 import { ScrollView } from '@tarojs/components';
4
 import { ScrollView } from '@tarojs/components';
5
 import './index.scss'
5
 import './index.scss'
6
 
6
 
7
-import Search from '@components/search'
7
+import Search from '@/components/search'
8
 
8
 
9
 @connect(state => state.city, { ...actions })
9
 @connect(state => state.city, { ...actions })
10
 export default class Index extends Component {
10
 export default class Index extends Component {

+ 1
- 1
src/pages/city/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .city {
3
 .city {
4
   background: $page-bg;
4
   background: $page-bg;

+ 14
- 18
src/pages/im/index.js 查看文件

3
 
3
 
4
 import dayjs from 'dayjs'
4
 import dayjs from 'dayjs'
5
 import MsgItem from './msgItem'
5
 import MsgItem from './msgItem'
6
-import FormIdCollector from '@components/formIdCollector'
7
-import BackHomeBtn from '@components/BackHomeBtn'
6
+import BackHomeBtn from '@/components/BackHomeBtn'
8
 
7
 
9
-import { queryChatHistory, setMessageReaded } from '@services/chat'
10
-import { uploadFiles, fetch } from '@utils/request'
11
-import { deepClone } from '@utils/tools'
8
+import { queryChatHistory, setMessageReaded } from '@/services/chat'
9
+import { uploadFiles, fetch } from '@/utils/request'
10
+import { deepClone } from '@/utils/tools'
12
 
11
 
13
-import { savePoint, updatePoint } from '@services/common'
12
+import { savePoint, updatePoint } from '@/services/common'
14
 import { connect } from '@tarojs/redux'
13
 import { connect } from '@tarojs/redux'
15
-import { ROLE_CODE } from '@constants/user'
16
-import { API_QUERY_USERINFO_BYID } from '@constants/api'
17
-import { dispatchCardInfo } from '@actions/card'
14
+import { ROLE_CODE } from '@/constants/user'
15
+import { API_QUERY_USERINFO_BYID } from '@/constants/api'
16
+import { dispatchCardInfo } from '@/actions/card'
18
 
17
 
19
-// import { dispatchUserPhone } from '@actions/user'
20
-import getUserPhone from '@utils/getUserPhone'
18
+// import { dispatchUserPhone } from '@/actions/user'
19
+import getUserPhone from '@/utils/getUserPhone'
21
 
20
 
22
-import socket, { MESSAGETYPE } from '@utils/im'
23
-import ready from '@utils/ready'
21
+import socket, { MESSAGETYPE } from '@/utils/im'
22
+import ready from '@/utils/ready'
24
 import store from '../../store'
23
 import store from '../../store'
25
 
24
 
26
 @connect(state => (
25
 @connect(state => (
506
     const extraWrap = (
505
     const extraWrap = (
507
       <View className="import-bottom">
506
       <View className="import-bottom">
508
         <View className="extra-item" onClick={this.bindAlbumClick}>
507
         <View className="extra-item" onClick={this.bindAlbumClick}>
509
-          <Image mode="aspectFit" className="extra-item__img" src={require('@assets/chat/choose_picture.png')} />
508
+          <Image mode="aspectFit" className="extra-item__img" src={require('@/assets/chat/choose_picture.png')} />
510
           <Text className="extra-item__text">相册</Text>
509
           <Text className="extra-item__text">相册</Text>
511
         </View>
510
         </View>
512
       </View>
511
       </View>
572
               placeholder='发送消息'
571
               placeholder='发送消息'
573
             />
572
             />
574
             <Text className="import-top__extra iconfont icon-Add" onClick={this.showExtraArea}></Text>
573
             <Text className="import-top__extra iconfont icon-Add" onClick={this.showExtraArea}></Text>
575
-            <FormIdCollector count={1}>
576
-              <Button size="mini" className="import-top__submit" onClick={this.bindSendBtn}>发送</Button>
577
-              {/* <Image src={require('@assets/news/fasong.png')} className='submit-img'  onClick={this.bindSendBtn}></Image> */}
578
-            </FormIdCollector>
574
+            <Button size="mini" className="import-top__submit" onClick={this.bindSendBtn}>发送</Button>
579
           </View>
575
           </View>
580
           {visExtra && extraWrap}
576
           {visExtra && extraWrap}
581
         </View>
577
         </View>

+ 1
- 1
src/pages/im/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .fixed-btn {
3
 .fixed-btn {
4
   position: fixed;
4
   position: fixed;

+ 6
- 6
src/pages/im/list/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
-import { getWindowHeight } from '@utils/style'
4
-import { queryChatFriends } from '@services/chat'
3
+import { getWindowHeight } from '@/utils/style'
4
+import { queryChatFriends } from '@/services/chat'
5
 
5
 
6
-import EmptyPage from '@components/empty-page'
6
+import EmptyPage from '@/components/empty-page'
7
 import Item from './item'
7
 import Item from './item'
8
-import ready from '@utils/ready'
8
+import ready from '@/utils/ready'
9
 
9
 
10
-import { DECREASE_UNREADNUM } from '@constants/user'
10
+import { DECREASE_UNREADNUM } from '@/constants/user'
11
 import { getStore, connect } from '@tarojs/redux'
11
 import { getStore, connect } from '@tarojs/redux'
12
-import * as noticeType from '@constants/common.js'
12
+import * as noticeType from '@/constants/common.js'
13
 
13
 
14
 @connect(state => state.user)
14
 @connect(state => state.user)
15
 export default class Index extends Component {
15
 export default class Index extends Component {

+ 1
- 1
src/pages/im/list/index.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .list {
3
 .list {
4
   padding: 20px 40px;
4
   padding: 20px 40px;

+ 1
- 1
src/pages/im/list/item.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
-import getDateFormat from '@utils/chatDate'
2
+import getDateFormat from '@/utils/chatDate'
3
 import dayjs from 'dayjs'
3
 import dayjs from 'dayjs'
4
 
4
 
5
 import './item.scss'
5
 import './item.scss'

+ 1
- 1
src/pages/im/list/item.scss 查看文件

1
-@import "@styles/theme.scss";
1
+@import "@/styles/theme.scss";
2
 
2
 
3
 .list__item {
3
 .list__item {
4
   display: flex;
4
   display: flex;

+ 2
- 2
src/pages/im/msgItem/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro';
1
 import Taro, { Component } from '@tarojs/taro';
2
 import './index.scss'
2
 import './index.scss'
3
 
3
 
4
-import getDateFormat from '@utils/chatDate'
4
+import getDateFormat from '@/utils/chatDate'
5
 import { connect } from '@tarojs/redux'
5
 import { connect } from '@tarojs/redux'
6
 
6
 
7
 @connect(state => ({ ...state.user, ...state.card }))
7
 @connect(state => ({ ...state.user, ...state.card }))
79
         {/* {list.map(row => (<Item row={row} key={row.chatId}></Item>))} */}
79
         {/* {list.map(row => (<Item row={row} key={row.chatId}></Item>))} */}
80
         {list.map(row => (
80
         {list.map(row => (
81
           <View key={row.chatId} className={`item__wrap ${row.sendPerson === personId ? "self" : "other"}`} >
81
           <View key={row.chatId} className={`item__wrap ${row.sendPerson === personId ? "self" : "other"}`} >
82
-            <Image mode="aspectFit" className="item__headimg" src={row.sendPerson === personId ? avatarurl : (row.sendAvatar||require('@assets/default-avatar.png'))} />
82
+            <Image mode="aspectFit" className="item__headimg" src={row.sendPerson === personId ? avatarurl : (row.sendAvatar||require('@/assets/default-avatar.png'))} />
83
 
83
 
84
             {this.renderMsgContent(row, phone)}
84
             {this.renderMsgContent(row, phone)}
85
           </View>
85
           </View>

+ 0
- 0
src/pages/im/msgItem/index.scss 查看文件


部分文件因为文件数量过多而无法显示