Merge pull request 'yhy' (#15) from yhy into master

Reviewed-on: #15

.env

@@ -11,13 +11,8 @@ SHOPRO_BASE_URL = https://zysc.fjptzykj.com
 
 # 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
 SHOPRO_DEV_BASE_URL = https://zysc.fjptzykj.com
-<<<<<<< Updated upstream
 #SHOPRO_DEV_BASE_URL = http://192.168.10.36:6127
 #SHOPRO_DEV_BASE_URL = http://192.168.10.29:6127
-=======
-#SHOPRO_DEV_BASE_URL = http://127.0.0.1:48080
-#SHOPRO_DEV_BASE_URL = http://192.168.10.5:6127
->>>>>>> Stashed changes
 #SHOPRO_DEV_BASE_URL = http://192.168.1.12:6127
 #SHOPRO_DEV_BASE_URL = http://192.168.10.75:6127
 #SHOPRO_DEV_BASE_URL = http://192.168.1.9:6127

pages/chat/chatList.vue

@@ -222,7 +222,8 @@
 
 				.userMessage {
 					color: gray;
-					max-height: 80rpx;
+					line-height: 1.2;
+					max-height: 3.6em;
 					overflow-y: hidden;
 				}
 			}

sheep/api/member/auth.js

@@ -95,6 +95,22 @@ const AuthUtil = {
 			},
 		});
 	},
+	// 查询
+	checkLogin: (type, code, state) => {
+		return request({
+			url: '/member/auth/checkLogin',
+			method: 'POST',
+			data: {
+				type,
+				code,
+				state,
+			},
+			custom: {
+				showSuccess: true,
+				// loadingMsg: '查询中',
+			},
+		});
+	},
 	// 微信小程序的一键登录
 	weixinMiniAppLogin: (phoneCode, loginCode, state) => {
 		return request({

sheep/components/s-menu-button/s-menu-button.vue

@@ -53,17 +53,11 @@
 		</view> -->
 		<view class="newList">
 			<view class="new_menu" v-for="(arr, index) in menuList" :key="index">
-<<<<<<< Updated upstream
-				<view v-for="(item, index) in arr" :key="index" class="new_items"
-					:style="[{ width: `${100 * (1 / data.column)}%`}]" @tap="sheep.$router.go(item.url)">
-					<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center">
-=======
 				<view v-for="(item, index) in arr" :key="index"
 					class="new_items"
 					:style="[{ width: `${100 * (1 / data.column)}%`}]">
 					<view class="menu-box ss-flex ss-flex-col ss-col-center ss-row-center"
 					@tap="sheep.$router.go(item.url)" v-if="item.title !== '平台客服' || (item.title === '平台客服' && userInfo.idKefu)">
->>>>>>> Stashed changes
 						<view v-if="item.badge.show" class="tag-box">
 							{{ item.badge.text }}
 						</view>
@@ -217,11 +211,7 @@
 
 	// 生成数据
 	const menuList = computed(() => splitData(props.data.list, props.data.row * props.data.column));
-<<<<<<< Updated upstream
 	console.log('这是菜单', menuList)
-=======
-	console.log("menulist",props.data.list);
->>>>>>> Stashed changes
 	const swiperHeight = computed(
 		() => props.data.row * (props.data.layout === 'iconText' ? 200 : 180),
 	);