|
|
@@ -23,11 +23,22 @@
|
|
|
<view class="lj-copy" v-if="!userInfo.spread" @click="spare()">绑定关系</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
+<<<<<<< HEAD
|
|
|
<view class="bottom">
|
|
|
<image class="bottom-bg" src="../../static/img/bottom.png" mode=""></image>
|
|
|
<view class="btn" @click="button()">查看推荐</view>
|
|
|
</view>
|
|
|
<!-- <uni-popup ref="yeji" type="center">
|
|
|
+=======
|
|
|
+<<<<<<< HEAD
|
|
|
+ <view class="tj-look" @click="getReferrer()">
|
|
|
+ 查看推荐
|
|
|
+ </view>
|
|
|
+=======
|
|
|
+ <view class="tj-look" @click="button()">查看推荐</view>
|
|
|
+>>>>>>> 5fe50ff5c260e745ba7833a119b93bf915605eb5
|
|
|
+ <uni-popup ref="yeji" type="center">
|
|
|
+>>>>>>> be58bfe5874c430483ea559c136a0a93cde5e317
|
|
|
<view class="yj-wrap">
|
|
|
<view class="yj-tit">收益明细</view>
|
|
|
<image src="../../static/img/yj-bg.png" mode="" class="yj-logo"></image>
|
