Browse Source

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

pull/10/head
xieying 1 year ago
parent
commit
660ca9a8f7
58 changed files with 447 additions and 50 deletions
  1. +40
    -0
      api/mine.js
  2. +5
    -2
      app.json
  3. BIN
      assets/img/notice.png
  4. +2
    -2
      package_mine/pages/IdList/index.js
  5. +0
    -0
      package_mine/pages/IdList/index.json
  6. +1
    -1
      package_mine/pages/IdList/index.wxml
  7. +1
    -1
      package_mine/pages/IdList/index.wxss
  8. +2
    -2
      package_mine/pages/approveId/index.js
  9. +0
    -0
      package_mine/pages/approveId/index.json
  10. +1
    -1
      package_mine/pages/approveId/index.wxml
  11. +1
    -1
      package_mine/pages/approveId/index.wxss
  12. +2
    -2
      package_mine/pages/beauties/index.js
  13. +0
    -0
      package_mine/pages/beauties/index.json
  14. +1
    -1
      package_mine/pages/beauties/index.wxml
  15. +1
    -1
      package_mine/pages/beauties/index.wxss
  16. +2
    -2
      package_mine/pages/exchange/index.js
  17. +0
    -0
      package_mine/pages/exchange/index.json
  18. +1
    -1
      package_mine/pages/exchange/index.wxml
  19. +1
    -1
      package_mine/pages/exchange/index.wxss
  20. +1
    -1
      package_mine/pages/feedbackDetail/index.js
  21. +0
    -0
      package_mine/pages/feedbackDetail/index.json
  22. +1
    -1
      package_mine/pages/feedbackDetail/index.wxml
  23. +1
    -1
      package_mine/pages/feedbackDetail/index.wxss
  24. +28
    -0
      package_mine/pages/history/index.js
  25. +7
    -0
      package_mine/pages/history/index.json
  26. +20
    -0
      package_mine/pages/history/index.wxml
  27. +56
    -0
      package_mine/pages/history/index.wxss
  28. +2
    -2
      package_mine/pages/myId/index.js
  29. +0
    -0
      package_mine/pages/myId/index.json
  30. +1
    -1
      package_mine/pages/myId/index.wxml
  31. +1
    -1
      package_mine/pages/myId/index.wxss
  32. +55
    -0
      package_mine/pages/notice/index.js
  33. +7
    -0
      package_mine/pages/notice/index.json
  34. +23
    -0
      package_mine/pages/notice/index.wxml
  35. +89
    -0
      package_mine/pages/notice/index.wxss
  36. +23
    -0
      package_mine/pages/noticeDetail/index.js
  37. +5
    -0
      package_mine/pages/noticeDetail/index.json
  38. +11
    -0
      package_mine/pages/noticeDetail/index.wxml
  39. +24
    -0
      package_mine/pages/noticeDetail/index.wxss
  40. +2
    -2
      package_mine/pages/records/index.js
  41. +0
    -0
      package_mine/pages/records/index.json
  42. +1
    -1
      package_mine/pages/records/index.wxml
  43. +1
    -1
      package_mine/pages/records/index.wxss
  44. +1
    -1
      package_mine/pages/senceDetail/index.js
  45. +0
    -0
      package_mine/pages/senceDetail/index.json
  46. +1
    -1
      package_mine/pages/senceDetail/index.wxml
  47. +1
    -1
      package_mine/pages/senceDetail/index.wxss
  48. +0
    -0
      package_mine/pages/submitSuccess/index.js
  49. +0
    -0
      package_mine/pages/submitSuccess/index.json
  50. +0
    -0
      package_mine/pages/submitSuccess/index.wxml
  51. +0
    -0
      package_mine/pages/submitSuccess/index.wxss
  52. +1
    -1
      package_mine/pages/userInfo/index.js
  53. +0
    -0
      package_mine/pages/userInfo/index.json
  54. +1
    -1
      package_mine/pages/userInfo/index.wxml
  55. +1
    -1
      package_mine/pages/userInfo/index.wxss
  56. +12
    -6
      pages/mine/index.js
  57. +1
    -1
      pages/mine/index.wxml
  58. +8
    -8
      project.private.config.json

+ 40
- 0
api/mine.js View File

@@ -46,4 +46,44 @@ export const getIdApprove = function (data) {
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
})
}

+ 5
- 2
app.json View File

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

BIN
assets/img/notice.png View File

Before After
Width: 56  |  Height: 45  |  Size: 3.5KB

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

