接口请求完善

src/app.config.js

@@ -23,6 +23,7 @@ export default {
     'pages/WoDe/index', // 我的
     'pages/WoDe/Feedback/index', // 我的-反馈
     'pages/WoDe/MyActivityList/index', // 我的-活动列表
+    'pages/WoDe/MyRecommed/index', // 我的-我的推荐
 
     'pages/SignIn/index' // 登录页
 

src/pages/HuiQuanYi/index.vue

@@ -9,6 +9,11 @@
         </view>
       </view>
 
+      <!-- 一荐倾心计划 -->
+      <navigator url="./Recommed/index" hover-class="other-navigator-hover" class="YiJianQingXin">
+        <image mode="widthFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/yijianqingxin.png"></image>
+      </navigator>
+
       <!-- 业主资讯 -->
       <view class="NewsList">
         <view class="flex-h">

src/pages/HuiQuanYi/page.scss

@@ -16,6 +16,12 @@
       background: #ccc;
     }
   }
+  .YiJianQingXin {
+    margin-top: 20px;
+    > image {
+      width: 100%;
+    }
+  }
   .NewsList {
     padding: 20px 0;
     background: #fff;

src/pages/HuiShengHuo/PhotoList/index.vue

@@ -16,7 +16,7 @@
               <view v-for="(subItem, subIndex) in item.List" :key="subIndex">
                 <view class="Img" @tap="CheckBigImg(subItem.imgUrl)">
                   <view class="MainItemImg">
-                    <image mode="aspectFill" :src="item.imgUrl"></image>
+                    <image mode="aspectFill" :src="subItem.imgUrl"></image>
                   </view>
                 </view>
               </view>
@@ -28,7 +28,7 @@
     </ScrollY>
 
     <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
-      <image mode="aspectFit" class="centerLabel" :src="BigImgUrl"></image>
+      <image mode="aspectFit" :src="BigImgUrl"></image>
     </view>
   </view>
 </template>

src/pages/HuiShengHuo/PhotoList/page.scss

@@ -2,7 +2,7 @@
   width: 100%;
   height: 100%;
   background: #fff;
-  >.BigImg {
+  > .BigImg {
     width: 100%;
     position: absolute;
     left: 0;
@@ -11,6 +11,10 @@
     z-index: 100;
     background: rgba(0, 0, 0, 0.7);
     overflow: hidden;
+    > image {
+      width: 100%;
+      height: 100%;
+    }
   }
   .PhotoList {
     > .flex-h {

src/pages/HuiShengHuo/index.vue

@@ -65,7 +65,7 @@
       </ScrollY>
 
       <view class="BigImg" v-if="ShowBigImg" @tap="ShowBigImg = false">
-        <image mode="aspectFit" class="centerLabel" :src="BigImgUrl"></image>
+        <image mode="aspectFit" :src="BigImgUrl"></image>
       </view>
     </view>
   </BasicLayout>

src/pages/HuiShengHuo/page.scss

@@ -11,6 +11,10 @@
     z-index: 100;
     background: rgba(0, 0, 0, 0.7);
     overflow: hidden;
+    > image {
+      width: 100%;
+      height: 100%;
+    }
   }
   .Banner {
     width: 100%;

src/pages/WoDe/MyRecommed/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '我的推荐'
+}

src/pages/WoDe/MyRecommed/index.vue

@@ -0,0 +1,114 @@
+<template>
+  <view class="page MyRecommed">
+    <ScrollY :IsRefreshing="IsRefreshing" @Refresh="Refresh" @ScrollBottom="ScrollBottom">
+      <view class="Container">
+
+        <!-- 标题 -->
+        <view class="Title">
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/wodetuijian.png"></image>
+        </view>
+
+        <view class="NoData" v-show="NoData">
+          <image mode="widthFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/nodata.png"></image>
+          <text>暂无内容</text>
+        </view>
+
+        <!-- 列表 -->
+        <view class="List" v-if="PageList.length">
+          <navigator v-for="(item, index) in PageList" :key="index" :url="`../../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
+            <view class="flex-item">
+              <text>{{item.name}}</text>
+              <text>已报名{{item.enrollNum}}人</text>
+              <text v-if="new Date(item.enrollEnd).getTime() <= Date.now()">已结束</text>
+            </view>
+            <view class="Img">
+              <view>
+                <view class="MainItemImg">
+                  <image mode="aspectFill" :src="item.thumb"></image>
+                </view>
+              </view>
+            </view>
+          </navigator>
+        </view>
+
+      </view>
+    </ScrollY>
+  </view>
+</template>
+
+<script>
+import ScrollY from '../../../components/ScrollY/index'
+import { createNamespacedHelpers } from 'vuex'
+const { mapState: mapUserState, mapActions: mapUserActions } = createNamespacedHelpers('user')
+export default {
+  name: 'MyRecommed',
+  data () {
+    return {
+      NoData: false,
+      PageData: {
+        pageNum: 1,
+        pageSize: 15
+      },
+      PageList: [],
+      HasNextPage: true,
+      IsRefreshing: false,
+      DataLock: false
+    }
+  },
+  computed: {
+    ...mapUserState({
+      UserInfo: x => x.UserInfo // 用户信息
+    })
+  },
+  components: {
+    ScrollY
+  },
+  created () {
+    this.Init() // 初始化
+  },
+  methods: {
+    ...mapUserActions([
+      'GetRecommedList' // 获取推荐的客户列表
+    ]),
+    Init () { // 初始化
+      this.PageData.pageNum = 1
+      this.HasNextPage = true
+      this.PageList = [] // 清空推荐的客户列表
+      this.ToGetPageList() // 获取列表
+    },
+    ToGetPageList () { // 获取列表
+      this.GetRecommedList({
+        urlData: { personId: this.UserInfo.PersonId },
+        queryData: { ...this.PageData }
+      }).then((res) => { // 获取推荐的客户列表
+        this.PageList = [...res.data.data]
+        this.NoData = !this.PageList.length
+        this.HasNextPage = res.data.data.current < res.data.data.pages
+        this.DataLock = false
+        this.IsRefreshing = false
+      }).catch(() => {
+        this.DataLock = false
+        this.IsRefreshing = false
+      })
+    },
+    ScrollBottom () { // 上拉加载
+      if (this.DataLock || !this.HasNextPage) return
+      this.DataLock = true
+      this.PageData.pageNum += 1
+      this.ToGetPageList() // 获取列表
+    },
+    Refresh (e) { // 页面下拉刷新
+      if (this.DataLock) return
+      this.DataLock = true
+      this.IsRefreshing = true
+      setTimeout(() => {
+        this.Init() // 获取列表
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+@import "page.scss";
+</style>

src/pages/WoDe/MyRecommed/page.scss

@@ -0,0 +1,75 @@
+.page.MyRecommed {
+  width: 100%;
+  height: 100%;
+  background: #fff;
+  .Container {
+    > .Title {
+      margin-top: 40px;
+      > image {
+        height: 50px;
+        margin-left: 20px;
+      }
+    }
+    > .List {
+      padding-left: 20px;
+      > .Item {
+        padding: 40px 0;
+        border-bottom: 2px solid #f5f5f5;
+        overflow: visible;
+        > .flex-item {
+          margin-right: 20px;
+          overflow: visible;
+          > text {
+            display: block;
+            font-size: 28px;
+            line-height: 40px;
+            overflow: hidden;
+            margin-top: 6px;
+            &:nth-child(1) {
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 2;
+              margin-top: 0;
+            }
+            &:nth-child(2) {
+              color: #666;
+              font-size: 24px;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+            }
+            &:nth-child(3) {
+              display: inline-block;
+              color: #000;
+              font-size: 24px;
+              line-height: 52px;
+              padding: 0 20px;
+              border-radius: 52px;
+              background: #ccc;
+              box-shadow: 0 10px 20px 5px rgba(0, 0, 0, 0.1);
+              &.active {
+                background: #fe4e45;
+                color: #fff;
+                box-shadow: 0 10px 20px 5px rgba(254, 78, 69, 0.3);
+              }
+            }
+          }
+        }
+        > .Img {
+          width: 34%;
+          margin-right: 20px;
+          position: relative;
+          overflow: hidden;
+          border-radius: 12px;
+          > view {
+            width: 100%;
+            padding-bottom: 70%;
+            background: #ccc;
+            position: relative;
+            overflow: hidden;
+          }
+        }
+      }
+    }
+  }
+}

src/pages/WoDe/index.vue

@@ -22,11 +22,18 @@
     <view class="TabList">
       <navigator url="./MyActivityList/index" hover-class="other-navigator-hover" class="flex-h">
         <view>
-          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/wodeicon1.png"></image>
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/iconhuodong.png"></image>
         </view>
         <text class="flex-item">我的报名</text>
         <text class="iconfont iconjiantouright"></text>
       </navigator>
+      <navigator url="./MyRecommed/index" hover-class="other-navigator-hover" class="flex-h">
+        <view>
+          <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/wodeicon1.png"></image>
+        </view>
+        <text class="flex-item">我的推荐</text>
+        <text class="iconfont iconjiantouright"></text>
+      </navigator>
       <!-- <navigator url="./Feedback/index" hover-class="other-navigator-hover" class="flex-h">
         <view>
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/wodeicon2.png"></image>

src/store/user/index.js

@@ -17,6 +17,21 @@ export default {
     }
   },
   actions: {
+    GetRecommedList (context, payload) { // 获取推荐的客户列表
+      return new Promise((resolve, reject) => {
+        ToolClass.WxRequest({
+          url: Api.GetRecommedList.url,
+          method: Api.GetRecommedList.method,
+          ...payload,
+          success (res) {
+            resolve(res)
+          },
+          error (res) {
+            reject(res)
+          }
+        })
+      })
+    },
     GetUserActivityList (context, payload) { // 获取我的活动列表
       return new Promise((resolve, reject) => {
         ToolClass.WxRequest({

src/util/Api/index.js

@@ -2,6 +2,10 @@
 const prefix = process.env.NODE_ENV === 'production' ? '' : ''
 
 const Api = {
+  GetRecommedList: { // 获取推荐的客户列表
+    method: 'get',
+    url: `${prefix}/person/:personId/recommender`
+  },
   PostRecommed: { // 推荐客户
     method: 'post',
     url: `${prefix}/recommender`