Merge branch 'master' of http://git.lcpcp.cc/root/lcoco

# Conflicts:
#	api/my.js

api/my.js

@@ -22,4 +22,11 @@ export const operateBlackList = (data) => request(goodsUrl + 'myself/blacklist/'
 
 export const delBlackItem = (data) => request(goodsUrl + 'myself/blacklist/' + data, 'delete', {})
 //兑换码
-export const exchangeCode = (data) => request(goodsUrl + 'myself/exchangeCode', 'post', data)
+export const exchangeCode = (data) => request(goodsUrl + 'myself/exchangeCode', 'post', data)
+// 喜欢我的人的列表
+export const likeMeList = (data) => request(goodsUrl + 'utility/likeMe', 'post', data)
+// 获取当前客户VIP信息
+export const getUserVip = (data) => request(goodsUrl + 'myself/getUserVip', 'get', data)
+// 购买VIP
+export const buyVip = (data) => request(goodsUrl + 'myself/buyVip', 'post', data)
+

pages/my/index.vue

@@ -117,7 +117,7 @@
 import MyNav from "@/pages/my/model/my-nav";
 import DynamicItems from "@/pages/common/dynamic/dynamic-items";
 import MyPraise from "@/pages/my/model/my-praise";
-import {getMemberInfo} from "@/api/my";
+import {getMemberInfo,getUserVip,buyVip} from "@/api/my";
 export default {
   components: {MyPraise, DynamicItems, MyNav},
   data() {
@@ -130,10 +130,19 @@ export default {
       }
     }
   },
+  mounted() {
+  	this.getUserVip()
+  },
   onLoad(query) {
     this.getMemberInfo()
   },
   methods: {
+	getUserVip(){
+		getUserVip().then((res)=>{
+			console.log(res);
+		})
+	},
+	  
     scrolltolower(){
       if(this.tagNum===0){
         this.$refs.dynamicObj.getMyMoments()

pages/wallet/like-me.vue

@@ -43,21 +43,18 @@
 				</view>
 				<!-- <view class="y-list">
 					<view class="y-box" v-for="(item,i) in 10" :key="i">
-						<image src="@/static/img/circle/1.png" mode="aspectFill"></image>
+						<image class="image-1" src="@/static/img/circle/1.png" mode="aspectFill"></image>
 						<view class="list-info box-sizing-border">
 							<view class="">
 								<view class="info-name sys-size-36 sys-color-white sys-weight-600 sys-webkit-box">仰看辉煌仰看辉煌仰看辉煌</view>
 								<view class="sys-size-24 sys-color-white">18/女/处女座</view>
 							</view>
-							<view class="info-right" @click="to(2)">	
-								<image src="@/static/img/wallet/s-xin.png" mode="aspectFill"></image>
-								<image src="@/static/img/wallet/n-xin.png" mode="aspectFill"></image>
-							</view>
+							<image class="image-2" @click="to(2)" src="@/static/img/wallet/n-xin.png" mode="aspectFill"></image>
 						</view>
 					</view>
 				</view> -->
 				<view class="n-list y-list">
-					<view class="y-box" v-for="(item,i) in 4" :key="i">
+					<view class="y-box" v-for="(item,i) in 6" :key="i">
 						<image class="image-1" src="@/static/img/circle/1.png" mode="aspectFill"></image>
 						<view class="list-info box-sizing-border">
 							<view class="">
@@ -83,13 +80,26 @@
 </template>
 
 <script>
+	import {likeMeList} from '@/api/my';
+	
 	export default {
 		data(){
 			return{
-				
+				pageNo:1,
+				pageSize:10,
 			}
 		},
+		mounted() {
+			this.likeMeList()
+		},
 		methods:{
+			likeMeList(){
+				likeMeList({pageNo:this.pageNo,pageSize:this.pageSize}).then((res)=>{
+					if(res.code === 0){
+						
+					}
+				})
+			},
 			scrolltoupper(){
 				// x 轴触底
 			},
@@ -206,7 +216,7 @@
 						.info-right{
 							width: 80rpx;
 							height: 80rpx;
-							background-color: #fff;
+							// background-color: #fff;
 							border-radius: 50%;
 							text-align: center;
 							image{