浏览代码

Merge branch 'v4' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v4

许静 5 年前
父节点
当前提交
b185acb5ee

+ 1
- 1
project.config.json 查看文件

1
 {
1
 {
2
 	"miniprogramRoot": "dist/",
2
 	"miniprogramRoot": "dist/",
3
 	"projectname": "mini-chengjiao",
3
 	"projectname": "mini-chengjiao",
4
-	"description": "dev环境",
4
+	"description": "知与行",
5
 	"appid": "wxd9ee3a9480a4e544",
5
 	"appid": "wxd9ee3a9480a4e544",
6
 	"setting": {
6
 	"setting": {
7
 		"urlCheck": false,
7
 		"urlCheck": false,

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

37
   }
37
   }
38
   componentWillUnmount() {
38
   componentWillUnmount() {
39
     const { recordId } = this.state
39
     const { recordId } = this.state
40
-    updatePoint(recordId)
40
+    recordId && updatePoint(recordId)
41
   }
41
   }
42
 
42
 
43
   loadList(pageNumber) {
43
   loadList(pageNumber) {

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

37
   }
37
   }
38
   componentWillUnmount() {
38
   componentWillUnmount() {
39
     const { recordId } = this.state
39
     const { recordId } = this.state
40
-    updatePoint(recordId)
40
+    recordId && updatePoint(recordId)
41
   }
41
   }
42
 
42
 
43
   loadList(pageNumber) {
43
   loadList(pageNumber) {

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

161
   // 打开关闭海报面板
161
   // 打开关闭海报面板
162
   togglePosterVisible = () => {
162
   togglePosterVisible = () => {
163
     const { posterVisible, posters } = this.state
163
     const { posterVisible, posters } = this.state
164
+    debugger
164
 
165
 
165
     if (!posters || !posters.length) {
166
     if (!posters || !posters.length) {
166
       Taro.showToast({
167
       Taro.showToast({
434
 
435
 
435
     return new Promise((resolve) => {
436
     return new Promise((resolve) => {
436
       getMiniQrcode(payload).then(qrCode => {
437
       getMiniQrcode(payload).then(qrCode => {
437
-        this.setState({ qrCode, posterVisible: true }, resolve)
438
+        this.setState({ qrCode }, resolve)
438
       })
439
       })
439
     })
440
     })
440
   }
441
   }

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

41
   }
41
   }
42
   componentWillUnmount() {
42
   componentWillUnmount() {
43
     const { recordId } = this.state
43
     const { recordId } = this.state
44
-    updatePoint(recordId)
44
+    recordId && updatePoint(recordId)
45
 
45
 
46
     this.loadList(1)
46
     this.loadList(1)
47
 
47
 

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

37
 
37
 
38
   componentWillUnmount() {
38
   componentWillUnmount() {
39
     const { recordId } = this.state
39
     const { recordId } = this.state
40
-    updatePoint(recordId)
40
+    recordId && updatePoint(recordId)
41
   }
41
   }
42
   componentDidMount() {
42
   componentDidMount() {
43
     this.loadList()
43
     this.loadList()

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

62
   }
62
   }
63
   componentWillUnmount(){
63
   componentWillUnmount(){
64
     const { recordId } = this.state
64
     const { recordId } = this.state
65
-    updatePoint(recordId)
65
+    recordId && updatePoint(recordId)
66
   }
66
   }
67
   loadList() {
67
   loadList() {
68
     var that = this;
68
     var that = this;

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

101
   }
101
   }
102
   componentWillUnmount() {
102
   componentWillUnmount() {
103
     const { recordId } = this.state
103
     const { recordId } = this.state
104
-    updatePoint(recordId)
104
+    recordId && updatePoint(recordId)
105
   }
105
   }
106
 
106
 
107
   loadData() {
107
   loadData() {

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

62
   }
62
   }
63
   componentWillUnmount(){
63
   componentWillUnmount(){
64
     const { recordId } = this.state
64
     const { recordId } = this.state
65
-    updatePoint(recordId).then(res=>{})
65
+    recordId && updatePoint(recordId)
66
   }
66
   }
67
   onPullDownRefresh = async (rest) => {
67
   onPullDownRefresh = async (rest) => {
68
     const { records: list, total } = await this.loadList(1);
68
     const { records: list, total } = await this.loadList(1);

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

35
   }
35
   }
36
   componentWillUnmount() {
36
   componentWillUnmount() {
37
     const { recordId } = this.state
37
     const { recordId } = this.state
38
-    updatePoint(recordId).then(res => { })
38
+    recordId && updatePoint(recordId)
39
   }
39
   }
40
 
40
 
41
   getPhoneNumber(e, item) {
41
   getPhoneNumber(e, item) {

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

200
   componentWillUnmount() {
200
   componentWillUnmount() {
201
     // socket.closeSocket()
201
     // socket.closeSocket()
202
     const { recordId } = this.state
202
     const { recordId } = this.state
203
-    updatePoint(recordId)
203
+    recordId && updatePoint(recordId)
204
   }
204
   }
205
   // createSocket() {
205
   // createSocket() {
206
   //   const { userInfo: { person: { personId } } } = this.props
206
   //   const { userInfo: { person: { personId } } } = this.props
332
   }
332
   }
333
 
333
 
334
   bindAlbumClick(e) {
334
   bindAlbumClick(e) {
335
+    debugger
335
     e.stopPropagation()
336
     e.stopPropagation()
336
     Taro.chooseImage({
337
     Taro.chooseImage({
337
       count: 1,
338
       count: 1,

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

39
 
39
 
40
   componentWillUnmount() {
40
   componentWillUnmount() {
41
     const { recordId } = this.state
41
     const { recordId } = this.state
42
-    updatePoint(recordId)
42
+    recordId && updatePoint(recordId)
43
   }
43
   }
44
   componentDidShow(){
44
   componentDidShow(){
45
     this.onPullDownRefresh()
45
     this.onPullDownRefresh()

+ 1
- 1
src/pages/project/album/index.js 查看文件

38
   }
38
   }
39
   componentWillUnmount() {
39
   componentWillUnmount() {
40
     const { recordId } = this.state
40
     const { recordId } = this.state
41
-    updatePoint(recordId).then(res => { })
41
+    recordId && updatePoint(recordId)
42
   }
42
   }
43
   // 图片预览
43
   // 图片预览
44
   previewImage(cur, urls) {
44
   previewImage(cur, urls) {

+ 1
- 1
src/pages/project/list/index.js 查看文件

41
 
41
 
42
   componentWillUnmount() {
42
   componentWillUnmount() {
43
     const { recordId } = this.state
43
     const { recordId } = this.state
44
-    updatePoint(recordId)
44
+    recordId && updatePoint(recordId)
45
   }
45
   }
46
 
46
 
47
   componentDidShow() {
47
   componentDidShow() {

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

37
   }
37
   }
38
   componentWillUnmount(){
38
   componentWillUnmount(){
39
     const { recordId } = this.state
39
     const { recordId } = this.state
40
-    updatePoint(recordId).then(res=>{})
40
+    recordId && updatePoint(recordId)
41
   }
41
   }
42
 	onChange = e => {
42
 	onChange = e => {
43
 		this.setState({
43
 		this.setState({