合并Merge branch 'master' of http://154.209.4.10:3001/tt0101/zhunong-h5

# Conflicts:
#	src/views/Mall.vue

src/api/home.js

@@ -1,7 +1,7 @@
 import request from "@/utils/request";
 //获取轮播图
 export const getBanners = (data) => request({ url: "index/get_banners", method: "post", data,loading:true });
-export const getUserInfo = (data) => request({ url: "user/get_userinfo", method: "post", data,loading:false });
+export const getUserInfo = (data) => request({ url: "user/get_userinfo", method: "post", data,loading:true });
 
 // 领取邀请奖励
 export function getShareReward(renshu) {