瀏覽代碼

静态页面

xcx 4 年之前
父節點
當前提交
51a46fbded
共有 4 個檔案被更改,包括 12 行新增12 行删除
  1. 1
    1
      src/app.js
  2. 9
    9
      src/pages.js
  3. 1
    1
      src/pages/WoDe/WoDeRenZheng/index.jsx
  4. 1
    1
      src/pages/WoDe/index.jsx

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

55
       success: res => {
55
       success: res => {
56
         if (res.errMsg === 'login:ok') {
56
         if (res.errMsg === 'login:ok') {
57
           request({ ...apis.login, params: { code: res.code, from, recommender, scene, mpOpenId } }).then(x => {
57
           request({ ...apis.login, params: { code: res.code, from, recommender, scene, mpOpenId } }).then(x => {
58
-            setUser({ ...x.person, ShowIndexAdv: false, FirstComing: true, communityId: x.houseList !== null && x.houseList.length ? x.houseList[0].communityId : null, roomId: x.houseList !== null && x.houseList.length ? x.houseList[0].id : null })
58
+            setUser({ ...x.person, ShowIndexAdv: false, FirstComing: true, communityId: x.houseList !== null && x.houseList.length ? x.houseList[0].communityId : null, roomId: x.houseList !== null && x.houseList.length ? x.houseList[0].id : null, roleName: x.houseList !== null && x.houseList.length ? x.houseList[0].roleName : null })
59
             Taro.setStorage({ key: 'token', data: x.token })
59
             Taro.setStorage({ key: 'token', data: x.token })
60
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })
60
             Taro.setStorage({ key: 'sessionKey', data: x.sessionKey })
61
 
61
 

+ 9
- 9
src/pages.js 查看文件

171
   {
171
   {
172
     name: '活动-活动签到',
172
     name: '活动-活动签到',
173
     page: 'pages/HuoDong/HuoDongSign/index',
173
     page: 'pages/HuoDong/HuoDongSign/index',
174
-    auth: ['avatar', 'phone'],
174
+    auth: ['avatar'],
175
     track: {
175
     track: {
176
       event: 'detail',
176
       event: 'detail',
177
       eventType: 'activity',
177
       eventType: 'activity',
180
   {
180
   {
181
     name: '活动-资讯详情',
181
     name: '活动-资讯详情',
182
     page: 'pages/HuoDong/ZiXunDetail/index',
182
     page: 'pages/HuoDong/ZiXunDetail/index',
183
-    auth: ['avatar', 'phone'],
183
+    auth: ['avatar'],
184
     track: {
184
     track: {
185
       event: 'detail',
185
       event: 'detail',
186
       eventType: 'news',
186
       eventType: 'news',
192
   {
192
   {
193
     name: '福利',
193
     name: '福利',
194
     page: 'pages/FuLi/index',
194
     page: 'pages/FuLi/index',
195
-    auth: ['avatar', 'phone'],
195
+    auth: ['avatar'],
196
     track: {
196
     track: {
197
       event: 'list',
197
       event: 'list',
198
       eventType: 'shop',
198
       eventType: 'shop',
201
   {
201
   {
202
     name: '福利搜索',
202
     name: '福利搜索',
203
     page: 'pages/FuLi/ShangPinFilter/index',
203
     page: 'pages/FuLi/ShangPinFilter/index',
204
-    auth: ['avatar', 'phone'],
204
+    auth: ['avatar'],
205
     track: {
205
     track: {
206
       event: 'list',
206
       event: 'list',
207
       eventType: 'shop',
207
       eventType: 'shop',
210
   {
210
   {
211
     name: '福利-商品详情',
211
     name: '福利-商品详情',
212
     page: 'pages/FuLi/ShangPinXiangQing/index',
212
     page: 'pages/FuLi/ShangPinXiangQing/index',
213
-    auth: ['avatar', 'phone'],
213
+    auth: ['avatar'],
214
     track: {
214
     track: {
215
       event: 'detail',
215
       event: 'detail',
216
       eventType: 'shop',
216
       eventType: 'shop',
219
   {
219
   {
220
     name: '福利-商品兑换',
220
     name: '福利-商品兑换',
221
     page: 'pages/FuLi/ShangPinDuiHuan/index',
221
     page: 'pages/FuLi/ShangPinDuiHuan/index',
222
-    auth: ['avatar', 'phone'],
222
+    auth: ['avatar'],
223
     track: {
223
     track: {
224
       event: 'exchange',
224
       event: 'exchange',
225
       eventType: 'shop',
225
       eventType: 'shop',
228
   {
228
   {
229
     name: '福利-积分规则',
229
     name: '福利-积分规则',
230
     page: 'pages/FuLi/JiFenGuiZe/index',
230
     page: 'pages/FuLi/JiFenGuiZe/index',
231
-    auth: ['avatar', 'phone'],
231
+    auth: ['avatar'],
232
     track: {
232
     track: {
233
       event: 'points_rule',
233
       event: 'points_rule',
234
       eventType: 'shop',
234
       eventType: 'shop',
237
   {
237
   {
238
     name: '福利-积分明细',
238
     name: '福利-积分明细',
239
     page: 'pages/FuLi/JiFenMingXi/index',
239
     page: 'pages/FuLi/JiFenMingXi/index',
240
-    auth: ['avatar', 'phone'],
240
+    auth: ['avatar'],
241
     track: {
241
     track: {
242
       event: 'points_details',
242
       event: 'points_details',
243
       eventType: 'shop',
243
       eventType: 'shop',
249
   {
249
   {
250
     name: '我的',
250
     name: '我的',
251
     page: 'pages/WoDe/index',
251
     page: 'pages/WoDe/index',
252
-    auth: ['avatar', 'phone'],
252
+    auth: ['avatar'],
253
     track: {
253
     track: {
254
       event: 'list',
254
       event: 'list',
255
       eventType: 'other',
255
       eventType: 'other',

+ 1
- 1
src/pages/WoDe/WoDeRenZheng/index.jsx 查看文件

59
   const SetDefaultRoom = (item) => {
59
   const SetDefaultRoom = (item) => {
60
     return () => {
60
     return () => {
61
       if (item.id - 0 !== user.roomId - 0) {
61
       if (item.id - 0 !== user.roomId - 0) {
62
-        setUser({ ...user, communityId: item.communityId, roomId: item.id })
62
+        setUser({ ...user, communityId: item.communityId, roomId: item.id, roleName: item.roleName })
63
       }
63
       }
64
     }
64
     }
65
   }
65
   }

+ 1
- 1
src/pages/WoDe/index.jsx 查看文件

79
               </view>
79
               </view>
80
               <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
80
               <view className='flex-item' onClick={() => { Taro.navigateTo({ url: '/pages/WoDe/GeRenXinXi/index' }) }}>
81
                 <text>{user.nickname || '暂未授权用户信息'}</text>
81
                 <text>{user.nickname || '暂未授权用户信息'}</text>
82
-                <text>{user.phone || '暂未授权手机号'}</text>
82
+                <text>{user.phone ? `${user.phone} ${user.roleName}` : '游客'}</text>
83
               </view>
83
               </view>
84
               {
84
               {
85
                 user.havaSigned !== undefined &&
85
                 user.havaSigned !== undefined &&