提交

xuqiang
components/chooseGift.vue
components/pay.vue
components/writeMsg.vue
main.js
pages/index/index.vue
pages/index/obiDetail.vue
pages/member/myWall.vue
--- a/components/chooseGift.vue
查看文件 @203aa1a
+++ b/components/chooseGift.vue
查看文件 @203aa1a
@@ -43,7 +43,7 @@
 					ob_id:this.ob_id,
 					gift_id:this.giftList[this.giftIndex].Id,
 					message:''
-				},2).then((res)=>{
+				},2,2).then((res)=>{
 					if(res.code == 1){
 						this.$emit('closeChooseGift',{code:1})
 					}
--- a/components/pay.vue
查看文件 @203aa1a
+++ b/components/pay.vue
查看文件 @203aa1a
@@ -107,7 +107,7 @@
 					name:this.name,
 					mobile:this.mobile,
 					message:this.message
-				},2).then((res)=>{
+				},2,2).then((res)=>{
 					console.log('随礼支付',res)
 					// #ifdef H5
 					if (this.$wechat) {
--- a/components/writeMsg.vue
查看文件 @203aa1a
+++ b/components/writeMsg.vue
查看文件 @203aa1a
@@ -78,7 +78,7 @@
 					ob_id:this.ob_id,
 					gift_id:0,
 					message:this.message
-				},2).then((res)=>{
+				},2,2).then((res)=>{
 					if(res.code == 1){
 						this.$emit('closeWriteMsg',{code:1})
 					}
--- a/main.js
查看文件 @203aa1a
+++ b/main.js
查看文件 @203aa1a
@@ -29,7 +29,7 @@ Vue.prototype.obiUrl="http://obituaries.tvue.brofirst.cn/"
 //正式腾讯地图key
 Vue.prototype.tencentMapKey = "AFZBZ-UCQL6-O3BSR-EMTTC-23YX7-33BRD"
-Vue.prototype.$request=function(url,data='',loadType = 1){
+Vue.prototype.$request=function(url,data='',loadType = 1,pageType = 1){
 	// var that=this
 	return new Promise((reslove,reject)=>{
 		if(loadType == 1){
@@ -53,28 +53,16 @@ Vue.prototype.$request=function(url,data='',loadType = 1){
 				if(res.data.code==1){
 					reslove(res.data)
 				}
-				if(res.data.code==2){
-					uni.setStorageSync('Token',res.data.token)
-					uni.request({
-						url:this.apiUrl+url,
-						method:"POST",
-						header: {
-							'token': uni.getStorageSync('token')
-						},
-						data:data,
-						success:(res)=>{
-							reslove(res.data)
-						}
-					})
-				}
 				if(res.data.code == 90001){
-					reslove(res.data)
-					uni.clearStorageSync()
-					window.location.href
-				}
-				if(res.data.code == 4){
-					reslove({"code":0,"msg":"没有相关数据"})
 					uni.setStorageSync("Token",'')
+					if(pageType == 1){
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}else{
+						window.location.href = window.location.href
+					}
+					return
 				}
 				if(res.data.code==0||res.data.code){
--- a/pages/index/index.vue
查看文件 @203aa1a
+++ b/pages/index/index.vue
查看文件 @203aa1a
@@ -86,19 +86,6 @@
 			wPicker
 		},
 		onLoad() {
-			this.isWeixin = this.isWechat()
-			if(!this.isWeixin){
-				uni.showToast({
-					title:'请在微信内置浏览器里打开！',
-					icon:'none',
-					duration:3000
-				})
-				return
-			}
-			if(uni.getStorageSync('Token') == ''){
-				this.checkWeChatCode()//通过微信官方接口获取code之后，会重新刷新设置的回调地址【redirect_uri】]
-				return
-			}
 			// #ifdef H5
 			//获取定位经纬度
 			if (this.$wechat) {
@@ -135,6 +122,19 @@
 			this.getData()
 		},
 		onShow(){
+			this.isWeixin = this.isWechat()
+			if(!this.isWeixin){
+				uni.showToast({
+					title:'请在微信内置浏览器里打开！',
+					icon:'none',
+					duration:3000
+				})
+				return
+			}
+			if(uni.getStorageSync('Token') == ''){
+				this.checkWeChatCode()//通过微信官方接口获取code之后，会重新刷新设置的回调地址【redirect_uri】]
+				return
+			}
 			uni.setStorageSync('ob_id','')
 			this.$store.commit('defaultCutImg')
 			if(this.$store.state.keyword != ''){
--- a/pages/index/obiDetail.vue
查看文件 @203aa1a
+++ b/pages/index/obiDetail.vue
查看文件 @203aa1a
@@ -94,7 +94,7 @@
 			</index-obituary-title>
 			<!-- 最后的祝福 -->
 			<index-obituary-title :title="5" :temp="temp">
-				<swiper class="msgList" v-if="obi.MessageArray.length > 0" :indicator-dots="false" :autoplay="true" :vertical="true" :circular="true" :interval="3000" :duration="1000">
+				<swiper class="msgList" v-if="obi.MessageArray.length > 0" display-multiple-items="3" :indicator-dots="false" :autoplay="true" :vertical="true" :circular="true" :interval="3000" :duration="1000">
 					<swiper-item class="msgItem" v-for="(item,index) in obi.MessageArray" :key="index">
 						<!-- <view class="msgItem"> -->
 							<view class="msgImg">
@@ -412,7 +412,7 @@
 						this.randomMsg = res.data.data
 					}
 				})
-				this.$request('/api/Index/ObCon',{ob_id:this.ob_id}).then((res)=>{
+				this.$request('/api/Index/ObCon',{ob_id:this.ob_id},1,2).then((res)=>{
 					this.obi = res.data
 					this.SellerArray = res.data.SellerArray
 					this.showObiDetail = true
@@ -606,7 +606,7 @@
 	.userTalk .talkMsg{color: #323233;font-size: 20rpx;text-align: center;font-weight: 600;}
 	.giftBtn{height: 80rpx;border-radius: 4px;color: #fff;text-align: center;line-height: 80rpx;font-size: 28rpx;margin-top:10rpx;}
-	.msgList{height: 100rpx;padding-top: 20rpx;}
+	.msgList{height: 300rpx;padding-top: 20rpx;}
 	.msgItem{display: flex;height: 100rpx;}
 	.msgItem .msgImg{width: 100rpx;}
 	.msgItem .msgInfo{flex: 1;}
--- a/pages/member/myWall.vue
查看文件 @203aa1a
+++ b/pages/member/myWall.vue
查看文件 @203aa1a
@@ -82,12 +82,16 @@
 					return
 				}
 				this.$request('/api/Config/OutMoney',{money:this.money},2).then((res)=>{
-					uni.showToast({
-						title:'提现成功'
-					})
-					setTimeout((res)=>{
+					if(res.code == 1){
 						this.getData()
-					},1000)
+						setTimeout(()=>{
+							uni.showToast({
+								title:'提现成功'
+							})
+						},1000)
+					}
+					
+					
 				})
 			},