no message

common/goeasyimutil.js

@@ -16,8 +16,9 @@ function CurrentUser(uuid, name, avatar) {
 function IMService() {
 	this.im = GoEasyIM.getInstance({
 		host: 'hangzhou.goeasy.io', //应用所在的区域地址: [hangzhou.goeasy.io, 新加坡暂不支持IM，敬请期待]
-		appkey: "BC-eef530bc08134a22b2a58ec8f8da0b25"  
-		// appkey: "BC-f420edb1a2c24b97ad43a55299987a85"
+		 appkey: "BC-eef530bc08134a22b2a58ec8f8da0b25" //测试  
+		// appkey: "BC-f420edb1a2c24b97ad43a55299987a85" //测试
+		//appkey: "BC-087763b7d212460484b71bffeaecb359" //
 	});
 	console.log(this.im)
 	//当前“我”

pages/common_tools/my_consulting/consultingInfo.vue

@@ -57,12 +57,12 @@
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-tabbar-height"></view>
 		<view class="cu-bar bg-white tabbar" v-if="orderInfo.order_status==4&&orderInfo.product_type==2" style="position: fixed;bottom: 0;width: 100%;display: flex;justify-content: flex-end;height: 108rpx;">
-			<u-button shape="circle" :custom-style="customStyle" :ripple="true">咨询会话</u-button>
+			<u-button shape="circle" :custom-style="customStyle" @click="gotoIm" :ripple="true">咨询会话</u-button>
 			<u-button shape="circle" :custom-style="customStyle" :ripple="true">评价</u-button>
 			<u-button shape="circle" :custom-style="customStylebtn" :ripple="true">意见单</u-button>
 		</view>
 		<view class="cu-bar bg-white tabbar" v-else-if="orderInfo.order_status==3" style="position: fixed;bottom: 0;width: 100%;">
-			<view class="submit" style="background-color: #0B73B9;color: white;" @click="">
+			<view class="submit" style="background-color: #0B73B9;color: white;" @click="gotochat">
 				{{orderInfo.product_type==1?'回拨':'咨询会话'}}
 			</view>
 		</view>
@@ -99,6 +99,16 @@
 				console.log(res)
 				if (res.status == 0) {
 					this.orderInfo = res.data
+					console.log(this.orderInfo)
+				}
+			},
+			gotochat() {
+				if (orderInfo.product_type == 1) {
+
+				} else if (orderInfo.product_type == 2) {
+					uni.navigateTo({
+						url: "conversation?doctor=" + JSON.stringify(this.orderInfo.docter)
+					})
 				}
 			}
 		}

pages/common_tools/my_consulting/conversation.vue

@@ -61,13 +61,14 @@
 		components: {
 			GoEasyAudioPlayer
 		},
