1.添加返回聊天后去分享的展示逻辑

2.修改查询明细布局及接口
3.修改二维码页面的布局

pages/index/index.vue

@@ -195,7 +195,8 @@ export default {
 	 },
 
 	onLoad(options) {
-		if(options.inviteId){
+		if(options.inviteId){
+			page = 1;
 			this.inviteId = options.inviteId;
 			getApp().globalData.inviteId = options.inviteId;
 			console.log('inviteId:',getApp().globalData.inviteId)
@@ -208,7 +209,7 @@ export default {
 		this.userHeadUrl = getApp().globalData.user_headUrl || '../../static/userDefault.png',
 		getApp().globalData.isAuth ? this.isAuth = true : this.isAuth = false ;
 		getApp().globalData.user_id ? this.getUserStorage(): this.title = 'RABOT' ;
-		getApp().globalData.user_id ? this.getHistory() : this.title = 'RABOT' ;
+		getApp().globalData.user_id ? this.isShowRecharge ? this.getHistory('show') : this.getHistory() : this.title = 'RABOT' ;
 	},
 	methods: {
 		userLogin(){

pages/selfInfo/shareDetail/shareDetail.vue

@@ -5,7 +5,11 @@
 			<view v-show="active===0">
 				<view class="dayGift-box" v-for="(day,index) in dayGiftList" :key='day.id'>
 					<view>{{index + 1}}</view>
-					<view style="margin-left: -35%">{{day.date}}</view>
+					<view style="margin-left: -35%">
+						<view v-if="day.type == 3">首次登录赠送</view>
+						<view v-else>每日免费赠送</view>
+					    <view style="color:#999;font-size:26rpx;">{{day.date}}</view>
+					</view>
 					<view style="color: #1AAD19;">+{{day.times || 0}}次</view>
 				</view>
 		        <view class="dayGift-box" style="justify-content: center;" v-if="!dayGiftList.length">暂无明细</view>
@@ -40,7 +44,7 @@
 		data() {
 			return {
 				type: [{
-					title: '每日赠送次数'
+					title: '免费赠送次数'
 				}, {
 					title: '邀好友奖励次数'
 				}],
@@ -84,14 +88,14 @@
 			}
 		},
 		onShow() {
-			this.getGiftRequest(4);
-			this.getGiftRequest(1);
+			this.getGiftRequest(3,4);
+			this.getGiftRequest(1,1);
 		},
 		methods: {
 			switchTabs(){
 				console.log(this.active)
 			},
-			getGiftRequest(types){
+			getGiftRequest(types,other){
 				let that = this;
 				uni.request({
 					url: getApp().globalData.shareUrl, //需要设置为全局
@@ -106,7 +110,7 @@
 						sign: md5('get_times_record_list' + getApp().globalData.globalTimestamp),
 						page:'',
 						page_size:'',
-						type:types
+						type:types+'|'+ other
 					},
 					success: res => {
 						if(res.data.code === 200){

pages/share/shareCode/index.vue

@@ -2,7 +2,7 @@
 	<view class="share-bg-box">
 		<view class="code-box"><image :src="codeUrl" mode="aspectFit" @longpress="saveCode"></image></view>
 
-		<view class="share-page-title" style="margin-top: 10%;">
+		<view class="share-page-title">
 			<view class="first-title">长按图片保存为二维码海报</view>
 			<view class="second-title">快去分享给好友扫码加入吧~</view>
 		</view>
@@ -148,12 +148,14 @@ page {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	justify-content: center;
+	justify-content: flex-start;
 }
 
 .code-box {
 	width: 300upx;
 	height: 300upx;
+	margin-bottom: 15%;
+	margin-top: 25%;
 }
 
 .code-box image {