Merge pull request 'xbx' (#237) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/237

App.vue

@@ -26,6 +26,12 @@
                 plus.navigator.closeSplashscreen();
              },3000)
             // #endif
+		},
+		onShow(){
+
+		},
+		onHide(){
+
 		},
 		methods: {
 			...mapMutations(['loginIn']),

common/http.interceptor.js

@@ -2,7 +2,7 @@ var md5 = require("../static/js/md5.min.js")
 const install = (Vue, vm) => {
 	// 此为自定义配置参数，具体参数见上方说明
 	Vue.prototype.$u.http.setConfig({
-		baseUrl: 'https://dmmall.sdbairui.com/api',
+		baseUrl: 'http://mall.dmygkeji.com/api',
 		loadingText: '努力加载中~',
 		loadingTime: 800,
         originalData: true

components/shop/group/item.vue

@@ -63,7 +63,7 @@ export default {
     .price{
         display: flex;
         // align-items: center;
-		align-content: flex-end;
+		// align-content: flex-end;
         justify-content: space-between;
         margin-top: 10rpx;
         > view:first-child{
@@ -75,6 +75,8 @@ export default {
 			font-size: 22rpx;
 			height: 22rpx;
             color: #FDD360;
+			text-align: end;
+			margin-top:8rpx;
         }
     }
 }

pageA/login/login.vue

@@ -61,6 +61,7 @@
 	</view>
 </template>
 <script>
+	import IMService from '@/static/imservice.js'
 	import identifying from '@/components/logininput/identifying'
 	import {
 		mapMutations
@@ -107,6 +108,8 @@
 			let pages = getCurrentPages();
 			let prePage = pages[pages.length - 2];
 			this.temp_url = prePage.route;
+			console.log(this.imService.lianjie)
+			this.imService.disconnect()
 			// console.log(this.temp_url);
 		},
 		// 切断正常返回
@@ -181,6 +184,7 @@
 							me.loginIn(res.data.token); //存储一个字符传值
 							// 缓存用户的信息
 							uni.setStorageSync('user_info',res.data);
+							this.imService.disconnect()
 							if (res.data.member.has_labels) {
 								uni.switchTab({
 									url: '/pages/index/index'

pageB/components/userinfo/index.vue

@@ -134,7 +134,7 @@
             // 关注
             following(id) {
                 uni.request({
-                    url: "https://dmmall.sdbairui.com/api/member/attentionMember",
+                    url: "http://mall.dmygkeji.com/api/member/attentionMember",
                     method: "POST",
                     data: {
                         member_id: id
@@ -163,7 +163,7 @@
             likeType(id) {
                 // console.log(id);
                 uni.request({
-                    url: "https://dmmall.sdbairui.com/api/article/articleLike",
+                    url: "http://mall.dmygkeji.com/api/article/articleLike",
                     method: "POST",
                     data: {
                         article_id: id
@@ -194,7 +194,7 @@
             // 收藏
             collecting(id) {
                 uni.request({
-                    url: "https://dmmall.sdbairui.com/api/article/articleCollect",
+                    url: "http://mall.dmygkeji.com/api/article/articleCollect",
                     method: "POST",
                     data: {
                         article_id: id

pageB/video/video.nvue

@@ -133,7 +133,7 @@
 
 <script>
     import userinfo from "../components/userinfo/index" // 点赞组件
-    const temp_url = "https://dmmall.sdbairui.com/api/";
+    const temp_url = "http://mall.dmygkeji.com/api/";
     export default {
         components: {
             userinfo

pageE/setting/Index.vue

@@ -23,6 +23,7 @@
 	import {
 		mapMutations
 	} from 'vuex';
+	import IMService from '@/static/imservice.js'
 	export default {
 		data() {
 			return {
@@ -88,7 +89,8 @@
 					url: url
 				});
 			},
-			loginOut() {
+			async loginOut() {
+				let im = this.imService
 				this.logout();
 				uni.redirectTo({
 					url: "../../pageA/login/login",

pageE/setting/ShieldUsers.vue

@@ -14,7 +14,7 @@
 export default {
 	data() {
 		return {
-			src: 'https://dmmall.sdbairui.com/uploads/home/avatar/avatar_19.jpg',
+			src: 'http://mall.dmygkeji.com/uploads/home/avatar/avatar_19.jpg',
 			userList: [],
 		}
 	},

pages/index/index.vue

@@ -272,6 +272,38 @@
             this.page = 1;
             if (this.page != 1) {
 			}
+			console.log(this.imService.status)
+			if(!this.imService.status && this.$store.state.hasLogin){
+				const user = uni.getStorageSync('user_info');
+				// console.log(user)
+				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
+				 this.imService.connectIM()
+				
+			}else if(!this.imService.status){
+				 this.$u.api.getDefaultAvatar().then((res)=>{
+					console.log(res)
+					uni.setStorageSync("morenimg",res.data.avatar)
+					this.imService.login(new Date().getTime(),"123",res.data.avatar)
+					this.imService.connectIM()
+					console.log("用户信息")
+				})
+				console.log("链接")
+			}
+		
+			// if(!this.imService.status && !this.imService.lianjie){
+			// 	console.log("1212")
+			// 	this.imService.lianjie = true
+			// 	let that = this
+			// 	setTimeout(function(){
+			// 		that.imService.disconnect()
+			// 		console.log("guanbi")
+			// 	},1000)
+			// 	setTimeout(function(){
+			// 		console.log("lianjie")
+			// 		that.imService.connectIM()
+			// 	},2000)
+			// }
+		
             // if (this.hasLogin) {
             //     this.isNewmembervoucher();
             // }
@@ -280,35 +312,36 @@
             this.articleList = [];
             this.getArticlelist();
 			this.getSwiper();
-            // 优惠券
-			if(this.$store.state.hasLogin){
 				this.isNewmembervoucher();
-				const user = uni.getStorageSync('user_info');
-				// console.log(user)
-				this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
-				await this.imService.connectIM()
 			
-			}else{
+            // 优惠券
-				await this.$u.api.getDefaultAvatar().then((res)=>{
+			// if(this.$store.state.hasLogin){
-					console.log(res)
+			// 	const user = uni.getStorageSync('user_info');
-					uni.setStorageSync("morenimg",res.data.avatar)
+			// 	// console.log(user)
-					this.imService.login(new Date().getTime(),"123",res.data.avatar)
+			// 	this.imService.login(user.member.member_id,user.member.member_nickname,user.member.member_avatar)
-					console.log("用户信息")
+			// 	await this.imService.connectIM()
-				})
-				console.log("链接")
-				await this.imService.connectIM()
 				
-			}
+			// }else{
-			console.log("1212")
+			// 	await this.$u.api.getDefaultAvatar().then((res)=>{
-			let that = this
+			// 		console.log(res)
-			setTimeout(function(){
+			// 		uni.setStorageSync("morenimg",res.data.avatar)
-				that.imService.disconnect()
+			// 		this.imService.login(new Date().getTime(),"123",res.data.avatar)
-				console.log("guanbi")
+			// 		console.log("用户信息")
-			},1000)
+			// 	})
-			setTimeout(function(){
+			// 	console.log("链接")
-				console.log("lianjie")
+			// 	await this.imService.connectIM()
-				that.imService.connectIM()
+
-			},2000)
+			// }
+			// console.log("1212")
+			// let that = this
+			// setTimeout(function(){
+			// 	that.imService.disconnect()
+			// 	console.log("guanbi")
+			// },1000)
+			// setTimeout(function(){
+			// 	console.log("lianjie")
+			// 	that.imService.connectIM()
+			// },2000)
 		},
 		onPullDownRefresh() {
             this.page = 1;

pages/information/information.vue

@@ -125,7 +125,7 @@
 					const token = uni.getStorageSync('token');
 					let that = this
 					uni.request({
-						url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+						url:"http://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
 						data:{
 							userId: 1
 						},

pages/zhibo/index.nvue

@@ -370,7 +370,7 @@ export default {
     const token = uni.getStorageSync('token');
     console.log(token,that.id)
     uni.request({
-      url:"https://dmmall.sdbairui.com/api/Specialci/goodsShelves",
+      url:"http://mall.dmygkeji.com/api/Specialci/goodsShelves",
       data:{
         live_id:that.id
       },
@@ -385,7 +385,7 @@ export default {
     })
     setInterval(function(){
        uni.request({
-          url:"https://dmmall.sdbairui.com/api/Specialci/goodsShelves",
+          url:"http://mall.dmygkeji.com/api/Specialci/goodsShelves",
           data:{
             live_id:that.id
           },
@@ -403,7 +403,7 @@ export default {
 
     },10 * 1000)
     uni.request({
-      url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
+      url:"http://mall.dmygkeji.com/api/Specialci/livingUserInfo",
       data:{
         live_id:that.id
       },
@@ -417,32 +417,13 @@ export default {
         // that.list= res.data.data
       }
     })
-    //当前用户
-     var currentUser = {}
-    if(this.$store.state.hasLogin){
-      const user = uni.getStorageSync('user_info');
-      currentUser = {
-        id : user.member.member_id,
-        nickname : user.member.member_nickname,
-        avatar: user.member.member_avatar 
-      };
-    }else{
-      const user = uni.getStorageSync('morenimg');
-      currentUser = {
-        id : new Date().getTime(),
-        nickname : "123",
-        avatar: user
-      };
-    }
-     
     var room = {
         id : a.rid + "",
         name : a.rid + ""
     };
       that.chatRoomService = getApp().globalData.im
-    console.log(room,currentUser)
     //构造chatRoomService
-    that.chatRoomService.subscribeRoomMessage(room,currentUser)
+    that.chatRoomService.subscribeRoomMessage(room)
     //获取当前聊天室数据
     that.room = that.chatRoomService.room;
     that.chatRoomService.initialWhenOnlineUserChange(that.newpeople)
@@ -520,7 +501,7 @@ export default {
       let that = this
       console.log(token)
       uni.request({
-        url:"https://dmmall.sdbairui.com/api/member/attentionMember",
+        url:"http://mall.dmygkeji.com/api/member/attentionMember",
         data:{
           member_id:that.info.user_id
         },
@@ -531,7 +512,7 @@ export default {
         success(res){
           console.log(res)
           uni.request({
-            url:"https://dmmall.sdbairui.com/api/Specialci/livingUserInfo",
+            url:"http://mall.dmygkeji.com/api/Specialci/livingUserInfo",
             data:{
               live_id:that.id
             },

static/imservice.js

@@ -6,6 +6,7 @@
  */
 
 import GoEasyIM from './goeasy-im-1.0.9';
+// import GoEasyIM from './goeasy-im-1.1.1';
 import restApi from './restapi';
 
 function Friend(uuid, name, avatar,time = "", text = "",date = "",unReadMessage = 0) {
@@ -38,6 +39,7 @@ function IMService() {
         appkey:'BC-453aa755c4ea48148abefc55a86df283'
     });
     this.status = false
+    this.lianjie = false
     //当前“我”
     this.currentUser = null;
     //我的好友
@@ -84,6 +86,7 @@ function IMService() {
 IMService.prototype.login = function (uuid, name, avatar) {
         //初始化当前用户
         this.currentUser = new CurrentUser(uuid, name, avatar);
+        
         //初始化联系人信息，包括群
         this.initialContacts();
         return true;
@@ -105,7 +108,7 @@ IMService.prototype.initialContacts = function (friendList) {
         const token = uni.getStorageSync('token');
         console.log(token)
         uni.request({
-            url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+            url:"http://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
             data:{
                 userId:i[0],
                 markup:1
@@ -203,6 +206,7 @@ IMService.prototype.resetFriendUnReadMessage = function (friend) {
 //连接GoEasy
 IMService.prototype.connectIM = function () {
     //初始化IM相关的监听器
+
     try {
     this.initialIMListeners();
         
@@ -210,6 +214,7 @@ IMService.prototype.connectIM = function () {
         console.log(123)
     }
     try {
+        console.log(this.currentUser)
         this.im.connect({
             id: this.currentUser.uuid,
             data: {
@@ -226,7 +231,6 @@ IMService.prototype.connectIM = function () {
             this.subscribeFriendsPresence();
         }).catch(error => {
             console.log('连接失败,请确保网络正常，appkey和host正确，code:' + error.code + " content:" + error.content);
-            this.connectIM()
         });
     } catch (error) {
         console.log(12323)
@@ -244,6 +248,7 @@ IMService.prototype.initialIMListeners = function () {
     this.im.on(GoEasyIM.EVENT.DISCONNECTED, () => {
         console.log('连接断开.')
         this.status = false
+        this.lianjie = false
     });
 
     //监听好友上下线
@@ -284,7 +289,7 @@ IMService.prototype.initialIMListeners = function () {
                 const token = uni.getStorageSync('token');
                 console.log(token)
                 uni.request({
-                    url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+                    url:"http://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
                     data:{
                         userId:message.senderId,
                         markup:1
@@ -527,7 +532,7 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
         const token = uni.getStorageSync('token');
         console.log(token)
         uni.request({
-            url:"https://dmmall.sdbairui.com/api/Specialci/getAtwillUserInfo",
+            url:"http://mall.dmygkeji.com/api/Specialci/getAtwillUserInfo",
             data:{
                 userId:friendId,
                 markup:1
@@ -831,7 +836,7 @@ IMService.prototype.listenerGroupPresence = function () {
 //查询和初始化在线用户列表和在线用户数
 IMService.prototype.initialOnlineUsers = function (roomId) {
     let self = this;
-
+    console.log(roomId)
     //查询最新上线的用户列表
     this.im.groupHereNow(roomId)
         .then(result => {
@@ -850,7 +855,7 @@ IMService.prototype.initialOnlineUsers = function (roomId) {
         if (e.code == 401) {
             console.log("您还没有开通用户在线状态提醒，登录goeasy->我的应用->查看详情->高级功能，自助开通.");
         } else {
-            console.log(e);
+            console.log(e,1212);
         }
     });
     //获取聊天室在线用户数
@@ -873,7 +878,12 @@ IMService.prototype.subscribePresence = function (roomId) {
 }
 
 //订阅聊天室消息
-IMService.prototype.subscribeRoomMessage = function (room, user) {
+IMService.prototype.subscribeRoomMessage = function (room) {
+    let user = {
+        id:this.currentUser.uuid,
+        nickname:this.currentUser.name,
+        avatar:this.currentUser.avatar
+    }
     this.room = new Room(room.id, room.name, user);