7.31

components/zh-slidingMenu/zhSlidingMenu/zhSlidingMenu.vue

@@ -12,12 +12,12 @@
 			<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation :style="[menuRight]"
 				@scroll="rightScroll">
 				<view class="menu_right_view">
-	<!-- 				<view class="menu_right_item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
+					<view class="menu_right_item" :id="'item' + index" v-for="(item , index) in tabbar" :key="index">
 						<view class="menu_right_title">{{item[keyName]}}</view>
 						<view class="">
-							<slot :scroll_list='item[tabbarName]'></slot>
+							<slot :scroll_list='item[tabbarName]' :language='language'></slot>
 						</view>
-					</view> -->
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -104,9 +104,13 @@
 				arr: [], //左侧菜单距离登录距离列表
 				scrollRightTop: 0, // 右边栏目scroll-view的滚动条高度
 				timer: null, // 定时器
+				language: ''
 			}
 		},
 		mounted() {
+			if (uni.getStorageSync('language')) {
+				this.language = uni.getStorageSync('language')
+			}
 			this.getMenuItemTop()
 		},
 		methods: {

pageA/shoplist.vue

@@ -27,44 +27,63 @@
 					<image v-else src="static/images/shaixuan.png" style="width: 24rpx;height: 24rpx;" mode=""></image>
 				</view>
 			</view>
+
 			<liu-waterfall :dataList="data" :column="columns" @click="detail"></liu-waterfall>
 			<view class="pop" style="position: absolute;top:80rpx" v-if="shai&&current==4">
+				<!-- 价格区间 -->
 				<view class=" title">{{i18n.Pricerange}}</view>
 				<view class="u-flex u-row-between">
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice"
+							v-model="price_range_start" />
 					</view>
 					<text>-</text>
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice"
+							v-model="price_range_end" />
 					</view>
 				</view>
+				<!-- 重量区间 -->
 				<view class="title" style="margin-top: 36rpx;">{{i18n.Weightinterval}}</view>
 				<view class="u-flex u-row-between">
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.Bottomprice"
+							v-model="weight_range_start" />
 					</view>
 					<text>-</text>
 					<view class="input u-flex u-row-center">
-						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice" />
+						<input style="text-align: center;" type="text" :placeholder="i18n.highestprice"
+							v-model="weight_range_end" />
 					</view>
 				</view>
+				<!-- 品牌 -->
 				<view style="margin-top: 36rpx;" class="title">{{i18n.brand}}</view>
 				<view class="u-flex " style="flex-wrap: wrap;column-gap: 34rpx;">
-					<view @click="changei(idx)" class="item" v-for="(item,idx) in 8" :key="idx"
-						:class="index==idx?'acitem':'item'">
-						PURICH/醇粹
+					<view @click="changei(item,idx)" v-for="(item,idx) in brandlist" :key="idx">
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='zh-CN'">
+							{{item.name_cn}}
+						</view>
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='en-US'">
+							{{item.name_en}}
+						</view>
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='es-ES'">
+							{{item.name_es}}
+						</view>
+						<view :class="index==idx?'acitem':'item'" class="" v-if="language =='it-IT'">
+							{{item.name_ita}}
+						</view>
 					</view>
 				</view>
 				<view style="margin-top: 36rpx;" class="title">{{i18n.Proprietary}}</view>
-				<view class="item">
+				<view :class="yes==true?'acitem':'item'" @click="yesa">
+					<!-- {{yes}} -->
 					{{i18n.yes}}
 				</view>
 				<view class="bottom u-flex" style="margin-top: 58rpx;">
 					<view class="btn1">
 						{{i18n.reset}}
 					</view>
-					<view class="btn2" @click="shai=false">
+					<view class="btn2" @click="enter">
 						{{i18n.enter}}
 					</view>
 				</view>
@@ -77,6 +96,7 @@
 	export default {
 		data() {
 			return {
+				yes: false,
 				shai: false,
 				current: 0,
 				curess: 0,
@@ -87,16 +107,22 @@
 				goodsid: '',
 				title: '',
 				parent_id: '',
-				language:'',
-				page:1,
-				
+				language: '',
+				page: 1,
+				weight_range_start: '', //重量区间 start
+				weight_range_end: '', //重量区间 end
+				brand_id: '', //品牌id
+				price_range_start: '', //价格区间
+				price_range_end: '', //价格区间
+				brandlist: []
 			};
 		},
 		onLoad(options) {
-			console.log(options);
 			this.goodsid = options.id
 			this.title = options.title
 			this.parent_id = options.parent_id
+			this.curess = options.index
+			console.log(options.index);
 		},
 		onShow() {
 			uni.setNavigationBarTitle({
@@ -107,6 +133,7 @@
 			if (uni.getStorageSync('language') != '') {
 				this.language = uni.getStorageSync('language')
 			}
+			this.brand()
 		},
 		computed: {
 			i18n() {
@@ -114,11 +141,19 @@
 			}
 		},
 		methods: {
+			enter() {
+				this.shai = false
+				this.goods(this.goodsid)
+			},
+
+			yesa() {
+				this.yes = !this.yes
+			},
 			//商品详情
-			detail(item){
+			detail(item) {
 				console.log(item);
 				uni.navigateTo({
-					url:'/pageA/productdetails?id='+item.id
+					url: '/pageA/productdetails?id=' + item.id
 				})
 			},
 			//商品分类
@@ -126,8 +161,8 @@
 				uni.$u.http.get('/api/goods/category', {
 					params: {
 						parent_id: id,
-						limit:10,
-						page:this.page
+						limit: 10,
+						page: this.page
 					}
 				}).then((res) => {
 					const categoryArr = res
@@ -152,7 +187,7 @@
 							item.name = item.name_cn
 						})
 					}
-					this.list1 = categoryArr
+					this.list1 = categoryArr.reverse()
 				}).catch(() => {
 
 				})
@@ -161,7 +196,14 @@
 			goods(id) {
 				uni.$u.http.get('/api/goods', {
 					params: {
-						category_id: id
+						category_id: id,
+						limit: 10,
+						page: this.page,
+						weight_range_start: this.weight_range_start,
+						weight_range_end: this.weight_range_end,
+						brand_id: this.brand_id,
+						price_range_start: this.price_range_start,
+						price_range_end: this.price_range_end
 					}
 				}).then((res) => {
 					this.data = res.data
@@ -169,6 +211,17 @@
 
 				})
 			},
+			//品牌列表
+			brand(id) {
+				uni.$u.http.get('/api/goods/brand', {
+					params: {}
+				}).then((res) => {
+					console.log(res);
+					this.brandlist = res
+				}).catch(() => {
+
+				})
+			},
 			shaixuan() {
 				this.shai = true,
 					this.current = 4
@@ -176,12 +229,32 @@
 			click(item) {
 				console.log('item', item);
 				this.curess = item.index
+				this.title = item.title
 				this.goods(item.id)
-				// uni.navigateTo({
-				// 	url: '/pageB/delivery'
-				// })
+				if (this.language == 'en-US') {
+					uni.setNavigationBarTitle({
+						title: item.name_en
+					})
+				}
+				if (this.language == 'es-ES') {
+					uni.setNavigationBarTitle({
+						title: item.name_es
+					})
+				}
+				if (this.language == 'it-IT') {
+					uni.setNavigationBarTitle({
+						title: item.name_ita
+					})
+				}
+
+				if (this.language == 'zh-CN') {
+					uni.setNavigationBarTitle({
+						title: item.name_cn
+					})
+				}
 			},
-			changei(idx) {
+			changei(item,idx) {
+				this.brand_id = item.id
 				this.index = idx
 			}
 		}
@@ -256,6 +329,7 @@
 			height: 64rpx;
 			font-family: PingFangSC, PingFang SC;
 			font-weight: 400;
+			border-radius: 36rpx;
 			font-size: 24rpx;
 			color: rgba(248, 50, 36, 1);
 			line-height: 64rpx;

pageA/shoptype.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="">
 		<zhSlidingMenu ref='zhSlidingMenu' :tabbar='list' :scrollH="scrollH">
-			<template #default="{scroll_list}">
+			<template #default="{scroll_list,language}">
 				<view class="goods">
 					<view class="goods_item" v-for="(item, index) in scroll_list" :key="index"
-						@click="clickGoods(item)">
+						@click="clickGoods(item,index)">
 						<image class="goods_item_img" :src="item.image" mode=""></image>
 						<view class="goods_item_name" v-if="language =='zh-CN'">
 							{{item.name_cn}}
@@ -34,54 +34,54 @@
 		data() {
 			return {
 				scrollH: 0, //scroll高度
-				// list: [{
-				// 		name: "女装",
-				// 		children: [{
-				// 				name: "A字裙",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
-				// 			},
-				// 			{
-				// 				name: "礼服/婚纱",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
-				// 			}
-				// 		]
-				// 	},
-				// 	{
-				// 		name: "美食",
-				// 		children: [{
-				// 				name: "火锅",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
-				// 			},
-				// 			{
-				// 				name: "精品茗茶",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
-				// 			},
-				// 			{
-				// 				name: "休闲食品",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
-				// 			},
-				// 		]
-				// 	},
-				// 	{
-				// 		name: "美妆",
-				// 		children: [{
-				// 				name: "化妆刷",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
-				// 			},
-				// 			{
-				// 				name: "防晒品",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
-				// 			},
-				// 			{
-				// 				name: "美甲",
-				// 				icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
-				// 			}
+				list1: [{
+						name: "女装",
+						children: [{
+								name: "A字裙",
+								icon: "https://cdn.uviewui.com/uview/common/classify/1/1.jpg",
+							},
+							{
+								name: "礼服/婚纱",
+								icon: "https://cdn.uviewui.com/uview/common/classify/1/14.jpg",
+							}
+						]
+					},
+					{
+						name: "美食",
+						children: [{
+								name: "火锅",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/1.jpg",
+							},
+							{
+								name: "精品茗茶",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/7.jpg",
+							},
+							{
+								name: "休闲食品",
+								icon: "https://cdn.uviewui.com/uview/common/classify/2/8.jpg",
+							},
+						]
+					},
+					{
+						name: "美妆",
+						children: [{
+								name: "化妆刷",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/1.jpg",
+							},
+							{
+								name: "防晒品",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/14.jpg",
+							},
+							{
+								name: "美甲",
+								icon: "https://cdn.uviewui.com/uview/common/classify/3/15.jpg",
+							}
 
-				// 		]
-				// 	}
-				// ],
-				language: '',
-				list:[]
+						]
+					}
+				],
+				language: 'zh-CN',
+				list: []
 			}
 		},
 		onLoad() {
@@ -90,6 +90,9 @@
 					this.scrollH = res.windowHeight
 				}
 			});
+			if (uni.getStorageSync('language')) {
+				this.language = uni.getStorageSync('language')
+			}
 		},
 		computed: {
 			i18n() {
@@ -100,36 +103,35 @@
 			uni.setNavigationBarTitle({
 				title: this.i18n.classification
 			})
+
 			this.category() //商品分类
-			if (uni.getStorageSync('language') != '') {
-				this.language = uni.getStorageSync('language')
-			}
+			console.log(this.language);
 		},
 		methods: {
-			clickGoods(item) { //点击商品
+			clickGoods(item, index) { //点击商品
 				console.log(item);
 				if (this.language == 'en-US') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_en + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 				if (this.language == 'es-ES') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_es + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 				if (this.language == 'it-IT') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_ita + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 				if (this.language == 'zh-CN') {
 					uni.navigateTo({
 						url: '/pageA/shoplist?id=' + item.id + '&title=' + item.name_cn + '&parent_id=' + item
-							.parent_id
+							.parent_id + "&index=" + index
 					})
 				}
 			},

pageA/subsidy.vue

@@ -121,9 +121,30 @@
 				Pleaseproductname: '', //搜索内容
 				language: 'zh-CN', //语言
 				keyword: '',
-				parent_id: ''
+				parent_id: '',
+				page: 1,
+				limit: 10,
+				last_page: 1,
 			};
 		},
+		onReachBottom() {
+			if (this.page < this.last_page) {
+				// if (this.current != 0) {
+				this.page++
+				if (this.show == 1) {
+					this.subsid() //百万补贴
+				}
+				if (this.show == 2) {
+					this.pack() //拼包好物
+				}
+				if (this.show == 3) {
+					this.shipp() //海外包邮
+				}
+				// }
+			} else {
+				this.$u.toast('已无更多数据')
+			}
+		},
 		computed: {
 			i18n() {
 				return this.$t('index')
@@ -228,10 +249,17 @@
 			//海外包邮接口
 			shipp(id) {
 				uni.$u.http.post('api/goods/shipping', {
+					page: this.page,
+					limit: this.limit,
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res.data
+					this.last_page = res.last_page
+					if (this.page == 1) {
+						this.list = res.data
+					} else {
+						this.list = this.list.concat(res.data)
+					}
 				}).catch(() => {
 
 				})
@@ -239,10 +267,17 @@
 			//拼包好物接口
 			pack(id) {
 				uni.$u.http.post('/api/goods/pack', {
+					page: this.page,
+					limit: this.limit,
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res.data
+					this.last_page = res.last_page
+					if (this.page == 1) {
+						this.list = res.data
+					} else {
+						this.list = this.list.concat(res.data)
+					}
 				}).catch(() => {
 
 				})
@@ -250,10 +285,17 @@
 			//百万补贴接口
 			subsid(id) {
 				uni.$u.http.post('/api/goods/subsidy', {
+					page: this.page,
+					limit: this.limit,
 					parent_id: id,
 					keyword: this.keyword
 				}).then((res) => {
-					this.list = res.data
+					this.last_page = res.last_page
+					if (this.page == 1) {
+						this.list = res.data
+					} else {
+						this.list = this.list.concat(res.data)
+					}
 				}).catch(() => {
 
 				})

pages/index/index.vue

@@ -525,6 +525,10 @@
 	}
 
 	.shopname {
+		width: 124rpx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 400;
 		font-size: 20rpx;

pages/login/login.vue

@@ -16,7 +16,6 @@
 		<view>
 			<u--input placeholder="请输入内容" border="surround" v-model="mobile"></u--input>
 			<u--input placeholder="请输入内容" border="surround" v-model="code"></u--input>
-<<<<<<< HEAD
 		</view>
 		<button @click="submit">登录</button>
 		<button @click="submita">注册</button>
@@ -31,32 +30,11 @@
 			<text class="fontYin" style="color: #f83224">《隐私协议》</text>
 		</view>
 	</view>
-=======
-		</view> -->
-    <button @click="submit">登录</button>
-    <view class="" style="margin-top: 42rpx; display: flex">
-      <u-checkbox-group
-        v-model="checkboxValue1"
-        placement="column"
-        @change="checkboxChange"
-      >
-        <u-checkbox
-          shape="circle"
-          :customStyle="{ marginBottom: '8px' }"
-          :name="1"
-        >
-        </u-checkbox>
-      </u-checkbox-group>
-      <text class="fontYin">我已阅读并同意</text>
-      <text class="fontYin" style="color: #f83224">《用户协议》</text>
-      <text class="fontYin">和</text>
-      <text class="fontYin" style="color: #f83224">《隐私协议》</text>
-    </view>
-  </view>
->>>>>>> 1ef0e2f26ceef3fa675ea80234177479c376fa52
 </template>
 
 <script>
+	// import {conn} from '@/utils/WebIM.js'
+	import {conn} from '../../utils/WebIM.js'
 	import {
 		login
 	} from "../../network/api/homeApi.js";
@@ -80,7 +58,7 @@
 								uni.$u.http
 									.post("/api/wxmini/login", {
 										code: code.code,
-									})
+									})  
 									.then((res) => {
 										console.log(res);
 										if (res == 10011) {
@@ -97,14 +75,27 @@
 														})
 														.then((res) => {
 															console.log(res);
+															uni.setStorageSync('user_no',res.easemob_username)
+															uni.setStorageSync('pwd',res.easemob_password)
+															var options = {
+															  user: res.easemob_username,
+															  pwd: res.easemob_password,
+															  appKey: conn.appkey,
+															  success: function (res2) {
+																								
+															  },
+															  error: function(){
+															  }
+															};
+															conn.open(options);
 															uni.setStorageSync("token", res.token);
 															uni.setStorageSync("openid", res
 																.openid);
-															setTimeout(() => {
-																uni.navigateTo({
-																	url: "/pageA/changelange",
-																});
-															}, 300);
+															// setTimeout(() => {
+															// 	uni.navigateTo({
+															// 		url: "/pageA/changelange",
+															// 	});
+															// }, 300);
 														})
 														.catch(() => {});
 												})
@@ -153,9 +144,22 @@
 					})
 					.then((res) => {
 						uni.setStorageSync("token", res.token);
-						uni.switchTab({
-							url: "/pages/index/index",
-						});
+						uni.setStorageSync('user_no',res.easemob_username)
+						uni.setStorageSync('pwd',res.easemob_password)
+						var options = {
+						  user: res.easemob_username,
+						  pwd: res.easemob_password,
+						  appKey: conn.appkey,
+						  success: function (res2) {
+								console.log(res2);							
+						  },
+						  error: function(){
+						  }
+						};
+						conn.open(options);
+						// uni.switchTab({
+						// 	url: "/pages/index/index",
+						// });
 					})
 					.catch((error) => {
 						console.log(error);

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -73,6 +73,10 @@ page.data-v-57280228 {
   margin-left: 12rpx;
 }
 .shopname.data-v-57280228 {
+  width: 124rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
   font-family: PingFangSC, PingFang SC;
   font-weight: 400;
   font-size: 20rpx;

unpackage/dist/dev/mp-weixin/pages/login/login.js

@@ -97,10 +97,44 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
-var render = function () {}
-var staticRenderFns = []
-var recyclableRender
 var components
+try {
+  components = {
+    "u-Input": function () {
+      return Promise.all(/*! import() | uview-ui/components/u--input/u--input */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u--input/u--input")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u--input/u--input.vue */ 959))
+    },
+    uCheckboxGroup: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox-group/u-checkbox-group */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox-group/u-checkbox-group")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox-group/u-checkbox-group.vue */ 910))
+    },
+    uCheckbox: function () {
+      return Promise.all(/*! import() | uview-ui/components/u-checkbox/u-checkbox */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uview-ui/components/u-checkbox/u-checkbox")]).then(__webpack_require__.bind(null, /*! @/uview-ui/components/u-checkbox/u-checkbox.vue */ 936))
+    },
+  }
+} catch (e) {
+  if (
+    e.message.indexOf("Cannot find module") !== -1 &&
+    e.message.indexOf(".vue") !== -1
+  ) {
+    console.error(e.message)
+    console.error("1. 排查组件名称拼写是否正确")
+    console.error(
+      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
+    )
+    console.error(
+      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
+    )
+  } else {
+    throw e
+  }
+}
+var render = function () {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+}
+var recyclableRender = false
+var staticRenderFns = []
+render._withStripped = true
 
 
 
@@ -136,6 +170,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _WebIM = __webpack_require__(/*! ../../utils/WebIM.js */ 1619);
 var _homeApi = __webpack_require__(/*! ../../network/api/homeApi.js */ 211);
 //
 //
@@ -171,30 +206,7 @@ var _homeApi = __webpack_require__(/*! ../../network/api/homeApi.js */ 211);
 //
 //
 //
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
-//
+// import {conn} from '@/utils/WebIM.js'
 var _default = {
   data: function data() {
     return {
@@ -226,13 +238,23 @@ var _default = {
                       mobile: res.mobile //	是	String	手机号码
                     }).then(function (res) {
                       console.log(res);
+                      uni.setStorageSync('user_no', res.easemob_username);
+                      uni.setStorageSync('pwd', res.easemob_password);
+                      var options = {
+                        user: res.easemob_username,
+                        pwd: res.easemob_password,
+                        appKey: _WebIM.conn.appkey,
+                        success: function success(res2) {},
+                        error: function error() {}
+                      };
+                      _WebIM.conn.open(options);
                       uni.setStorageSync("token", res.token);
                       uni.setStorageSync("openid", res.openid);
-                      setTimeout(function () {
-                        uni.navigateTo({
-                          url: "/pageA/changelange"
-                        });
-                      }, 300);
+                      // setTimeout(() => {
+                      // 	uni.navigateTo({
+                      // 		url: "/pageA/changelange",
+                      // 	});
+                      // }, 300);
                     }).catch(function () {});
                   }).catch(function () {});
                 } else {
@@ -276,9 +298,21 @@ var _default = {
         password: '123456'
       }).then(function (res) {
         uni.setStorageSync("token", res.token);
-        uni.switchTab({
-          url: "/pages/index/index"
-        });
+        uni.setStorageSync('user_no', res.easemob_username);
+        uni.setStorageSync('pwd', res.easemob_password);
+        var options = {
+          user: res.easemob_username,
+          pwd: res.easemob_password,
+          appKey: _WebIM.conn.appkey,
+          success: function success(res2) {
+            console.log(res2);
+          },
+          error: function error() {}
+        };
+        _WebIM.conn.open(options);
+        // uni.switchTab({
+        // 	url: "/pages/index/index",
+        // });
       }).catch(function (error) {
         console.log(error);
       });

utils/Dispatcher.js

@@ -0,0 +1,37 @@
+var dispCbs = [];
+var dispIns = [];
+
+function Dispatcher() {
+  dispIns.push(this);
+  dispCbs.push({});
+}
+
+Dispatcher.prototype = {
+  on(type, cb) {
+    let cbtypes = dispCbs[dispIns.indexOf(this)];
+    let cbs = cbtypes[type] = cbtypes[type] || [];
+    if (!~cbs.indexOf(cb)) {
+		cbs.push(cb);
+    }
+  },
+
+  off(type, cb) {
+    let cbtypes = dispCbs[dispIns.indexOf(this)];
+    let cbs = cbtypes[type] = cbtypes[type] || [];
+    let curTypeCbIdx = cbs.indexOf(cb);
+    if (~curTypeCbIdx) {
+      cbs.splice(curTypeCbIdx, 1);
+    }
+  },
+
+  fire(type, ...args) {
+    let cbtypes = dispCbs[dispIns.indexOf(this)];
+    let cbs = cbtypes[type] = cbtypes[type] || [];
+
+    for (let i = 0; i < cbs.length; i++) {
+      cbs[i].apply(null, args);
+    }
+  }
+
+};
+module.exports = Dispatcher;

utils/WebIM.js

@@ -0,0 +1,96 @@
+import WebIM from '../newSDK/Easemob-chat-4.1.4.js'
+import config from './WebIMConfig.js'
+import vueBus from '@/utils/vueBus'
+   
+//初始化
+let conn = {};
+WebIM.config = config;
+conn = WebIM.conn = new WebIM.connection({
+    appKey: config.appkey,
+     https: true, //是否使用HTTPS
+     url: "wss://im-api-wechat.easemob.com/websocket", // socket server (3.0 SDK)
+     apiUrl: "https://a1.easemob.com", // rest server
+     heartBeatWait: 30000, //心跳间隔
+     autoReconnectNumMax: 5, //自动重连次数
+     useOwnUploadFun: true, // 是否使用自己的上传方式（如将图片文件等上传到自己的服务器，构建消息时只传url）
+// WebIM.config 为之前集成里介绍的WebIMConfig.js
+})
+
+let login = false
+
+//回调
+conn.listen({
+    onOpened: function ( message ) {
+        console.log('环信登录成功');
+    },         //连接成功回调 
+    onClosed: function ( message ) {
+		
+        console.log('环信断开链接');
+		/* uni.showModal({
+			title: '提示',
+			content: '您已在其他地方登录，是否重新登录',
+			success: function (res) {
+				if (res.confirm) {
+					uni.reLaunch({
+						url: "/pages/login/login"
+					})
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		}); */
+    },         //连接关闭回调
+    onTextMessage: function ( message ) {
+		vueBus.$emit('message','text')
+	},    //收到文本消息
+    onEmojiMessage: function ( message ) {
+        vueBus.$emit('message','emoji')
+    },   //收到表情消息
+    onPictureMessage: function ( message ) {
+		vueBus.$emit('message','img')
+	}, //收到图片消息
+    onCmdMessage: function ( message ) {},     //收到命令消息
+    onAudioMessage: function ( message ) {
+		vueBus.$emit('message','audio')
+	},   //收到音频消息
+    onLocationMessage: function ( message ) {},//收到位置消息
+    onFileMessage: function ( message ) {},    //收到文件消息
+    onVideoMessage: function (message) {
+        var node = document.getElementById('privateVideo');
+        var option = {
+            url: message.url,
+            headers: {
+              'Accept': 'audio/mp4'
+            },
+            onFileDownloadComplete: function (response) {
+                var objectURL = WebIM.utils.parseDownloadResponse.call(conn, response);
+                node.src = objectURL;
+            },
+            onFileDownloadError: function () {
+                console.log('File down load error.')
+            }
+        };
+        WebIM.utils.download.call(conn, option);
+    },   //收到视频消息
+    onPresence: function ( message ) {},       //处理“广播”或“发布-订阅”消息，如联系人订阅请求、处理群组、聊天室被踢解散等消息
+    onRoster: function ( message ) {},         //处理好友申请
+    onInviteMessage: function ( message ) {},  //处理群组邀请
+    onOnline: function () {},                  //本机网络连接成功
+    onOffline: function () {},                 //本机网络掉线
+    onError: function ( message ) {},          //失败回调
+    onBlacklistUpdate: function (list) {       //黑名单变动
+        // 查询黑名单，将好友拉黑，将好友从黑名单移除都会回调这个函数，list则是黑名单现有的所有好友信息
+        console.log(list);
+    },
+    onRecallMessage: function(message){},      //收到撤回消息回调
+    onReceivedMessage: function(message){},    //收到消息送达服务器回执
+    onDeliveredMessage: function(message){
+
+    },   //收到消息送达客户端回执
+    onReadMessage: function(message){},        //收到消息已读回执
+    onCreateGroup: function(message){},        //创建群组成功回执（需调用createGroupNew）
+    onMutedMessage: function(message){},       //如果用户在A群组被禁言，在A群发消息会走这个回调并且消息不会传递给群其它成员
+    onChannelMessage: function(message){}      //收到整个会话已读的回执，在对方发送channel ack时会在这个回调里收到消息
+});
+
+export {conn};

utils/WebIMConfig.js

@@ -0,0 +1,96 @@
+/**
+ * git do not control webim.config.js
+ * everyone should copy webim.config.js to webim.config.js
+ * and have their own configs.
+ * In this way , others won't be influenced by this config while git pull.
+ *
+ */
+// for react native
+let location = {
+  protocol: "https"
+};
+let config = {
+  /*
+   * XMPP server
+   */
+
+  // xmppURL: "wss://im-api-new-hsb.easemob.com/websocket",// websdk 3.0 server 沙箱（测试用）
+  
+  // xmppURL: "wss://im-api.easemob.com/ws",  //小程序sdk 2.0 server
+
+  // xmppURL: 'wss://im-api-wechat.easemob.com/websocket', //小程序3.0 server 线上 小程序和原生客户端使用这个
+  
+  // xmppURL: 'wss://im-api-v2-hsb-alipay.easemob.com/websocket', // 支付宝沙箱 （测试用）
+  
+    // xmppURL: 'wss://im-api-alipay.easemob.com/websocket', // 支付宝线上 支付宝小程序请使用这个地址
+  
+  /*
+   * Backend REST API URL
+   */
+  // apiURL: (location.protocol === 'https:' ? 'https:' : 'http:') + '//a1.easemob.com',
+  // ios must be https!!! by lwz
+  apiURL: "https://a1.easemob.com",
+  
+  // apiURL: 'https://192.168.43.137:8080', // 支付宝测试
+  // apiURL: (location.protocol === 'https:' ? 'https:' : 'http:') + '//172.17.3.155:8080',
+
+  /*
+   * Application AppKey
+   */
+  appkey: "1104240707154651#demo",
+
+  /*
+   * Whether to use HTTPS      '1177161227178308#xcx'
+   * @parameter {Boolean} true or false
+   */
+  https: false,
+
+  /*
+   * isMultiLoginSessions
+   * true: A visitor can sign in to multiple webpages and receive messages at all the webpages.
+   * false: A visitor can sign in to only one webpage and receive messages at the webpage.
+   */
+  isMultiLoginSessions: false,
+
+  /**
+   * Whether to use window.doQuery()
+   * @parameter {Boolean} true or false
+   */
+  isWindowSDK: false,
+
+  /**
+   * isSandBox=true:  xmppURL: 'im-api.sandbox.easemob.com',  apiURL: '//a1.sdb.easemob.com',
+   * isSandBox=false: xmppURL: 'im-api.easemob.com',          apiURL: '//a1.easemob.com',
+   * @parameter {Boolean} true or false
+   */
+  isSandBox: false,
+
+  /**
+   * Whether to console.log in strophe.log()
+   * @parameter {Boolean} true or false
+   */
+  isDebug: false,
+
+  /**
+   * will auto connect the xmpp server autoReconnectNumMax times in background when client is offline.
+   * won't auto connect if autoReconnectNumMax=0.
+   */
+  autoReconnectNumMax: 2,
+
+  /**
+   * the interval secons between each atuo reconnectting.
+   * works only if autoReconnectMaxNum >= 2.
+   */
+  autoReconnectInterval: 2,
+
+  /**
+   * webrtc supports WebKit and https only
+   */
+  isWebRTC: false,
+
+  /*
+   * Set to auto sign-in
+   */
+  isAutoLogin: true
+};
+export default config;

utils/broadcast.js

@@ -0,0 +1,3 @@
+var Dispatcher = require("./Dispatcher.js");
+
+module.exports = new Dispatcher();

utils/index.js

@@ -0,0 +1,16 @@
+export function renderTime(time) {
+    var t = new Date(parseInt(time));
+    var Y = t.getFullYear();
+    var M = t.getMonth() + 1 < 10 ? '0' + (t.getMonth() + 1) : t.getMonth() + 1;
+    var D = t.getDate() < 10 ? '0' + t.getDate() : t.getDate();
+    var H = t.getHours() < 10 ? '0' + t.getHours() : t.getHours();
+    var F = t.getMinutes() < 10 ? '0' + t.getMinutes() : t.getMinutes();
+    var S = t.getSeconds() < 10 ? '0' + t.getSeconds() : t.getSeconds();
+    return `${M}-${D} ${H}:${F}`;
+}
+
+export function readablizeBytes(value) {
+    let s = ['Bytes', 'KB', 'MB', 'GB', 'TB', 'PB'];
+    let e = Math.floor(Math.log(value) / Math.log(1024));
+    return (value / Math.pow(1024, Math.floor(e))).toFixed(2) + ' ' + s[e];
+}

utils/vueBus.js

@@ -0,0 +1,3 @@
+import Vue from 'vue';
+let VueBUs = new Vue()
+export default VueBUs;