张延森 5 年前
父节点
当前提交
ea824a056b

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

@@ -190,7 +190,7 @@ export default class Detail extends Component {
190 190
         return
191 191
       }
192 192
 
193
-      const { userInfo: { person } } = this.props
193
+      const { userInfo: { person, miniApp } } = this.props
194 194
       const { avatarurl, nickname, personId } = person
195 195
       const { detail: { dynamicId, posters, createDate } } = this.state
196 196
       const payload = {
@@ -208,6 +208,7 @@ export default class Detail extends Component {
208 208
           title: posters[0].posterTitle,//海报标题
209 209
           posterDescription: posters[0].posterDescription,//海报标题
210 210
           createDate: createDate,//时间
211
+          miniAppName: miniApp.name, // 小程序名称
211 212
         }
212 213
         resolve(data)
213 214
       })

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

@@ -110,16 +110,16 @@ export default class Index extends Component {
110 110
       {
111 111
         x: 100,
112 112
         y: 1065,
113
-        text: '橙蕉',
113
+        text: data.miniAppName,
114 114
         fontSize: 34,
115 115
         color: 'red',
116 116
         baseLine: 'middle',
117 117
         lineHeight: 48,
118
-        width: 120,
118
+        width: (data.miniAppName || '').length * 30 + 60,
119 119
         zIndex: 11
120 120
       },
121 121
       {
122
-        x: 190,
122
+        x: (data.miniAppName || '').length * 30 + 130,
123 123
         y: 1065,
124 124
         text: '热门活动',
125 125
         fontSize: 26,

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

@@ -293,7 +293,7 @@ export default class Index extends Component {
293 293
         resolve(posterData)
294 294
         return
295 295
       }
296
-      const { userInfo: { person }, projectDetail: { buildingId }, cardInfo } = this.props
296
+      const { userInfo: { person, miniApp }, projectDetail: { buildingId }, cardInfo } = this.props
297 297
       const { id } = cardInfo
298 298
       const { personId } = person
299 299
       const payload = {
@@ -301,7 +301,7 @@ export default class Index extends Component {
301 301
         "page": 'pages/card/index',
302 302
       }
303 303
       getMiniQrcode(payload).then(qrcode => {
304
-        let data = Object.assign({ qrcode }, cardInfo)
304
+        let data = Object.assign({ qrcode, miniAppName: miniApp.name }, cardInfo)
305 305
         resolve(data)
306 306
       })
307 307
     })

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

@@ -118,16 +118,16 @@ export default class Index extends Component {
118 118
       {
119 119
         x: 170,
120 120
         y: 755,
121
-        text: '橙蕉',
121
+        text: data.miniAppName,
122 122
         fontSize: 34,
123 123
         color: 'red',
124 124
         baseLine: 'middle',
125 125
         lineHeight: 48,
126
-        width: 120,
126
+        width: (data.miniAppName || '').length * 30 + 60,
127 127
         zIndex: 100
128 128
       },
129 129
       {
130
-        x: 260,
130
+        x: (data.miniAppName || '').length * 30 + 200,
131 131
         y: 755,
132 132
         text: '查看主页',
133 133
         fontSize: 26,
@@ -140,7 +140,7 @@ export default class Index extends Component {
140 140
       {
141 141
         x: 320,
142 142
         y: 1075,
143
-        text: '橙蕉',
143
+        text: data.miniAppName,
144 144
         fontSize: 32,
145 145
         color: '#b5b3b3',
146 146
         baseLine: 'middle',

+ 3
- 2
src/pages/news/detail/index.js 查看文件

@@ -154,7 +154,7 @@ export default class NewsDetail extends Component {
154 154
         resolve(posterData)
155 155
         return
156 156
       }
157
-      const { userInfo: { person } } = this.props
157
+      const { userInfo: { person, miniApp } } = this.props
158 158
       const { avatarurl, nickname, personId } = person
159 159
       const { newsId, detail: { posters, newsName, createDate } } = this.state
160 160
       const payload = {
@@ -171,7 +171,8 @@ export default class NewsDetail extends Component {
171 171
           title: posters[0].posterTitle,//资讯海报标题
172 172
           posterDescription: posters[0].posterDescription,//资讯海报描述
173 173
           createDate: createDate,//资讯时间
174
-          poster: posters[0].posterImg
174
+          poster: posters[0].posterImg,
175
+          miniAppName: miniApp.name,
175 176
         }
176 177
         resolve(data)
177 178
       })

+ 3
- 3
src/pages/news/detail/poster.js 查看文件

@@ -110,16 +110,16 @@ export default class Index extends Component {
110 110
       {
111 111
         x: 100,
112 112
         y: 1065,
113
-        text: '橙蕉',
113
+        text: data.miniAppName,
114 114
         fontSize: 34,
115 115
         color: 'red',
116 116
         baseLine: 'middle',
117 117
         lineHeight: 48,
118
-        width: 120,
118
+        width: (data.miniAppName || '').length * 30 + 60,
119 119
         zIndex: 11
120 120
       },
121 121
       {
122
-        x: 190,
122
+        x: (data.miniAppName || '').length * 30 + 130,
123 123
         y: 1065,
124 124
         text: '查看资讯',
125 125
         fontSize: 26,

+ 3
- 2
src/pages/project/detail/index.js 查看文件

@@ -297,7 +297,7 @@ export default class Index extends Component {
297 297
         return
298 298
       }
299 299
       const {
300
-        userInfo: { person: { avatarurl, nickname, personId } },
300
+        userInfo: { person: { avatarurl, nickname, personId }, miniApp },
301 301
         projectDetail: { posters, buildingId, poster, price, buildingRestaurant, createDate, buildingName, tel, buildingTag, uvList = {} }
302 302
       } = this.props
303 303
       const { total = 0 } = uvList
@@ -319,7 +319,8 @@ export default class Index extends Component {
319 319
           buildingName: posters[0].posterTitle,//标题
320 320
           createDate: createDate,//时间
321 321
           buildingTag: buildingTag,//标签,
322
-          total: total//围观人数
322
+          total: total, //围观人数
323
+          miniAppName: miniApp.name,
323 324
         }
324 325
         resolve(data)
325 326
       })

+ 3
- 3
src/pages/project/detail/poster.js 查看文件

@@ -101,16 +101,16 @@ export default class Index extends Component {
101 101
       {
102 102
         x: 100,
103 103
         y: 1070,
104
-        text: '橙蕉',
104
+        text: data.miniAppName,
105 105
         fontSize: 34,
106 106
         color: 'red',
107 107
         baseLine: 'middle',
108 108
         lineHeight: 48,
109
-        width: 120,
109
+        width: (data.miniAppName || '').length * 30 + 60,
110 110
         zIndex: 11
111 111
       },
112 112
       {
113
-        x: 190,
113
+        x: (data.miniAppName || '').length * 30 + 130,
114 114
         y: 1070,
115 115
         text: '项目详情',
116 116
         fontSize: 26,