-		onLoad() {
+		onLoad(op) {
 			this.imService = getApp().globalData.imService;
+			this.doctorInfo = JSON.parse(op.doctor)
 			//对话数据
 			this.friend = {
-				uuid: "8",
-				name: "勇敢的心",
-				avatar: "xxxxxxxx"
+				uuid: this.doctorInfo.id,
+				name: this.doctorInfo.name,
+				avatar: this.doctorInfo.avatar
 			};
 			this.currentUser = this.imService.currentUser;
 			let privateMessages = this.imService.getPrivateMessages(this.friend.uuid);
@@ -108,6 +109,7 @@
 					//语音录音中
 					recording: false,
 				},
+				doctorInfo: {}
 			}
 		},
 		onPullDownRefresh: function(e) {

pages/doctor_related/doctor_info.vue

@@ -132,14 +132,17 @@
 </template>
 
 <script>
+	var user = require('../../common/user.js');
 	export default {
 		onLoad(options) {
 			this.doctorid = options.id
 			this.daytime = options.time
 			console.log(options)
 		},
-		mounted() {
+		onShow() {
 			this.getdoctorInfo()
+		},
+		mounted() {
 			this.gettime()
 		},
 		data() {
@@ -184,7 +187,8 @@
 					type: 1,
 					relation_id: e.currentTarget.dataset.id
 				})
-				if (res.status == 0) {
+				let status = user.islogin(res)
+				if (status) {
 					if (res.data.is_collect == 0) {
 						uni.showToast({
 							title: "取消成功",
@@ -205,7 +209,8 @@
 					docter_id: this.doctorid
 				})
 				console.log(res)
-				if (res.status == 0) {
+				let status = user.islogin(res)
+				if (status) {
 					if (res.data.data.length != 0) {
 						let nian = res.data.data.map(item => {
 							return item.schedule_date
@@ -236,6 +241,7 @@
 				}
 			},
 			phonezixun() {
+				
 				uni.navigateTo({
 					url: "info_write?doctor=" + JSON.stringify(this.doctor) + "&type=" + this.barindex + "&time=" + this.daytime +
 						"&hospital=" + this.hospital + "&jigou=" + this.jigouid + "&year=" + this.year + "&yearid=" + this.yearid

pages/doctor_related/select_doctor.vue

@@ -125,11 +125,11 @@
 			}
 		},
 		onShow() {
+			this.gettime()
 			this.getDoctorList()
+			this.getareaList()
 		},
 		mounted() {
-			this.gettime()
-			this.getareaList()
 		},
 		data() {
 			return {
@@ -289,6 +289,7 @@
 					time_period_id: this.timehour
 				}, )
 				console.log(res, this.value1)
+				
 				if (res.status == 0) {
 					if (this.pageindex > res.data.last_page) {
 						uni.showToast({
@@ -304,7 +305,8 @@
 			gettime: async function() {
 				let res = await this.$request.post("/api/v1/docter/timePeriodList")
 				console.log(res)
-				if (res.status == 0) {
+				let status = user.islogin(res)
+				if (status) {
 					res.data.list.forEach(item => {
 						item.start_time_period = item.start_time_period + '-' + item.end_time_period
 					})

pages/index/book.vue

@@ -25,13 +25,17 @@
 </template>
 
 <script>
+	var user = require('../../common/user.js');
 	export default {
 		onLoad(options) {
 
 		},
-		mounted() {
+		onShow() {
 			this.getbook()
 			this.getconfigLsit()
+		},
+		mounted() {
+			
 		},
 		data() {
 			return {
@@ -55,7 +59,8 @@
 		methods: {
 			getbook: async function() {
 				let res = await this.$request.post("/api/v1/article/articleList")
-				if (res.status == 0) {
+				let status = user.islogin(res)
+				if (status) {
 					this.list = res.data.data
 				}
 			},

pages/index/index.vue

@@ -201,7 +201,8 @@
 									</view>
 									<view class="text-black flex justify-between align-center margin-top-sm" style="font-size: 30rpx;">
 										<view class="jisu flex align-center">
-											<image src="../../static/img/speed.png" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;margin-top: 6rpx;" mode=""></image>急速响应
+											<image src="../../static/img/speed.png" style="width: 30rpx;height: 30rpx;margin-right: 10rpx;margin-top: 6rpx;"
+											 mode=""></image>急速响应
 										</view>
 										<view class="">
 											服务
@@ -248,6 +249,7 @@
 			this.getDoctorList()
 		},
 		onLoad(options) {
+
 			this.getconfigData()
 		},
 		data() {
@@ -278,7 +280,7 @@
 				latitude: 0,
 				longitude: 0,
 				pageindex: 1,
-				configInfo:{}
+				configInfo: {}
 			}
 		},
 		onHide() {
@@ -354,9 +356,9 @@
 					url: "../doctor_related/select_doctor?value=" + value
 				})
 			},
-			childcare(){
+			childcare() {
 				uni.navigateTo({
-					url:"../childcare/child_care"
+					url: "../childcare/child_care"
 				})
 			},
 			vaccines() {
@@ -364,10 +366,10 @@
 					url: "../vaccines/vaccines_info"
 				})
 			},
-			getconfigData:async function(){
+			getconfigData: async function() {
 				let res = await this.$request.post("/api/v1/common/configList")
 				console.log(res)
-				if(res.status == 0){
+				if (res.status == 0) {
 					this.configInfo = res.data
 				}
 			},
@@ -382,6 +384,26 @@
 
 				})
 			},
+			// gettokeninfo: async function() {
+			// 	uni.login({
+			// 		success: (res) => {
+			// 			this.$request.post("/api/v1/common/wxLogin", {
+			// 				wechat_code: res.code
+			// 			}).then(data => {
+			// 				console.log(data)
+			// 				if (res.status == 0) {
+			// 					if (res.data.token) {
+			// 						store.commit('setJwt', res.data.token);
+			// 						store.commit('setUser', res.data);
+			// 						store.commit('login');
+			// 					}
+			// 				}
+			// 			}).catch(err => {
+
+			// 			})
+			// 		}
+			// 	})
+			// }
 		}
 	};
 </script>

pages/index/message.vue

@@ -74,7 +74,9 @@
 					uni.navigateTo({
 						url: "../common_tools/my_consulting/consultingInfo?id=" + item.relation_id
 					})
-				}
+				}//else if(){
+					
+				//}
 			}
 		}
 	};

pages/index/mine.vue

@@ -143,6 +143,7 @@
 </template>
 
 <script>
+	var user = require('../../common/user.js');
 	import store from '@/store'
 	export default {
 		onLoad(options) {
@@ -166,7 +167,8 @@
 			},
 			getUserInfo: async function() {
 				let res = await this.$request.post('/api/v1/user/userInfo')
-				if (res.status == 0) {
+				let status = user.islogin(res)
+				if (status) {
 					this.info = res.data
 					console.log(this.info)
 					store.commit('setUser', this.info)

pages/login/login.vue

@@ -196,7 +196,7 @@
 									}, 1500)
 									setTimeout(() => {
 										uni.navigateBack({
-											delta: 1
+											delta: 1	
 										})
 									}, 1500)
 								}

pages/service_box/choiceBox.vue

@@ -108,10 +108,10 @@
 				let res = await this.$request.post("/api/v1/order/orderDetail", {
 					order_id: this.service.order_id
 				})
-				console.log(res)
-				// if (res.status == 0) {
-				// 	this.packs = res.data
-				// }
+				// console.log(res)
+				if (res.status == 0) {
+					this.packs = res.data
+				}
 			}
 		}
 	}