feat：请亲卡消费记录bug修改

common/js/env.js

@@ -5,8 +5,8 @@
 /** 测试环境 */
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
 /** 开发环境*/
-let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
-// let baseUrl = `http://47.108.114.127:10888`
+// let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
+let baseUrl = `http://47.108.114.127:10888`
 
 
 

myPages/familyCard/index.vue

@@ -1,11 +1,11 @@
 <template>
   <view class="box">
-    <text style="margin-bottom: 24rpx">我收到的亲情卡</text>
+    <text style="margin-bottom: 24rpx" v-if="gotList.length>0">我收到的亲情卡</text>
 
     <view class="getCard Card" v-for="item in gotList" @click="jumpToDetail(item)">
       <view style="display: flex;align-items: center">
         <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 class="Lines">
         <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 style="display: flex;align-items: center">
         <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 class="Lines">
         <text style="float: right;margin:0 10rpx;">已用额度</text>

myPages/familyCard/unbindFamilyCard/unbindFamilyCard.vue

@@ -22,7 +22,7 @@
           </view>
         </view>
           <text style="margin:24rpx 0;overflow: hidden">使用记录</text>
-        <view>
+        <view v-if="data.id">
           <mescroll-item ref="MescrollItem" :i="0"  :index="0" :cardId="data.id" :height="scrollViewHeight">
           </mescroll-item>
         </view>

pages/my/index.vue

@@ -112,7 +112,7 @@ export default {
         {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/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: [