积分优化

components/nodata/nodata.js

@@ -0,0 +1,9 @@
+Component({
+    properties: {
+        isShow: {
+            type: Boolean
+        }
+    },
+    data: {},
+    methods: {}
+});

components/nodata/nodata.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/nodata/nodata.wxml

@@ -0,0 +1,5 @@
+<!--components/nodata/nodata.wxml-->
+<view class="box" wx:if="{{isShow}}">
+    <image src="../../images/nodata.png"  class="image"/>
+    <text class="text">暂无数据~</text>
+</view>

components/nodata/nodata.wxss

@@ -0,0 +1,19 @@
+/* components/nodata/nodata.wxss */
+.box{
+    width: 100%;
+    height: auto;
+    box-sizing: border-box;
+    text-align: center;
+    margin-top: 100rpx;
+}
+.image{
+    width: 450rpx;
+    height: 240rpx;
+}
+.text{
+    width: 100%;
+    height: auto;
+    font-size: 28rpx;
+    color: #BCBCBC;
+    display: block;
+}

pages/mine/mine.js

@@ -1,5 +1,7 @@
 const api = require('../../utils/api')
-import { getTimestamp } from '../../utils/common'
+import {
+  getTimestamp
+} from '../../utils/common'
 const app = getApp()
 
 Page({
@@ -22,13 +24,13 @@ Page({
     completeInfoDialogVisible: false,
     infoCompleted: 0
   },
-  onLoad () {
+  onLoad() {
     this.getUserInfo()
     this.setData({
       infoCompleted: app.globalData.infoCompleted
     })
   },
-  onShow () {
+  onShow() {
     if (!app.globalData.previewImage) {
       this.data.pageNo = 1
       this.data.pageSize = 10
@@ -41,7 +43,7 @@ Page({
         this.getIssueList()
       } else if (this.data.selectedTabBar === 'project') {
         this.getProjectList()
-      } else if (this.data.selectedTabBar  === 'topic') {
+      } else if (this.data.selectedTabBar === 'topic') {
         this.getTopicList()
       }
     }
@@ -74,7 +76,7 @@ Page({
     }
   },
   // tab 切换
-  chooseTabBar (e) {
+  chooseTabBar(e) {
     this.setData({
       nomoreVisible: false,
       nomoreStatus: 'loading',
@@ -90,13 +92,13 @@ Page({
       this.getProjectList()
     } else if (e.currentTarget.dataset.type === 'topic') {
       this.getTopicList()
-    } 
+    }
     this.setData({
       selectedTabBar: e.currentTarget.dataset.type
     })
   },
   // 获取 我的话题列表
-  getTopicList () {
+  getTopicList() {
     this.setData({
       topicList: []
     })
@@ -121,7 +123,7 @@ Page({
     })
   },
   // 获取 我的话题列表 上拉加载
-  loadMoreTopicList () {
+  loadMoreTopicList() {
     const para = {
       pageIndex: this.data.pageNo,
       pageSize: this.data.pageSize
@@ -144,7 +146,7 @@ Page({
     })
   },
   // 获取 我的议题列表
-  getIssueList () {
+  getIssueList() {
     this.setData({
       issueList: []
     })
@@ -165,7 +167,7 @@ Page({
     })
   },
   // 获取 我的项目列表
-  getProjectList () {
+  getProjectList() {
     this.setData({
       projectList: []
     })
@@ -192,7 +194,7 @@ Page({
     })
   },
   // 获取 我的项目列表  上拉加载
-  loadMoreProjectList () {
+  loadMoreProjectList() {
     const para = {
       pageIndex: this.data.pageNo,
       pageSize: this.data.pageSize,
@@ -200,7 +202,7 @@ Page({
     }
     api.getMyProjectList(para).then(res => {
       console.log('我的项目列表', res)
-      const projectList = [...this.data.projectList,...res.data]
+      const projectList = [...this.data.projectList, ...res.data]
       this.setData({
         nomoreStatus: res.data.length === 10 ? 'loading' : 'none',
         preloadVisible: false,
@@ -216,11 +218,11 @@ Page({
     })
   },
   // 获取用户信息
-  getUserInfo () {
+  getUserInfo() {
     api.getUserInfo().then(res => {
       console.log('用户信息', res)
       const userInfo = {}
-      for(const key in this.data.userInfo) {
+      for (const key in this.data.userInfo) {
         userInfo[key] = res.data[key]
       }
       this.setData({
@@ -238,14 +240,17 @@ Page({
     })
   },
   // 完善信息
-  navigateToComplete () {
+  navigateToComplete() {
     wx.navigateTo({
       url: '/pages/complete/complete'
     })
   },
   // 议题列表 跳转详情
-  toIssueDetail (e) {
+  toIssueDetail(e) {
-    const { issueId, state } = e.detail
+    const {
+      issueId,
+      state
+    } = e.detail
     if (state !== '待审核' && state !== '未通过') {
       wx.navigateTo({
         url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=issue&detailId=${issueId}`
@@ -257,21 +262,25 @@ Page({
     }
   },
   // 项目列表 跳转详情
-  toProjectDetail (e) {
+  toProjectDetail(e) {
-    const { itemId } = e.detail
+    const {
+      itemId
+    } = e.detail
     wx.navigateTo({
       url: `/subpages/discussion/pages/discussionDetail/discussionDetail?type=project&detailId=${itemId}`
     })
   },
   // 话题列表 跳转详情
-  toTopicDetail (e) {
+  toTopicDetail(e) {
-    const { topicId } = e.detail
+    const {
+      topicId
+    } = e.detail
     wx.navigateTo({
       url: `/subpages/association/pages/topicDetail/topicDetail?detailId=${topicId}`
     })
   },
   // 我有事说
-  addIssue () {
+  addIssue() {
     if (this.data.infoCompleted == 0) {
       this.setData({
         completeInfoDialogVisible: !this.data.completeInfoDialogVisible
@@ -283,15 +292,21 @@ Page({
     })
   },
   // 跳转到 邀请记录
-  navigateToInviteRecord () {
+  navigateToInviteRecord() {
     wx.navigateTo({
       url: '/subpages/mine/pages/inviteRecord/inviteRecord'
     })
   },
   // 跳转到 网格管理
-  navigateToGridManage () {
+  navigateToGridManage() {
     wx.navigateTo({
       url: '/subpages/mine/pages/gridManage/gridManage'
     })
+  },
+  //跳转到积分中心
+  navigateToIntegralCentre(e) {
+    wx.navigateTo({
+      url: `/subpages/integralCentre/pages/index/index?points = ` + e.currentTarget.dataset.points
+    })
   }
 })

pages/mine/mine.wxml

@@ -25,6 +25,13 @@
             </view>
           </view>
         </view>
+        <view class="bottom" bindtap="navigateToIntegralCentre" data-points="{{userInfo.points}}">
+          <text wx:if="{{userInfo.grade > 0}}" class="text1">等级：{{userInfo.grade}}</text>
+          <text wx:else class="text1">等级：0</text>
+          <text wx:if="{{userInfo.points > 0}}" class="text2">积分：{{userInfo.points}}</text>
+          <text wx:else class="text2">积分：0</text>
+          <text class="text3">积分兑换</text>
+        </view>
         <!-- <view class="bottom">
           <view class="operation" bindtap="navigateToInviteRecord">
             <image src="../../images/mine/yaoqingjilu.png" />
@@ -40,28 +47,13 @@
   </view>
 
   <view class="tab-bar">
-    <view 
+    <view class="type {{selectedTabBar === 'issue' ? 'selected-issue' : ''}}" data-type="issue" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
-      class="type {{selectedTabBar === 'issue' ? 'selected-issue' : ''}}" 
-      data-type="issue"
-      hover-class="hover-tabbar"
-      hover-stay-time="300"
-      bindtap="chooseTabBar">
       我的议题
     </view>
-    <view
+    <view class="type {{selectedTabBar === 'project' ? 'selected-project' : ''}}" data-type="project" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
-      class="type {{selectedTabBar === 'project' ? 'selected-project' : ''}}"
-      data-type="project"
-      hover-class="hover-tabbar"
-      hover-stay-time="300"
-      bindtap="chooseTabBar">
       我的项目
     </view>
-    <view 
+    <view class="type {{selectedTabBar === 'topic' ? 'selected-topic' : ''}}" data-type="topic" hover-class="hover-tabbar" hover-stay-time="300" bindtap="chooseTabBar">
-      class="type {{selectedTabBar === 'topic' ? 'selected-topic' : ''}}"
-      data-type="topic"
-      hover-class="hover-tabbar"
-      hover-stay-time="300"
-      bindtap="chooseTabBar">
       我的话题
     </view>
     <view class="select-bar {{selectedTabBar === 'issue' ? 'selected-issue' : selectedTabBar === 'project' ? 'selected-project' : selectedTabBar === 'topic' ? 'selected-topic' : ''}}"></view>
@@ -72,12 +64,7 @@
       <preload-issue-item wx:for="{{[1]}}" wx:key="{{index}}" wx:for-index="index"></preload-issue-item>
     </block>
     <block wx:if="{{issueList.length > 0}}">
-      <issue-item 
+      <issue-item wx:for="{{issueList}}" wx:key="{{item.id}}" wx:for-item="item" bind:toIssueDetail="toIssueDetail" issueObj="{{item}}">
-        wx:for="{{issueList}}"
-        wx:key="{{item.id}}"
-        wx:for-item="item"
-        bind:toIssueDetail="toIssueDetail"
-        issueObj="{{item}}">
       </issue-item>
     </block>
     <view class="issue-nodata" wx:if="{{issueList.length === 0 && !preloadVisible}}">
@@ -95,16 +82,10 @@
       <preload-project-item wx:for="{{[1]}}" wx:key="{{index}}" wx:for-index="index"></preload-project-item>
     </block>
     <block wx:if="{{projectList.length > 0}}">
-      <project-item 
+      <project-item wx:for="{{projectList}}" wx:for-item="item" wx:key="{{item.id}}" projectObj="{{item}}" bind:toProjectDetail="toProjectDetail" wx:for-index="index">
-        wx:for="{{projectList}}"
-        wx:for-item="item"
-        wx:key="{{item.id}}"
-        projectObj="{{item}}"
-        bind:toProjectDetail="toProjectDetail"
-        wx:for-index="index">
       </project-item>
     </block>
-    <view class="project-nodata"  wx:if="{{projectList.length === 0 && !preloadVisible}}">
+    <view class="project-nodata" wx:if="{{projectList.length === 0 && !preloadVisible}}">
       <image class="no-data" src="../../images/mine/project-nodata.png" />
       <view class="tip">您还没有转为项目的议题，请先发布议题</view>
       <view class="tip">快来点击“我有事说”发布吧</view>
@@ -120,13 +101,7 @@
       <preload-topic-item wx:for="{{[1]}}" wx:key="{{index}}" wx:for-index="index"></preload-topic-item>
     </block>
     <block wx:if="{{topicList.length > 0}}">
-      <topic-item 
+      <topic-item wx:for="{{topicList}}" wx:for-item="item" wx:for-index="index" topicObj="{{item}}" bind:toTopicDetail="toTopicDetail" wx:key="{{item.id}}">
-        wx:for="{{topicList}}"
-        wx:for-item="item"
-        wx:for-index="index"
-        topicObj="{{item}}"
-        bind:toTopicDetail="toTopicDetail"
-        wx:key="{{item.id}}">
       </topic-item>
     </block>
     <view class="topic-nodata" wx:if="{{topicList.length === 0 && !preloadVisible}}">
@@ -137,9 +112,8 @@
   </view>
 
   <load-more loadMoreVisible="{{nomoreVisible}}" loadMoreType="{{nomoreStatus}}"></load-more>
-  
+
 </view>
 
-<completeInfo-dialog
+<completeInfo-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}">
-  completeInfoDialogVisible="{{completeInfoDialogVisible}}">
 </completeInfo-dialog>

pages/mine/mine.wxss

@@ -34,6 +34,21 @@ page {
   z-index: 100;
   overflow: hidden;
 }
+.personal-info .box .content .bottom {
+  margin-top: 50rpx !important;
+  box-sizing: border-box;
+  padding-left: 30rpx;
+  width: 100%;
+  height: 30rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.personal-info .box .content .bottom text{
+  color: #fff;
+  font-size: 30rpx;
+  line-height: 30rpx;
+}
 .personal-info .box .content .top {
   margin-top: 30rpx;
   box-sizing: border-box;

subpages/integralCentre/pages/index/index.js

@@ -12,6 +12,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    points:0,//积分
     pageIndex: 1,
     pageSize: 10,
     pointsRecordlist: [], //积分记录列表
@@ -37,6 +38,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
+    this.setData({//前面页面传过来的积分总数
+      points: options.points
+    })
     this.pointsRecordlist(); //初始化加载积分记录列表
   },
   // tab 切换
@@ -139,8 +143,7 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function (options) {
-
   },
 
   /**

subpages/integralCentre/pages/index/index.json

@@ -3,6 +3,7 @@
   "navigationBarTextStyle": "white",
   "navigationBarBackgroundColor": "#DD5245",
   "usingComponents": {
-    "load-more": "../../../../components/loadMore/loadMore"
+    "load-more": "../../../../components/loadMore/loadMore",
+    "no-data":"../../../../components/nodata/nodata"
   }
 }

subpages/integralCentre/pages/index/index.wxml

@@ -1,6 +1,6 @@
 <view class="home">
   <view class='title'>
-    <text class="number">888</text>
+    <text class="number">{{points}}</text>
     <text class="name">积分</text>
   </view>
   <!-- tabbar -->
@@ -24,6 +24,9 @@
         <text wx:else>+</text>{{item.points}}</view>
       <view class="jf-list-li jf-list-li-last color1">{{item.operationTime}}</view>
     </view>
+    <view wx:if="{{pointsRecordlist.length < 1}}">
+      <no-data isShow="{{true}}"></no-data>
+    </view>
   </block>
   <!-- 积分排行 -->
   <block wx:else>
@@ -47,6 +50,10 @@
       </view>
       <view class="right">{{item.points}}</view>
     </view>
+
+    <view wx:if="{{pointsRankinglist.length < 1}}">
+      <no-data isShow="{{true}}"></no-data>
+    </view>
   </block>
 
   <!--加载更多提示-->

utils/api.js

@@ -160,10 +160,12 @@ function getProjectList(params) {
  * 获取用户信息
  * @param {*} param0
  */
+// function getUserInfo() {
+//   return fly.get('/app-user/user/getInfoById')
+// }
 function getUserInfo() {
-  return fly.get('/app-user/user/getInfoById')
+  return fly.get('app-user/user/getInfoById')
 }
-
 /**
  * 我的群列表
  */