张延森 5 years ago
parent
commit
26cb8633ab

+ 2
- 2
config/dev.js View File

9
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
9
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10
     // HOST: '"https://lt.pawoma.cn"',
10
     // HOST: '"https://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
11
     // WSS_HOST: '"wss://lt.pawoma.cn"',
12
-    HOST: '"http://192.168.0.84:8080"',
13
-    WSS_HOST: '"ws://192.168.0.84:8080"',
12
+    HOST: '"http://127.0.0.1:8080"',
13
+    WSS_HOST: '"ws://127.0.0.1:8080"',
14
   },
14
   },
15
   weapp: {},
15
   weapp: {},
16
   h5: {}
16
   h5: {}

+ 1
- 1
project.config.json View File

2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "mini-chengjiao",
3
 	"projectname": "mini-chengjiao",
4
 	"description": "dev环境",
4
 	"description": "dev环境",
5
-	"appid": "wxda1f84b79b3edeb3",
5
+	"appid": "wxd9ee3a9480a4e544",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,
8
 		"es6": false,
8
 		"es6": false,

+ 6
- 2
src/components/Poster/index.js View File

4
 import './style.scss';
4
 import './style.scss';
5
 
5
 
6
 export default class Poster extends Component {
6
 export default class Poster extends Component {
7
+  static options = {
8
+    addGlobalClass: true
9
+  }
10
+
7
   state = {
11
   state = {
8
     images: [],
12
     images: [],
9
     done: false,
13
     done: false,
80
       }
84
       }
81
 
85
 
82
       if (inx + 1 === this.props.configs.length) {
86
       if (inx + 1 === this.props.configs.length) {
83
-        this.setState({ done: true, images: [...this.tmpImgs] });
87
+        this.setState({ done: true, images: [...this.tmpImgs], current: this.tmpImgs[0] });
84
         this.tmpImgs = [];
88
         this.tmpImgs = [];
85
         Taro.hideLoading();
89
         Taro.hideLoading();
86
       }
90
       }
90
   onCreateFail = (inx) => (err) => {
94
   onCreateFail = (inx) => (err) => {
91
     this.tmpImgs[inx] = undefined
95
     this.tmpImgs[inx] = undefined
92
     if (inx + 1 === this.props.configs.length) {
96
     if (inx + 1 === this.props.configs.length) {
93
-      this.setState({ done: true, images: [...this.tmpImgs] });
97
+      this.setState({ done: true, images: [...this.tmpImgs], current: this.tmpImgs[0] });
94
       this.tmpImgs = [];
98
       this.tmpImgs = [];
95
       Taro.hideLoading();
99
       Taro.hideLoading();
96
     }
100
     }

+ 6
- 2
src/pages/activity/detail/assemble.js View File

25
 const memberImg = require('@assets/helpgroup/group/member.png')
25
 const memberImg = require('@assets/helpgroup/group/member.png')
26
 const successImg = require('@assets/helpgroup/group/success.png')
26
 const successImg = require('@assets/helpgroup/group/success.png')
27
 const failImg = require('@assets/helpgroup/group/fail.png')
27
 const failImg = require('@assets/helpgroup/group/fail.png')
28
+const quoteImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/quota.png'
28
 
29
 
29
 // 活动状态
30
 // 活动状态
30
 const ActBeforeStart = 0;
31
 const ActBeforeStart = 0;
477
     const posterData = {
478
     const posterData = {
478
       title: posters[0] ? posters[0].posterTitle : '',
479
       title: posters[0] ? posters[0].posterTitle : '',
479
       desc: posters[0] ? posters[0].posterDescription : '',
480
       desc: posters[0] ? posters[0].posterDescription : '',
480
-      poster: posters[0] ? posters[0].posterImg : '',
481
+      poster: posters[0] ? getDownloadURL(posters[0].posterImg, 'alioss') : '',
481
       name: userInfo.person.name || userInfo.person.nickname,
482
       name: userInfo.person.name || userInfo.person.nickname,
482
-      qrcode: qrCode,
483
+      qrcode: getDownloadURL(qrCode, 'alioss'),
484
+      quote: getDownloadURL(quoteImg, 'alioss'),
483
       avatarurl: getDownloadURL(userInfo.person.avatarurl, 'avatar') || '',
485
       avatarurl: getDownloadURL(userInfo.person.avatarurl, 'avatar') || '',
486
+      date: dayjs().format('YYYY.MM.DD'),
487
+      appName: (userInfo.miniApp || {}).name,
484
     }
488
     }
485
 
489
 
486
     // 团长显示团长核销码, 参团的显示参团核销码
490
     // 团长显示团长核销码, 参团的显示参团核销码

+ 8
- 4
src/pages/activity/detail/assistance.js View File

23
 
23
 
24
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
24
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
25
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
25
 const failImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/help%20failure.png'
26
+const quoteImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/quota.png';
26
 const waitImg = require('@assets/helpgroup/wait.png')
27
 const waitImg = require('@assets/helpgroup/wait.png')
27
 
28
 
28
 // 活动状态
29
 // 活动状态
478
     const posterData = {
479
     const posterData = {
479
       title: posters[0] ? posters[0].posterTitle : '',
480
       title: posters[0] ? posters[0].posterTitle : '',
480
       desc: posters[0] ? posters[0].posterDescription : '',
481
       desc: posters[0] ? posters[0].posterDescription : '',
481
-      poster: posters[0] ? posters[0].posterImg : '',
482
-      name: userInfo.person.name || userInfo.person.nickname,
483
-      qrcode: qrCode,
484
-      avatarurl: getDownloadURL(userInfo.person.avatarurl, 'avatar') || '',
482
+      poster: posters[0] ? getDownloadURL(posters[0].posterImg, 'alioss') : '',
483
+      userName: userInfo.person.name || userInfo.person.nickname,
484
+      qrcode: getDownloadURL(qrCode, 'alioss'),
485
+      quote: getDownloadURL(quoteImg, 'alioss'),
486
+      avatar: getDownloadURL(userInfo.person.avatarurl, 'avatar') || '',
487
+      date: dayjs().format('YYYY.MM.DD'),
488
+      appName: (userInfo.miniApp || {}).name,
485
     }
489
     }
486
 
490
 
487
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)
491
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)

+ 7
- 4
src/reducers/user.js View File

12
   userInfo: {
12
   userInfo: {
13
     person: {},
13
     person: {},
14
     extraInfo: {},
14
     extraInfo: {},
15
+    miniApp: {},
15
   },
16
   },
16
   unReadNum: 0
17
   unReadNum: 0
17
 }
18
 }
