Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_qmhh_web into xieying

api/mine.js

         method: 'GET',
         data
     })
+}
+/**
+ * 积分获取明细
+ */
+export const pointDetail = function (data) {
+    return request({
+        url: '/my/pointsDetail',
+        method: 'GET',
+        data
+    })
+}
+/**
+ * 查询积分列表
+ */
+export const messageList = function (data) {
+    return request({
+        url: '/message/list',
+        method: 'GET',
+        data
+    })
+}
+/**
+ * 查看消息详情
+ */
+export const messageDetail = function (data) {
+    return request({
+        url: '/message/deail',
+        method: 'GET',
+        data
+    })
+}
+/**
+ * 全部已读
+ */
+export const readAll = function (data) {
+    return request({
+        url: '/message/read',
+        method: 'PUT',
+        data
+    })
 }

app.json

             ]
         },
         {
-            "root": "package_B",
+            "root": "package_mine",
             "pages": [
                 "pages/records/index",
                 "pages/feedbackDetail/index",
                 "pages/approveId/index",
                 "pages/exchange/index",
                 "pages/IdList/index",
-                "pages/submitSuccess/index"
+                "pages/submitSuccess/index",
+                "pages/history/index",
+                "pages/notice/index",
+                "pages/noticeDetail/index"
             ]
         }
     ],

package_B/pages/IdList/index.js → package_mine/pages/IdList/index.js

