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

@@ -1,132 +1,148 @@
 import request from '@/sheep/request';
 
 const AuthUtil = {
-  // 使用手机 + 密码登录
+	// 使用手机 + 密码登录
-  login: (data) => {
+	login: (data) => {
-    return request({
+		return request({
-      url: '/member/auth/login',
+			url: '/member/auth/login',
-      method: 'POST',
+			method: 'POST',
-      data,
+			data,
-      custom: {
+			custom: {
-        showSuccess: true,
+				showSuccess: true,
-        loadingMsg: '登录中',
+				loadingMsg: '登录中',
-        successMsg: '登录成功',
+				successMsg: '登录成功',
-      },
+			},
-    });
+		});
-  },
+	},
-  // 使用手机 + 验证码登录
+	// 使用手机 + 验证码登录
-  smsLogin: (data) => {
+	smsLogin: (data) => {
-    return request({
+		return request({
-      url: '/member/auth/sms-login',
+			url: '/member/auth/sms-login',
-      method: 'POST',
+			method: 'POST',
-      data,
+			data,
-      custom: {
+			custom: {
-        showSuccess: true,
+				showSuccess: true,
-        loadingMsg: '登录中',
+				loadingMsg: '登录中',
-        successMsg: '登录成功',
+				successMsg: '登录成功',
-      },
+			},
-    });
+		});
-  },
+	},
-  // 发送手机验证码
+	// 发送手机验证码
-  sendSmsCode: (mobile, scene) => {
+	sendSmsCode: (mobile, scene) => {
-    return request({
+		return request({
-      url: '/member/auth/send-sms-code',
+			url: '/member/auth/send-sms-code',
-      method: 'POST',
+			method: 'POST',
-      data: {
+			data: {
-        mobile,
+				mobile,
-        scene,
+				scene,
-      },
+			},
-      custom: {
+			custom: {
-        loadingMsg: '发送中',
+				loadingMsg: '发送中',
-        showSuccess: true,
+				showSuccess: true,
-        successMsg: '发送成功',
+				successMsg: '发送成功',
-      },
+			},
-    });
+		});
-  },
+	},
-  // 登出系统
+	// 登出系统
-  logout: () => {
+	logout: () => {
-    return request({
+		return request({
-      url: '/member/auth/logout',
+			url: '/member/auth/logout',
-      method: 'POST',
+			method: 'POST',
-    });
+		});
-  },
+	},
-  // 刷新令牌
+	// 刷新令牌
-  refreshToken: (refreshToken) => {
+	refreshToken: (refreshToken) => {
-    return request({
+		return request({
-      url: '/member/auth/refresh-token',
+			url: '/member/auth/refresh-token',
-      method: 'POST',
+			method: 'POST',
-      params: {
+			params: {
-        refreshToken,
+				refreshToken,
-      },
+			},
-      custom: {
+			custom: {
-        loading: false, // 不用加载中
+				loading: false, // 不用加载中
-        showError: false, // 不展示错误提示
+				showError: false, // 不展示错误提示
-      },
+			},
-    });
+		});
-  },
+	},
-  // 社交授权的跳转
+	// 社交授权的跳转
-  socialAuthRedirect: (type, redirectUri) => {
+	socialAuthRedirect: (type, redirectUri) => {
-    return request({
+		return request({
-      url: '/member/auth/social-auth-redirect',
+			url: '/member/auth/social-auth-redirect',
-      method: 'GET',
+			method: 'GET',
-      params: {
+			params: {
-        type,
+				type,
-        redirectUri,
+				redirectUri,
-      },
+			},
-      custom: {
+			custom: {
-        showSuccess: true,
+				showSuccess: true,
-        loadingMsg: '登陆中',
+				loadingMsg: '登陆中',
-      },
+			},
-    });
+		});
-  },
+	},
-  // 社交快捷登录
+	// 社交快捷登录
-  socialLogin: (type, code, state) => {
+	socialLogin: (type, code, state) => {
-    return request({
+		return request({
-      url: '/member/auth/social-login',
+			url: '/member/auth/social-login',
-      method: 'POST',
+			method: 'POST',
-      data: {
+			data: {
-        type,
+				type,
-        code,
+				code,
-        state,
+				state,
-      },
+			},
-      custom: {
+			custom: {
-        showSuccess: true,
+				showSuccess: true,
-        loadingMsg: '登陆中',
+				loadingMsg: '登陆中',
-      },
+			},
-    });
+		});
-  },
+	},
-  // 微信小程序的一键登录
+	// 查询
-  weixinMiniAppLogin: (phoneCode, loginCode, state) => {
+	checkLogin: (type, code, state) => {
-    return request({
+		return request({
-      url: '/member/auth/weixin-mini-app-login',
+			url: '/member/auth/checkLogin',
-      method: 'POST',
+			method: 'POST',
-      data: {
+			data: {
-        phoneCode,
+				type,
-        loginCode,
+				code,
-        state,
+				state,
-      },
+			},
-      custom: {
+			custom: {
-        showSuccess: true,
+				showSuccess: true,
-        loadingMsg: '登陆中',
+				// loadingMsg: '查询中',
-        successMsg: '登录成功',
+			},
-      },
+		});
-    });
+	},
-  },
+	// 微信小程序的一键登录
-  // 创建微信 JS SDK 初始化所需的签名
+	weixinMiniAppLogin: (phoneCode, loginCode, state) => {
-  createWeixinMpJsapiSignature: (url) => {
+		return request({
-    return request({
+			url: '/member/auth/weixin-mini-app-login',
-      url: '/member/auth/create-weixin-jsapi-signature',
+			method: 'POST',
-      method: 'POST',
+			data: {
-      params: {
+				phoneCode,
-        url,
+				loginCode,
-      },
+				state,
-      custom: {
+			},
-        showError: false,
+			custom: {
-        showLoading: false,
+				showSuccess: true,
-      },
+				loadingMsg: '登陆中',
-    });
+				successMsg: '登录成功',
-  },
+			},
-  //
+		});
+	},
+	// 创建微信 JS SDK 初始化所需的签名
+	createWeixinMpJsapiSignature: (url) => {
+		return request({
+			url: '/member/auth/create-weixin-jsapi-signature',
+			method: 'POST',
+			params: {
+				url,
+			},
+			custom: {
+				showError: false,
+				showLoading: false,
+			},
+		});
+	},
+	//
 };
 
-export default AuthUtil;
+export default AuthUtil;

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),
 	);
@@ -408,4 +398,4 @@
 			}
 		}
 	}
-</style>
+</style>