zhanghui 2 лет назад
Родитель
Сommit
f7672f69d0
2 измененных файлов с 4 добавлено и 3 удалено
  1. 2 2
      myPages/familyCard/index.vue
  2. 2 1
      pages/my/index.vue

+ 2 - 2
myPages/familyCard/index.vue

@@ -5,7 +5,7 @@
     <view class="getCard Card" v-for="item in gotList" @click="jumpToDetail(item)">
     <view class="getCard Card" v-for="item in gotList" @click="jumpToDetail(item)">
       <view style="display: flex;align-items: center">
       <view style="display: flex;align-items: center">
         <u-avatar :src="item.url || '/static/me/ud4.png'"></u-avatar>
         <u-avatar :src="item.url || '/static/me/ud4.png'"></u-avatar>
-        <text style="margin:0 10rpx;color:#FFFFFF ">会员{{ item.userNo }}送的亲情卡</text>
+        <text style="margin:0 10rpx;color:#FFFFFF ">{{ item.presentUserName }}{{ item.presentUserNo }}送的亲情卡</text>
       </view>
       </view>
       <view class="Lines">
       <view class="Lines">
         <text style="float: right;margin:0 10rpx;color:#FFFFFF ">已用额度</text>
         <text style="float: right;margin:0 10rpx;color:#FFFFFF ">已用额度</text>
@@ -27,7 +27,7 @@
     <view class="postCard Card" v-for="item in giveList" @click="jumpToDetail(item.id)">
     <view class="postCard Card" v-for="item in giveList" @click="jumpToDetail(item.id)">
       <view style="display: flex;align-items: center">
       <view style="display: flex;align-items: center">
         <u-avatar :src="item.url || '/static/me/ud4.png'"></u-avatar>
         <u-avatar :src="item.url || '/static/me/ud4.png'"></u-avatar>
-        <text style="margin:0 10rpx;">会员{{ item.userNo }}送的亲情卡</text>
+        <text style="margin:0 10rpx;">{{ item.userName }}{{ item.userNo }}</text>
       </view>
       </view>
       <view class="Lines">
       <view class="Lines">
         <text style="float: right;margin:0 10rpx;">已用额度</text>
         <text style="float: right;margin:0 10rpx;">已用额度</text>

+ 2 - 1
pages/my/index.vue

@@ -112,7 +112,7 @@ export default {
         {thumb: '/static/me/u826.png', title: '储值服务', rightText: '', to: '/myPages/recharge/index'},
         {thumb: '/static/me/u826.png', title: '储值服务', rightText: '', to: '/myPages/recharge/index'},
         {thumb: '/static/me/u701.png', title: '交易记录', rightText: '', to: '/myPages/transactionRecord/index'},
         {thumb: '/static/me/u701.png', title: '交易记录', rightText: '', to: '/myPages/transactionRecord/index'},
         {thumb: '/static/me/u11.png', title: '会员须知', rightText: '', to: '/myPages/aboutOur/index'},
         {thumb: '/static/me/u11.png', title: '会员须知', rightText: '', to: '/myPages/aboutOur/index'},
-        // {thumb: '/static/me/familyCard_icon.png', title: '亲情卡', rightText: '', to: '/myPages/familyCard/index'}
+        {thumb: '/static/me/familyCard_icon.png', title: '亲情卡', rightText: '', to: '/myPages/familyCard/index'}
       ],
       ],
       group2: [
       group2: [
 
 
@@ -120,6 +120,7 @@ export default {
         // {thumb:'/static/me/u101.png',title:'设置',rightText:'',to:'/myPages/setting/index'}
         // {thumb:'/static/me/u101.png',title:'设置',rightText:'',to:'/myPages/setting/index'}
       ],
       ],
       height: '',
       height: '',
+
       title: 'Hello',
       title: 'Hello',
       tabIndex: 4,
       tabIndex: 4,
       userInfo: {}
       userInfo: {}