张延森 5 anos atrás
pai
commit
26cb8633ab

+ 2
- 2
config/dev.js Ver arquivo

@@ -9,8 +9,8 @@ module.exports = {
9 9
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
10 10
     // HOST: '"https://lt.pawoma.cn"',
11 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 15
   weapp: {},
16 16
   h5: {}

+ 1
- 1
project.config.json Ver arquivo

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

+ 6
- 2
src/components/Poster/index.js Ver arquivo

@@ -4,6 +4,10 @@ import { TaroCanvasDrawer } from '@components/taro-plugin-canvas';
4 4
 import './style.scss';
5 5
 
6 6
 export default class Poster extends Component {
7
+  static options = {
8
+    addGlobalClass: true
9
+  }
10
+
7 11
   state = {
8 12
     images: [],
9 13
     done: false,
@@ -80,7 +84,7 @@ export default class Poster extends Component {
80 84
       }
81 85
 
82 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 88
         this.tmpImgs = [];
85 89
         Taro.hideLoading();
86 90
       }
@@ -90,7 +94,7 @@ export default class Poster extends Component {
90 94
   onCreateFail = (inx) => (err) => {
91 95
     this.tmpImgs[inx] = undefined
92 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 98
       this.tmpImgs = [];
95 99
       Taro.hideLoading();
96 100
     }

+ 6
- 2
src/pages/activity/detail/assemble.js Ver arquivo

@@ -25,6 +25,7 @@ const waitImg = require('@assets/helpgroup/wait.png')
25 25
 const memberImg = require('@assets/helpgroup/group/member.png')
26 26
 const successImg = require('@assets/helpgroup/group/success.png')
27 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 31
 const ActBeforeStart = 0;
@@ -477,10 +478,13 @@ export default class Detail extends Component {
477 478
     const posterData = {
478 479
       title: posters[0] ? posters[0].posterTitle : '',
479 480
       desc: posters[0] ? posters[0].posterDescription : '',
480
-      poster: posters[0] ? posters[0].posterImg : '',
481
+      poster: posters[0] ? getDownloadURL(posters[0].posterImg, 'alioss') : '',
481 482
       name: userInfo.person.name || userInfo.person.nickname,
482
-      qrcode: qrCode,
483
+      qrcode: getDownloadURL(qrCode, 'alioss'),
484
+      quote: getDownloadURL(quoteImg, 'alioss'),
483 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 Ver arquivo

@@ -23,6 +23,7 @@ import { connect } from '@tarojs/redux'
23 23
 
24 24
 const successImg = 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/help/success2.png'
25 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 27
 const waitImg = require('@assets/helpgroup/wait.png')
27 28
 
28 29
 // 活动状态
@@ -478,10 +479,13 @@ export default class Detail extends Component {
478 479
     const posterData = {
479 480
       title: posters[0] ? posters[0].posterTitle : '',
480 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 491
     const posterConfigs = this.transTPLs2Configs(posterTpls, posterData)

+ 7
- 4
src/reducers/user.js Ver arquivo

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