40
     //   }
41
     //   }
41
     // }
42
     // }
42
     case UPDATE_USER_INFO: {
43
     case UPDATE_USER_INFO: {
43
-      const { person, extraInfo } = state.userInfo
44
+      const { person, extraInfo, miniApp = {} } = state.userInfo
44
       // debugger
45
       // debugger
45
       return {
46
       return {
46
         ...state,
47
         ...state,
49
           person: {
50
           person: {
50
             ...person,
51
             ...person,
51
             ...action.payload
52
             ...action.payload
52
-          }
53
+          },
54
+          miniApp,
53
         }
55
         }
54
       }
56
       }
55
     }
57
     }
56
     case USER_SIGNIN: {
58
     case USER_SIGNIN: {
57
-      let { person, extraInfo } = state.userInfo
59
+      let { person, extraInfo, miniApp = {} } = state.userInfo
58
       return {
60
       return {
59
         ...state,
61
         ...state,
60
         userInfo: {
62
         userInfo: {
65
           extraInfo: {
67
           extraInfo: {
66
             ...extraInfo,
68
             ...extraInfo,
67
             havaSigned: 1
69
             havaSigned: 1
68
-          }
70
+          },
71
+          miniApp,
69
         }
72
         }
70
       }
73
       }
71
     }
74
     }