-// package_B/pages/IdList/index.js
+// package_mine/pages/IdList/index.js
 Page({
 
     /**
             applyIdentityName: detail.identityName
         }
         wx.navigateTo({
-            url: '/package_B/pages/approveId/index?data=' + JSON.stringify(params),
+            url: '/package_mine/pages/approveId/index?data=' + JSON.stringify(params),
         })
     },
 

package_B/pages/IdList/index.wxml → package_mine/pages/IdList/index.wxml

-<!--package_B/pages/IdList/index.wxml-->
+<!--package_mine/pages/IdList/index.wxml-->
 <view class="id_container">
     <list id="list" class="id_list" url="{{current}}" bind:update-list="updateList" list="{{list}}" bind:reset-list="resetList" params="{{params}}">
         <view class="id_item" data-item="{{item}}" bindtap="showDetail" wx:for="{{list}}" wx:key="index">

package_B/pages/IdList/index.wxss → package_mine/pages/IdList/index.wxss

-/* package_B/pages/IdList/index.wxss */
+/* package_mine/pages/IdList/index.wxss */
 .id_container {
     width: 100%;
     height: 100vh;

package_B/pages/approveId/index.js → package_mine/pages/approveId/index.js

-// package_B/pages/approveId/index.js
+// package_mine/pages/approveId/index.js
 import {approveIdenty} from '../../../api/mine.js'
 import {isPositiveInteger} from '../../../utils/check.js'
 
                 approveIdenty(params).then(res => {
                     if (res.code === 0) {
                         wx.reLaunch({
-                            url: '/package_B/pages/submitSuccess/index',
+                            url: '/package_mine/pages/submitSuccess/index',
                         })
                     }
                 }).finally(()=>{

package_B/pages/approveId/index.wxml → package_mine/pages/approveId/index.wxml

-<!--package_B/pages/approveId/index.wxml-->
+<!--package_mine/pages/approveId/index.wxml-->
 <view class="approve_container">
 <text class="approve_title">请提交你的申请信息</text>
     <view class="form_container">

package_B/pages/approveId/index.wxss → package_mine/pages/approveId/index.wxss

-/* package_B/pages/approveId/index.wxss */
+/* package_mine/pages/approveId/index.wxss */
 .approve_container {
     width: 100%;
     padding: 0 60rpx;

package_B/pages/beauties/index.js → package_mine/pages/beauties/index.js

-// package_B/pages/beauties/index.js
+// package_mine/pages/beauties/index.js
 Page({
 
     /**
     showDetail(e) {
         let data = e.currentTarget.dataset.item
         wx.navigateTo({
-          url: '/package_B/pages/senceDetail/index?data='+ JSON.stringify(data),
+          url: '/package_mine/pages/senceDetail/index?data='+ JSON.stringify(data),
         })
     }
 

package_B/pages/beauties/index.wxml → package_mine/pages/beauties/index.wxml

-<!--package_B/pages/beauties/index.wxml-->
+<!--package_mine/pages/beauties/index.wxml-->
 <view class="protect_container">
     <list id="list" class="feedback_list" url="{{current}}" bind:update-list="updateList" list="{{list}}" bind:reset-list="resetList" params="{{params}}">
         <view class="feedback_item" data-item="{{item}}" bindtap="showDetail" wx:for="{{list}}" wx:key="index">

package_B/pages/beauties/index.wxss → package_mine/pages/beauties/index.wxss

-/* package_B/pages/beauties/index.wxss */
+/* package_mine/pages/beauties/index.wxss */
 .protect_container {
     width: 100%;
     min-height: 100vh;

package_B/pages/exchange/index.js → package_mine/pages/exchange/index.js

-// package_B/pages/exchange/index.js
+// package_mine/pages/exchange/index.js
 Page({
 
     /**
     // showDetail(e) {
     //     let data = e.currentTarget.dataset.item
     //     wx.navigateTo({
-    //     url: '/package_B/pages/feedbackDetail/index?data='+ JSON.stringify(data),
+    //     url: '/package_mine/pages/feedbackDetail/index?data='+ JSON.stringify(data),
     //     })
     // }
 })

package_B/pages/exchange/index.wxml → package_mine/pages/exchange/index.wxml

-<!--package_B/pages/exchange/index.wxml-->
+<!--package_mine/pages/exchange/index.wxml-->
 <view class="protect_container">
     <list id="list" class="exchange_list" url="{{current}}" bind:update-list="updateList" list="{{list}}" bind:reset-list="resetList" params="{{params}}">
         <view class="exchange_item" data-item="{{item}}" wx:for="{{list}}" wx:key="index">

package_B/pages/exchange/index.wxss → package_mine/pages/exchange/index.wxss

-/* package_B/pages/exchange/index.wxss */
+/* package_mine/pages/exchange/index.wxss */
 .protect_container {
     width: 100%;
     height: 100vh;

package_B/pages/feedbackDetail/index.js → package_mine/pages/feedbackDetail/index.js

-// package_B/pages/feedbackDetail/index.js
+// package_mine/pages/feedbackDetail/index.js
 Page({
 
     /**

package_B/pages/feedbackDetail/index.wxml → package_mine/pages/feedbackDetail/index.wxml

-<!--package_B/pages/feedbackDetail/index.wxml-->
+<!--package_mine/pages/feedbackDetail/index.wxml-->
 <view class="detail_container">
     <view class="detail_main">
         <view class="detail_item">

package_B/pages/feedbackDetail/index.wxss → package_mine/pages/feedbackDetail/index.wxss

-/* package_B/pages/feedbackDetail/index.wxss */
+/* package_mine/pages/feedbackDetail/index.wxss */
 .detail_container {
     width: 100%;
     padding: 0 30rpx;

package_mine/pages/history/index.js

+Page({
+  data: {
+    // 列表数据筛选条件
+    params: {
+      openid: null
+    },
+    list: [],
+    current: "",
+  },
+  onLoad() {
+    const openid = wx.getStorageSync('openid')
+    this.setData(
+        {
+          params:{ openid },
+          current:'/my/pointsDetail' 
+        }
+      )
+  },
+  /* 更新数据 */
+  updateList(e) {
+    let list = this.data.list.concat(e.detail || [])
+    this.setData({ list })
+  },
+  /* 重置数据 */
+  resetList() {
+    this.setData({ list: [] })
+  },
+})

package_mine/pages/history/index.json

+{
+  "usingComponents": {
+    "list": "../../../components/List/index"
+  },
+  "navigationBarTitleText": "积分明细",
+  "navigationBarBackgroundColor": "#0066FF"
+}

package_mine/pages/history/index.wxml

+<view class="history__container">
+  <view class="history__back"></view>
+  <view class="history__content">
+    <list id="list" class="history_list" url="{{current}}" bind:update-list="updateList" list="{{list}}" bind:reset-list="resetList" params="{{params}}">
+        <view class="history__item" data-item="{{item}}" wx:for="{{list}}" wx:key="index">
+          <view class="item__content">
+            <view class="item__title">
+              {{item.changeName}}
+            </view>
+            <view class="item__time">
+              {{item.createTime}}
+            </view>
+          </view>
+          <view class="item__score {{item.type===1? 'plus' : 'minus'}}">
+            {{ item.type === 1 ? '+' : '-' }}{{item.pointsChange}}
+          </view>
+        </view>
+    </list>
+  </view>
+</view>

package_mine/pages/history/index.wxss

+.history__container{
+  position: relative;
+  background: rgba(241, 244, 245, 1);
+}
+
+.history__back{
+  position: absolute;
+  width: 100%;
+  height: 300rpx;
+  background: linear-gradient(180deg,rgba(0, 102, 255, 1), rgba(0, 140, 255, 0));
+}
+
+.history__content{
+  position: relative;
+  padding: 30rpx;
+  height: 100vh;
+}
+
+.history__item{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 40rpx 70rpx 50rpx 60rpx;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 20rpx;
+  margin-bottom: 14rpx;
+}
+
+.history__item :last-child{
+  margin-bottom: 0;
+}
+
+.item__content{
+  display: flex;
+  flex-direction: column;
+}
+
+.item__title{
+  font-size: 32rpx;
+  margin-bottom: 16rpx;
+}
+.item__time{
+  font-size: 26rpx;
+  font-weight: 400;
+  color: #7B8280;
+}
+.item__score{
+  font-size: 44rpx;
+  font-weight: bold;
+}
+.item__score.plus{
+  color: rgba(50, 117, 233, 1);
+}
+.item__score.minus{
+  color: rgba(247, 96, 0, 1);
+}

package_B/pages/myId/index.js → package_mine/pages/myId/index.js

-// package_B/pages/myId/index.js
+// package_mine/pages/myId/index.js
 import {getIdApprove} from '../../../api/mine.js'
 Page({
 
     // 重新申请
     reApprove() {
         wx.navigateTo({
-          url: '/package_B/pages/IdList/index',
+          url: '/package_mine/pages/IdList/index',
         })
     },
     // 返回我的页面

package_B/pages/myId/index.wxml → package_mine/pages/myId/index.wxml

-<!--package_B/pages/myId/index.wxml-->
+<!--package_mine/pages/myId/index.wxml-->
 <view class="myid_container">
     <view class="records_box" wx:if="{{records}}">
         <view class="record_title">您当前申请的身份</view>

package_B/pages/myId/index.wxss → package_mine/pages/myId/index.wxss

-/* package_B/pages/myId/index.wxss */
+/* package_mine/pages/myId/index.wxss */
 .myid_container {
     width: 100%;
     padding: 0 30rpx;

package_mine/pages/notice/index.js

+Page({
+  data: {
+    // 列表数据筛选条件
+    params: {
+      openId: null
+    },
+    skip: false,
+    queryId: null,
+    list: [],
+    current: "",
+  },
+  onLoad() {
+    const openId = wx.getStorageSync('openid')
+    this.setData(
+        {
+          params:{ openId },
+          current:'/message/list' 
+        }
+      )
+  },
+  onShow(){
+    if(this.data.skip){
+      const {list,queryId} = this.data
+      list.forEach((item)=>{
+        if(item.id === queryId){
+          item.status = 2
+        }
+      })
+      this.setData({
+        list,
+        skip: false,
+        queryId: null
+      })
+    }
+  },
+  /* 更新数据 */
+  updateList(e) {
+    let list = this.data.list.concat(e.detail || [])
+    this.setData({ list })
+  },
+  /* 重置数据 */
+  resetList() {
+    this.setData({ list: [] })
+  },
+  handleDetail(e) {
+    const {id} = e.currentTarget.dataset
+    this.setData({
+      skip: true,
+      queryId: id
+    })
+    wx.navigateTo({
+      url: '/package_mine/pages/noticeDetail/index?msgId=' + id,
+    })
+  }
+})

package_mine/pages/notice/index.json

+{
+  "usingComponents": {
+    "list": "../../../components/List/index"
+  },
+  "navigationBarTitleText": "消息通知",
+  "navigationBarBackgroundColor": "#FFFFFF"
+}

package_mine/pages/notice/index.wxml

+<view class="notice__container">
+  <view class="notice__content">
+    <list id="list2" class="notice_list" url="{{current}}" bind:update-list="updateList" list="{{list}}" bind:reset-list="resetList" params="{{params}}">
+        <view class="notice__item" data-item="{{item}}" wx:for="{{list}}" wx:key="index">
+          <view class="item__time" >{{ item.createTime }}</view>
+          <view class="item__container" data-id="{{item.id}}" bindtap="handleDetail">
+            <view class="item__title">
+              <view class="title__left {{item.status === 1 ? 'no--read' : 'is--read'}}" >
+                <image src="../../../assets/img/notice.png"></image>
+                系统消息
+              </view>
+              <view class="title__right">
+                查看详情
+              </view>
+            </view>
+            <view class="item__content">
+              {{ item.msgDetail }}
+            </view>
+          </view>
+        </view>
+    </list>
+  </view>
+</view>

package_mine/pages/notice/index.wxss

+.notice__container{
+  position: relative;
+  background: rgba(241, 244, 245, 1);
+}
+
+.notice__content{
+  position: relative;
+  padding: 30rpx 40rpx;
+  height: 100vh;
+}
+
+.notice__item{
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  /* justify-content: space-between; */
+  /* padding: 40rpx 70rpx 50rpx 60rpx; */
+  margin-bottom: 40rpx;
+}
+
+.notice__item :last-child{
+  margin-bottom: 0;
+}
+
+.item__time{
+  font-size: 26rpx;
+  color: #FFFFFF;
+  padding: 10rpx 16rpx;
+  background: rgba(216, 217, 227, 0.8);
+  border-radius: 30rpx;
+  margin-bottom: 40rpx;
+}
+
+.item__container{
+  background: rgba(255, 255, 255, 1);
+  border-radius: 20rpx;
+  margin-bottom: 14rpx;
+  padding: 26rpx 30rpx 40rpx;
+}
+
+.item__title{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 30rpx;
+  padding-bottom: 26rpx;
+  border-bottom: 1px solid rgba(216, 217, 227, 1);
+}
+
+.title__left{
+  display: flex;
+  align-items: center;
+  color: rgba(33, 30, 58, 1);
+}
+
+.title__left::before{
+  content: "";
+  width: 16rpx;
+  height: 16rpx;
+  border-radius: 8rpx;
+  margin-right: 10rpx;
+}
+
+.is--read::before{
+  background: rgba(135, 135, 135, 1);
+}
+.no--read::before{
+  background: rgba(255, 62, 75, 1);
+}
+
+.title__left image{
+  width: 60rpx;
+  height: 60rpx;
+  margin-right: 8rpx;
+}
+
+.title__right{
+  color: rgba(176, 178, 195, 1);
+}
+
+.title__right::after{
+  content: '>'
+}
+
+.item__content{
+  padding: 30rpx 0;
+  font-size: 32rpx;
+  color: rgba(65, 64, 84, 1);
+}

package_mine/pages/noticeDetail/index.js

+import { messageDetail } from '../../../api/mine.js'
+
+Page({
+  data:{
+    detail: {}
+  },
+  onLoad(options){
+    const { msgId } = options
+    if(!msgId){
+      wx.redirectTo({
+        url: '/package_mine/pages/notice/index',
+      })
+    }else{
+      messageDetail({msgId})
+      .then(res=>{
+        this.setData({
+          detail: res.data || {}
+        })
+      })
+    }
+  },
+  
+})

package_mine/pages/noticeDetail/index.json

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "消息详情",
+  "navigationBarBackgroundColor": "#006DF7"
+}

package_mine/pages/noticeDetail/index.wxml

+<view class="detail__container">
+  <view class="detail__title">
+    消息通知
+  </view>
+  <view class="detail__time">
+    {{ detail.createTime }}
+  </view>
+  <view class="detail__content">
+    {{ detail.msgDetail }}
+  </view>
+</view>

package_mine/pages/noticeDetail/index.wxss

+.detail__container{
+  padding: 56rpx 30rpx;
+  background: rgba(255,255,255,1);
+}
+
+.detail__title{
+  font-size: 36rpx;
+  color: rgba(0, 0, 0, 1);
+  margin-bottom: 40rpx;
+}
+
+.detail__time{
+  font-size: 32rpx;
+  padding-bottom: 30rpx;
+  margin-bottom: 60rpx;
+  color: rgba(164, 164, 164, 1);
+  border-bottom: 1px solid rgba(224, 224, 224, 1);
+}
+
+.detail__content{
+  font-size: 32rpx;
+  color: rgba(29, 29, 29, 1);
+  line-height: 54rpx;
+}

package_B/pages/records/index.js → package_mine/pages/records/index.js

-// package_B/records/index.js
+// package_mine/records/index.js
 Page({
 
     /**
     showDetail(e) {
         let data = e.currentTarget.dataset.item
         wx.navigateTo({
-          url: '/package_B/pages/feedbackDetail/index?data='+ JSON.stringify(data),
+          url: '/package_mine/pages/feedbackDetail/index?data='+ JSON.stringify(data),
         })
     }
 

package_B/pages/records/index.wxml → package_mine/pages/records/index.wxml

-<!--package_B/records/index.wxml-->
+<!--package_mine/records/index.wxml-->
 <view class="protect_container">
     <list id="list" class="feedback_list" url="{{current}}" bind:update-list="updateList" list="{{list}}" bind:reset-list="resetList" params="{{params}}">
         <view class="feedback_item" data-item="{{item}}" bindtap="showDetail" wx:for="{{list}}" wx:key="index">

package_B/pages/records/index.wxss → package_mine/pages/records/index.wxss

-/* package_B/records/index.wxss */
+/* package_mine/records/index.wxss */
 .protect_container {
     width: 100%;
     height: 100vh;

package_B/pages/senceDetail/index.js → package_mine/pages/senceDetail/index.js

-// package_B/pages/senceDetail/index.js
+// package_mine/pages/senceDetail/index.js
 Page({
 
     /**

package_B/pages/senceDetail/index.wxml → package_mine/pages/senceDetail/index.wxml

-<!--package_B/pages/senceDetail/index.wxml-->
+<!--package_mine/pages/senceDetail/index.wxml-->
 <view class="detail_container">
     <!-- 图片 -->
     <view class="banner_box">

package_B/pages/senceDetail/index.wxss → package_mine/pages/senceDetail/index.wxss

-/* package_B/pages/senceDetail/index.wxss */
+/* package_mine/pages/senceDetail/index.wxss */
 .detail_container {
     width: 100%;
     padding: 0 30rpx;

package_B/pages/userInfo/index.js → package_mine/pages/userInfo/index.js

-// package_B/pages/userInfo/index.js
+// package_mine/pages/userInfo/index.js
 import {Base64} from 'js-base64'
 import {getOssAuth} from '../../../api/uploadOss.js'
 const crypto = require('crypto-js')

package_B/pages/userInfo/index.wxml → package_mine/pages/userInfo/index.wxml

-<!--package_B/pages/userInfo/index.wxml-->
+<!--package_mine/pages/userInfo/index.wxml-->
 <view class="form_container">
     <view class="form_item {{formRules.nickname.warning ? 'warning' : ''}}">
         <text><text style="color: red;">*</text>用户名称：</text>

package_B/pages/userInfo/index.wxss → package_mine/pages/userInfo/index.wxss

-/* package_B/pages/userInfo/index.wxss */
+/* package_mine/pages/userInfo/index.wxss */
 .form_container {
     width: 100%;
     padding: 30rpx 80rpx;

pages/mine/index.js

     data: {
         userInfo: {}, // 用户授权信息
         list: [
-            {title: '个人信息', type: 'userinfo', path: '/package_B/pages/userInfo/index'},
-            {title: '我的反馈', type: 'feedback', path: '/package_B/pages/records/index'},
-            {title: '我的美拍', type: 'beauty', path: '/package_B/pages/beauties/index'},
-            {title: '我的兑换', type: 'exchange', path: '/package_B/pages/exchange/index'},
-            {title: '我的身份', type: 'myid', path: '/package_B/pages/myId/index'}
+            {title: '个人信息', type: 'userinfo', path: '/package_mine/pages/userInfo/index'},
+            {title: '护河身份', type: 'myid', path: '/package_mine/pages/myId/index'},
+            {title: '我的兑换', type: 'exchange', path: '/package_mine/pages/exchange/index'},
+            {title: '河湖问题反馈', type: 'feedback', path: '/package_mine/pages/records/index'},
+            // {title: '我的美拍', type: 'beauty', path: '/package_mine/pages/beauties/index'},
+            {title: '消息通知', type: 'notice', path: '/package_mine/pages/notice/index'},
         ],
         myId: '', // 身份
         integral: 0, // 积分
     // 进入申请身份页面
     goApprove() {
         wx.navigateTo({
-          url: '/package_B/pages/IdList/index',
+          url: '/package_mine/pages/IdList/index',
+        })
+    },
+    handlePointDetail(){
+        wx.navigateTo({
+            url: '/package_mine/pages/history/index',
         })
     }
 })

pages/mine/index.wxml

                 <text class="user_name">{{userInfo.nickname}}</text>
                 <view class="integral">
                     <text style="color: #ffffff;font-size: 20rpx;">护河积分</text>
-                    <text style="font-size: 40rpx;color: #FFC65E;">{{userInfo.mallPoints || 0}}</text>
+                    <text style="font-size: 40rpx;color: #FFC65E;" bindtap="handlePointDetail">{{userInfo.mallPoints || 0}}</text>
                 </view>
             </view>
         </view>

project.private.config.json

                 },
                 {
                     "name": "我的反馈",
-                    "pathName": "package_B/pages/records/index",
+                    "pathName": "package_mine/pages/records/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
                     "name": "我的美拍",
-                    "pathName": "package_B/pages/beauties/index",
+                    "pathName": "package_mine/pages/beauties/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
                     "name": "个人信息",
-                    "pathName": "package_B/pages/userInfo/index",
+                    "pathName": "package_mine/pages/userInfo/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
                     "name": "身份申请",
-                    "pathName": "package_B/pages/approveId/index",
+                    "pathName": "package_mine/pages/approveId/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
                     "name": "身份列表",
-                    "pathName": "package_B/pages/IdList/index",
+                    "pathName": "package_mine/pages/IdList/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
                     "name": "我的身份",
-                    "pathName": "package_B/pages/myId/index",
+                    "pathName": "package_mine/pages/myId/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
                 },
                 {
                     "name": "我的兑换",
-                    "pathName": "package_B/pages/exchange/index",
+                    "pathName": "package_mine/pages/exchange/index",
                     "query": "",
                     "launchMode": "default",
                     "scene": null
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
     "projectname": "%E5%85%A8%E6%B0%91%E6%8A%A4%E6%B2%B3%E5%B0%8F%E7%A8%8B%E5%BA%8F",
-    "libVersion": "2.17.0"
+    "libVersion": "2.16.0"
 }