@@ -1,4 +1,4 @@
// package_B/pages/IdList/index.js
// package_mine/pages/IdList/index.js
Page({

/**
@@ -35,7 +35,7 @@ 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.json → package_mine/pages/IdList/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

@@ -1,4 +1,4 @@
/* 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 View File

@@ -1,4 +1,4 @@
// package_B/pages/approveId/index.js
// package_mine/pages/approveId/index.js
import {approveIdenty} from '../../../api/mine.js'
import {isPositiveInteger} from '../../../utils/check.js'

@@ -111,7 +111,7 @@ Page({
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.json → package_mine/pages/approveId/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

@@ -1,4 +1,4 @@
/* 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 View File

@@ -1,4 +1,4 @@
// package_B/pages/beauties/index.js
// package_mine/pages/beauties/index.js
Page({

/**
@@ -37,7 +37,7 @@ 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.json → package_mine/pages/beauties/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

@@ -1,4 +1,4 @@
/* 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 View File

@@ -1,4 +1,4 @@
// package_B/pages/exchange/index.js
// package_mine/pages/exchange/index.js
Page({

/**
@@ -32,7 +32,7 @@ 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.json → package_mine/pages/exchange/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

@@ -1,4 +1,4 @@
/* 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 View File

@@ -1,4 +1,4 @@
// package_B/pages/feedbackDetail/index.js
// package_mine/pages/feedbackDetail/index.js
Page({

/**

package_B/pages/feedbackDetail/index.json → package_mine/pages/feedbackDetail/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

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

+ 28
- 0
package_mine/pages/history/index.js View File

@@ -0,0 +1,28 @@
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: [] })
},
})

+ 7
- 0
package_mine/pages/history/index.json View File

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

+ 20
- 0
package_mine/pages/history/index.wxml View File

@@ -0,0 +1,20 @@
<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>

+ 56
- 0
package_mine/pages/history/index.wxss View File

@@ -0,0 +1,56 @@
.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 View File

@@ -1,4 +1,4 @@
// package_B/pages/myId/index.js
// package_mine/pages/myId/index.js
import {getIdApprove} from '../../../api/mine.js'
Page({

@@ -29,7 +29,7 @@ Page({
// 重新申请
reApprove() {
wx.navigateTo({
url: '/package_B/pages/IdList/index',
url: '/package_mine/pages/IdList/index',
})
},
// 返回我的页面

package_B/pages/myId/index.json → package_mine/pages/myId/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

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

+ 55
- 0
package_mine/pages/notice/index.js View File

@@ -0,0 +1,55 @@
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,
})
}
})

+ 7
- 0
package_mine/pages/notice/index.json View File

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

+ 23
- 0
package_mine/pages/notice/index.wxml View File

@@ -0,0 +1,23 @@
<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>

+ 89
- 0
package_mine/pages/notice/index.wxss View File

@@ -0,0 +1,89 @@
.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);
}

+ 23
- 0
package_mine/pages/noticeDetail/index.js View File

@@ -0,0 +1,23 @@
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 || {}
})
})
}
},
})

+ 5
- 0
package_mine/pages/noticeDetail/index.json View File

@@ -0,0 +1,5 @@
{
"usingComponents": {},
"navigationBarTitleText": "消息详情",
"navigationBarBackgroundColor": "#006DF7"
}

+ 11
- 0
package_mine/pages/noticeDetail/index.wxml View File

@@ -0,0 +1,11 @@
<view class="detail__container">
<view class="detail__title">
消息通知
</view>
<view class="detail__time">
{{ detail.createTime }}
</view>
<view class="detail__content">
{{ detail.msgDetail }}
</view>
</view>

+ 24
- 0
package_mine/pages/noticeDetail/index.wxss View File

@@ -0,0 +1,24 @@
.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 View File

@@ -1,4 +1,4 @@
// package_B/records/index.js
// package_mine/records/index.js
Page({

/**
@@ -39,7 +39,7 @@ 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.json → package_mine/pages/records/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

@@ -1,4 +1,4 @@
/* 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 View File

@@ -1,4 +1,4 @@
// package_B/pages/senceDetail/index.js
// package_mine/pages/senceDetail/index.js
Page({

/**

package_B/pages/senceDetail/index.json → package_mine/pages/senceDetail/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

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

package_B/pages/submitSuccess/index.js → package_mine/pages/submitSuccess/index.js View File


package_B/pages/submitSuccess/index.json → package_mine/pages/submitSuccess/index.json View File


package_B/pages/submitSuccess/index.wxml → package_mine/pages/submitSuccess/index.wxml View File


package_B/pages/submitSuccess/index.wxss → package_mine/pages/submitSuccess/index.wxss View File


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

@@ -1,4 +1,4 @@
// 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.json → package_mine/pages/userInfo/index.json View File


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

@@ -1,4 +1,4 @@
<!--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 View File

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

+ 12
- 6
pages/mine/index.js View File

@@ -8,11 +8,12 @@ Page({
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, // 积分
@@ -54,7 +55,12 @@ Page({
// 进入申请身份页面
goApprove() {
wx.navigateTo({
url: '/package_B/pages/IdList/index',
url: '/package_mine/pages/IdList/index',
})
},
handlePointDetail(){
wx.navigateTo({
url: '/package_mine/pages/history/index',
})
}
})

+ 1
- 1
pages/mine/index.wxml View File

@@ -7,7 +7,7 @@
<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>

+ 8
- 8
project.private.config.json View File

@@ -38,7 +38,7 @@
},
{
"name": "我的反馈",
"pathName": "package_B/pages/records/index",
"pathName": "package_mine/pages/records/index",
"query": "",
"launchMode": "default",
"scene": null
@@ -87,7 +87,7 @@
},
{
"name": "我的美拍",
"pathName": "package_B/pages/beauties/index",
"pathName": "package_mine/pages/beauties/index",
"query": "",
"launchMode": "default",
"scene": null
@@ -101,28 +101,28 @@
},
{
"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
@@ -143,7 +143,7 @@
},
{
"name": "我的兑换",
"pathName": "package_B/pages/exchange/index",
"pathName": "package_mine/pages/exchange/index",
"query": "",
"launchMode": "default",
"scene": null
@@ -181,5 +181,5 @@
},
"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"
}

Loading…
Cancel
Save