请求数据逻辑编写

project.config.json

@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": true,
+		"useCompilerModule": false,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/pages/HuiAiXin/index.vue

@@ -104,7 +104,7 @@ export default {
       this.EmptyHuiAiXinBanner() // 清空荟爱心banner
       this.EmptyMingXingYeZhuList() // 清空明星业主列表
       this.EmptyZhengNengLiangShiJiList() // 清空正能量事迹列表
-      this.GetHuiAiXinBanner({ queryData: { accountId: 5, pageNum: 1, pageSize: 5 } }).then(() => { // 获取荟爱心banner
+      this.GetHuiAiXinBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'love' } }).then(() => { // 获取荟爱心banner
         this.CheckRequestNum(3) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(3) // 判断请求接口个数

src/pages/HuiQuanYi/index.vue

@@ -72,12 +72,12 @@ export default {
       this.RequestNum = 0
       this.EmptyQuanYiBanner() // 清空荟权益banner
       this.EmptyYeZhuZiXunList() // 清空业主资讯列表
-      this.GetHuiQuanYiBanner({ queryData: { accountId: 5, pageNum: 1, pageSize: 5 } }).then(() => { // 获取荟权益banner
+      this.GetHuiQuanYiBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'right' } }).then(() => { // 获取荟权益banner
         this.CheckRequestNum(2) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(2) // 判断请求接口个数
       })
-      this.GetYeZhuZiXunList({ queryData: { accountId: 5, pageNum: 1, pageSize: 10 } }).then(() => { // 获取业主资讯列表
+      this.GetYeZhuZiXunList({ queryData: { pageNum: 1, pageSize: 10, typeId: 1 } }).then(() => { // 获取业主资讯列表
         this.CheckRequestNum(2) // 判断请求接口个数
       }).catch(() => {
         this.CheckRequestNum(2) // 判断请求接口个数

src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue

@@ -73,7 +73,9 @@
 </template>
 
 <script>
-
+import { createNamespacedHelpers } from 'vuex'
+const { mapActions: mapIndexActions } = createNamespacedHelpers('index')
+const { mapState: mapUserState } = createNamespacedHelpers('user')
 export default {
   name: 'HuoDongXiangQing',
   data () {
@@ -99,13 +101,22 @@ export default {
       ]
     }
   },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo // 用户信息
+    })
+  },
   components: {
   },
   created () {
     this.Init()
   },
   methods: {
+    ...mapIndexActions([
+      'GetActivityDetail' // 获取活动详情
+    ]),
     Init () {
+      this.GetActivityDetail({ urlData: { id: 1 } })
     }
   }
 }

src/pages/HuiShengHuo/ActivityList/index.vue

@@ -6,7 +6,7 @@
       <scroll-view scroll-x="true">
         <view class="NavX">
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/jingcaihuodong.png"></image>
-          <view v-for="(item, index) in HuoDongNavList" :key="index" :class="{'active': CurrentNavId === index}" @tap="CutNav(item, index)">导航{{index + 1}}</view>
+          <view v-for="(item, index) in HuoDongNavList" :key="index" :class="{'active': CurrentNavId - 0 === item.Id - 0}" @tap="CutNav(item)">{{item.Name}}</view>
         </view>
       </scroll-view>
     </view>
@@ -52,7 +52,15 @@ export default {
         pageNum: 1,
         pageSize: 15
       },
-      CurrentNavId: null,
+      HuoDongNavList: [
+        { Name: '暖场活动', Id: '1' },
+        { Name: '六点半学堂', Id: '2' },
+        { Name: '夜跑行动', Id: '3' },
+        { Name: '美好出游季', Id: '4' },
+        { Name: '旧衣飞行', Id: '5' },
+        { Name: '丽园助农', Id: '6' }
+      ],
+      CurrentNavId: 1,
       HasNextPage: true,
       IsRefreshing: false,
       DataLock: false
@@ -60,7 +68,6 @@ export default {
   },
   computed: {
     ...mapIndexState({
-      HuoDongNavList: x => x.HuoDongNavList, // 活动类型列表
       ActivityList: x => x.ActivityList // 活动列表
     })
   },
@@ -68,21 +75,13 @@ export default {
     ScrollY
   },
   created () {
-    this.EmptyActivityList() // 清空活动列表
-    this.GetHuoDongNavList({ queryData: { accountId: 5, pageNum: 1, pageSize: 10 } }).then(() => { // 获取活动类型列表
-      if (this.HuoDongNavList.length) {
-        this.CurrentNavId = 0
-        this.Init() // 初始化
-      }
-    })
+    this.Init() // 初始化
   },
   methods: {
     ...mapIndexActions([
-      'GetHuoDongNavList', // 获取活动类型列表
       'GetActivityList' // 获取活动列表
     ]),
     ...mapIndexMutations([
-      'EmptyHuoDongNavList', // 清空活动类型列表
       'EmptyActivityList' // 清空活动列表
     ]),
     Init () { // 初始化
@@ -94,11 +93,11 @@ export default {
     LinkTo (url) { // 跳转页面
       wx.navigateTo({ url })
     },
-    CutNav (item, index) { // 切换导航
+    CutNav (item) { // 切换导航
       if (this.DataLock) return
       this.DataLock = true
       this.EmptyActivityList() // 清空活动列表
-      this.CurrentNavId = index
+      this.CurrentNavId = item.Id
       setTimeout(() => {
         this.Init() // 初始化
       }, 300)
@@ -110,7 +109,7 @@ export default {
       this.ToGetPageList() // 获取列表
     },
     ToGetPageList () { // 获取列表
-      this.GetActivityList({ queryData: { accountId: 5, ...this.PageData } }).then((res) => { // 获取活动列表
+      this.GetActivityList({ queryData: { ...this.PageData, typeId: this.CurrentNavId } }).then((res) => { // 获取活动列表
         this.HasNextPage = res.data.data.hasNextPage
         this.DataLock = false
         this.IsRefreshing = false

src/pages/HuiShengHuo/index.vue

@@ -104,20 +104,20 @@ export default {
       this.EmptyIndexBanner() // 清空首页banner
       this.EmptyPhotoList() // 清空照片墙列表
       this.EmptyActivityList() // 清空活动列表
-      this.GetIndexBanner({ queryData: { accountId: 5, pageNum: 1, pageSize: 5 } }).then(() => { // 获取首页banner
-        this.CheckRequestNum(3) // 判断请求接口个数
+      this.GetIndexBanner({ queryData: { pageNum: 1, pageSize: 10, position: 'left' } }).then(() => { // 获取首页banner
+        this.CheckRequestNum(2) // 判断请求接口个数
       }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
+        this.CheckRequestNum(2) // 判断请求接口个数
       })
-      this.GetPhotoList({ queryData: { accountId: 5, pageNum: 1, pageSize: 10 } }).then(() => { // 获取照片墙列表
-        this.CheckRequestNum(3) // 判断请求接口个数
+      // this.GetPhotoList({ queryData: { pageNum: 1, pageSize: 10, typeId: 2 } }).then(() => { // 获取照片墙列表
+      //   this.CheckRequestNum(2) // 判断请求接口个数
+      // }).catch(() => {
+      //   this.CheckRequestNum(2) // 判断请求接口个数
+      // })
+      this.GetActivityList({ queryData: { pageNum: 1, pageSize: 10, typeId: 1 } }).then(() => { // 获取活动列表
+        this.CheckRequestNum(2) // 判断请求接口个数
       }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
-      })
-      this.GetActivityList({ queryData: { accountId: 5, pageNum: 1, pageSize: 10 } }).then(() => { // 获取活动列表
-        this.CheckRequestNum(3) // 判断请求接口个数
-      }).catch(() => {
-        this.CheckRequestNum(3) // 判断请求接口个数
+        this.CheckRequestNum(2) // 判断请求接口个数
       })
     },
     CheckRequestNum (num) { // 判断请求接口个数

src/pages/SignIn/index.vue

@@ -18,7 +18,7 @@
 
 <script>
 import { createNamespacedHelpers } from 'vuex'
-const { mapState: mapUserState, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
+const { mapState: mapUserState, mapActions: mapUserActions, mapMutations: mapUserMutations } = createNamespacedHelpers('user')
 export default {
   name: 'DengLu',
   data () {
@@ -38,8 +38,12 @@ export default {
     this.Init()
   },
   methods: {
+    ...mapUserActions([
+      'MainSignIn', // 获取用户信息
+      'GetUserPhone' // 获取用户手机号
+    ]),
     ...mapUserMutations([
-      'EditUserInfo'
+      'EditUserInfo' // 编辑用户信息
     ]),
     Init () {
       this.ToLogin()
@@ -51,13 +55,10 @@ export default {
       let _that = this
       wx.login({
         success (res) {
-          wx.request({ // 获取用户信息
-            url: `https://dev.fangdeal.cn/liyuanhui/wx/login?code=${res.code}`,
-            method: 'post',
-            success: (res) => {
-              _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
-              _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
-            }
+          _that.MainSignIn({ queryData: { code: res.code } }).then((res) => { // 获取用户信息
+            _that.EditUserInfo({ name: 'PersonId', value: res.data.data.person.personId })
+            _that.EditUserInfo({ name: 'OpenId', value: res.data.data.person.openId })
+            _that.GetUserPhone({ urlData: { personId: _that.UserInfo.PersonId } })
           })
         }
       })

src/store/index/index.js

@@ -223,6 +223,21 @@ export default {
         })
       })
     },
+    GetActivityDetail (context, payload) { // 获取活动详情
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.GetActivityDetail.url,
+          method: Api.GetActivityDetail.method,
+          ...payload,
+          success (res) {
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
     GetActivityList (context, payload) { // 获取活动列表
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({

src/store/user/index.js

@@ -17,14 +17,30 @@ export default {
     }
   },
   actions: {
-    GetUserPlaylist (context, payload) {
+    GetUserPhone (context, payload) { // 获取用户手机号
+      payload = { ...payload, IsSigIn: true }
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({
-          url: Api.GetUserPlaylist.url,
-          method: Api.GetUserPlaylist.method,
+          url: Api.GetUserPhone.url,
+          method: Api.GetUserPhone.method,
+          ...payload,
+          success (res) {
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
+    MainSignIn (context, payload) { // 登录
+      payload = { ...payload, IsSigIn: true }
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.MainSignIn.url,
+          method: Api.MainSignIn.method,
           ...payload,
           success (res) {
-            context.commit('UpdateUserPlaylist', res.data.data.list)
             resolve(res)
           },
           error (res) {

src/util/Api/index.js

@@ -2,21 +2,33 @@
 const prefix = process.env.NODE_ENV === 'production' ? '' : ''
 
 const Api = {
+  MainSignIn: { // 登录
+    method: 'post',
+    url: `${prefix}/login`
+  },
+  GetUserPhone: { // 获取用户手机号
+    method: 'post',
+    url: `${prefix}/person/:personId/phone`
+  },
   GetIndexBanner: { // 获取首页banner
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/advert`
   },
   GetPhotoList: { // 获取照片墙列表
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/activity`
   },
   GetActivityList: { // 获取活动列表
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/activity`
+  },
+  GetActivityDetail: { // 获取活动详情
+    method: 'get',
+    url: `${prefix}/activity/:id`
   },
   GetHuiQuanYiBanner: { // 获取荟权益banner
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/advert`
   },
   GetYeZhuZiXunList: { // 获取业主资讯列表
     method: 'get',
@@ -24,23 +36,23 @@ const Api = {
   },
   GetHuiAiXinBanner: { // 获取荟爱心banner
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/advert`
   },
   GetMingXingYeZhuList: { // 获取明星业主列表
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/activity`
   },
   GetZhengNengLiangShiJiList: { // 获取正能量事迹列表
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/activity`
   },
   GetHuoDongNavList: { // 获取活动类型列表
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/activity`
   },
   GetUserActivityList: { // 获取我的活动列表
     method: 'get',
-    url: `${prefix}/news`
+    url: `${prefix}/activity`
   }
 }
 

src/util/PublicMethod/index.js

@@ -11,6 +11,7 @@ const ToolClass = {
     }, url)
   },
   WxRequest (config) { // 网络请求
+    let _that = this
     let urlData = qs.stringify(config.urlData)
     let queryData = qs.stringify(config.queryData)
     if (config.url.indexOf(':') > -1) {
@@ -33,23 +34,38 @@ const ToolClass = {
       ...(config.data || {}),
       header: { ...Header },
       success: (res) => {
-        console.log(res)
         if (res.header['X-Authorization-JWT'] !== undefined) { // 更新本地存储token
           wx.setStorageSync('token', res.header['X-Authorization-JWT'])
         }
         if (res.data.code - 0 === 1001) { // token失效
-          wx.navigateTo({url: '../../SignIn/index'})
+          wx.login({ // 微信获取code
+            success (subRes) {
+              wx.request({ // 登录获取token
+                url: `https://dev.fangdeal.cn/liyuanhui/wx/login?code=${subRes.code}`,
+                method: `post`,
+                success: (cRes) => {
+                  if (cRes.header['X-Authorization-JWT'] !== undefined) { // 更新本地存储token
+                    wx.setStorageSync('token', cRes.header['X-Authorization-JWT'])
+                    _that.WxRequest(config) // 获得token之后重新请求接口
+                  }
+                }
+              })
+            }
+          })
         }
-        if (config.success !== undefined) {
+        if (config.success !== undefined && res.data.code - 0 === 1000) {
           config.success(res)
         }
+        if (config.error !== undefined && res.data.code - 0 !== 1000) {
+          config.error(res)
+        }
       },
       fail: (res) => {
         if (res.header['X-Authorization-JWT'] !== undefined) { // 更新本地存储token
           wx.setStorageSync('token', res.header['X-Authorization-JWT'])
         }
         if (res.data.code - 0 === 1001) { // token失效
-          wx.navigateTo({url: '../../SignIn/index'})
+          wx.navigateTo({ url: '../../pages/SignIn/index' })
         }
         if (config.error !== undefined) {
           config.error(res)