init

.gitignore

@@ -0,0 +1,21 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+.DS_Store
+dist
+*.local
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

.hbuilderx/launch.json

@@ -0,0 +1,20 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

App.vue

@@ -0,0 +1,247 @@
+<script>
+	import {
+		EMClient
+	} from "@/EaseIM";
+	import {
+		emConnectListener,
+		emMountGlobalListener
+	} from "@/EaseIM/emListener";
+	import {
+		emConnect,
+		emUserInfos,
+		emConversation
+	} from "@/EaseIM/emApis";
+	import {
+		CONNECT_CALLBACK_TYPE,
+		HANDLER_EVENT_NAME
+	} from "@/EaseIM/constant";
+	import {
+		emHandleReconnect
+	} from "@/EaseIM/utils";
+	// import readAppInfo from './utils/readAppInfo.js';
+	const {
+		fetchUserInfoWithLoginId,
+		fetchOtherInfoFromServer
+	} =
+	emUserInfos();
+	//获取会话列表
+	const {
+		fetchConversationFromServer,
+		fetchPinConversationFromServer,
+		getLocalConversations
+	} = emConversation();
+
+
+	export default {
+		onLaunch() {
+			console.log('App Launch')
+			//传给监听callback回调
+			return;
+
+
+			const connectedCallback = (type) => {
+				console.log(">>>>>IM连接回调", type);
+				if (type === CONNECT_CALLBACK_TYPE.CONNECT_CALLBACK) {
+					this.onConnectedSuccess();
+				}
+				if (type === CONNECT_CALLBACK_TYPE.DISCONNECT_CALLBACK) {
+					this.onDisconnect();
+				}
+				if (type === CONNECT_CALLBACK_TYPE.RECONNECTING_CALLBACK) {
+					this.onReconnecting();
+				}
+			};
+
+			/* 链接所需监听回调 */
+			emConnectListener(connectedCallback);
+			/* 全局类型监听集合、消息、联系人、群组等... */
+			emMountGlobalListener();
+			this.handleAutoLoginEaseIM();
+
+		},
+		computed: {
+			loginStoreStatus() {
+				return this.$store.state.LoginStore.loginStatus;
+			},
+			loginStoreUserBaseInfos() {
+				return this.$store.state.LoginStore.loginUserBaseInfos;
+			},
+		},
+		onShow: function() {
+			console.log('appshow===>>>>>>')
+			// 读取url参数信息，存储app传递的用户相关信息
+			// readAppInfo(() => {
+			// 	// uni.redirectTo({
+			// 	// 	url: "/pages/my/index"
+			// 	// });
+			// });
+			// uni.redirectTo({
+			// 	url: "/pages/my/index"
+			// });
+
+
+
+		},
+		methods: {
+			//获取会话列表
+			getConversationFromServer() {
+
+				const uIds = [];
+				EMClient.getServerConversations({
+					pageSize: 100,
+					cursor: ''
+				}).then((res) => {
+					res.data.conversations && res.data.conversations.forEach((item) => {
+						console.log('会话item', item)
+						uIds.push(item.conversationId)
+					})
+					console.log('用户列表id', uIds);
+					uni.setStorage({
+						key: 'uIds',
+						data: uIds
+					})
+					// EMClient.fetchUserInfoById(uIds).then((resData)=>{
+					// 	console.log('用户列表',resData.data);
+					// })
+				}).catch((error) => {
+					console.log(error);
+				})
+			},
+			//登录环信
+			async loginWithUserId() {
+
+				try {
+					const res = await loginWithPassword(
+						uni.getStorageSync('im_userid'),
+						uni.getStorageSync('im_pass')
+					);
+					this.$store.commit('SET_LOGIN_USER_BASE_INFOS', {
+						loginUserId: uni.getStorageSync('im_userid'),
+					});
+					this.setEMUserLoginInfosToStorage(
+						uni.getStorageSync('im_userid').toLowerCase(),
+						res.accessToken
+					);
+				} catch (error) {
+					console.log('>>>>>>环信登录失败', error);
+					uni.showToast({
+						title: '登录失败',
+						icon: 'none',
+					});
+				} finally {
+
+				}
+			},
+			setEMUserLoginInfosToStorage(userId, token) {
+				const params = {
+					key: `EM_LOGIN_INFOS`,
+					data: {
+						userId: userId,
+						token: token
+					},
+				};
+				uni.setStorage({
+					...params
+				});
+			},
+			//自动登录
+			handleAutoLoginEaseIM() {
+				const {
+					actionEMReconnect
+				} = emHandleReconnect();
+				const loginInfos = uni.getStorageSync(`EM_LOGIN_INFOS`);
+				console.log('loginInfos', loginInfos)
+				if (!loginInfos) return;
+				actionEMReconnect();
+			},
+			onConnectedSuccess() {
+				const {
+					loginUserId
+				} = this.loginStoreUserBaseInfos || {};
+				const finalLoginUserId = loginUserId || EMClient.user;
+				if (!this.loginStoreStatus) {
+					this.fetchLoginUserNeedData();
+					uni.hideLoading();
+					console.log(">>>>>>开始跳转至会话列表页面");
+					//
+					this.getConversationFromServer();
+					uni.redirectTo({
+						url: "../home/home?myName=" + finalLoginUserId,
+					});
+				}
+				this.$store.commit("SET_LOGIN_USER_BASE_INFOS", {
+					loginUserId: finalLoginUserId,
+				});
+				this.$store.commit("SET_LOGIN_STATUS", true);
+
+			},
+			onDisconnect() {
+				const {
+					closeEaseIM
+				} = emConnect();
+				const {
+					actionEMReconnect
+				} = emHandleReconnect();
+				//断开回调触发后，如果业务登录状态为true则说明异常断开需要重新登录
+				if (!this.loginStatus) {
+					uni.showToast({
+						title: "退出登录",
+						icon: "none",
+						duration: 2000,
+					});
+					uni.redirectTo({
+						url: "../login/login",
+					});
+					closeEaseIM();
+				} else {
+					console.log(">>>>>需执行重登逻辑");
+					//执行通过token进行重新登录
+					actionEMReconnect();
+				}
+			},
+			onReconnecting() {
+				uni.showToast({
+					title: "IM 重连中...",
+					icon: "none",
+				});
+			},
+			//获取登录所需基础参数
+			async fetchLoginUserNeedData() {
+				await this.$store.dispatch("fetchFriendList");
+				//获取好友用户属性
+				await this.$store.dispatch("fetchFriendUserInfoCollection");
+				//获取当前登录用户好友信息
+				await this.$store.dispatch("fetchLoginUserProfile");
+				await this.$store.dispatch("fetchBlockUserList");
+				// 在线状态订阅
+				await this.$store.dispatch("subscribePresenceStatus");
+				this.fetchJoinedGroupList();
+				//初始化缓存本地的新邀请列表
+				this.$store.commit("INIT_RECEIVE_INVITE_LIST");
+			},
+			//获取加入的群组列表
+			async fetchJoinedGroupList() {
+				//获取群组列表
+				await this.$store.dispatch("fetchJoinedGroupList", {
+					isInit: true,
+				});
+			},
+		},
+
+		onHide: function() {
+			console.log('App Hide')
+		},
+	}
+</script>
+
+<style>
+	/*每个页面公共css */
+	* {
+		padding: 0;
+		margin: 0;
+		/* background-color: rgb(247, 248, 252); */
+		/* background-color: green; */
+	}
+
+	@import "@/uni_modules/uview-ui/index.scss";
+</style>

EaseIM/config/index.js

@@ -0,0 +1,5 @@
+export const EM_API_URL = 'https://a1.easemob.com';
+export const EM_WEB_SOCKET_URL = 'wss://im-api-wechat.easemob.com/websocket';
+export const EM_APP_KEY = '1154240320150538#cxb-yhc';
+// export const EM_APP_KEY = 'easemob-demo#support';
+

EaseIM/constant/grayInform.js

@@ -0,0 +1,35 @@
+/**
+ * 此常量非SDK内置，而是基于SDK回调事件演化而来，
+ * 用于在聊天界面能够展示灰色小字通知
+ * 如不需要，可以不做引入。
+ * */
+//灰色通知好友类型
+export const GRAY_INFORM_TEMPLATE_NAME = {
+  USER: '[XXX]',
+  GROUP_USER_FROM: '[AXX]',
+  GROUP_USER_TO: '[BXX]',
+  GROUP_ID: '[X_GROUP_ID_X]',
+};
+export const GRAY_INFORM_TYPE_SINGLE = {
+  CONTACT_ADDED: 'contactAdded',
+  CONTACT_AGREED: 'contactAgreed',
+};
+//灰色通知对应好友文本展示，[XXX]用于替换为实际用户ID或昵称
+export const GRAY_INFORM_MAP_SINGLE_TEXT = {
+  [GRAY_INFORM_TYPE_SINGLE.CONTACT_ADDED]: `你已添加了${GRAY_INFORM_TEMPLATE_NAME.USER}，打个招呼吧！`,
+  [GRAY_INFORM_TYPE_SINGLE.CONTACT_AGREED]: `${GRAY_INFORM_TEMPLATE_NAME.USER}通过了你的好友申请，打个招呼吧！`,
+};
+//灰色通知群聊
+export const GRAY_INFORM_TYPE_GROUP = {
+  MEMBER_PRESENCE: 'memberPresence', // 有用户加入群组。除了新成员，其他群成员会收到该回调。
+  MEMBER_ABSENCE: 'memberAbsence', //群成员主动退出群组
+  CHANGE_OWNER: 'changeOwner', // 转让群组。原群主和新群主会收到该回调。
+  MEMBER_REMOVE: 'removeMember', // 用户被移出群组。被踢出群组的成员会收到该回调。
+};
+
+export const GRAY_INFORM_MAP_GROUP_TEXT = {
+  [GRAY_INFORM_TYPE_GROUP.MEMBER_PRESENCE]: `${GRAY_INFORM_TEMPLATE_NAME.GROUP_USER_FROM}加入了群组`,
+  [GRAY_INFORM_TYPE_GROUP.MEMBER_ABSENCE]: `${GRAY_INFORM_TEMPLATE_NAME.GROUP_USER_FROM}退出了群组`,
+  [GRAY_INFORM_TYPE_GROUP.CHANGE_OWNER]: `${GRAY_INFORM_TEMPLATE_NAME.GROUP_USER_FROM}移交群组至${GRAY_INFORM_TEMPLATE_NAME.GROUP_USER_TO}`,
+  [GRAY_INFORM_TYPE_GROUP.MEMBER_REMOVE]: `您已被移出${GRAY_INFORM_TEMPLATE_NAME.GROUP_ID}该群组！`,
+};

EaseIM/constant/index.js

@@ -0,0 +1,180 @@
+import {
+  GRAY_INFORM_TYPE_SINGLE,
+  GRAY_INFORM_MAP_SINGLE_TEXT,
+  GRAY_INFORM_TYPE_GROUP,
+  GRAY_INFORM_MAP_GROUP_TEXT,
+  GRAY_INFORM_TEMPLATE_NAME,
+} from './grayInform';
+/* 灰色通知类型 */
+export {
+  GRAY_INFORM_TYPE_SINGLE,
+  GRAY_INFORM_MAP_SINGLE_TEXT,
+  GRAY_INFORM_TYPE_GROUP,
+  GRAY_INFORM_MAP_GROUP_TEXT,
+  GRAY_INFORM_TEMPLATE_NAME,
+};
+export const CHAT_TYPE = {
+  SINGLE_CHAT: 'singleChat',
+  GROUP_CHAT: 'groupChat',
+};
+export const INFORM_TYPE = {
+  CONTACTS: 'contacts',
+  GROUPS: 'groups',
+};
+export const HANDLER_EVENT_NAME = {
+  CONNECT_EVENT: 'connectEvent',
+  MESSAGES_EVENT: 'messagesEvent',
+  CONTACTS_EVENT: 'contactsEvent',
+  GROUP_EVENT: 'groupEvent',
+  ERROR_EVENT: 'errorEvent',
+  PRESENCE_EVENT:'presenceEvent'
+};
+
+export const CONNECT_CALLBACK_TYPE = {
+  CONNECT_CALLBACK: 'connected',
+  DISCONNECT_CALLBACK: 'disconnected',
+  RECONNECTING_CALLBACK: 'reconnecting',
+  ERROR_CALLBACK: 'onerror',
+};
+//定义消息状态
+export const MESSAGE_STATUS = {
+  READ: 'read',
+  UNREAD: 'unread',
+  DELETE: 'deleted',
+  PENDING: 'pending',
+  RECALL: 'recalled',
+  FAIL: 'fail',
+};
+export const MESSAGE_TYPE = {
+  IMAGE: 'img',
+  TEXT: 'txt',
+  LOCATION: 'location',
+  VIDEO: 'video',
+  AUDIO: 'audio',
+  EMOJI: 'emoji',
+  FILE: 'file',
+  CUSTOM: 'custom',
+  CMD: 'cmd',
+  GRAY_INFORM: 'gray_inform', //此类型非SDK正式类型，此类型为自定义的本地插入用于灰色通知类型。
+};
+export const SESSION_MESSAGE_TYPE = {
+  [MESSAGE_TYPE.IMAGE]: '[图片]',
+  [MESSAGE_TYPE.FILE]: '[文件]',
+  [MESSAGE_TYPE.AUDIO]: '[语音]',
+  [MESSAGE_TYPE.LOCATION]: '[位置]',
+  [MESSAGE_TYPE.VIDEO]: '[视频]',
+  [MESSAGE_TYPE.PRODUCTLINK]: '[商品链接]',
+};
+export const CUSTOM_EVENT_NAME = {
+  USER_CARD: 'userCard',
+  PRODUCTLINK:'productLink',
+};
+export const CUSTOM_TYPE = {
+  [CUSTOM_EVENT_NAME.USER_CARD]: '个人名片',
+  [CUSTOM_EVENT_NAME.PRODUCTLINK]: '[商品链接]',
+};
+
+export const EMOJI = {
+  path: '@/static/images/faces',
+  map: {
+    '[):]': 'ee_1.png',
+    '[:D]': 'ee_2.png',
+    '[;)]': 'ee_3.png',
+    '[:-o]': 'ee_4.png',
+    '[:p]': 'ee_5.png',
+    '[(H)]': 'ee_6.png',
+    '[:@]': 'ee_7.png',
+    '[:s]': 'ee_8.png',
+    '[:$]': 'ee_9.png',
+    '[:(]': 'ee_10.png',
+    "[:'(]": 'ee_11.png',
+    '[<o)]': 'ee_12.png',
+    '[(a)]': 'ee_13.png',
+    '[8o|]': 'ee_14.png',
+    '[8-|]': 'ee_15.png',
+    '[+o(]': 'ee_16.png',
+    '[|-)]': 'ee_17.png',
+    '[:|]': 'ee_18.png',
+    '[*-)]': 'ee_19.png',
+    '[:-#]': 'ee_20.png',
+    '[^o)]': 'ee_21.png',
+    '[:-*]': 'ee_22.png',
+    '[8-)]': 'ee_23.png',
+    '[del]': 'btn_del.png',
+    '[(|)]': 'ee_24.png',
+    '[(u)]': 'ee_25.png',
+    '[(S)]': 'ee_26.png',
+    '[(*)]': 'ee_27.png',
+    '[(#)]': 'ee_28.png',
+    '[(R)]': 'ee_29.png',
+    '[({)]': 'ee_30.png',
+    '[(})]': 'ee_31.png',
+    '[(k)]': 'ee_32.png',
+    '[(F)]': 'ee_33.png',
+    '[(W)]': 'ee_34.png',
+    '[(D)]': 'ee_35.png',
+  },
+};
+export const EMOJIOBJ = {
+  // 相对 emoji.js 路径
+  path: '/static/images/faces',
+  map1: {
+    '[):]': 'ee_1.png',
+    '[:D]': 'ee_2.png',
+    '[;)]': 'ee_3.png',
+    '[:-o]': 'ee_4.png',
+    '[:p]': 'ee_5.png',
+    '[(H)]': 'ee_6.png',
+    '[:@]': 'ee_7.png',
+  },
+  map2: {
+    '[:s]': 'ee_8.png',
+    '[:$]': 'ee_9.png',
+    '[:(]': 'ee_10.png',
+    "[:'(]": 'ee_11.png',
+    '[<o)]': 'ee_12.png',
+    '[(a)]': 'ee_13.png',
+    '[8o|]': 'ee_14.png',
+  },
+  map3: {
+    '[8-|]': 'ee_15.png',
+    '[+o(]': 'ee_16.png',
+    '[|-)]': 'ee_17.png',
+    '[:|]': 'ee_18.png',
+    '[*-)]': 'ee_19.png',
+    '[:-#]': 'ee_20.png',
+    '[del]': 'del.png',
+  },
+  map4: {
+    '[^o)]': 'ee_21.png',
+    '[:-*]': 'ee_22.png',
+    '[8-)]': 'ee_23.png',
+    '[(|)]': 'ee_24.png',
+    '[(u)]': 'ee_25.png',
+    '[(S)]': 'ee_26.png',
+    '[(*)]': 'ee_27.png',
+  },
+  map5: {
+    '[(#)]': 'ee_28.png',
+    '[(R)]': 'ee_29.png',
+    '[({)]': 'ee_30.png',
+    '[(})]': 'ee_31.png',
+    '[(k)]': 'ee_32.png',
+    '[(F)]': 'ee_33.png',
+    '[(W)]': 'ee_34.png',
+    '[(D)]': 'ee_35.png',
+  },
+  map6: {
+    '[del]': 'del.png',
+  },
+};
+export const GROUP_ROLE_TYPE_NAME = {
+  OWNER: 'owner',
+  ADMIN: 'admin',
+  MEMBER: 'member',
+};
+export const GROUP_ROLE_TYPE = {
+  [GROUP_ROLE_TYPE_NAME.OWNER]: 0,
+  [GROUP_ROLE_TYPE_NAME.ADMIN]: 1,
+  [GROUP_ROLE_TYPE_NAME.MEMBER]: 2,
+};

EaseIM/emApis/emAboutAck.js

@@ -0,0 +1,46 @@
+/* read ack、channel ack、recall ack*/
+import { EaseSDK, EMClient } from '../index';
+const emSendReadAck = () => {
+  // 处理未读消息回执
+  const sendReadAckMsg = (receivemsg) => {
+    const { chatType, from, id } = receivemsg;
+    let option = {
+      type: 'read', // 消息是否已读。
+      chatType: chatType, // 会话类型，这里为单聊。
+      to: from, // 消息接收方的用户 ID。
+      id: id, // 需要发送已读回执的消息 ID。
+    };
+    let msg = EaseSDK.message.create(option);
+    EMClient.send(msg);
+  };
+  //发送撤回ack
+  const sendRecallAckMsg = (recallSourceMsg) => {
+    const { chatType, to, mid } = recallSourceMsg;
+    let option = {
+      // 要撤回消息的消息 ID。
+      mid: mid,
+      // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+      to: to,
+      // 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+      chatType: chatType,
+    };
+    return new Promise((resolve, reject) => {
+      EMClient.recallMessage(option)
+        .then((res) => {
+          console.log('recall success', res);
+          resolve(res);
+        })
+        .catch((error) => {
+          // 消息撤回失败，原因可能是超过了撤销时限(超过 2 分钟)。
+          console.log('fail', error);
+          reject(error);
+        });
+    });
+  };
+  return {
+    sendReadAckMsg,
+    sendRecallAckMsg,
+  };
+};
+
+export default emSendReadAck;

EaseIM/emApis/emConnect.js

@@ -0,0 +1,38 @@
+import { EMClient } from '../index';
+const emConnect = () => {
+  const loginWithPassword = (hxUserId, hxPassword) => {
+    if (!hxUserId || !hxPassword) throw Error('empty params');
+    return new Promise((resolve, reject) => {
+      EMClient.open({
+        user: hxUserId,
+        pwd: hxPassword,
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  const loginWithAccessToken = (hxUserId, hxAccessToken) => {
+    if (!hxUserId || !hxAccessToken) throw Error('empty params');
+    return new Promise((resolve, reject) => {
+      EMClient.open({
+        user: hxUserId,
+        accessToken: hxAccessToken,
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  const closeEaseIM = () => {
+    EMClient.close();
+  };
+  return {
+    loginWithPassword,
+    loginWithAccessToken,
+    closeEaseIM,
+  };
+};
+export default emConnect;

EaseIM/emApis/emContacts.js

@@ -0,0 +1,123 @@
+import { EMClient } from '../index';
+const emContacts = () => {
+  const fetchContactsListFromServer = () => {
+    return new Promise((resolve, reject) => {
+      EMClient.getAllContacts()
+        .then((res) => {
+          const { data } = res;
+          console.log('>>>>>获取全部好友列表');
+          resolve(data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const removeContactFromServer = (contactId) => {
+    if (contactId) {
+      return new Promise((resolve, reject) => {
+        EMClient.deleteContact(contactId)
+          .then((res) => {
+            resolve(res);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    }
+  };
+  const addContactFromServer = (contactId, applyMsg = '加个好友吧') => {
+    if (contactId) {
+      return new Promise((resolve, reject) => {
+        EMClient.addContact(contactId, applyMsg)
+          .then((res) => {
+            resolve(res);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    }
+  };
+
+  const acceptContactInvite = (contactId) => {
+    if (contactId) {
+      return new Promise((resolve, reject) => {
+        EMClient.acceptContactInvite(contactId)
+          .then((res) => {
+            resolve(res);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+      //   EMClient.acceptContactInvite(contactId);
+    }
+  };
+  const declineContactInvite = (contactId) => {
+    if (contactId) {
+      EMClient.declineContactInvite(contactId);
+    }
+  };
+  const getBlocklistFromServer = () => {
+    return new Promise((resolve, reject) => {
+      EMClient.getBlocklist()
+        .then((res) => {
+          const { data } = res;
+          resolve(data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const addUsersToBlocklist = (userList) => {
+    return new Promise((resolve, reject) => {
+      EMClient.addUsersToBlocklist({ name: [...userList] })
+        .then((res) => {
+          const { data } = res;
+          resolve(data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const removeUsersFromBlocklist = (userList) => {
+    return new Promise((resolve, reject) => {
+      EMClient.removeUserFromBlocklist({ name: [...userList] })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const setContactRemarkFromServer = (contactId, remark) => {
+    return new Promise((resolve, reject) => {
+      EMClient.setContactRemark({
+        userId: contactId,
+        remark,
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  return {
+    fetchContactsListFromServer,
+    removeContactFromServer,
+    addContactFromServer,
+    acceptContactInvite,
+    declineContactInvite,
+    getBlocklistFromServer,
+    addUsersToBlocklist,
+    removeUsersFromBlocklist,
+    setContactRemarkFromServer,
+  };
+};
+export default emContacts;

EaseIM/emApis/emConversation.js

@@ -0,0 +1,91 @@
+import { EaseSDK, EMClient } from '../index';
+import { CHAT_TYPE } from '../constant';
+const emConversation = () => {
+  //从服务端获取置顶会话列表
+  const fetchPinConversationFromServer = (pageSize = 50, cursor = '') => {
+    return new Promise((resolve, reject) => {
+      EMClient.getServerPinnedConversations({ pageSize, cursor })
+        .then((res) => {
+          console.log('>>>>置顶会话列表数据获取成功',res);
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  //置顶会话列表
+  const pinConversationItem = (params) => {
+    const { conversationId, conversationType, isPinned } = params;
+    return new Promise((resolve, reject) => {
+      EMClient.pinConversation({
+        conversationId,
+        conversationType,
+        isPinned,
+      })
+        .then((res) => {
+          console.log('>>>>置顶会话列表添加成功');
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  //从服务端获取会话列表
+  const fetchConversationFromServer = (
+    options = { pageSize: 20, cursor: '' }
+  ) => {
+    return new Promise((resolve, reject) => {
+      //支持分页这里写死只取二十条
+      EMClient.getServerConversations({ ...options })
+        .then((res) => {
+          console.log('>>>>会话列表数据获取成功',res);
+          const result = res.data.conversations;
+          resolve(result);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  //从服务端删除会话
+  const removeConversationFromServer = (
+    channel,
+    chatType = CHAT_TYPE.SINGLE_CHAT,
+    deleteRoam = false
+  ) => {
+    if (!channel) return;
+    return new Promise((resolve, reject) => {
+      EMClient.deleteConversation({ channel, chatType, deleteRoam })
+        .then((res) => {
+          console.log('>>>>会话删除成功');
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  //发送会话已读回执
+  const sendChannelAck = (targetId, chatType = CHAT_TYPE.SINGLE_CHAT) => {
+    if (!targetId) return;
+    let option = {
+      chatType: chatType, // 会话类型，设置为单聊。
+      type: 'channel', // 消息类型。
+      to: targetId, // 接收消息对象的用户 ID。
+    };
+    const msg = EaseSDK.message.create(option);
+    EMClient.send(msg);
+  };
+  
+  return {
+    fetchPinConversationFromServer,
+    pinConversationItem,
+    fetchConversationFromServer,
+    removeConversationFromServer,
+    sendChannelAck,
+  };
+};
+
+export default emConversation;

EaseIM/emApis/emGroups.js

@@ -0,0 +1,265 @@
+import { EMClient } from '@/EaseIM';
+const emGroups = () => {
+  const fetchJoinedGroupListFromServer = (pageNum = 0, pageSize = 20) => {
+    return new Promise((resolve, reject) => {
+      console.log('>>>>开始获取加入的群组列表');
+      EMClient.getJoinedGroups({
+        pageNum,
+        pageSize,
+        needAffiliations: true,
+        needRole: true,
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const createNewGroup = (params) => {
+    return new Promise((resolve, reject) => {
+      console.log('>>>>开始创建群组');
+      EMClient.createGroup({ data: { ...params } })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const getGroupInfosFromServer = (groupId) => {
+    return new Promise((resolve, reject) => {
+      EMClient.getGroupInfo({
+        groupId,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const getGroupMembersFromServer = (groupId) => {
+    //暂且仅取前100个群成员
+    const pageNum = 1,
+      pageSize = 100;
+    return new Promise((resolve, reject) => {
+      EMClient.listGroupMembers({
+        pageNum: pageNum,
+        pageSize: pageSize,
+        groupId,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const inviteUsersToGroup = (groupId, memberIdList) => {
+    return new Promise((resolve, reject) => {
+      EMClient.inviteUsersToGroup({
+        groupId: groupId,
+        users: memberIdList,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const leaveGroupFromServer = (groupId) => {
+    return new Promise((resolve, reject) => {
+      EMClient.leaveGroup({ groupId })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const destroyGroupFromServer = (groupId) => {
+    return new Promise((resolve, reject) => {
+      EMClient.destroyGroup({ groupId })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const acceptGroupInvite = (invitee, groupId) => {
+    return new Promise((resolve, reject) => {
+      EMClient.acceptGroupInvite({
+        groupId: groupId,
+        invitee: invitee,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const rejectGroupInvite = (invitee, groupId) => {
+    return new Promise((resolve, reject) => {
+      EMClient.rejectGroupInvite({
+        groupId: groupId,
+        invitee: invitee,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const joinPublicGroup = (groupId) => {
+    return new Promise((resolve, reject) => {
+      EMClient.joinGroup({ groupId, message: 'I want to join the group' })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const modifyGroupInfo = (groupId, params) => {
+    return new Promise((resolve, reject) => {
+      EMClient.modifyGroup({
+        groupId,
+        ...params,
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const removeGroupMembers = (groupId, users) => {
+    return new Promise((resolve, reject) => {
+      EMClient.removeGroupMembers({
+        groupId,
+        users,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const changeGroupOwner = (groupId, newOwner) => {
+    return new Promise((resolve, reject) => {
+      EMClient.changeGroupOwner({ groupId, newOwner })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  //分页获取群组列表
+  const listGroupMembersFromServer = (params) => {
+    const { pageNum = 1, pageSize = 100, groupId } = params;
+    return new Promise((resolve, reject) => {
+      EMClient.listGroupMembers({
+        ...params,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  /* 群组属性相关 */
+  //获取单个用户属性
+  const getSingleGroupAttributesFromServer = (groupId, userId) => {
+    let options = {
+      groupId,
+      userId,
+    };
+    return new Promise((resolve, reject) => {
+      EMClient.getGroupMemberAttributes({ ...options })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  //设置单个群组属性
+  const setSingleGroupAttributesFromServer = (params) => {
+    const { groupId, userId, memberAttributes } = params;
+    return new Promise((resolve, reject) => {
+      EMClient.setGroupMemberAttributes({
+        groupId,
+        userId,
+        memberAttributes: { ...memberAttributes },
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  //根据key获取多个群组成员自定义属性
+  const getMultiGroupAttributesFromServer = (params) => {
+    const { groupId, userIds, keys } = params;
+    return new Promise((resolve, reject) => {
+      EMClient.getGroupMembersAttributes({
+        groupId,
+        userIds,
+        keys,
+      })
+        .then((res) => {
+          resolve(res.data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+
+  return {
+    fetchJoinedGroupListFromServer,
+    createNewGroup,
+    getGroupInfosFromServer,
+    getGroupMembersFromServer,
+    inviteUsersToGroup,
+    leaveGroupFromServer,
+    destroyGroupFromServer,
+    acceptGroupInvite,
+    rejectGroupInvite,
+    joinPublicGroup,
+    modifyGroupInfo,
+    changeGroupOwner,
+    removeGroupMembers,
+    listGroupMembersFromServer,
+    getSingleGroupAttributesFromServer,
+    getMultiGroupAttributesFromServer,
+    setSingleGroupAttributesFromServer,
+  };
+};
+
+export default emGroups;

EaseIM/emApis/emMessages.js

@@ -0,0 +1,134 @@
+import { EaseSDK, EMClient } from '../index';
+import { MESSAGE_TYPE } from '../constant';
+import { getEMKey } from '@/EaseIM/utils';
+import store from '@/store';
+const emMessages = () => {
+  const reportMessages = (params) => {
+    const { reportType, reportReason, messageId } = params;
+    return new Promise((resolve, reject) => {
+      EMClient.reportMessage({
+        reportType: reportType, // 举报类型
+        reportReason: reportReason, // 举报原因。
+        messageId: messageId, // 上报消息id
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  const fetchHistoryMessagesFromServer = (params) => {
+    const { targetId, cursor, chatType } = params;
+    return new Promise((resolve, reject) => {
+      let options = {
+        // 对方的用户 ID 或者群组 ID 或聊天室 ID。
+        targetId: targetId,
+        // 每页期望获取的消息条数。取值范围为 [1,50]，默认值为 20。
+        pageSize: 20,
+        // 查询的起始消息 ID。若该参数设置为 `-1`、`null` 或空字符串，从最新消息开始。
+        cursor: cursor || -1,
+        // 会话类型：（默认） `singleChat`：单聊；`groupChat`：群聊。
+        chatType: chatType,
+        // 消息搜索方向：（默认）`up`：按服务器收到消息的时间的逆序获取；`down`：按服务器收到消息的时间的正序获取。
+        searchDirection: 'up',
+      };
+      EMClient.getHistoryMessages(options)
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((e) => {
+          // 获取失败。
+          reject(e);
+        });
+    });
+  };
+  const sendDisplayMessages = (messageBody) => {
+    messageBody.from = EMClient.user;
+    const key = getEMKey(
+      EMClient.user,
+      messageBody.from,
+      messageBody.to,
+      messageBody.chatType
+    );
+    console.log('>>>>要发送的消息key', key);
+    return new Promise((resolve, reject) => {
+      const message = EaseSDK.message.create(messageBody);
+      console.log('>>>>构建的消息msg', message);
+      EMClient.send(message)
+        .then((res) => {
+          const { message: resMessage } = res;
+          //   message.id = res.serverMsgId;
+          console.log('>>>>>res更新后的消息体', res);
+          store.commit('UPDATE_MESSAGE_COLLECTION', {
+            key,
+            message: resMessage,
+          });
+          resolve(res);
+          //   store.commit('UPDATE_CONVERSATION_ITEM', {
+          //     conversationId: messageBody.to,
+          //     lastMessage: message,
+          //   });
+        })
+        .catch((err) => {
+          reject(err);
+          console.log('>>>>>发送失败', err);
+        });
+    });
+  };
+  const sendCommandMessages = (messageBody) => {
+    return new Promise((resolve, reject) => {
+      console.log('messageBody', messageBody);
+      const message = EaseSDK.message.create(messageBody);
+      console.log('>>>>构建的命令消息msg', message);
+      EMClient.send(message)
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((e) => {
+          reject(e);
+        });
+    });
+  };
+  //修改展示类消息【暂只支持文本消息】
+  const modifyDisplayMessages = (messageBody) => {
+    const { msg, to, id, chatType } = messageBody;
+    const textMessage = EaseSDK.message.create({
+      type: MESSAGE_TYPE.TEXT,
+      msg: msg,
+      to: to,
+      chatType: chatType,
+    });
+    const key = getEMKey(
+      EMClient.user,
+      messageBody.from || EMClient.user,
+      messageBody.to,
+      messageBody.chatType
+    );
+    return new Promise((resolve, reject) => {
+      EMClient.modifyMessage({ messageId: id, modifiedMessage: textMessage })
+        .then((res) => {
+          console.log(res.message);
+          store.commit('MODIFY_MESSAGE_FROM_COLLECTION', {
+            key: key,
+            mid: res.message.id,
+            message: { ...res.message },
+          });
+          resolve(res);
+        })
+        .catch((e) => {
+          console.log(e);
+          reject(e);
+        });
+    });
+  };
+  return {
+    reportMessages,
+    fetchHistoryMessagesFromServer,
+    sendDisplayMessages,
+    sendCommandMessages,
+    modifyDisplayMessages,
+  };
+};
+export default emMessages;

EaseIM/emApis/emPresence.js

@@ -0,0 +1,136 @@
+import {
+	EaseSDK,
+	EMClient
+} from '../index';
+const _chunkArr = (oldArr, num) => {
+	oldArr.sort((a, b) => {
+		return a - b;
+	});
+	if (oldArr.length <= 0) return oldArr;
+	let newArr = [];
+	if (Math.ceil(oldArr.length / num) <= 1) {
+		newArr.push(oldArr);
+		return newArr;
+	}
+	for (let i = 0; i < oldArr.length; i = i + num) {
+		newArr.push(oldArr.slice(i, i + num));
+	}
+	return newArr;
+};
+const emPresence = () => {
+	// 发布自定义在线状态
+	const publishPresence = (presenceMsg) => {
+		return new Promise((resolve, reject) => {
+			EMClient.publishPresence({
+					description: presenceMsg,
+
+				})
+				.then((res) => {
+					resolve(res)
+				})
+				.catch((error) => {
+					reject(error);
+				});
+		});
+	};
+	// 订阅用户的在线状态
+	const subscribePresence = (userList) => {
+		let friendList = [];
+		friendList = Object.assign([], userList);
+		return new Promise((resolve, reject) => {
+			if (friendList.length && friendList.length < 99) {
+				EMClient.subscribePresence({
+						usernames: friendList,
+						expiry: 7 * 24 * 3600
+					})
+					.then((res) => {
+						const {
+							data
+						} = res;
+						resolve(data.result);
+					})
+					.catch((error) => {
+						reject(error);
+					});
+			} else {
+				let newArr = _chunkArr(friendList, 99);
+				for (let i = 0; i < newArr.length; i++) {
+					EMClient.subscribePresence({
+						usernames: newArr[i],
+						expiry: 7 * 24 * 3600
+					} )
+						.then((res) => {
+							const {
+								data
+							} = res;
+							resolve(data.result);
+						})
+						.catch((error) => {
+							reject(error);
+						});
+				}
+			}
+		});
+	};
+	// 获取用户的当前在线状态
+	const getPresenceStatus = (userList) => {
+		let friendList = [];
+		friendList = Object.assign([], userList);
+		return new Promise((resolve, reject) => {
+			if (friendList.length && friendList.length < 99) {
+				EMClient.getPresenceStatus({
+						usernames: friendList
+					})
+					.then((res) => {
+						const {
+							data
+						} = res;
+						resolve(data.result);
+					})
+					.catch((error) => {
+						reject(error);
+					});
+			} else {
+				let newArr = _chunkArr(friendList, 99);
+				for (let i = 0; i < newArr.length; i++) {
+					EMClient.getPresenceStatus({
+							usernames: newArr[i]
+						})
+						.then((res) => {
+							const {
+								data
+							} = res;
+							resolve(data.result);
+						})
+						.catch((error) => {
+							reject(error);
+						});
+				}
+			}
+		});
+	};
+	// 取消订阅
+	const unsubscribePresence = (userName) => {
+		return new Promise((resolve, reject) => {
+			EMClient.unsubscribePresence({
+					usernames: [userName]
+	
+				})
+				.then((res) => {
+					console.log("取消订阅成功")
+					resolve(res)
+				})
+				.catch((error) => {
+					reject(error);
+				});
+		});
+	};
+	return {
+		publishPresence,
+		subscribePresence,
+		getPresenceStatus,
+		unsubscribePresence
+	};
+};
+
+export default emPresence;

EaseIM/emApis/emSilent.js

@@ -0,0 +1,72 @@
+import { EMClient } from '../index';
+const emSilent = () => {
+  const getSilentModeForConversation = (conversationId, type) => {
+    return new Promise((resolve, reject) => {
+      EMClient.getSilentModeForConversation({
+        conversationId,
+        type,
+      })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  const getSilentModeForConversationList = (conversationList) => {
+    return new Promise((resolve, reject) => {
+      EMClient.getSilentModeForConversations({ conversationList })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  const getSilentModeForAll = () => {
+    return new Promise((resolve, reject) => {
+      EMClient.getSilentModeForAll()
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  const setSilentModeForAll = ({ paramType = 0, remindType = 'ALL' }) => {
+    return new Promise((resolve, reject) => {
+      EMClient.setSilentModeForAll({ options: { paramType, remindType } })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  const setSilentModeForConversation = (params) => {
+    const { conversationId, type, options } = params;
+    return new Promise((resolve, reject) => {
+      EMClient.setSilentModeForConversation({ conversationId, type, options })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  const clearRemindTypeForConversation = (params) => {
+    const { conversationId, type } = params;
+    return new Promise((resolve, reject) => {
+      EMClient.clearRemindTypeForConversation({ conversationId, type })
+        .then((res) => {
+          resolve(res);
+        })
+        .catch((err) => reject(err));
+    });
+  };
+  return {
+    getSilentModeForAll,
+    setSilentModeForAll,
+    getSilentModeForConversation,
+    getSilentModeForConversationList,
+    setSilentModeForConversation,
+    clearRemindTypeForConversation,
+  };
+};
+
+export default emSilent;

EaseIM/emApis/emUserInfos.js

@@ -0,0 +1,80 @@
+import { EMClient } from '../index';
+const _chunkArr = (oldArr, num) => {
+  oldArr.sort((a, b) => {
+    return a - b;
+  });
+  if (oldArr.length <= 0) return oldArr;
+  let newArr = [];
+  if (Math.ceil(oldArr.length / num) <= 1) {
+    newArr.push(oldArr);
+    return newArr;
+  }
+  for (let i = 0; i < oldArr.length; i = i + num) {
+    newArr.push(oldArr.slice(i, i + num));
+  }
+  return newArr;
+};
+
+const emUserInofs = () => {
+  const fetchUserInfoWithLoginId = () => {
+    const userId = EMClient.user;
+    return new Promise((resolve, reject) => {
+      if (userId) {
+        EMClient.fetchUserInfoById(userId)
+          .then((res) => {
+            const { data } = res;
+            resolve(data);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      }
+    });
+  };
+  const fetchOtherInfoFromServer = (userList) => {
+    let friendList = [];
+    friendList = Object.assign([], userList);
+    return new Promise((resolve, reject) => {
+      if (friendList.length && friendList.length < 99) {
+        EMClient.fetchUserInfoById(friendList)
+          .then((res) => {
+            const { data } = res;
+            resolve(data);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      } else {
+        let newArr = _chunkArr(friendList, 99);
+        for (let i = 0; i < newArr.length; i++) {
+          EMClient.fetchUserInfoById(newArr[i])
+            .then((res) => {
+              const { data } = res;
+              resolve(data);
+            })
+            .catch((error) => {
+              reject(error);
+            });
+        }
+      }
+    });
+  };
+  const updateUserInfosFromServer = (params) => {
+    return new Promise((resolve, reject) => {
+      EMClient.updateUserInfo({ ...params })
+        .then((res) => {
+          const { data } = res;
+          resolve(data);
+        })
+        .catch((error) => {
+          reject(error);
+        });
+    });
+  };
+  return {
+    fetchUserInfoWithLoginId,
+    fetchOtherInfoFromServer,
+    updateUserInfosFromServer,
+  };
+};
+export default emUserInofs;

EaseIM/emApis/index.js

@@ -0,0 +1,20 @@
+import emConnect from './emConnect';
+import emUserInfos from './emUserInfos';
+import emContacts from './emContacts';
+import emGroups from './emGroups';
+import emAboutAck from './emAboutAck';
+import emConversation from './emConversation';
+import emMessages from './emMessages';
+import emSilent from './emSilent';
+import emPresence from './emPresence';
+export {
+  emConnect,
+  emUserInfos,
+  emContacts,
+  emGroups,
+  emAboutAck,
+  emConversation,
+  emMessages,
+  emSilent,
+  emPresence
+};

EaseIM/emListener/emConnectListener.js

@@ -0,0 +1,25 @@
+import { EMClient } from '../index';
+import { CONNECT_CALLBACK_TYPE, HANDLER_EVENT_NAME } from '../constant';
+export const emConnectListener = (callback, listenerEventName) => {
+  console.log('>>>>连接监听已挂载');
+  const connectListenFunc = {
+    onConnected: () => {
+      console.log('connected...');
+      callback && callback(CONNECT_CALLBACK_TYPE.CONNECT_CALLBACK);
+    },
+    onDisconnected: () => {
+      callback && callback(CONNECT_CALLBACK_TYPE.DISCONNECT_CALLBACK);
+      console.log('disconnected...');
+    },
+    onReconnecting: () => {
+      callback && callback(CONNECT_CALLBACK_TYPE.RECONNECTING_CALLBACK);
+    },
+  };
+  EMClient.removeEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.CONNECT_EVENT
+  );
+  EMClient.addEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.CONNECT_EVENT,
+    connectListenFunc
+  );
+};

EaseIM/emListener/emContactsListener.js

@@ -0,0 +1,139 @@
+import { EMClient } from "../index";
+import { getEMKey } from "@/EaseIM/utils";
+import emContacts from "../emApis/emContacts";
+import {
+  HANDLER_EVENT_NAME,
+  CHAT_TYPE,
+  INFORM_TYPE,
+  MESSAGE_TYPE,
+  GRAY_INFORM_TYPE_SINGLE,
+} from "../constant";
+import store from "@/store";
+
+export const emContactsListener = (callback, listenerEventName) => {
+  console.log(">>>>>好友关系监听挂载");
+  //自动通过用户好友申请
+  const { acceptContactInvite } = emContacts();
+  const handleAutoAcceptInvitation = async (contactsInform) => {
+    const { from } = contactsInform;
+    const res = uni.getStorageSync(`EM_${EMClient.user}_GENNERAL_CONFIG`);
+    const { isAutoAcceptFriendRequest } = res || {};
+    //未开启则新增好友邀请消息
+    if (!isAutoAcceptFriendRequest) {
+      reveiveFriendInvite({
+        chatType: CHAT_TYPE.SINGLE_CHAT,
+        ...contactsInform,
+      });
+      return;
+    }
+    try {
+      await acceptContactInvite(from);
+      uni.showToast({
+        title: "自动通过好友申请",
+        icon: "none",
+        duration: 2000,
+      });
+    } catch (error) {
+      uni.showToast({
+        title: "自动通过好友申请失败",
+        icon: "none",
+        duration: 2000,
+      });
+    }
+  };
+  //变更当前好友列表数据
+  const changeFriendList = (type, params) => {
+    if (type === "INCREMENT") {
+      const param = {
+        remark: null,
+        userId: params.from,
+      };
+      store.commit("SET_FROEND_LIST", param);
+      store.dispatch("fetchFriendUserInfo", params.from);
+      store.dispatch("subscribePresenceStatus", params.from);
+    }
+    if (type === "DECREMENT") {
+      const friendId = params.from;
+      store.commit("DELETE_FRIEND_ITEM", friendId);
+      store.dispatch("unsubscribePresenceStatus", friendId);
+      store.commit("DELETE_PRESENCE_ITEM", friendId);
+    }
+  };
+  const addNewInformFunc = (params) => {
+    store.commit("ADD_NEW_INFORM", {
+      informType: INFORM_TYPE.CONTACTS,
+      inform: params,
+    });
+  };
+  //处理新邀请更新至邀请信息缓存store
+  const reveiveFriendInvite = (params) => {
+    store.commit("ADD_NEW_RECEIVE_INVITE_MSG", params);
+  };
+  //构造inform消息体
+  const addGrayInformMessage = (params) => {
+    const message = {
+      from: params.from,
+      to: params.to,
+      chatType: CHAT_TYPE.SINGLE_CHAT,
+      type: MESSAGE_TYPE.GRAY_INFORM,
+      time: Date.now(),
+      grayInformType: params.grayInformType,
+    };
+
+    const key = getEMKey(
+      EMClient.user,
+      message.from,
+      message.to,
+      message.chatType
+    );
+    store.commit("ADD_NEW_GRAY_INFORM_MESSAGE", { key, message });
+  };
+  const contactsListenFunc = {
+    // 当前用户收到好友请求。用户 B 向用户 A 发送好友请求，用户 A 收到该事件。
+    onContactInvited: function (msg) {
+      const contactsInform = Object.assign({}, msg);
+      callback && callback(contactsInform);
+      //   addNewInformFunc({ ...msg });
+      //如果本地配置开启了自动通过好友申请，则自动调用同意好友申请
+      handleAutoAcceptInvitation(contactsInform);
+    },
+    // 当前用户被其他用户从联系人列表上移除。用户 B 将用户 A 从联系人列表上删除，用户 A 收到该事件。
+    onContactDeleted: function (msg) {
+      callback && callback(msg);
+      addNewInformFunc(msg);
+      changeFriendList("DECREMENT", msg);
+    },
+    // 当前用户新增了联系人。用户 B 向用户 A 发送好友请求，用户 A 同意该请求，用户 A 收到该事件，而用户 B 收到 `onContactAgreed` 事件。
+    onContactAdded: function (msg) {
+      callback && callback(msg);
+      addNewInformFunc(msg);
+      const msgBody = Object.assign({}, msg);
+      msgBody.grayInformType = GRAY_INFORM_TYPE_SINGLE.CONTACT_ADDED;
+      //增加聊天页内灰色通知消息
+      addGrayInformMessage(msgBody);
+      //更新好友列表
+      changeFriendList("INCREMENT", msgBody);
+    },
+    // 当前用户发送的好友请求被拒绝。用户 A 向用户 B 发送好友请求，用户 B 收到好友请求后，拒绝加好友，则用户 A 收到该事件。
+    onContactRefuse: function (msg) {
+      callback && callback(msg);
+      addNewInformFunc(msg);
+    },
+    // 当前用户发送的好友请求经过了对方同意。用户 A 向用户 B 发送好友请求，用户 B 收到好友请求后，同意加好友，则用户 A 收到该事件。
+    onContactAgreed: function (msg) {
+      callback && callback(msg);
+      addNewInformFunc(msg);
+      const msgBody = Object.assign({}, msg);
+      msgBody.grayInformType = GRAY_INFORM_TYPE_SINGLE.CONTACT_AGREED;
+      addGrayInformMessage(msgBody);
+      changeFriendList("INCREMENT", msgBody);
+    },
+  };
+  EMClient.removeEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.CONTACTS_EVENT
+  );
+  EMClient.addEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.CONTACTS_EVENT,
+    contactsListenFunc
+  );
+};

EaseIM/emListener/emErrorListener.js

@@ -0,0 +1,18 @@
+import { EMClient } from '../index';
+import { HANDLER_EVENT_NAME } from '../constant';
+export const emErrorListener = (callback, listenerEventName) => {
+  console.log('>>>>error监听已挂载');
+  const errorListenFunc = {
+    onError: (e) => {
+      console.log('>>>>>onError', e);
+      callback && callback(HANDLER_EVENT_NAME.ERROR_EVENT, e);
+    },
+  };
+  EMClient.removeEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.ERROR_EVENT
+  );
+  EMClient.addEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.ERROR_EVENT,
+    errorListenFunc
+  );
+};

EaseIM/emListener/emGroupListener.js

@@ -0,0 +1,221 @@
+import { EMClient } from '../index';
+import { getEMKey } from '@/EaseIM/utils';
+import emGroups from '../emApis/emGroups';
+import {
+  HANDLER_EVENT_NAME,
+  CHAT_TYPE,
+  MESSAGE_TYPE,
+  GRAY_INFORM_TYPE_GROUP,
+} from '../constant';
+import store from '@/store';
+export const emGroupListener = (callback, listenerEventName) => {
+  console.log('>>>>群组事件监听挂载');
+  //处理新邀请更新至邀请信息缓存store
+  const reveiveFriendInvite = (params) => {
+    store.commit('ADD_NEW_RECEIVE_INVITE_MSG', params);
+  };
+  //构造inform消息体
+  const addGrayInformMessage = (params) => {
+    const message = {
+      from: params.from,
+      to: params.id,
+      chatType: CHAT_TYPE.GROUP_CHAT,
+      type: MESSAGE_TYPE.GRAY_INFORM,
+      time: Date.now(),
+      grayInformType: params.grayInformType,
+    };
+    const key = getEMKey(
+      EMClient.user,
+      message.from,
+      message.to,
+      message.chatType
+    );
+    store.commit('ADD_NEW_GRAY_INFORM_MESSAGE', { key, message });
+  };
+  //初始化更新当前群组列表
+  const initJoinedGroupList = async () => {
+    try {
+      await store.dispatch('fetchJoinedGroupList', {
+        isInit: true,
+      });
+    } catch (error) {
+      uni.showToast({
+        icon: 'none',
+        title: '初始化群组列表失败',
+        duration: 2000,
+      });
+    }
+  };
+  //自动通过群组邀请
+  const { acceptGroupInvite } = emGroups();
+  const handleAutoAcceptInvitation = async (event) => {
+    console.log('>>>>>自动处理群组邀请', event);
+    const { id: groupId } = event;
+    const res = uni.getStorageSync(`EM_${EMClient.user}_GENNERAL_CONFIG`);
+    const { isAutoAcceptGroupRequest } = res || {};
+    if (!isAutoAcceptGroupRequest) {
+      //未开启则新增一条邀请信息
+      reveiveFriendInvite({ chatType: CHAT_TYPE.GROUP_CHAT, ...event });
+      return;
+    }
+    try {
+      await acceptGroupInvite(EMClient.user, groupId);
+      initJoinedGroupList();
+      uni.showToast({
+        icon: 'none',
+        title: '自动加入群组成功',
+        duration: 2000,
+      });
+    } catch (error) {
+      uni.showToast({
+        icon: 'none',
+        title: '自动加入群组失败',
+        duration: 2000,
+      });
+    }
+  };
+
+  const groupListenFunc = {
+    onGroupEvent: (event) => {
+      console.log('>>>>群组事件监听触发', event);
+      const { operation, from, id: groupId } = event;
+      const msgBody = Object.assign({}, event);
+      callback(HANDLER_EVENT_NAME.GROUP_EVENT, event);
+      switch (operation) {
+        // 有新群组创建。群主的其他设备会收到该回调。
+        case 'create':
+          break;
+        // 关闭群组一键禁言。群组所有成员（除操作者外）会收到该回调。
+        case 'unmuteAllMembers':
+          break;
+        // 开启群组一键禁言。群组所有成员（除操作者外）会收到该回调。
+        case 'muteAllMembers':
+          break;
+        // 有成员从群白名单中移出。被移出的成员及群主和群管理员（除操作者外）会收到该回调。
+        case 'removeAllowlistMember':
+          break;
+        // 有成员添加至群白名单。被添加的成员及群主和群管理员（除操作者外）会收到该回调。
+        case 'addUserToAllowlist':
+          break;
+        // 删除群共享文件。群组所有成员会收到该回调。
+        case 'deleteFile':
+          break;
+        // 上传群共享文件。群组所有成员会收到该回调。
+        case 'uploadFile':
+          break;
+        // 删除群公告。群组所有成员会收到该回调。
+        case 'deleteAnnouncement':
+          break;
+        // 更新群公告。群组所有成员会收到该回调。
+        case 'updateAnnouncement':
+          break;
+        // 更新群组信息，如群组名称和群组描述。群组所有成员会收到该回调。
+        case 'updateInfo':
+          break;
+        // 有成员被移出禁言列表。被解除禁言的成员及群主和群管理员（除操作者外）会收到该回调。
+        case 'unmuteMember':
+          break;
+        // 有群组成员被加入禁言列表。被禁言的成员及群主和群管理员（除操作者外）会收到该回调。
+        case 'muteMember':
+          break;
+        // 有管理员被移出管理员列表。群主、被移除的管理员和其他管理员会收到该回调。
+        case 'removeAdmin':
+          break;
+        // 设置管理员。群主、新管理员和其他管理员会收到该回调。
+        case 'setAdmin':
+          break;
+        // 转让群组。原群主和新群主会收到该回调。
+        case 'changeOwner':
+          //TODO 待处理store中的owner变更
+          msgBody.grayInformType = GRAY_INFORM_TYPE_GROUP.CHANGE_OWNER;
+          addGrayInformMessage(msgBody);
+          break;
+        // 群组所有者和管理员拉用户进群时，无需用户确认时会触发该回调。被拉进群的用户会收到该回调。
+        case 'directJoined':
+          //强制被拉入群，更新加入的群组列表
+          console.log('>>>>被拉入群组当中。');
+          setTimeout(() => {
+            initJoinedGroupList();
+          }, 1000);
+
+          break;
+        // 群成员主动退出群组。除了退群的成员，其他群成员会收到该回调。
+        case 'memberAbsence':
+          store.commit('DELETE_GROUP_MEMBERS_PROFILE', {
+            groupId,
+            memberList: [from],
+          });
+          store.commit('CHANGE_AFFILIATIONS_COUNT', {
+            groupId,
+            count: -1,
+          });
+          msgBody.grayInformType = GRAY_INFORM_TYPE_GROUP.MEMBER_ABSENCE;
+          addGrayInformMessage(msgBody);
+          break;
+        // 有用户加入群组。除了新成员，其他群成员会收到该回调。
+        case 'memberPresence':
+          console.log('>>>>memberPresence', groupId);
+          store.dispatch('fetchGroupMembersProfile', {
+            groupId,
+            memberList: [from],
+          });
+          store.commit('CHANGE_AFFILIATIONS_COUNT', {
+            groupId,
+            count: 1,
+          });
+          msgBody.grayInformType = GRAY_INFORM_TYPE_GROUP.MEMBER_PRESENCE;
+          addGrayInformMessage(msgBody);
+          break;
+        // 用户被移出群组。被踢出群组的成员会收到该回调。
+        case 'removeMember':
+          {
+            initJoinedGroupList();
+          }
+          break;
+        // 当前用户的入群邀请被拒绝。邀请人会收到该回调。例如，用户 B 拒绝了用户 A 的入群邀请，用户 A 会收到该回调。
+        case 'rejectInvite':
+          break;
+        // 当前用户的入群邀请被接受。邀请人会收到该回调。例如，用户 B 接受了用户 A 的入群邀请，则用户 A 会收到该回调。
+        case 'acceptInvite':
+          break;
+        // 当前用户收到了入群邀请。受邀用户会收到该回调。例如，用户 B 邀请用户 A 入群，则用户 A 会收到该回调。
+        case 'inviteToJoin':
+          {
+            handleAutoAcceptInvitation(event);
+          }
+          break;
+        // 当前用户的入群申请被拒绝。申请人会收到该回调。例如，用户 B 拒绝用户 A 的入群申请后，用户 A 会收到该回调。
+        case 'joinPublicGroupDeclined':
+          break;
+        // 当前用户的入群申请被接受。申请人会收到该回调。例如，用户 B 接受用户 A 的入群申请后，用户 A 会收到该回调。
+        case 'acceptRequest':
+          {
+            initJoinedGroupList();
+          }
+          break;
+        // 当前用户发送入群申请。群主和群管理员会收到该回调。
+        case 'requestToJoin':
+          console.log('>>>>>requestToJoin', event);
+          break;
+        // 群组被解散。群主解散群组时，所有群成员均会收到该回调。
+        case 'destroy':
+          {
+            initJoinedGroupList();
+          }
+          break;
+        // 设置群成员的自定义属性。群组内其他成员均会收到该回调。
+        case 'memberAttributesUpdate':
+          break;
+        default:
+          break;
+      }
+    },
+  };
+  EMClient.removeEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.GROUP_EVENT
+  );
+  EMClient.addEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.GROUP_EVENT,
+    groupListenFunc
+  );
+};

EaseIM/emListener/emMessagesListener.js

@@ -0,0 +1,147 @@
+import { EMClient } from '../index';
+import store from '@/store';
+import { CHAT_TYPE, HANDLER_EVENT_NAME, MESSAGE_STATUS } from '../constant';
+import { getEMKey } from '@/EaseIM/utils';
+export const emMessagesListener = (callback, listenerEventName) => {
+  console.log('消息监听已挂载');
+  //处理展示类型消息（txt、image、file...）
+  const handleReciveDisPlayMessages = (message) => {
+    console.log('>>>>开始处理收到的消息', message);
+    let key = getEMKey(
+      EMClient.user,
+      message.from,
+      message.to,
+      message.chatType
+    );
+    //向消息集合中添加新消息
+    store.commit('UPDATE_MESSAGE_COLLECTION', {
+      key,
+      message,
+    });
+    store.commit('UPDATE_CONVERSATION_ITEM', {
+      conversationId: key,
+      lastMessage: message,
+    });
+    // messageStore.updateMessageCollection(key, message);
+    // conversationStore.updateConversationLastMessage(key, message);
+    // }
+  };
+  //处理回执类型消息
+  const handleReciveAckMessages = (message) => {
+    console.log('>>>>开始处理回执类型消息');
+  };
+  //处理撤回类型消息
+  const handleReciveRecallMessage = (message) => {
+    const { mid } = message;
+    //收集消息状态--撤回
+    store.commit('UPDATE_MESSAGE_COLLECTION_STATUS', {
+      key: mid,
+      status: MESSAGE_STATUS.RECALL,
+    });
+    console.log('>>>>开始处理撤回类型消息', message);
+  };
+  //处理command 命令消息
+  const handleReciveCommandMessage = (message) => {
+    console.log('>>>>开始处理命令消息', message);
+    //action TypingBegin
+    const { action, from } = message;
+    switch (action) {
+      //处理对方正在输入状态
+      case 'TypingBegin':
+        {
+          const chattingId = store.getters.chattingId;
+          const chattingTypingStatus = store.getters.chattingTypingStatus;
+          if (from === chattingId && chattingTypingStatus === false) {
+            store.commit('SET_CHATING_USER_INFO_TYPING_STATUS', true);
+            setTimeout(() => {
+              //5s重置输入中的状态
+              store.commit('SET_CHATING_USER_INFO_TYPING_STATUS', false);
+            }, 5000);
+          }
+        }
+        break;
+
+      default:
+        break;
+    }
+  };
+  const messagesListenFunc = {
+    // 当前用户收到文本消息。
+    onTextMessage: function (message) {
+      handleReciveDisPlayMessages({ ...message });
+    },
+    // 当前用户收到图片消息。
+    onImageMessage: function (message) {
+      handleReciveDisPlayMessages({ ...message });
+    },
+    // 当前用户收到透传消息。
+    onCmdMessage: function (message) {
+      handleReciveCommandMessage({ ...message });
+    },
+    // 当前用户收到语音消息。
+    onAudioMessage: function (message) {
+      handleReciveDisPlayMessages({ ...message });
+    },
+    // 当前用户收到位置消息。
+    onLocationMessage: function (message) {
+      handleReciveDisPlayMessages({ ...message });
+    },
+    // 当前用户收到文件消息。
+    onFileMessage: function (message) {
+      handleReciveDisPlayMessages({ ...message });
+    },
+    // 当前用户收到自定义消息。
+    onCustomMessage: function (message) {
+      handleReciveDisPlayMessages({ ...message });
+    },
+	// 当前用户收到自定义消息。
+	onCustomMessage1: function (message) {
+	  handleReciveDisPlayMessages({ ...message });
+	},
+    // 当前用户收到视频消息。
+    onVideoMessage: function (message) {
+      handleReciveDisPlayMessages({ ...message });
+    },
+    // 当前用户收到的消息被消息发送方撤回。
+    onRecallMessage: function (message) {
+      handleReciveRecallMessage({ ...message });
+    },
+    // 当前用户发送的消息被接收方收到。
+    onReceivedMessage: function (message) {
+      handleReciveAckMessages({ ...message });
+    },
+    // 当前用户收到消息送达回执。
+    onDeliveredMessage: function (message) {
+      handleReciveAckMessages({ ...message });
+    },
+    // 当前用户收到消息已读回执。
+    onReadMessage: function (message) {
+      handleReciveAckMessages({ ...message });
+    },
+    // 当前用户收到会话已读回执。
+    onChannelMessage: function (message) {
+      handleReciveAckMessages({ ...message });
+    },
+    //监听到有用户修改消息
+    onModifiedMessage: function (message) {
+      let key = getEMKey(
+        EMClient.user,
+        message.from,
+        message.to,
+        message.chatType
+      );
+      store.commit('MODIFY_MESSAGE_FROM_COLLECTION', {
+        key,
+        mid: message.id,
+        message,
+      });
+    },
+  };
+  EMClient.removeEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.MESSAGES_EVENT
+  );
+  EMClient.addEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.MESSAGES_EVENT,
+    messagesListenFunc
+  );
+};

EaseIM/emListener/emMountGlobalListener.js

@@ -0,0 +1,19 @@
+import { emContactsListener } from './emContactsListener';
+import { emGroupListener } from './emGroupListener';
+import { emMessagesListener } from './emMessagesListener';
+import { emErrorListener } from './emErrorListener';
+import { emPresenceListener } from './emPresenceListener';
+export const emMountGlobalListener = (cb = () => {}) => {
+  if (typeof cb === 'function') {
+    // 参数是一个函数
+    emMessagesListener(cb);
+    emContactsListener(cb);
+    emGroupListener(cb);
+    emErrorListener(cb);
+    emPresenceListener(cb);
+  } else {
+    // 参数不是一个函数
+    console.error('传入的参数不是一个函数');
+  }
+  console.log('>>>>全局监听');
+};

EaseIM/emListener/emPresenceListener.js

@@ -0,0 +1,23 @@
+import { EMClient } from "../index";
+import { CONNECT_CALLBACK_TYPE, HANDLER_EVENT_NAME } from "../constant";
+import store from "@/store";
+export const emPresenceListener = (callback, listenerEventName) => {
+  console.log(">>>>在线状态订阅监听已挂载");
+  const handlePresence = (message) => {
+    store.dispatch("handlePresenceChanges", message);
+  };
+  const presenceListenFunc = {
+    onPresenceStatusChange: function (message) {
+      console.log(">>>>状态变化了", message);
+
+      handlePresence(...message);
+    },
+  };
+  EMClient.removeEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.PRESENCE_EVENT
+  );
+  EMClient.addEventHandler(
+    listenerEventName || HANDLER_EVENT_NAME.PRESENCE_EVENT,
+    presenceListenFunc
+  );
+};

EaseIM/emListener/index.js

@@ -0,0 +1,10 @@
+import { emConnectListener } from "./emConnectListener";
+import { emContactsListener } from "./emContactsListener";
+import { emMountGlobalListener } from "./emMountGlobalListener";
+import { emPresenceListener } from "./emPresenceListener";
+export {
+  emMountGlobalListener,
+  emConnectListener,
+  emContactsListener,
+  emPresenceListener,
+};

EaseIM/index.js

@@ -0,0 +1,10 @@
+import EaseSDK from 'easemob-websdk/uniApp/Easemob-chat';
+import { EM_APP_KEY, EM_API_URL, EM_WEB_SOCKET_URL } from './config';
+let EMClient = (uni.EMClient = {});
+EMClient = new EaseSDK.connection({
+  appKey: EM_APP_KEY,
+  apiUrl: EM_API_URL,
+  url: EM_WEB_SOCKET_URL,
+});
+uni.EMClient = EMClient;
+export { EaseSDK, EMClient };

EaseIM/utils/convertGroupDetailsToGroupList.js

@@ -0,0 +1,23 @@
+export default function convertGroupDetailsToGroupList(detailsData) {
+  const groupListData = {};
+  // 转换重合字段名
+  groupListData.groupName = detailsData.name;
+  groupListData.groupId = detailsData.id;
+  groupListData.maxUsers = detailsData.maxusers;
+  groupListData.allowInvites = detailsData.allowinvites;
+  groupListData.affiliationsCount = detailsData.affiliations_count;
+  //将返回群列表里面的不存在的属性从群详情新增。
+  groupListData.shieldgroup = detailsData.shieldgroup;
+  groupListData.affiliations = detailsData.affiliations;
+  groupListData.mute = detailsData.mute;
+  groupListData.custom = detailsData.custom;
+  groupListData.created = detailsData.created;
+  groupListData.owner = detailsData.owner;
+  groupListData.membersonly = detailsData.membersonly;
+  //两个数据结构重合的属性值
+  groupListData.description = detailsData.description;
+  groupListData.disabled = detailsData.disabled;
+  groupListData.public = detailsData.public;
+
+  return groupListData;
+}

EaseIM/utils/emHandleReconnect.js

@@ -0,0 +1,22 @@
+import { EMClient } from '../index';
+import emConnect from '../emApis/emConnect';
+const { loginWithAccessToken, closeEaseIM } = emConnect();
+const emHandleReconnect = () => {
+  const getEMClientSocketState = () => {
+    //三种状态 undefined false 为SDK 断开连接，true 正在连接中。
+	// console.log(EMClient.isOpened(),'三种状态 undefined false 为SDK 断开连接，true 正在连接中')
+    return EMClient.isOpened();
+  };
+  const actionEMReconnect = () => {
+    closeEaseIM();
+    setTimeout(() => {
+      const loginInfos = uni.getStorageSync(`EM_LOGIN_INFOS`);
+      loginWithAccessToken(loginInfos.userId, loginInfos.token);
+    }, 300);
+  };
+  return {
+    getEMClientSocketState,
+    actionEMReconnect,
+  };
+};
+export default emHandleReconnect;

EaseIM/utils/getCurrentRoute.js

@@ -0,0 +1,11 @@
+//通过uni-app提供的方法调用getCurrentPages 获取当前页面路由url
+const getCurrentRoute = () => {
+  let pages = getCurrentPages();
+  if (pages.length > 0) {
+    let currentPage = pages[pages.length - 1];
+    return currentPage.route;
+  }
+  return '/';
+};
+
+export default getCurrentRoute;

EaseIM/utils/getEMKey.js

@@ -0,0 +1,15 @@
+/* 用以获取消息存储格式时的key */
+const getEMKey = (loginId, fromId, toId, chatType) => {
+  let key = '';
+  if (chatType === 'singleChat') {
+    if (loginId === fromId) {
+      key = toId;
+    } else {
+      key = fromId;
+    }
+  } else if (chatType === 'groupChat') {
+    key = toId;
+  }
+  return key;
+};
+export default getEMKey;

EaseIM/utils/handlePresence.js

@@ -0,0 +1,32 @@
+const handleStatusDetails = (params) => {
+  let resultArr = [];
+
+  if (Array.isArray(params)) {
+    resultArr = [...params];
+    return resultArr;
+  }
+
+  if (params instanceof Object) {
+    for (const key in params) {
+      if (params.hasOwnProperty(key)) {
+        const status = params[key];
+        resultArr.push({ device: key, status: Number(status) });
+      }
+    }
+  }
+
+  return resultArr;
+};
+
+export default function (statusBody) {
+  return {
+    uid: statusBody.uid || statusBody.userId,
+    expiry: statusBody.expiry || statusBody.expire,
+    lastTime: statusBody.lastTime || statusBody.last_time,
+    statusDetails: handleStatusDetails(
+      statusBody.status || statusBody.statusDetails
+    ),
+
+    ext: statusBody.ext,
+  };
+}

EaseIM/utils/index.js

@@ -0,0 +1,12 @@
+import paseEmoji from './paseEmoji';
+import getEMKey from './getEMKey';
+import convertGroupDetailsToGroupList from './convertGroupDetailsToGroupList';
+import emHandleReconnect from './emHandleReconnect';
+import handlePresence from './handlePresence';
+export {
+  paseEmoji,
+  getEMKey,
+  convertGroupDetailsToGroupList,
+  emHandleReconnect,
+  handlePresence,
+};

EaseIM/utils/paseEmoji.js

@@ -0,0 +1,86 @@
+const Emoji = {
+  path: '../static/images/faces/',
+  map: {
+    '[):]': 'ee_1.png',
+    '[:D]': 'ee_2.png',
+    '[;)]': 'ee_3.png',
+    '[:-o]': 'ee_4.png',
+    '[:p]': 'ee_5.png',
+    '[(H)]': 'ee_6.png',
+    '[:@]': 'ee_7.png',
+    '[:s]': 'ee_8.png',
+    '[:$]': 'ee_9.png',
+    '[:(]': 'ee_10.png',
+    "[:'(]": 'ee_11.png',
+    '[<o)]': 'ee_12.png',
+    '[(a)]': 'ee_13.png',
+    '[8o|]': 'ee_14.png',
+    '[8-|]': 'ee_15.png',
+    '[+o(]': 'ee_16.png',
+    '[|-)]': 'ee_17.png',
+    '[:|]': 'ee_18.png',
+    '[*-)]': 'ee_19.png',
+    '[:-#]': 'ee_20.png',
+    '[^o)]': 'ee_21.png',
+    '[:-*]': 'ee_22.png',
+    '[8-)]': 'ee_23.png',
+    '[del]': 'btn_del.png',
+    '[(|)]': 'ee_24.png',
+    '[(u)]': 'ee_25.png',
+    '[(S)]': 'ee_26.png',
+    '[(*)]': 'ee_27.png',
+    '[(#)]': 'ee_28.png',
+    '[(R)]': 'ee_29.png',
+    '[({)]': 'ee_30.png',
+    '[(})]': 'ee_31.png',
+    '[(k)]': 'ee_32.png',
+    '[(F)]': 'ee_33.png',
+    '[(W)]': 'ee_34.png',
+    '[(D)]': 'ee_35.png',
+  },
+};
+
+const parseEmoji = (msg) => {
+  if (typeof Emoji === 'undefined' || typeof Emoji.map === 'undefined') {
+    return msg;
+  }
+
+  var emoji = Emoji,
+    reg = null;
+  var msgList = [];
+  var objList = [];
+
+  for (var face in emoji.map) {
+    if (emoji.map.hasOwnProperty(face)) {
+      while (msg.indexOf(face) > -1) {
+        msg = msg.replace(face, '^' + emoji.map[face] + '^');
+      }
+    }
+  }
+
+  var ary = msg.split('^');
+  var reg = /^e.*g$/;
+
+  for (var i = 0; i < ary.length; i++) {
+    if (ary[i] != '') {
+      msgList.push(ary[i]);
+    }
+  }
+
+  for (var i = 0; i < msgList.length; i++) {
+    if (reg.test(msgList[i])) {
+      var obj = {};
+      obj.data = msgList[i];
+      obj.type = 'emoji';
+      objList.push(obj);
+    } else {
+      var obj = {};
+      obj.data = msgList[i];
+      obj.type = 'txt';
+      objList.push(obj);
+    }
+  }
+
+  return objList;
+};
+export default parseEmoji;

chat/contacts/contacts.css

@@ -0,0 +1,103 @@
+
+.but{
+	width:80%;
+	height:40px;
+	line-height: 40px;
+	text-align: center;
+	border-radius: 20px;
+	background-color:#007aff ;
+	color:#fff;
+	margin:0 auto;
+	margin-top: 100px;
+}.contacts_container {
+  box-sizing: border-box;
+  /* height: 100%; */
+  /* overflow-y: auto; */
+}
+.contacts_navbar_center {
+  width: 98px;
+  height: 22px;
+}
+.u-nav-slot {
+  display:  flex;
+  align-items: center;
+  justify-content: space-between;
+  border-width: 0.5px;
+  border-radius: 100px;
+  border-color: #ccc;
+  padding: 3px 7px;
+
+}
+.contacts_header_container {
+  background: #fff;
+}
+.search_container {
+  height: 40px;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 4px;
+  background: #fff;
+  margin-bottom: 5px;
+}
+.searching_container {
+  height: 40px;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 4px;
+  background: #fff;
+  margin-bottom: 5px;
+}
+
+.search_icon_box {
+  width: 100%;
+  height: 36px;
+  background: #f1f2f3;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  border-radius: 4px;
+}
+.search_text {
+  /* Input */
+
+  width: 32px;
+  height: 22px;
+
+  /* 简体中文/文本/大 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  /* identical to box height, or 138% */
+
+  /* Neutral/6 */
+  color: #919ba1;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+.header_title {
+  /* 简体中文/次级标题/中 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 16px;
+  line-height: 22px;
+  /* identical to box height, or 138% */
+
+  /* Neutral/1 */
+  color: #171a1c;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 0;
+  flex-grow: 0;
+}
+
+.contacts_item_cell {
+  background: #fff;
+}

chat/contacts/contacts.vue

@@ -0,0 +1,380 @@
+<template>
+    <view class="contacts_container">
+        <!-- navbar -->
+        <!-- #ifdef H5 || APP-PLUS -->
+        <u-navbar title="联系人" :placeholder="true">
+            <u-avatar size="32" slot="left" shape="square" :src="loginUserAvatar">
+            </u-avatar>
+            <view slot="center">
+                <image class="contacts_navbar_center" src="/static/images/new_ui/contacts_log.png" />
+            </view>
+            <u-icon slot="right" size="24" name="/static/images/new_ui/contacts/add_contacts.png"
+                @click="entryAddContactsPage"></u-icon>
+        </u-navbar>
+        <!-- #endif -->
+        <!-- #ifndef H5 || APP-PLUS-->
+        <u-navbar title="联系人" :placeholder="true">
+            <view class="u-nav-slot" slot="left">
+                <u-avatar size="32" shape="square" :src="loginUserAvatar"> </u-avatar>
+                <u-line direction="column" :hairline="false" length="16" margin="0 8px"></u-line>
+                <u-icon size="24" name="/static/images/new_ui/contacts/add_contacts.png"
+                    @click="entryAddContactsPage"></u-icon>
+            </view>
+
+            <view slot="center">
+                <image class="contacts_navbar_center" src="/static/images/new_ui/contacts_log.png" />
+            </view>
+
+        </u-navbar>
+
+        <!-- #endif -->
+		
+		
+        <!-- search -->
+        <!-- 搜索好友列表相关 -->
+        <view>
+            <view class="search_container" v-if="isShowDefaultSearch">
+                <view class="search_icon_box" @click="openSearch">
+                    <u-icon size="22" name="/static/images/new_ui/search_icon.png"></u-icon>
+                    <text class="search_text">搜索</text>
+                </view>
+            </view>
+            <!-- 好友搜索结果展示 -->
+            <view class="searching_container" v-if="!isShowDefaultSearch">
+                <u-search v-model.trim="searchInputKeywords" shape="square" placeholder="搜索联系人" :actionText="'取消'"
+                    :actionStyle="{
+            color: '#0873de',
+        }" :clearabled="true" :focus="true" @search="onSearchContacts" @input="onSearchContacts"
+                    @custom="cancelSearch"></u-search>
+            </view>
+        </view>
+        <!-- 搜索结果list -->
+        <template v-if="!isShowDefaultSearch">
+            <u-index-list class="index_list_container" :index-list="indexList" @select="onSelectIndex"
+                activeColor="#009EFF" customNavHeight="90">
+                <template v-for="(item, index) in searchFriendResultList">
+                    <u-index-item>
+                        <u-index-anchor :text="indexList[index]" bgColor="#FFF" color="#75828A"
+                            height="32px"></u-index-anchor>
+                        <u-cell class="contacts_item_cell" v-for="(cell, index1) in item"
+                            :key="cell.initial + cell.userId" :border="false">
+                            <!-- 头像 -->
+                            <u-avatar slot="icon" shape="square" size="40" :src="showFriendAvatar(cell.userId)"
+                                customStyle="margin: -3px 5px -3px 0"></u-avatar>
+                            <!-- name -->
+                            <view class="conversation_item_title" slot="title">
+                                <u--text class="conversation_item_title_text" :lines="1"
+                                    :text="showFriendNickname(cell)" iconStyle="margin-left: 2px;">
+                                </u--text>
+                            </view>
+                        </u-cell>
+                    </u-index-item>
+                </template>
+            </u-index-list>
+        </template>
+        <!-- 默认好友列表list -->
+        <template v-else>
+            <u-index-list :index-list="indexList" @select="onSelectIndex" activeColor="#009EFF" customNavHeight="90">
+                <!-- Contacts -->
+                <view slot="header" class="contacts_header_container">
+                    <u-cell-group :border="false">
+                        <u-cell :clickable="true" :isLink="true" @click="entryNewInvitePage">
+                            <text slot="title" class="header_title">新邀请</text>
+                            <u-badge slot="value" type="primary" max="99" :value="newInviteMsgNum"></u-badge>
+                        </u-cell>
+                        <u-cell :clickable="true" :isLink="true" @click="entryGroupListPage">
+                            <text slot="title" class="header_title">群聊</text>
+                            <text slot="value">{{ joinedGroupTotal }}</text>
+                        </u-cell>
+                        <u-cell :clickable="true" :isLink="true" @click="entryBlockMembersPage">
+                            <text slot="title" class="header_title">黑名单</text>
+                            <text slot="value">{{ blockUserList.length }}</text>
+                        </u-cell>
+                    </u-cell-group>
+                </view>
+                <template>
+                    <u-index-item v-for="(item, index) in sortedContactsList" :key="index">
+                        <u-index-anchor :text="indexList[index]" bgColor="#FFF" color="#75828A"
+                            height="32px"></u-index-anchor>
+                        <u-cell class="contacts_item_cell" v-for="(cell, index1) in item" :key="cell.userId"
+                            :border="false" @click="entryContactsDetailPage(cell.userId)">
+                            <!-- 头像 -->
+                            <u-avatar slot="icon" shape="square" size="40" :src="showFriendAvatar(cell.userId)"
+                                customStyle="margin: -3px 5px -3px 0"></u-avatar>
+                            <!-- name -->
+                            <view class="conversation_item_title" slot="title">
+                                <u--text class="conversation_item_title_text" :lines="1"
+                                    :text="showFriendNickname(cell)" iconStyle="margin-left: 2px;">
+                                </u--text>
+                            </view>
+                        </u-cell>
+                    </u-index-item>
+                </template>
+                <view slot="footer" class="u-safe-area-inset--bottom">
+                    <text class="list__footer"></text>
+                    <u-divider :text="`${friendList.length}个联系人`" :hairline="true"></u-divider>
+                </view>
+            </u-index-list>
+        </template>
+		<view class="but" @click="gotoPage('/pages/storemanagement/index')">
+			查看会话列表
+		</view>
+    </view>
+</template>
+
+<script>
+import { CHAT_TYPE } from "@/EaseIM/constant";
+const indexList = () => {
+    const indexList = [];
+    const charCodeOfA = "A".charCodeAt(0);
+    for (let i = 0; i < 26; i++) {
+        indexList.push(String.fromCharCode(charCodeOfA + i));
+    }
+    indexList.push("#");
+    return indexList;
+};
+export default {
+    data() {
+        return {
+            isShowDefaultSearch: true,
+            searchInputKeywords: "",
+            searchFriendResultList: [],
+            defaultAvatar: "/static/images/new_ui/defaultAvatar.png",
+            indexList: [],
+            //   indexList: indexList(),
+            sortedContactsList: [],
+        };
+    },
+    mounted() {
+        uni.hideHomeButton && uni.hideHomeButton();
+        this.getBrandsList(this.friendList);
+    },
+    computed: {
+        loginUserProfiles() {
+            return this.$store.state.LoginStore.loginUserProfiles;
+        },
+        loginUserAvatar() {
+            if (this.loginUserProfiles.avatarurl) {
+                return this.loginUserProfiles?.avatarurl;
+            } else {
+                return this.defaultAvatar;
+            }
+        },
+        //好友列表
+        friendList() {
+            return this.$store.state.ContactsStore.friendList;
+        },
+        friendUserInfoCollection() {
+            return this.$store.getters.friendUserInfoCollection;
+        },
+        blockUserList() {
+            return this.$store.state.ContactsStore.blockUserList;
+        },
+        newInviteMsgNum() {
+            return (
+                this.$store.getters.getReceiveInviteList?.length &&
+                this.$store.getters.getReceiveInviteList.filter(
+                    (inform) => !inform.isHandled
+                ).length
+            );
+        },
+        //群组总数
+        joinedGroupTotal() {
+            return this.$store.getters.joinedGroupTotal;
+        },
+        //好友头像展示
+        showFriendAvatar() {
+            return (hxId) => {
+                if (
+                    this.friendUserInfoCollection[hxId] &&
+                    this.friendUserInfoCollection[hxId]?.avatarurl
+                ) {
+                    return this.friendUserInfoCollection[hxId].avatarurl;
+                } else {
+                    return this.defaultAvatar;
+                }
+            };
+        },
+        //好友昵称展示
+        showFriendNickname() {
+            return (userItem) => {
+                const { userId, remark } = userItem;
+                if (remark) {
+                    return remark;
+                }
+                if (
+                    this.friendUserInfoCollection[userId] &&
+                    this.friendUserInfoCollection[userId]?.nickname
+                ) {
+                    return this.friendUserInfoCollection[userId].nickname;
+                } else {
+                    return userId;
+                }
+            };
+        },
+    },
+    watch: {
+        friendList() {
+            this.getBrandsList(this.friendList);
+        },
+    },
+    methods: {
+		gotoPage(url){
+			// uni.navigateTo({
+			//   url: url,
+			// });
+			uni.switchTab({
+				url:url
+			})
+		},
+        //开启搜索模式
+        openSearch() {
+            this.isShowDefaultSearch = false;
+        },
+        cancelSearch() {
+            this.isShowDefaultSearch = true;
+            this.searchInputKeywords = "";
+            this.searchFriendResultList = [];
+            this.getBrandsList(this.friendList);
+        },
+        onSearchContacts() {
+            let searchValue = this.searchInputKeywords;
+            let member = this.friendList;
+            let serchList = [];
+            member.forEach((friendItem) => {
+                if (String(friendItem.userId).indexOf(searchValue) > -1) {
+                    serchList.push(friendItem);
+                } else if (
+                    this.friendUserInfoCollection[friendItem.userId] &&
+                    this.friendUserInfoCollection[friendItem.userId]?.nickname
+                ) {
+                    if (
+                        this.friendUserInfoCollection[friendItem.userId].nickname.indexOf(
+                            searchValue
+                        ) > -1
+                    ) {
+                        serchList.push(friendItem);
+                    }
+                }
+            });
+            this.getBrandsList(serchList, "search");
+        },
+        //删除好友
+        //二次确认&执行删除
+        async deleteFriend(event) {
+            console.log(">>>>执行删除好友", event);
+            const { name: delFriendId } = event;
+            const res = await uni.showModal({
+                title: "确认删除？+ delFriendId",
+                confirmText: "删除",
+            });
+            if (res.confirm) {
+                removeContactFromServer(delFriendId);
+                updateFriendList();
+            }
+        },
+
+        //前往系统通知页面
+        entryTabNnotificationPage: function () {
+            uni.navigateTo({
+                url: "../notification/notification",
+            });
+        },
+        //前往群组页面
+        entryGroupsPage: function () {
+            uni.navigateTo({
+                url: "../groups/groups?myName=" + this.myName,
+            });
+        },
+        //前往单聊页面
+        entryemChat: function (params) {
+            const chatType = CHAT_TYPE.SINGLE_CHAT;
+            uni.navigateTo({
+                url: `../emChatContainer/index?targetId=${params.name}&chatType=${chatType}`,
+            });
+        },
+        //前往添加好友页面
+        entryAddNewFreiend: function (event) {
+            uni.navigateTo({
+                url: "../addNewFriend/addNewFriend",
+            });
+        },
+        //构建indexList
+        //type为构建indexList init search
+        getBrandsList(friendsList, type) {
+            const reg = /[a-z]/i;
+            let contactsObj = {};
+            let indexList = [];
+
+            friendsList.length &&
+                friendsList.forEach((friendItem) => {
+                    const { userId, remark } = friendItem;
+                    const params = {};
+                    params.userId = userId;
+                    params.remark = remark;
+                    console.log("friendItem", friendItem);
+                    if (reg.test(userId.substring(0, 1))) {
+                        const initial = userId.substring(0, 1).toUpperCase();
+                        if (!contactsObj[initial]) {
+                            contactsObj[initial] = [];
+                        }
+                        params.initial = initial;
+                        contactsObj[initial].push(params);
+                        indexList.push(userId.substring(0, 1).toUpperCase());
+                    } else {
+                        const initial = "#";
+                        params.initial = initial;
+                        if (!contactsObj[initial]) {
+                            contactsObj[initial] = [];
+                        }
+                        contactsObj[initial].push({ ...params });
+                        indexList.push("#");
+                    }
+                });
+            if (type === "search") {
+                this.searchFriendResultList = Object.values(contactsObj);
+            } else {
+                this.sortedContactsList = Object.values(contactsObj);
+            }
+            this.indexList = [...new Set(indexList)];
+            console.log("contactsList", Object.values(contactsObj));
+        },
+        onSelectIndex(value) {
+            console.log(">>>>>>>", value);
+        },
+        //前往添加联系人页面
+        entryAddContactsPage() {
+            uni.navigateTo({
+                url: "../addContacts/index",
+            });
+        },
+        //前往新邀请页面
+        entryNewInvitePage() {
+            uni.navigateTo({
+                url: "../newInvite/index",
+            });
+        },
+        //前往群组列表页面
+        entryGroupListPage() {
+            uni.navigateTo({
+                url: "../groupList/index",
+            });
+        },
+        //前往黑名单列表页面
+        entryBlockMembersPage() {
+            uni.navigateTo({
+                url: "../blockMembers/index",
+            });
+        },
+        //前往联系人详情页面
+        entryContactsDetailPage(userId) {
+            uni.navigateTo({
+                url: `../contactsDetail/index?userId=${userId}`,
+            });
+        },
+    },
+};
+</script>
+<style>
+@import "./contacts.css";
+</style>

commit/api.js

@@ -0,0 +1,173 @@
+import { 
+ myRequest 
+} from './request.js'
+ 
+// 查询所有权限
+export function queryJurisdiction(data) { 
+ return myRequest({ 
+  url: 'merchant_service/StoreBranch/queryJurisdiction', 
+  method: 'get', 
+  data 
+ }) 
+} 
+// 门店下添加部门
+export function addStoreBranch(data) { 
+ return myRequest({ 
+  url: 'merchant_service/StoreBranch/addStoreBranch', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 根据门店查询所有部门
+export function queryStoreBranchBymerid(data) { 
+ return myRequest({ 
+  url: 'merchant_service/StoreBranch/queryStoreBranchBymerid', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 添加门店员工
+export function storeStafAdd(data) { 
+ return myRequest({ 
+  url: 'merchant_service/StoreStall/storeStafAdd', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 根据部门id查询所有员工
+export function queryStoreStaff(data) { 
+ return myRequest({ 
+  url: 'merchant_service/StoreStall/queryStoreStaff', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 修改门店员工信息
+export function updateStoreStaff(data) { 
+ return myRequest({ 
+  url: 'merchant_service/StoreStall/updateStoreStaff', 
+  method: 'post', 
+  data 
+ }) 
+} 
+//获取验证码
+export function userPhoneLogOnCode(data) { 
+ return myRequest({ 
+  url: 'userCenter_service/userLogOnService/userPhoneLogOnCode', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 登录注册
+export function userPhoneLogOn(data) { 
+ return myRequest({ 
+  url: 'userCenter_service/userLogOnService/userPhoneLogOn', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 用户状态判断
+export function selectMerchant(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/selectMerchant', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 上传照片
+export function uploadPicture(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/uploadPicture', 
+  method: 'post', 
+  data 
+ }) 
+} 
+
+// 银行列表
+export function settlementBank(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/settlementBank', 
+  method: 'post', 
+  data 
+ }) 
+} 
+
+// 省市区
+export function addressList(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/addressList', 
+  method: 'post', 
+  data 
+ }) 
+} 
+
+// 门店分类
+export function selectMerchantSort(data) { 
+ return myRequest({ 
+  url: 'wares_service/waresServiceMerchant/selectMerchantSort', 
+  method: 'get', 
+  data 
+ }) 
+} 
+
+// 提交店铺申请
+export function merchaSettlen(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/merchaSettlen', 
+  method: 'post', 
+  data 
+ }) 
+} 
+
+// 修改店铺申请
+export function updateMerchaSettlen(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/updateMerchaSettlen', 
+  method: 'post', 
+  data 
+ }) 
+} 
+
+// 更具商户ID查询商户提交的数据
+export function selectMerchaSettlen(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/selectMerchaSettlen', 
+  method: 'post', 
+  data 
+ }) 
+} 
+
+// 激活码
+export function updateActivationCode(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/updateActivationCode', 
+  method: 'post', 
+  data 
+ }) 
+} 
+
+// 创建支付订单
+export function insterMerchantOrder(data) { 
+ return myRequest({ 
+  url: 'merchant_service/merchantSettleInService/insterMerchantOrder', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 通过部门id查询权限
+export function queryStoreBranch(data) { 
+ return myRequest({ 
+  url: 'merchant_service/StoreStall/queryStoreBranch', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 环信注册
+export function getImUser(data) { 
+ return myRequest({ 
+  url: 'merchant_service/cashierService/getImUser', 
+  method: 'post', 
+  data 
+ }) 
+} 
+

commit/config.js

@@ -0,0 +1,55 @@
+import {
+	myRequest
+} from './request.js'
+// 店铺信息头
+export function queyrConfig(data) {
+	return myRequest({
+		url: 'merchant_service/systemConfigValue/queyrConfig',
+		method: 'post',
+		data
+	})
+}
+
+
+
+// 获取门店分润值
+export function getShopBonusSetting(data) {
+	return myRequest({
+		url: 'merchant_service/systemConfigValue/getShopBonusSetting',
+		method: 'post',
+		data
+	})
+}
+
+// 修改门店分润值
+export function updateShopBonusSetting(data) {
+	return myRequest({
+		url: 'merchant_service/systemConfigValue/updateShopBonusSetting',
+		method: 'post',
+		data
+	})
+}
+// 锁定用户信息
+export function queryOrderUser(data) {
+	return myRequest({
+		url: 'order_service/orderService/queryOrderUser',
+		method: 'post',
+		data
+	})
+}
+// 锁定用户信息
+export function merchantYxadd(data) {
+	return myRequest({
+		url: 'merchant_service/merchantYx/add',
+		method: 'post',
+		data
+	})
+}
+// 查询音响是否绑定
+export function queryByMerId(data) {
+	return myRequest({
+		url: 'merchant_service/merchantYx/queryByMerId ',
+		method: 'post',
+		data
+	})
+}

commit/item.js

@@ -0,0 +1,179 @@
+// this.$time.dateFormat('yyyy-MM-dd',new Date())
+//                          格式        时间
+import {
+        encryptDes,
+        decryptDes
+} from '@/encryption/index.js' // 引用路径根据自己的文件结构而定
+import
+Base64
+from 'base-64'
+export default {
+  // 时间格式化
+  dateFormat: function(fmt, date) {
+	 if (date == null) return ''
+    if (typeof date === 'string') {
+      date = new Date(Date.parse(date.replace(/-/g, '/').replace('.0', '')))
+    } else {
+      date = new Date(date)
+    }
+    let ret
+    const opt = {
+      'y+': date.getFullYear().toString(), // 年
+      'M+': (date.getMonth() + 1).toString(), // 月
+      'd+': date.getDate().toString(), // 日
+      'H+': date.getHours().toString(), // 时
+      'm+': date.getMinutes().toString(), // 分
+      'S+': date.getSeconds().toString() // 秒
+      // 有其他格式化字符需求可以继续添加，必须转化成字符串
+    }
+    for (const k in opt) {
+      ret = new RegExp('(' + k + ')').exec(fmt)
+      // opt = opt.replace('-','/')
+      if (ret) {
+        fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length, '0')))
+      }
+    }
+    return fmt
+  },
+  // 秒数转换分钟秒
+  minuteSecond: function(second) {
+    var second = Math.floor(second)
+    return this.dateFormat(
+      'mm:SS',
+      '2000/03/02 05:' + Math.floor(second / 60) + ':' + (second % 60)
+    )
+  },
+  // 根据给定日期算出星期
+  getWeek: function(date) {
+	  if (date == null) return ''
+    if (typeof date === 'string') {
+      date = new Date(Date.parse(date.replace(/-/g, '/').replace('.0', '')))
+    }
+    var week = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+    return week[date.getDay()]
+  },
+  // 上传图片
+  uploadPictures(successCallback) {
+	let userinfo = uni.getStorageSync('userinfo')
+	let d = new Date()
+  	let Fzitem = this.dateFormat("yyyy-MM-dd HH:mm:SS", d) //2022-08-08 14:02:59
+  	let shijian = '123456789/' + Fzitem //定义时间 + 封装时间
+  	let jmi = encryptDes(shijian, "bjtdba123")
+  	let bas = Base64.encode(jmi + "," + Fzitem)
+	
+  	uni.chooseFile({ 
+  		count: 1,
+		mediaType: ['image'],
+  		success: function (data) {
+			console.log('---------2', data)
+  			uni.uploadFile({
+  				url: '/gateway/merchant_service/merchantSettleInService/uploadPicture',
+  				filePath: data.tempFiles[0].path,
+  				name: 'file',
+  				formData: {
+  					'uid': userinfo.uid
+  				},
+  				header: {
+  					'authorization': uni.getStorageSync('token'), //请求头信息 
+  					'volunteerdes': bas // DES+B64加密
+  				},
+  				success: function(res) {
+  					let filedata = res.data ? JSON.parse(res.data) : {};
+  					if (filedata.status == 200) {
+  						successCallback && successCallback(filedata.data.urlMap.url)
+  					} else {
+  						uni.showToast({
+  							title: filedata.message,
+  							icon: "none"
+  						})
+  					}
+  				},
+  				fail: function(res) {
+					console.log('url = ',url,'res = ',res,)
+  					uni.showToast({
+  						title:res.data.message,
+  						icon: "none"
+  					})
+  				}
+  			})
+  		},
+		fail: function (error) {
+			console.log('---------3',error)
+			uni.showToast({
+				title:error.message,
+				icon: "none"
+			})
+		}
+  	});
+	
+	
+	// wx.chooseImage({
+		
+	//     //count表示一次可以选择多少照片
+	//       count: 1,
+	//       //sizeType所选的图片的尺寸，original原图，compressed压缩图
+	//       sizeType: ['original', 'compressed'],
+	//       //如果sourceType为camera则调用摄像头，为album时调用相册
+	//       sourceType: [that.data.sourceType[tapIndex]],
+	//       success(res) {
+	// 		  console.log('---------3')
+	//         // tempFilePath可以作为img标签的src属性显示图片
+	//         const tempFilePaths = res.tempFilePaths
+	//         //将选择到的图片缓存到本地storage中
+	//         wx.setStorageSync('tempFilePaths', tempFilePaths)
+	//         /*
+	// 		由于在我们选择图片后图片只是保存到storage中，所以我们需要调用一次   	        setHeader()方法来使页面上的头像更新
+	// 		*/
+	//         that.setHeader();
+	//         wx.showToast({
+	//           title: '设置成功',
+	//           icon: 'success',
+	//           duration: 2000
+	//         })
+	//       }
+	//     })
+	
+	// wx.chooseMessageFile({
+	// 	success: chooseImageRes => {
+	// 		const tempFilePaths = chooseImageRes.tempFiles;
+	// 		console.log('chooseImageRes=",chooseImageRes);
+	// 		let repeatImg = this.uploadImg.find(item => {
+	// 			return item.name == chooseImageRes.tempFiles[0].name;
+	// 		});
+	// 		console.log('tempFilePaths=',tempFilePaths[0])
+	// 		if(repeatImg == undefined){
+	// 			uni.uploadFile({
+	// 				url:filePath: tempFilePaths[0].path,
+	// 				name: 'file',
+	// 				formData:{
+	// 					user: "test'
+	// 				},
+	// 				success: uploadFileRes => {
+	// 					console.log('uploadFileRes==',uploadFileRes)
+	// 					console.log(JsoN.parse(uploadFileRes.data));
+	// 					let temporaryImg=JSON.parse(uploadFileRes.data);
+	// 					this.uploadImg.push({ name: chooseImageRes.tempFiles[0].name, url: temporaryImg.data[0].data.url });
+	// 					console.log('上传===='，this.uploadImg);
+	// 				}
+	// 			});
+		
+	// 		} else {
+	// 			this.msgType = 'error';
+	// 			this.message 
+	// 			this.open(); 
+	// 		}
+	// 	}
+	// });
+	
+  },
+  
+  // 验证邮箱
+  isEmailAvailable(emailInput) {
+  	var myreg = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
+  	if (!myreg.test(emailInput)) {
+  		return false;
+  	} else {
+  		return true;
+  	}
+  }
+}

commit/order.js

@@ -0,0 +1,27 @@
+import { 
+ myRequest 
+} from './request.js'
+// 正向订单状态数
+export function getOrderStstusAmount(data) { 
+ return myRequest({ 
+  url: 'order_service/orderService/getOrderStstusAmount', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 正向订单列表
+export function orderList(data) { 
+ return myRequest({ 
+  url: 'order_service/orderService/orderList', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 订单详情页面
+export function getOrderDetails(data) { 
+ return myRequest({ 
+  url: 'order_service/orderService/getOrderDetails', 
+  method: 'post', 
+  data 
+ }) 
+} 

commit/request.js

@@ -0,0 +1,67 @@
+let is = 2
+var baseURL = '' // API访问的地址
+ if(is==1){
+	  baseURL = 'https://test.hebeiyhc.com/gateway/';//测试环境
+ }else if(is==2){
+	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
+	 // baseURL = 'https://api.hebeiyhc.com/gateway/'; //生产环境
+	 baseURL = '/gateway/'; //生产环境
+ }else{
+	  baseURL = 'https://pre.bjtdba.com/gateway/'; //预生产环境
+ }
+let token = ''; // 用户的token
+let volunteerToken = ''; // DES+B64加密
+import time from '@/commit/item.js';
+import {
+	encryptDes,
+	decryptDes
+} from '@/encryption/index.js' // 引用路径根据自己的文件结构而定
+import
+Base64
+from 'base-64'
+var d = new Date(); //标准时间
+let Fzitem = time.dateFormat("yyyy-MM-dd HH:mm:SS", d) //2022-08-08 14:02:59
+let shijian = '123456789/' + Fzitem //定义时间 + 封装时间
+let jmi = encryptDes(shijian, "bjtdba123")
+let bas = Base64.encode(jmi + "," + Fzitem)
+ 
+export const myRequest = (options) => {
+	return new Promise((resolve, reject) => {
+		uni.request({
+			url: baseURL + options.url, //接口地址：前缀+方法中传入的地址 
+			method: options.method || 'GET', //请求方法：传入的方法或者默认是“GET” 
+			data: options.data || {}, //传递参数：传入的参数或者默认传递空集合 
+			header: {
+				// 'Content-Type': 'application/x-www-form-urlencoded',
+				'X-token': uni.getStorageSync('authorization'), //请求头信息
+				'volunteerdes': bas // DES+B64加密
+			},
+
+			success: (res) => {
+				console.log('url = ',baseURL + options.url)
+				console.log('params = ',options.data)
+				// debugger
+				resolve(res, "查看")
+				//返回的数据（不固定，看后端接口，这里是做了一个判断，如果不为true，用uni.showToast方法提示获取数据失败) 
+				// 如果不满足上述判断就输出数据 
+				if (res.data.status == 200) { //接口返回200走一下操作
+					resolve(res)
+				} else if (res.data.status == 500) {//接口返回500走一下操作
+					return uni.showToast({
+						title: res.data.error,
+						icon: 'none'
+					})
+				} else { //除了500都会走以下操作
+					return uni.showToast({
+						title: res.data.message,
+						icon: 'none'
+					})
+				}
+			},
+			// 这里的接口请求，如果出现问题就输出接口请求失败 
+			fail: (err) => {
+				reject(err)
+			}
+		})
+	})
+}

commit/shop.js

@@ -0,0 +1,59 @@
+import { 
+ myRequest 
+} from './request.js'
+// 店铺信息头
+export function selectMerchant(data) { 
+ return myRequest({ 
+  url: 'merchant_service/cashierService/selectMerchant', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 今日昨日收益
+export function selectMerchantOrder(data) { 
+ return myRequest({ 
+  url: 'merchant_service/cashierService/selectMerchantOrder', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 今日昨日收益
+export function payUserList(data) { 
+ return myRequest({ 
+  url: 'merchant_service/cashierService/payUserList', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 消费分页面
+export function merchantConsumption(data) { 
+ return myRequest({ 
+  url: 'merchant_service/cashierService/merchantConsumption', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 开通消费分接口
+export function updateConsumptionScore(data) { 
+ return myRequest({ 
+  url: 'merchant_service/cashierService/updateConsumptionScore', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 消费分明细
+export function selectMerchantConsumption(data) { 
+ return myRequest({ 
+  url: 'merchant_service/cashierService/selectMerchantConsumption', 
+  method: 'post', 
+  data 
+ }) 
+} 
+// 收款二维码隐藏显示
+export function queryByKey(data) { 
+ return myRequest({ 
+  url: 'system_service/sysconfig/wxQueryByKey', 
+  method: 'get', 
+  data 
+ }) 
+} 

constant/emoji.js

@@ -0,0 +1,319 @@
+export const emojis = [
+  '😀',
+  '😃',
+  '😄',
+  '😁',
+  '😆',
+  '😅',
+  '🤣',
+  '😂',
+  '🙂',
+  '🙃',
+  '😉',
+  '😊',
+  '😇',
+  '😍',
+  '🤩',
+  '😘',
+  '😗',
+  '😚',
+  '😙',
+  '😋',
+  '😛',
+  '😜',
+  '🤪',
+  '😝',
+  '🤑',
+  '🤗',
+  '🤭',
+  '🤫',
+  '🤔',
+  '🤐',
+  '🤨',
+  '😐',
+  '😑',
+  '😶',
+  '😏',
+  '😒',
+  '🙄',
+  '😬',
+  '🤥',
+  '😌',
+  '😔',
+  '😪',
+  '🤤',
+  '😴',
+  '😷',
+  '🤒',
+  '🤕',
+  '🤢',
+  '🤮',
+  '🤧',
+  '😵',
+  '🤯',
+  '🤠',
+  '😎',
+  '🤓',
+  '🧐',
+  '😕',
+  '😟',
+  '🙁',
+  '😮',
+  '😯',
+  '😲',
+  '😳',
+  '😦',
+  '😧',
+  '😨',
+  '😰',
+  '😥',
+  '😢',
+  '😭',
+  '😱',
+  '😖',
+  '😣',
+  '😞',
+  '😓',
+  '😩',
+  '😫',
+  '😤',
+  '😡',
+  '😠',
+  '🤬',
+  '😈',
+  '👿',
+  '💀',
+  '💩',
+  '🤡',
+  '👹',
+  '👺',
+  '👻',
+  '👽',
+  '👾',
+  '🤖',
+  '😺',
+  '😸',
+  '😹',
+  '😻',
+  '😼',
+  '😽',
+  '🙀',
+  '😿',
+  '😾',
+  '💋',
+  '👋',
+  '🤚',
+  '🖐',
+  '✋',
+  '🖖',
+  '👌',
+  '🤞',
+  '🤟',
+  '🤘',
+  '🤙',
+  '👈',
+  '👉',
+  '👆',
+  '🖕',
+  '👇',
+  '👍',
+  '👎',
+  '✊',
+  '👊',
+  '🤛',
+  '🤜',
+  '👏',
+  '🙌',
+  '👐',
+  '🤲',
+  '🤝',
+  '🙏',
+  '💅',
+  '🤳',
+  '💪',
+  '👂',
+  '👃',
+  '🧠',
+  '👀',
+  '👁',
+  '👅',
+  '👄',
+  '👶',
+  '🧒',
+  '👦',
+  '👧',
+  '🧑',
+  '👱',
+  '👨',
+  '🧔',
+  '👱‍',
+  '👨‍',
+  '👨‍',
+  '👩',
+  '👱‍',
+  '👩‍',
+  '👩‍',
+  '👩‍',
+  '👩‍',
+  '🧓',
+  '👴',
+  '👵',
+  '🙍',
+  '🙅',
+  '🙆',
+  '💁',
+  '🙋',
+  '🙇',
+  '🙇‍',
+  '🙇‍',
+  '🤦',
+  '🤷',
+  '🤷‍',
+  '🤷‍',
+  '👨‍⚕️',
+  '👩‍⚕️',
+  '👨‍🎓',
+  '👩‍🎓',
+  '👨‍🏫',
+  '👩‍🏫',
+  '👨‍⚖️',
+  '👩‍⚖️',
+  '👨‍🌾',
+  '👩‍🌾',
+  '👨‍🍳',
+  '👩‍🍳',
+  '👨‍🔧',
+  '👩‍🔧',
+  '👨‍🏭',
+  '👩‍🏭',
+  '👨‍💼',
+  '👩‍💼',
+  '👨‍🔬',
+  '👩‍🔬',
+  '👨‍💻',
+  '👩‍💻',
+  '👨‍🎤',
+  '👩‍🎤',
+  '👨‍🎨',
+  '👩‍🎨',
+  '👨‍✈️',
+  '👩‍✈️',
+  '👨‍🚀',
+  '👩‍🚀',
+  '👨‍🚒',
+  '👩‍🚒',
+  '👮',
+  '👮‍♂️',
+  '👮‍♀️',
+  '🕵',
+  '🕵️‍♂️',
+  '🕵️‍♀️',
+  '💂',
+  '💂‍',
+  '💂‍',
+  '👷',
+  '👷‍',
+  '👷‍',
+  '🤴',
+  '👸',
+  '👳',
+  '👳‍',
+  '👳‍',
+  '👲',
+  '🧕',
+  '🤵',
+  '👰',
+  '🤰',
+  '🤱',
+  '👼',
+  '🎅',
+  '🤶',
+  '🧙',
+  '🧚',
+  '🧛',
+  '🧜',
+  '🧝',
+  '🧞',
+  '🧟',
+  '💆',
+  '💇',
+  '🚶',
+  '🏃',
+  '💃',
+  '🕺',
+  '🕴',
+  '👯',
+  '🧖',
+  '🧖‍',
+  '🧖‍',
+  '🧘',
+  '👭',
+  '👫',
+  '👬',
+  '💏',
+  '👨‍',
+  '👩‍',
+  '💑',
+  '👨‍',
+  '👩‍',
+  '👪',
+  '👨‍👩‍👦',
+  '👨‍👩‍👧',
+  '👨‍👩‍👧‍👦',
+  '👨‍👩‍👦‍👦',
+  '👨‍👩‍👧‍👧',
+  '👨‍👨‍👦',
+  '👨‍👨‍👧',
+  '👨‍👨‍👧‍👦',
+  '👩‍👩‍👦',
+  '👩‍👩‍👧',
+  '👩‍👩‍👧‍👦',
+  '👩‍👩‍👦‍👦',
+  '👩‍👩‍👧‍👧',
+  '👨‍👦',
+  '👨‍👦‍👦',
+  '👨‍👧',
+  '👨‍👧‍👦',
+  '👨‍👧‍👧',
+  '👩‍👦',
+  '👩‍👦‍👦',
+  '👩‍👧',
+  '👩‍👧‍👦',
+  '👩‍👧‍👧',
+  '🗣',
+  '👤',
+  '👥',
+  '👣',
+  '🌂',
+  '☂',
+  '👓',
+  '🕶',
+  '👔',
+  '👕',
+  '👖',
+  '🧣',
+  '🧤',
+  '🧥',
+  '🧦',
+  '👗',
+  '👘',
+  '👙',
+  '👚',
+  '👛',
+  '👜',
+  '👝',
+  '🎒',
+  '👞',
+  '👟',
+  '👠',
+  '👡',
+  '👢',
+  '👑',
+  '👒',
+  '🎩',
+  '🎓',
+  '🧢',
+  '💄',
+  '💍',
+  '💼',
+];

constant/index.js

@@ -0,0 +1,33 @@
+import * as emoji from './emoji';
+export { emoji };
+//群成员页面为复用页面，定义三种展示形态
+export const GROUP_MEMEBERS_SHOW_TYPE = {
+  READ_ONLY: 1, //只读
+  TRANSFER_OWNER: 2, //转让群主
+  ADD_NEW_MEMBER: 3, //新增群成员
+  DEL_MEMBER: 4, //删除群成员
+};
+//个人信息编辑类型
+export const PERSONAL_INFO_EDIT_TYPE = {
+  NICKNAME: 1,
+  SIGN: 2,
+};
+//uni.$emit 事件名称
+export const EVENT_BUS_NAME = {
+  EASEIM_MESSAGE_COLLECTION_UPDATE: 'easeim-message-collection-update',
+  EASEIM_MESSAGE_COLLECTION_DELETE: 'easeim-message-collection-delete',
+  EASEIM_MESSAGE_COLLECTION_MODIFY: 'easeim-message-collection-modify',
+};
+/* 录音相关 */
+export const RECORD_STATUS = {
+  SHOW: 0,
+  HIDE: 1,
+  HOLD: 2,
+  SWIPE: 3,
+  RELEASE: 4,
+};
+export const RECOED_DESC = {
+  0: '长按开始录音',
+  2: '向上滑动取消',
+  3: '松开手取消',
+};

emChat/emChatContainer/emChatNavbar/index.vue

@@ -0,0 +1,320 @@
+<template>
+  <!-- #ifdef H5 || APP-PLUS -->
+  <u-navbar :placeholder="true">
+    <u-icon
+      slot="left"
+      size="20"
+      name="arrow-left"
+      @click="onArrowLeftBackClick"
+    ></u-icon>
+    <!-- <u-avatar
+      slot="left"
+      size="32"
+      shape="square"
+      :src="navbarAvatar"
+    ></u-avatar> -->
+    <view slot="left" class="chat_name">
+      <text v-show="!chattingTypingStatus" class="chat_name_text">
+        {{ navigatorName }}
+      </text>
+      <text v-show="chattingTypingStatus" class="chat_name_text"
+        >对方正在输入...</text
+      >
+      <text class="presence_status_text">{{ presenceStatus }}</text>
+    </view>
+
+    <u-icon
+      slot="right"
+      @click="onRightIconClick"
+      size="36"
+      name="/static/images/new_ui/more_icon.png"
+    ></u-icon>
+  </u-navbar>
+  <!-- #endif -->
+  <!-- #ifndef H5 || APP-PLUS-->
+<!--  <u-navbar :placeholder="true">
+    <view class="u-nav-slot" slot="left">
+      <u-icon
+        slot="left"
+        size="20"
+        name="arrow-left"
+        @click="onArrowLeftBackClick"
+      ></u-icon>
+     <u-avatar
+        slot="left"
+        size="32"
+        shape="square"
+        :src="navbarAvatar"
+      ></u-avatar>
+      <view slot="center" class="chat_name">
+        <text v-show="!chattingTypingStatus" class="chat_name_text">
+          客服11
+        </text>
+       <text v-show="chattingTypingStatus" class="chat_name_text"
+          >对方正在输入...</text
+        >
+        <text class="presence_status_text">{{ presenceStatus }}</text>
+      </view>
+      <u-line
+        direction="column"
+        :hairline="false"
+        length="12"
+        margin="0 5px"
+      ></u-line>
+      <u-icon
+        @click="onRightIconClick"
+        size="36"
+        name="/static/images/new_ui/more_icon.png"
+      ></u-icon>
+    </view>
+  </u-navbar> -->
+  
+  <u-navbar :placeholder="true">
+    <view class="u-nav-slot" slot="left">
+      <u-icon
+        slot="left"
+        size="20"
+        name="arrow-left"
+        @click="onArrowLeftBackClick"
+      ></u-icon>
+    </view>
+	<view slot="center">
+		<view slot="center" class="chat_name">
+		  <text v-show="!chattingTypingStatus" class="chat_name_text">
+		    客服
+		  </text>
+		 <text v-show="chattingTypingStatus" class="chat_name_text"
+		    >对方正在输入...</text
+		  >
+		  <text class="presence_status_text">{{ presenceStatus }}</text>
+		</view>
+	</view>
+  </u-navbar>
+  <!-- #endif -->
+</template>
+
+<script>
+import { CHAT_TYPE } from "@/EaseIM/constant";
+export default {
+  props: {
+    targetId: {
+      type: String,
+      default: "",
+    },
+    chatType: {
+      type: String,
+      default: CHAT_TYPE.SINGLE_CHAT,
+    },
+  },
+  data() {
+    return {
+      // defaultAvatar: "/static/images/new_ui/defaultAvatar.png",
+	  nowConversationIntem:uni.getStorageSync('nowConversationIntem'),
+      defaultAvatar: "https://app.bjtdba.com/uploads/logo.jpg",
+      defaultGroupAvatar: "/static/images/new_ui/defaultGroupAvatar.png",
+    };
+  },
+ //  onHide() {
+	// console.log('页面消失');
+ //  	uni.removeStorageSync('nowConversationIntem');
+ //  },
+  computed: {
+    chattingId() {
+		console.log('chattingId',this.$store.getters.chattingId);
+      return this.$store.getters.chattingId;
+	  
+    },
+    loginUserPresence() {
+      return this.$store.state.ContactsStore.subscribeStatusInfoMap;
+    },
+    chattingChatType() {
+      return this.$store.getters.chattingChatType;
+    },
+    chattingTypingStatus() {
+      return this.$store.getters.chattingTypingStatus;
+    },
+    friendUserInfoCollection() {
+      return this.$store.getters.friendUserInfoCollection;
+    },
+    joinedGroupList() {
+      return this.$store.getters.joinedGroupList;
+    },
+    // navbarAvatar() {
+    //   if (this.chattingChatType === CHAT_TYPE.SINGLE_CHAT) {
+    //     const userId = this.chattingId;
+    //     if (
+    //       uni.getStorageSync('nowConversationIntem')&&
+		  // uni.getStorageSync('nowConversationIntem').avatarurl
+    //     ) {
+    //       return (
+    //         uni.getStorageSync('nowConversationIntem').avatarurl
+    //       );
+    //     } else {
+    //       return this.defaultAvatar;
+    //     }
+    //   }
+    //   if (this.chattingChatType === CHAT_TYPE.GROUP_CHAT) {
+    //     return this.defaultGroupAvatar;
+    //   }
+    // },
+    // navigatorName() {
+    //   if (this.chattingChatType === CHAT_TYPE.SINGLE_CHAT) {
+    //     const userId = this.chattingId;
+    //     if (
+    //       uni.getStorageSync('nowConversationIntem') &&
+    //       uni.getStorageSync('nowConversationIntem').nickname
+    //     ) {
+         
+		  // return uni.getStorageSync('nowConversationIntem').nickname;
+    //     } else {
+          
+    //       return uni.getStorageSync('nowConversationIntem').nickname;
+    //     }
+    //   }
+    //   if (this.chattingChatType === CHAT_TYPE.GROUP_CHAT) {
+    //     const group = this.joinedGroupList.find(
+    //       (group) => group.groupId == this.chattingId
+    //     );
+    //     if (group) {
+    //       return group.groupName || group.groupId;
+    //     } else {
+    //       return this.chattingId;
+    //     }
+    //   }
+    // },
+    presenceStatus() {
+      const presenceInfo = this.loginUserPresence[this.chattingId];
+      if (presenceInfo) {
+        const statusDetails = presenceInfo.statusDetails;
+        let isOnline = false;
+
+        for (const item of statusDetails) {
+          if (item.status === 1) {
+            isOnline = true;
+            break;
+          }
+        }
+
+        if (isOnline) {
+          if (presenceInfo.ext) {
+            switch (presenceInfo.ext) {
+              case "Cloaking":
+                return "请勿打扰";
+              case "Online":
+                return "在线";
+              case "Leave":
+                return "离开";
+              case "Offline":
+                return "离线";
+              default:
+                return presenceInfo.ext;
+            }
+          } else {
+            return "在线";
+          }
+        } else {
+          return "离线";
+        }
+      }
+    },
+  },
+  methods: {
+    onArrowLeftBackClick() {
+      uni.navigateBack();
+    },
+    onRightIconClick() {
+      if (this.chatType === CHAT_TYPE.SINGLE_CHAT) {
+        this.entryFriendDetail();
+      }
+      if (this.chatType === CHAT_TYPE.GROUP_CHAT) {
+        this.entryGroupDetail();
+      }
+    },
+    //前往好友详情页面
+    entryFriendDetail() {
+      const friendId = this.targetId;
+      uni.navigateTo({
+        url: `../contactsDetail/index?userId=${friendId}`,
+      });
+    },
+    //前往群组详情页面
+    entryGroupDetail() {
+      const groupId = this.targetId;
+      if (groupId) {
+        uni.navigateTo({
+          url: "../groupDetail/index?groupId=" + groupId,
+        });
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.u-nav-slot {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-width: 0.5px;
+  border-radius: 100px;
+  border-color: #ccc;
+  padding: 3px 7px;
+  /* opacity: 0.8; */
+}
+.chat_name {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  /* align-items: center; */
+  width: 150px;
+  height: 36px;
+  margin-left: 10px;
+}
+.chat_name_text {
+  /* Frame 28 */
+
+  /* Auto layout */
+  padding: 0px;
+  width: 128px;
+  height: 22px;
+
+  /* 简体中文/次级标题/中 */
+  font-family: "PingFang SC";
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  /* identical to box height, or 138% */
+
+  /* Neutral/1 */
+  color: #171a1c;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 0;
+  flex-grow: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  text-align: center;
+}
+.presence_status_text {
+  /* Subtitle */
+
+  width: 100px;
+  height: 14px;
+  left: 40px;
+  top: 22px;
+
+  /* 简体中文/文本/超小 */
+  font-family: "PingFang SC";
+  font-style: normal;
+  font-weight: 400;
+  font-size: 11px;
+  line-height: 14px;
+  /* identical to box height, or 127% */
+
+  /* Neutral/5 */
+  color: #75828a;
+}
+</style>

emChat/emChatContainer/emGrayMessageContainer/index.vue

@@ -0,0 +1,238 @@
+<template>
+  <view class="message_gray_item">
+    <!-- 撤回类型通知消息 -->
+    <template
+      v-if="msgBody.type !== MESSAGE_TYPE.GRAY_INFORM && msgType !== ''"
+    >
+      <text class="message_time">{{ messageTime(msgBody.time) }}</text>
+      <view
+        v-if="msgType === MESSAGE_STATUS.RECALL"
+        class="recall_msg_item_container"
+      >
+        <view v-if="isSelf">
+          <text>你撤回了一条消息</text>
+          <text
+            class="re_edit_text"
+            v-if="msgBody.type === MESSAGE_TYPE.TEXT"
+            @click="callReEditTextMessage"
+            >重新编辑</text
+          >
+        </view>
+        <view v-else>
+          <text>“{{ msgBody.from }}”</text>
+          <text>撤回了一条消息</text>
+        </view>
+      </view>
+    </template>
+    <!-- 单聊好友关系变更类型的通知消息 -->
+    <template
+      v-if="
+        msgBody.chatType === CHAT_TYPE.SINGLE_CHAT &&
+        GRAY_INFORM_MAP_SINGLE_TEXT[msgBody.grayInformType]
+      "
+    >
+      <text class="message_time">{{ messageTime(msgBody.time) }}</text>
+      <view class="common_msg_item_container">
+        <text>{{ replaceStr }}</text>
+      </view>
+    </template>
+    <!-- 群组事件系统通知 -->
+    <template
+      v-if="
+        msgBody.chatType === CHAT_TYPE.GROUP_CHAT &&
+        GRAY_INFORM_MAP_GROUP_TEXT[msgBody.grayInformType]
+      "
+    >
+      <text class="message_time">{{ messageTime(msgBody.time) }}</text>
+      <view class="common_msg_item_container">
+        <text>{{ replaceStr }}</text>
+      </view>
+    </template>
+  </view>
+</template>
+
+<script>
+import {
+  CHAT_TYPE,
+  MESSAGE_STATUS,
+  MESSAGE_TYPE,
+  GRAY_INFORM_TYPE_SINGLE,
+  GRAY_INFORM_MAP_SINGLE_TEXT,
+  GRAY_INFORM_TEMPLATE_NAME,
+  GRAY_INFORM_TYPE_GROUP,
+  GRAY_INFORM_MAP_GROUP_TEXT,
+} from '@/EaseIM/constant';
+export default {
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+      required: true,
+    },
+  },
+  data() {
+    return {
+      CHAT_TYPE,
+      MESSAGE_STATUS,
+      MESSAGE_TYPE,
+      GRAY_INFORM_TYPE_SINGLE,
+      GRAY_INFORM_MAP_SINGLE_TEXT,
+      GRAY_INFORM_TEMPLATE_NAME,
+      GRAY_INFORM_TYPE_GROUP,
+      GRAY_INFORM_MAP_GROUP_TEXT,
+    };
+  },
+  computed: {
+    isSelf() {
+      const { from } = this.msgBody;
+      return (
+        from === this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+      );
+    },
+    messageTime() {
+      return (time) => {
+        return this.$u.timeFrom(time);
+      };
+    },
+    messageCollectionStatus() {
+      return this.$store.getters.messageStatusCollection;
+    },
+    friendUserInfoCollection() {
+      return this.$store.getters.friendUserInfoCollection;
+    },
+    groupMembersProfileData() {
+      return this.$store.getters.groupMembersProfile;
+    },
+    // 灰色通知消息类型
+    msgType() {
+      const msgBody = this.msgBody;
+      let msgStatus = '';
+      if (msgBody.id) {
+        if (
+          this.messageCollectionStatus &&
+          this.messageCollectionStatus[msgBody.id] === MESSAGE_STATUS.DELETE
+        ) {
+          msgStatus = MESSAGE_STATUS.DELETE;
+        } else if (
+          this.messageCollectionStatus &&
+          this.messageCollectionStatus[msgBody.id] === MESSAGE_STATUS.RECALL
+        ) {
+          msgStatus = MESSAGE_STATUS.RECALL;
+        }
+      }
+      return msgStatus;
+    },
+    //将灰色系统通知包含昵称模版的进一步替换替换字符串[XXX]为用户昵称或ID
+    replaceStr() {
+      const { chatType, grayInformType, from, to } = this.msgBody;
+      if (chatType === CHAT_TYPE.SINGLE_CHAT) {
+        let str = GRAY_INFORM_MAP_SINGLE_TEXT[grayInformType];
+        if (str) {
+          return (str = str.replace(
+            GRAY_INFORM_TEMPLATE_NAME.USER,
+            this.getFriendNickname(from)
+          ));
+        }
+        return str;
+      }
+      if (chatType === CHAT_TYPE.GROUP_CHAT) {
+        const groupId = to;
+        let str = GRAY_INFORM_MAP_GROUP_TEXT[grayInformType];
+        if (str) {
+          if (str.includes(GRAY_INFORM_TEMPLATE_NAME.GROUP_USER_FROM)) {
+            return (str = str.replace(
+              GRAY_INFORM_TEMPLATE_NAME.GROUP_USER_FROM,
+              this.getMemberGroupNickname(from, groupId)
+            ));
+          } else {
+            return str;
+          }
+        }
+        return str;
+      }
+    },
+  },
+  methods: {
+    callReEditTextMessage() {
+      const { msg } = this.msgBody;
+      if (msg) {
+        this.$emit('reEditTextMessage', msg);
+      }
+    },
+    getFriendNickname(userId) {
+      if (
+        this.friendUserInfoCollection[userId] &&
+        this.friendUserInfoCollection[userId]?.nickname
+      ) {
+        return `“${this.friendUserInfoCollection[userId].nickname}”`;
+      } else {
+        return `“${userId}”`;
+      }
+    },
+    //获取用户对应群组昵称
+    getMemberGroupNickname(userId, groupId) {
+      const groupMemberData = this.groupMembersProfileData[groupId];
+      console.log(groupMemberData);
+      let nickname = '';
+      if (groupMemberData) {
+        nickname =
+          groupMemberData[userId]?.nickName ||
+          groupMemberData[userId]?.nickname ||
+          userId;
+        return `“${nickname}”`;
+      } else {
+        return `“${userId}”`;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.message_gray_item {
+  width: 100%;
+}
+.recall_msg_item_container,
+.common_msg_item_container {
+  width: 100%;
+  height: 16px;
+  text-align: center;
+  /* 简体中文/标签/小 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+
+  /* Neutral/5 */
+  color: #75828a;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+.re_edit_text {
+  color: #3e91fa;
+  font-size: 13px;
+}
+.message_time {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 16px;
+  /* Alphabet/Body/Small */
+  font-family: 'SF Pro';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+  /* Neutral/7 */
+  color: #acb4b9;
+  margin: 10px 0 5px 0;
+}
+</style>

emChat/emChatContainer/emInputBarContainer/editMessageContainer/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <view class="edit_message_container">
+    <view class="edit_message_container_left">
+      <u-icon class="edit_message_container_left_icon"></u-icon>
+      <text class="edit_message_container_left_text">正在编辑...</text>
+    </view>
+    <view class="edit_message_container_right">
+      <u-icon
+        @click="$emit('onShowEditMessageContainer')"
+        class="edit_message_container_right_icon"
+        name="/static/images/new_ui/message/replyMessage/close_icon.png"
+      ></u-icon>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {};
+</script>
+
+<style scoped>
+.edit_message_container {
+  width: 100%;
+  height: 30px;
+  background-color: #eff0f1;
+  box-sizing: border-box;
+  padding: 0 8px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+}
+.edit_message_container_left_text {
+  /* Nickname */
+
+  width: 36px;
+  height: 16px;
+
+  /* 简体中文/标签/小 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+
+  /* Neutral Special/5 */
+  color: #5270ad;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+</style>

emChat/emChatContainer/emInputBarContainer/emojiPickerContainer/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <view>
+    <scroll-view scroll-y="true" class="scroll-emoji-box">
+      <view
+        class="emoji-item"
+        v-for="(item, index) in emoji.emojis"
+        :key="index"
+        @click="handleClick(item)"
+        >{{ item }}</view
+      >
+    </scroll-view>
+  </view>
+</template>
+
+<script>
+import { emoji } from '@/constant';
+export default {
+  data() {
+    return {
+      emoji,
+    };
+  },
+  methods: {
+    handleClick(emoji) {
+      this.$emit('appendEmojiIcon', emoji);
+    },
+  },
+};
+</script>
+
+<style scoped>
+.scroll-emoji-box {
+  height: 200px;
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  align-items: center;
+}
+.emoji-item {
+  width: 10%;
+  height: 37px;
+  font-size: 26px;
+  display: inline-block;
+  text-align: center;
+  line-height: 36px;
+  box-sizing: border-box;
+}
+</style>

emChat/emChatContainer/emInputBarContainer/index.vue

@@ -0,0 +1,481 @@
+<template>
+  <view class="chat-input-bar-container">
+    <reply-message-container
+      ref="replyMessageContainerComps"
+      v-show="isShowReplyMessageContainer"
+      @onShowReplyMessageContainer="onShowReplyMessageContainer"
+      :checkedPopupMsgBody="checkedPopupMsgBody"
+    />
+    <edit-message-container
+      v-show="isShowEditMessageContainer"
+      @onShowEditMessageContainer="onShowEditMessageContainer"
+    />
+    <view class="chat-input-bar">
+      <!-- <template v-if="!isShowEditMessageContainer">
+        <image
+          class="chat-audio-icon-container"
+          @click="onShowAudioMessageContainer"
+          src="/static/images/new_ui/inputbar/audio_click_icon.png"
+        ></image>
+      </template> -->
+      <!-- 文本输入input -->
+      <view class="chat-input-container">
+        <input
+          class="chat-input"
+          v-model="msgContent"
+          :cursor-spacing="cursorSpacing"
+          confirm-type="send"
+          type="text"
+          :always-embed="true"
+          :adjust-position="false"
+          @focus="onInputFocus"
+          @blur="onInputBlur"
+          @confirm="sendTextMessage"
+          @input="onInput"
+        />
+      </view>
+      <template v-if="isShowEditMessageContainer">
+        <image
+          class="chat-emoji-icon-container"
+          @click="actionModifyMessage"
+          src="/static/images/new_ui/message/send_edit_msg_icon.png"
+        ></image>
+      </template>
+    </view>
+    <!-- 输入框底部功能栏 -->
+    <view class="chat-input-bottom-bar">
+      <!-- 语音 -->
+     <!-- <view class="input-bottom-bar-icon" @click="onShowAudioMessageContainer">
+        <image
+          src="/static/images/new_ui/inputbar/tofeipeng/icons/mic_stroke@2x.png"
+        ></image>
+      </view> -->
+      <!-- 图库 -->
+      <view class="input-bottom-bar-icon" @click="openPhotoAlbum('album')">
+        <image
+          src="/static/images/new_ui/inputbar/tofeipeng/icons/img@2x.png"
+        ></image>
+      </view>
+      <!-- 拍照 -->
+      <view class="input-bottom-bar-icon" @click="openPhotoAlbum('camera')">
+        <image
+          src="/static/images/new_ui/inputbar/tofeipeng/icons/camera@2x.png"
+        ></image>
+      </view>
+      <!-- 文件 -->
+      <!-- <view class="input-bottom-bar-icon">
+        <image
+          src="/static/images/new_ui/inputbar/tofeipeng/icons/folder@2x.png"
+        ></image>
+      </view> -->
+      <!-- <SendFileMessage
+        ref="fileComps"
+        @onCloseAllShowContainer="onCloseAllShowContainer"
+      >
+        <view class="input-bottom-bar-icon">
+          <image
+            src="/static/images/new_ui/inputbar/tofeipeng/icons/folder@2x.png"
+          ></image>
+        </view>
+      </SendFileMessage> -->
+      <!-- emoji -->
+      <view class="input-bottom-bar-icon" @click="onShowEmojiIconContainer">
+        <image
+          src="/static/images/new_ui/inputbar/tofeipeng/icons/face@2x.png"
+        ></image>
+      </view>
+      <!-- 更多 -->
+     <!-- <view class="input-bottom-bar-icon" @click="onShowMoreFuncContainer">
+        <image
+          src="/static/images/new_ui/inputbar/tofeipeng/icons/plus_in_circle@2x.png"
+        ></image>
+      </view> -->
+    </view>
+    <!-- 音频发送板块 -->
+    <view v-if="isShowAudioMessageContainer" class="chat-audio-container">
+      <RecordAudioContainer
+        @changeRecordAudioContainer="
+          () => (isShowAudioMessageContainer = false)
+        "
+      />
+    </view>
+    <!-- Emoji Icon选择板块 -->
+    <view v-if="isShowEmojiIconContainer" class="chat-emoji-picker-container">
+      <EmojiPickerContainer @appendEmojiIcon="appendEmojiIcon" />
+    </view>
+    <!-- 更多功能选择板块 -->
+    <view v-if="isShowMoreFuncContainer" class="chat-more-icon-container">
+      <MoreFuncContainer @onCloseAllShowContainer="onCloseAllShowContainer" />
+    </view>
+    <!-- 发送图片 -->
+    <SendImageMessage
+      ref="imageComps"
+      @onCloseAllShowContainer="onCloseAllShowContainer"
+    />
+    <!-- 软键盘弹起占位容器 -->
+    <view
+      class="softkeyword-placeholder"
+      :style="{ height: softkeyboardHeight + 'px' }"
+    ></view>
+    <!-- #ifdef H5 || APP-PLUS -->
+    <!-- 小程序的宿主一般自带底部安全区 -->
+    <view class="chat-input-bar-bottom-placeholder"></view>
+    <!-- #endif -->
+  </view>
+</template>
+
+<script>
+import { EMClient } from '@/EaseIM';
+import { CHAT_TYPE } from '@/EaseIM/constant';
+import { emMessages } from '@/EaseIM/emApis';
+import RecordAudioContainer from './recordAudioContainer';
+import EmojiPickerContainer from './emojiPickerContainer';
+import MoreFuncContainer from './moreFuncContainer';
+import ReplyMessageContainer from './replyMessageContainer';
+import EditMessageContainer from './editMessageContainer';
+import SendImageMessage from './inputMessages/sendImageMessage';
+import SendFileMessage from './inputMessages/sendFileMessage';
+import { MESSAGE_TYPE } from '../../../EaseIM/constant';
+const { sendDisplayMessages, sendCommandMessages, modifyDisplayMessages } =
+  emMessages();
+export default {
+  name: 'chat-input-bar',
+  components: {
+    RecordAudioContainer,
+    EmojiPickerContainer,
+    MoreFuncContainer,
+    ReplyMessageContainer,
+    EditMessageContainer,
+    SendImageMessage,
+    SendFileMessage,
+  },
+  props: {
+    checkedPopupMsgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      msgContent: '',
+      cursorSpacing: 20,
+      softkeyboardHeight: 0,
+      isShowAudioMessageContainer: false,
+      isShowEmojiIconContainer: false,
+      isShowMoreFuncContainer: false,
+      isShowReplyMessageContainer: false,
+      isShowEditMessageContainer: false,
+      isOpenedTypingBeginStatus: false,
+    };
+  },
+  mounted() {
+    // #ifndef APP-NVUE
+    const query = uni.createSelectorQuery().in(this);
+    query
+      .select('.chat-input-bar-bottom-placeholder')
+      .boundingClientRect((data) => {
+        if (data && data.height) {
+          this.cursorSpacing = data.height + 20;
+        }
+      })
+      .exec();
+    // #endif
+    this.getLocalInputingStatus();
+    //监听键盘高度变化
+    //监听键盘抬起事件
+    uni.onKeyboardHeightChange &&
+      uni.onKeyboardHeightChange(this.listenerKeyboardHeight);
+  },
+  computed: {
+    chattingId() {
+      return this.$store.getters.chattingId;
+    },
+    chattingChatType() {
+      return this.$store.getters.chattingChatType;
+    },
+  },
+  methods: {
+    onInputFocus() {
+      // input focus的时候重新设置一下input内容以修复在微信小程序&QQ小程序中input focus后位置偏移的bug
+      // #ifdef MP-WEIXIN || MP-QQ
+      //   this.msgContent += ' ';
+      //   this.$nextTick(() => {
+      //     this.msgContent = this.msgContent.slice(0, -1);
+      //   });
+      // #endif
+      this.onCloseAllShowContainer();
+    },
+    listenerKeyboardHeight(e) {
+      if (e.height > 0) {
+        this.softkeyboardHeight = e.height;
+      } else {
+        this.softkeyboardHeight = 0;
+      }
+    },
+    onInputBlur() {
+      this.onCloseAllShowContainer();
+    },
+    onInput() {
+      if (
+        this.isShowEditMessageContainer === false &&
+        this.isOpenedTypingBeginStatus
+      ) {
+        //节流正在输入中信令发送调用 10s发送一次。
+        uni.$u.throttle(this.sendTypingBeginMessage, 10000, true);
+      }
+    },
+    //发送文本消息
+    async sendTextMessage() {
+      if (this.msgContent.match(/^\s*$/)) {
+        uni.showToast({
+          title: '请输入内容',
+          icon: 'none',
+        });
+        return;
+      }
+      let params = {
+        // 消息类型。
+        type: 'txt',
+        // 消息内容。
+        msg: this.msgContent,
+        // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+        to: this.chattingId,
+        // 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+        chatType: this.chattingChatType,
+        ext: {},
+      };
+      //如果此时为编辑模式则直接return 并调用编辑消息
+      if (this.isShowEditMessageContainer) {
+        this.actionModifyMessage();
+        return;
+      }
+      //检测是否存在引用消息
+      if (this.isShowReplyMessageContainer) {
+        params.ext.msgQuote = {};
+        params.ext.msgQuote =
+          this.$refs.replyMessageContainerComps.extractMessageBodyValue();
+        console.log('>>>存在引用', params);
+      }
+      try {
+        const res = await sendDisplayMessages({ ...params });
+        console.log('>>>>>文本消息发送成功', res);
+      } catch (error) {
+        console.log('>>>>>文本消息发送失败', error);
+        if (error.type === 508) {
+          uni.showToast({
+            title: '发送内容不合规',
+            icon: 'none',
+          });
+        } else {
+          uni.showToast({
+            title: '消息发送失败',
+            icon: 'none',
+          });
+        }
+      } finally {
+        this.msgContent = '';
+        this.onCloseAllShowContainer();
+        this.isShowReplyMessageContainer &&
+          (this.isShowReplyMessageContainer = false);
+      }
+    },
+    //编辑修改已发送文本消息
+    async actionModifyMessage() {
+      const editMessageContent = {
+        msg: this.msgContent,
+        to: this.checkedPopupMsgBody.to,
+        id: this.checkedPopupMsgBody.id,
+        chatType: CHAT_TYPE.SINGLE_CHAT,
+      };
+      try {
+        const res = await modifyDisplayMessages(editMessageContent);
+        console.log('>>>>>>消息修改成功', res);
+      } catch (error) {
+        console.log('>>>>>>修改消息失败', error);
+        if (error?.type === 50) {
+          uni.showToast({
+            icon: 'none',
+            title: '该消息可编辑次数已达上限',
+          });
+        } else {
+          uni.showToast({
+            icon: 'none',
+            title: '消息编辑失败请稍后重试',
+          });
+        }
+      } finally {
+        this.isShowEditMessageContainer = false;
+        this.msgContent = '';
+      }
+    },
+    //获取当前键入中开启状态
+    getLocalInputingStatus() {
+      const res = uni.getStorageSync(`EM_${EMClient.user}_GENNERAL_CONFIG`);
+      const { isShowInputingStatus } = res || {};
+      this.isOpenedTypingBeginStatus = isShowInputingStatus;
+    },
+    //发送正在键入command
+    async sendTypingBeginMessage() {
+      const params = {
+        type: MESSAGE_TYPE.CMD,
+        // 消息类型。
+        action: 'TypingBegin',
+        // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+        to: this.chattingId,
+        // 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+        chatType: this.chattingChatType,
+      };
+      try {
+        await sendCommandMessages(params);
+      } catch (error) {
+        console.log('>>>>>发送失败', error);
+      }
+    },
+    onShowAudioMessageContainer() {
+      this.isShowAudioMessageContainer = !this.isShowAudioMessageContainer;
+      this.isShowEmojiIconContainer && (this.isShowEmojiIconContainer = false);
+      this.isShowMoreFuncContainer && (this.isShowMoreFuncContainer = false);
+      this.$emit('resetScrollHeight', 200);
+    },
+    onShowEmojiIconContainer() {
+      this.isShowEmojiIconContainer = !this.isShowEmojiIconContainer;
+      this.isShowAudioMessageContainer &&
+        (this.isShowAudioMessageContainer = false);
+      this.isShowMoreFuncContainer && (this.isShowMoreFuncContainer = false);
+    },
+    onShowMoreFuncContainer() {
+      this.isShowMoreFuncContainer = !this.isShowMoreFuncContainer;
+      this.isShowAudioMessageContainer &&
+        (this.isShowAudioMessageContainer = false);
+      this.isShowEmojiIconContainer && (this.isShowEmojiIconContainer = false);
+    },
+    onShowReplyMessageContainer() {
+      this.isShowReplyMessageContainer = !this.isShowReplyMessageContainer;
+      this.isShowEditMessageContainer &&
+        (this.isShowEditMessageContainer = false);
+      this.onCloseAllShowContainer();
+    },
+    onShowEditMessageContainer() {
+      if (this.isShowEditMessageContainer === false) {
+        this.msgContent = this.checkedPopupMsgBody.msg;
+      }
+      this.isShowEditMessageContainer = !this.isShowEditMessageContainer;
+      this.isShowReplyMessageContainer &&
+        (this.isShowReplyMessageContainer = false);
+      this.onCloseAllShowContainer();
+    },
+    onCloseAllShowContainer() {
+      this.isShowAudioMessageContainer = false;
+      this.isShowEmojiIconContainer = false;
+      this.isShowMoreFuncContainer = false;
+    },
+    appendEmojiIcon(emoji) {
+      this.msgContent += emoji;
+    },
+    appendReEditTextMessage(content) {
+      if (this.msgContent !== '') {
+        this.msgContent += content;
+      } else {
+        this.msgContent = content;
+      }
+    },
+    openPhotoAlbum(type) {
+      if (type === 'camera') {
+        this.$refs.imageComps.openCamera();
+      } else if (type === 'album') {
+        this.$refs.imageComps.openPhotoAlbum();
+      }
+    },
+  },
+  beforeDestroy() {
+    uni.offKeyboardHeightChange &&
+      uni.offKeyboardHeightChange(this.listenerKeyboardHeight);
+  },
+};
+</script>
+
+<style scoped>
+.chat-input-bar {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  border-top: solid 1px #f5f5f5;
+  background-color: #f8f8f8;
+  padding: 10rpx 15rpx;
+}
+.chat-input-bar-bottom-placeholder {
+  background-color: #f8f8f8;
+  /* #ifndef APP-PLUS */
+  height: env(safe-area-inset-bottom);
+  /* #endif */
+}
+.softkeyword-placeholder {
+  width: 100%;
+  background-color: white;
+}
+.chat-input-container {
+  flex: 1;
+  display: flex;
+  /* #ifndef APP-NVUE */
+  padding: 15rpx;
+  /* #endif */
+  /* #ifdef APP-NVUE */
+  padding: 10rpx;
+  /* #endif */
+  background-color: white;
+  border-radius: 10rpx;
+}
+.chat-input-bottom-bar {
+  width: 100%;
+  height: 100rpx;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 50rpx;
+  box-sizing: border-box;
+  background-color: white;
+}
+.input-bottom-bar-icon {
+  width: 60rpx;
+  height: 60rpx;
+}
+.input-bottom-bar-icon image {
+  width: 100%;
+  height: 100%;
+}
+.chat-input {
+  flex: 1;
+  font-size: 28rpx;
+}
+.chat-input-send {
+  background-color: #007aff;
+  margin: 10rpx 10rpx 10rpx 20rpx;
+  border-radius: 10rpx;
+  padding: 10rpx 30rpx;
+}
+.chat-input-send-text {
+  color: white;
+  font-size: 26rpx;
+}
+.chat-audio-icon-container,
+.chat-emoji-icon-container,
+.chat-cancel-icon-container {
+  width: 30px;
+  height: 30px;
+}
+.chat-audio-container {
+  width: 100%;
+  height: 200px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+  background: #fff;
+}
+.chat-emoji-picker-container {
+  width: 100%;
+  /* height: 300px; */
+  background: #fff;
+}
+</style>

emChat/emChatContainer/emInputBarContainer/inputMessages/sendFileMessage/index.vue

@@ -0,0 +1,125 @@
+<template>
+  <view>
+    <lsj-upload
+      ref="lsjUpload"
+      childId="upload1"
+      :option="option"
+      :size="size"
+      :formats="formats"
+      :debug="debug"
+      :instantly="instantly"
+      :width="width"
+      :height="height"
+      @uploadEnd="onUploadEnd"
+      @onProgress="onProgress"
+    >
+      <view>
+        <slot></slot>
+      </view>
+    </lsj-upload>
+  </view>
+</template>
+
+<script>
+/* EaseIM */
+import { EMClient } from '@/EaseIM';
+import { MESSAGE_TYPE } from '@/EaseIM/constant';
+import { emMessages } from '@/EaseIM/emApis';
+const { sendDisplayMessages } = emMessages();
+const apiUrl = EMClient.apiUrl;
+const orgName = EMClient.orgName;
+const appName = EMClient.appName;
+const token = EMClient.token;
+const uploadTargetUrl = `${apiUrl}/${orgName}/${appName}/chatfiles`;
+export default {
+  data() {
+    return {
+      option: {
+        url: uploadTargetUrl,
+        name: 'file',
+        header: {
+          Authorization: `Bearer ${token}`,
+        },
+      },
+      // 选择文件后是否立即自动上传，true=选择后立即上传
+      instantly: true,
+      // 必传宽高且宽高应与slot宽高保持一致
+      //   width: '64px',
+      //   height: '62px',
+      width: '30px',
+      height: '27px',
+      // 限制允许选择的格式，空串=不限制，默认为空
+      formats: '',
+      // 文件上传大小限制
+      size: 10,
+      // 是否打印日志
+      debug: true,
+    };
+  },
+  computed: {
+    chattingId() {
+      return this.$store.getters.chattingId;
+    },
+    chattingChatType() {
+      return this.$store.getters.chattingChatType;
+    },
+  },
+  methods: {
+    //发送附件消息
+    async sendFileMessage(payload) {
+      console.log('>>>>>sendFileMessage payload', payload);
+      const { dataObj, filename, file_length } = payload;
+      let params = {
+        // 消息类型。
+        type: MESSAGE_TYPE.FILE,
+        // 单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+        chatType: this.chattingChatType,
+        // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+        to: this.chattingId,
+        body: {
+          // 文件 URL。
+          url: dataObj.uri + '/' + dataObj.entities[0].uuid,
+          // 文件类型。
+          type: 'filetype',
+          // 文件名称。
+          filename: filename,
+          // 文件大小。
+          file_length: file_length,
+        },
+        ext: {},
+      };
+      // 发送消息。
+      console.log('>>>>>要发送的消息params', params);
+      try {
+        await sendDisplayMessages(params);
+        console.log('>>>>>文件发送成功');
+      } catch (error) {
+        console.log('>>>>>文件消息发送失败', error);
+        uni.showToast({
+          title: '消息发送失败',
+          icon: 'none',
+        });
+      } finally {
+        uni.hideLoading();
+        this.$emit('onCloseAllShowContainer');
+      }
+    },
+    onUploadEnd(res) {
+      const dataObj = JSON.parse(res.responseText); // 接收上传文件对象
+      const payload = {
+        dataObj,
+        filename: res.name,
+        file_length: res.size,
+      };
+      this.sendFileMessage(payload);
+      uni.hideLoading();
+    },
+    //onProgress
+    onProgress(evt) {
+      uni.showLoading({ title: '文件上传中，请稍后' });
+    },
+  },
+};
+</script>
+
+<style></style>

emChat/emChatContainer/emInputBarContainer/inputMessages/sendImageMessage/index.vue

@@ -0,0 +1,194 @@
+<template>
+  <view> </view>
+</template>
+
+<script>
+import { EMClient } from '@/EaseIM';
+import { MESSAGE_TYPE } from '@/EaseIM/constant';
+import { emMessages } from '@/EaseIM/emApis';
+const { sendDisplayMessages } = emMessages();
+const apiUrl = EMClient.apiUrl;
+const orgName = EMClient.orgName;
+const appName = EMClient.appName;
+const uploadTargetUrl = `${apiUrl}/${orgName}/${appName}/chatfiles`;
+const token = EMClient.token;
+export default {
+  data() {
+    return {
+      platForm: '',
+    };
+  },
+  computed: {
+    chattingId() {
+      return this.$store.getters.chattingId;
+    },
+    chattingChatType() {
+      return this.$store.getters.chattingChatType;
+    },
+  },
+  mounted() {
+    const res = uni.getSystemInfoSync();
+    this.platForm = res?.uniPlatform;
+  },
+  methods: {
+    //打开图库
+    openPhotoAlbum() {
+      // #ifdef MP-WEIXIN  || MP-TOUTIAO || MP-LARK || MP-JD
+      uni.chooseMedia({
+        count: 1,
+        mediaType: ['image'],
+        sourceType: ['album'],
+        camera: 'back',
+        success: (res) => {
+          console.log('拍照选取的图片', res);
+          this.upLoadImage(res);
+        },
+        fail: (err) => {
+          uni.showToast({
+            title: err.errMsg,
+            icon: 'none',
+          });
+        },
+      });
+      // #endif
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['original', 'compressed'],
+        sourceType: ['album'],
+        success: (res) => {
+          this.upLoadImage(res);
+        },
+        fail: (err) => {
+          uni.showToast({
+            title: err.errMsg,
+            icon: 'none',
+          });
+        },
+      });
+    },
+    //打开相机
+    openCamera() {
+      // #ifdef MP-WEIXIN  || MP-TOUTIAO || MP-LARK || MP-JD
+      uni.chooseMedia({
+        count: 1,
+        mediaType: ['image'],
+        sourceType: ['camera'],
+        camera: 'back',
+        success: (res) => {
+          console.log('拍照选取的图片', res);
+          this.upLoadImage(res);
+        },
+        fail: (err) => {
+          uni.showToast({
+            title: err.errMsg,
+            icon: 'none',
+          });
+        },
+      });
+      // #endif
+      uni.chooseImage({
+        count: 1,
+        sizeType: ['original', 'compressed'],
+        sourceType: ['camera'],
+
+        success: (res) => {
+          this.upLoadImage(res);
+        },
+        fail: (err) => {
+          uni.showToast({
+            title: err.errMsg,
+            icon: 'none',
+          });
+        },
+      });
+    },
+    async upLoadImage(res) {
+      const tempFile = res?.tempFiles[0];
+      const tempFilePath =
+        (res && res.tempFilePaths && res.tempFilePaths[0]) ||
+        (res && res.tempFiles && res.tempFiles[0].tempFilePath);
+
+      console.log('tempFilePath', tempFilePath);
+      const imageName = tempFile?.name || 'image' + Date.now();
+      const imageType = tempFile?.type?.split('/')[1] || '';
+      let width = '';
+      let height = '';
+      uni.getImageInfo({
+        src: tempFilePath,
+        success: (res) => {
+          console.log('>>>>获取图片信息成功', res);
+          width = res.width;
+          height = res.height;
+        },
+        fail: (err) => {
+          console.log('>>>>>>获取图片信息失败', err);
+        },
+      });
+      uni.uploadFile({
+        url: uploadTargetUrl,
+        filePath: tempFilePath,
+        fileType: 'image',
+        name: 'file',
+        header: {
+          Authorization: 'Bearer ' + token,
+        },
+        success: (res) => {
+          console.log('上传图片成功', res);
+          if (res.statusCode === 400) {
+            // 图片上传阿里云检验不合法
+            var errData = JSON.parse(res.data);
+            if (errData.error === 'content improper') {
+              uni.showToast({ title: '图片不合法', icon: 'none' });
+              return false;
+            }
+          }
+          this.sendImagesMessage(res, { imageName, width, height, imageType });
+          console.log(
+            '>>>>>>>执行发送图片信息',
+            imageName,
+            width,
+            height,
+            imageType
+          );
+          uni.showToast({ title: '图片已上传', icon: 'none' });
+        },
+        fail: (e) => {
+          console.log('>>>>>上传失败', e);
+          uni.showToast({ title: '图片上传失败', icon: 'none' });
+        },
+      });
+    },
+    async sendImagesMessage(res, { imageName, width, height, imageType }) {
+      console.log('>>>>>开始执行发送图片消息', res);
+      const dataObj = JSON.parse(res.data); // 接收消息对象
+      var params = {
+        type: MESSAGE_TYPE.IMAGE,
+        width: width,
+        height: height,
+        url: dataObj.uri + '/' + dataObj.entities[0].uuid,
+        // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+        to: this.chattingId,
+        // 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+        chatType: this.chattingChatType,
+        ext: {
+          imageName: imageName,
+          imageType: imageType,
+        },
+      };
+      try {
+        const res = await sendDisplayMessages({ ...params });
+      } catch (error) {
+        console.log('>>>>>图片消息发送失败', error);
+        uni.showToast({
+          title: '消息发送失败',
+          icon: 'none',
+        });
+      } finally {
+        this.$emit('onCloseAllShowContainer');
+      }
+    },
+  },
+};
+</script>
+
+<style scoped></style>

emChat/emChatContainer/emInputBarContainer/moreFuncContainer/index.css

@@ -0,0 +1,65 @@
+.more_func_container {
+  width: 100%;
+  height: 200px;
+  padding: 16px 0;
+  background: #fff;
+
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: flex-start;
+  align-items: flex-start;
+  padding: 0 30px;
+}
+.more_func_item {
+  /* flex-basis: 25%; */
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.more_func_item text {
+  /* 照片 */
+
+  width: 24px;
+  height: 16px;
+
+  /* 简体中文/文本/小 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+  text-align: center;
+
+  /* Neutral/3 */
+  color: #464e53;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+.more_func_item_icon {
+  width: 64px;
+  height: 64px;
+  border-radius: 12px;
+  background-color: #f1f2f3;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.more_func_item_icon_img {
+  width: 32px;
+  height: 32px;
+}
+.more_func_item_icon_common {
+  width: 26.67px;
+  height: 21.33px;
+}
+.more_func_item_icon_profile {
+  width: 21.33px;
+  height: 24px;
+}

emChat/emChatContainer/emInputBarContainer/moreFuncContainer/index.vue

@@ -0,0 +1,86 @@
+<template>
+  <view class="more_func_container">
+    <!-- 照片 -->
+    <!-- <view class="more_func_item" @click="openPhotoAlbum('album')">
+      <view class="more_func_item_icon">
+        <image
+          class="more_func_item_icon_img"
+          src="/static/images/new_ui/inputbar/more_picture_icon.png "
+        ></image>
+      </view>
+      <text>照片</text>
+    </view> -->
+    <!-- 相机 -->
+    <!-- <view class="more_func_item" @click="openPhotoAlbum('camera')">
+      <view class="more_func_item_icon">
+        <image
+          class="more_func_item_icon_common"
+          src="/static/images/new_ui/inputbar/more_camera_icon.png"
+        ></image>
+      </view>
+      <text>相机</text>
+    </view> -->
+    <!-- 文件 -->
+    <!-- <view class="more_func_item">
+      <SendFileMessage
+        ref="fileComps"
+        @onCloseAllShowContainer="onCloseAllShowContainer"
+      >
+        <view class="more_func_item_icon">
+          <image
+            class="more_func_item_icon_common"
+            src="/static/images/new_ui/inputbar/more_file_icon.png"
+          ></image>
+        </view>
+      </SendFileMessage>
+      <text>文件</text>
+    </view> -->
+    <!-- 名片 -->
+    <view class="more_func_item" @click="entrySelectUserCard">
+      <view class="more_func_item_icon">
+        <image
+          class="more_func_item_icon_profile"
+          src="/static/images/new_ui/inputbar/more_profile_card_icon.png"
+        ></image>
+      </view>
+      <text>名片</text>
+    </view>
+    <SendImageMessage
+      ref="imageComps"
+      @onCloseAllShowContainer="onCloseAllShowContainer"
+    />
+  </view>
+</template>
+
+<script>
+import SendImageMessage from '../inputMessages/sendImageMessage';
+import SendFileMessage from '../inputMessages/sendFileMessage';
+export default {
+  components: { SendImageMessage, SendFileMessage },
+  data() {
+    return {};
+  },
+  methods: {
+    openPhotoAlbum(type) {
+      if (type === 'camera') {
+        this.$refs.imageComps.openCamera();
+      } else if (type === 'album') {
+        this.$refs.imageComps.openPhotoAlbum();
+      }
+    },
+    onCloseAllShowContainer() {
+      this.$emit('onCloseAllShowContainer');
+    },
+    entrySelectUserCard() {
+      uni.navigateTo({
+        url: '../emChatContainer/emSelectUserCard/index',
+      });
+      this.onCloseAllShowContainer();
+    },
+  },
+};
+</script>
+
+<style scoped>
+@import './index.css';
+</style>

emChat/emChatContainer/emInputBarContainer/recordAudioContainer/index.vue

@@ -0,0 +1,447 @@
+<template>
+  <view>
+    <view class="audio_start_box" @click="startRecordAudio">
+      <image src="/static/images/new_ui/inputbar/audio_click_start_icon.png">
+      </image>
+      <text>点击录音</text>
+    </view>
+    <u-popup :show="isStartRecording" @close="isStartRecording = false">
+      <view class="audio_record_box">
+        <image
+          class="audio_icon"
+          @click="cannelRecordAudio"
+          src="/static/images/new_ui/inputbar/audio_delete_icon.png"
+        ></image>
+        <view class="record_statistics_box">
+          <view class="record_length_text">{{ recordTime }}s</view>
+          <text>正在录音</text>
+        </view>
+
+        <image
+          class="audio_icon"
+          @click="sendAudioMessage"
+          src="/static/images/new_ui/inputbar/audio_send_icon.png"
+        ></image>
+      </view>
+    </u-popup>
+  </view>
+</template>
+
+<script>
+import { EMClient } from '@/EaseIM';
+import { emMessages } from '@/EaseIM/emApis';
+import { RECORD_STATUS, RECOED_DESC } from '@/constant';
+const { sendDisplayMessages } = emMessages();
+let recordTimeInterval = null;
+export default {
+  data() {
+    return {
+      RECOED_DESC,
+      RECORD_STATUS,
+      isStartRecording: false,
+      recordStatus: RECORD_STATUS.HIDE,
+      recorderManager: null, //全局唯一录音管理器
+      recording: false, //是否正在录音中
+      recordTime: 0,
+      webRecorderManager: null, // h5 audio record
+      platFormInfo: uni.getSystemInfoSync(),
+    };
+  },
+  mounted() {
+    this.platFormInfo = uni.getSystemInfoSync();
+    if (this.platFormInfo !== 'web') {
+      this.recorderManager = uni.getRecorderManager();
+    }
+  },
+  watch: {
+    recordTime(newVal, oldVal) {
+      if (this.recording && newVal > 50) {
+        uni.showToast({
+          icon: 'none',
+          title: '录音时长最大60秒，注意时长！',
+          duration: 2000,
+        });
+        this.cannelRecordAudio();
+      }
+      if (this.recording && newVal > 60) {
+        uni.showToast({
+          icon: 'none',
+          title: '录音时长最大60秒',
+          duration: 2000,
+        });
+        this.cannelRecordAudio();
+      }
+    },
+  },
+  computed: {
+    chattingId() {
+      return this.$store.getters.chattingId;
+    },
+    chattingChatType() {
+      return this.$store.getters.chattingChatType;
+    },
+  },
+  methods: {
+    startRecordAudio() {
+      console.log('>>>>>开始采集');
+      this.isStartRecording = true;
+      this.handleRecording();
+    },
+    handleRecording() {
+      // h5不支持uni.getRecorderManager, 需要单独处理
+      if (this.platFormInfo.uniPlatform === 'web') {
+        console.log('>>>>>>>>++++++');
+        this.executeWebAudioRecord();
+      } else {
+        setTimeout(() => {
+          //请求授权
+          this.requestMiniProgramAuthorization();
+        }, 350);
+      }
+    },
+
+    //web平台采集音频录音
+    //#ifdef WEB
+    executeWebAudioRecord() {
+      import('../../../../recorderCore/src/recorder-core').then((Recorder) => {
+        require('../../../../recorderCore/src/engine/mp3');
+        require('../../../../recorderCore/src/engine/mp3-engine');
+        this.initStartRecord();
+        this.webRecorderManager = new Recorder.default({
+          type: 'mp3',
+        });
+        this.webRecorderManager.open(
+          () => {
+            console.log('>>>>>>web 录音开始执行');
+            this.recording = true;
+            this.saveRecordTime();
+            this.webRecorderManager.start();
+          },
+          (msg, isUserNotAllow) => {
+            if (isUserNotAllow) {
+              uni.showToast({
+                title: '鉴权失败，请重试',
+                icon: 'none',
+              });
+            } else {
+              uni.showToast({
+                title: `开启失败，请重试`,
+                icon: 'none',
+              });
+            }
+          }
+        );
+      });
+    },
+    // #endif
+    requestMiniProgramAuthorization() {
+      const onSuccess = (res) => {
+        this.initStartRecord();
+        const recordAuth = res.authSetting['scope.record'];
+        if (!recordAuth) {
+          // 已申请过授权，但是用户拒绝
+          uni.openSetting({
+            success: function (res) {
+              const recordAuth = res.authSetting['scope.record'];
+              if (recordAuth == true) {
+                uni.showToast({
+                  title: '授权成功',
+                  icon: 'success',
+                });
+              } else {
+                uni.showToast({
+                  title: '请授权录音',
+                  icon: 'none',
+                });
+              }
+            },
+          });
+          return;
+        }
+        // 用户已经同意授权
+        if (recordAuth) {
+          this.executeMiniProgramRecord();
+          return;
+        }
+        // 第一次进来，未发起授权
+        uni.authorize({
+          scope: 'scope.record',
+          success: () => {
+            // 授权成功
+            uni.showToast({
+              title: '授权成功',
+              icon: 'icon',
+            });
+            this.executeMiniProgramRecord();
+          },
+        });
+      };
+      const onFail = (res) => {
+        uni.showToast({
+          title: '鉴权失败，请重试',
+          icon: 'none',
+        });
+      };
+      if (uni.getSetting) {
+        uni.getSetting({
+          success: onSuccess,
+          fail: onFail,
+        });
+        return;
+      } else {
+        this.executeMiniProgramRecord();
+        return;
+      }
+    },
+    //针对mini program 平台采集音频录音
+    executeMiniProgramRecord() {
+      this.initStartRecord();
+      let recorderManager = this.recorderManager || uni.getRecorderManager();
+      recorderManager.onStart(() => {
+        this.recording = true;
+        this.saveRecordTime();
+      });
+      recorderManager.start({
+        format: 'mp3',
+      });
+    },
+    // 初始化开始录音状态
+    initStartRecord() {
+      clearInterval(recordTimeInterval);
+      this.recordTime = 0;
+      this.recording = false;
+    },
+    getRecorderCollectionData() {
+      const recorderManager = this.recorderManager;
+      const webRecorderManager = this.webRecorderManager;
+      const duration = this.recordTime * 1000;
+      return new Promise((resolve, reject) => {
+        if (webRecorderManager && this.platFormInfo.uniPlatform === 'web') {
+          this.webRecorderManager.stop(
+            (blob) => {
+              clearInterval(recordTimeInterval);
+              if (duration <= 1000) {
+                uni.showToast({
+                  title: '录音时间太短',
+                  icon: 'none',
+                });
+              } else {
+                const tempFilePath = window.URL.createObjectURL(blob);
+                resolve({ tempFilePath, duration });
+              }
+              this.recordTime = 0;
+            },
+            (s) => {
+              reject(s);
+              console.log('结束出错：' + s, 1);
+            },
+            true
+          );
+        } else if (recorderManager) {
+          recorderManager.onStop((res) => {
+            if (duration <= 1000) {
+              uni.showToast({
+                title: '录音时间太短',
+                icon: 'none',
+              });
+            } else {
+              // 上传
+              resolve({ tempFilePath: res.tempFilePath, duration });
+            }
+            this.initStartRecord();
+          });
+          // 停止录音
+          recorderManager.stop();
+        }
+      });
+    },
+    //取消录音
+    cannelRecordAudio() {
+      //调用对应管理器结束录音采集
+      if (this.platFormInfo.uniPlatform === 'web' && this.webRecorderManager) {
+        this.webRecorderManager.close(() => {
+          this.initStartRecord();
+        });
+      } else if (this.recorderManager) {
+        this.recorderManager.onStop(() => {
+          this.initStartRecord();
+        });
+        this.recorderManager.stop();
+      }
+      this.isStartRecording = false;
+      this.$emit('changeRecordAudioContainer');
+    },
+    //上传录音附件资源至环信服务器
+    async uploadRecordFile(tempFilePath) {
+      if (!tempFilePath) return;
+      const apiUrl = EMClient.apiUrl;
+      const orgName = EMClient.orgName;
+      const appName = EMClient.appName;
+      const uploadTargetUrl = `${apiUrl}/${orgName}/${appName}/chatfiles`;
+      const accessToken = EMClient.token;
+      return new Promise((resolve, reject) => {
+        const requestParams = {
+          url: uploadTargetUrl,
+          filePath: tempFilePath,
+          fileType: 'audio',
+          name: 'file',
+          header: {
+            Authorization: 'Bearer ' + accessToken,
+          },
+          success: (res) => {
+            console.log('>>>>>录音上传成功', res);
+            uni.showToast({ title: '音源已上传...', icon: 'none' });
+            resolve(res);
+          },
+          fail: (e) => {
+            console.log('>>>>>上传失败', e);
+            uni.showToast({ title: '录音上传失败', icon: 'none' });
+            reject(e);
+          },
+        };
+        uni.uploadFile(requestParams);
+      });
+    },
+    //发送语音消息
+    async sendAudioMessage() {
+      try {
+        //获取对应音频源文件
+        const { tempFilePath, duration } =
+          await this.getRecorderCollectionData();
+        //进行文件上传
+        const uploadFileRes = await this.uploadRecordFile(tempFilePath);
+        const dataObj = JSON.parse(uploadFileRes.data); // 接收消息对象
+        const bodys = {
+          url: dataObj.uri + '/' + dataObj.entities[0].uuid,
+          filename: `${new Date().getTime()}.mp3`,
+          filetype: 'mp3',
+          length: Math.ceil(duration / 1000),
+        };
+        const params = {
+          // 消息类型。
+          type: 'audio',
+          body: { ...bodys },
+          filename: bodys.filename,
+          // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+          to: this.chattingId,
+          // 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+          chatType: this.chattingChatType,
+          ext: {},
+        };
+        const res = await sendDisplayMessages({ ...params });
+        console.log('>>>>>>已发送', res);
+      } catch (error) {
+        console.log('>>>>>语音消息发送失败', error);
+        uni.showToast({
+          title: `消息发送失败${error}`,
+          icon: 'none',
+        });
+      } finally {
+        this.isStartRecording = false;
+        this.$emit('changeRecordAudioContainer');
+      }
+    },
+    // 记录录音时长
+    saveRecordTime() {
+      recordTimeInterval = setInterval(() => {
+        this.recordTime++;
+      }, 1000);
+    },
+  },
+  beforeDestroy() {
+    clearInterval(recordTimeInterval);
+    this.recordTime = 0;
+  },
+};
+</script>
+
+<style scoped>
+.audio_record_box {
+  width: 100%;
+  height: 200px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-around;
+  background: #fff;
+}
+.audio_start_box {
+  width: 100%;
+  height: 200px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.audio_start_box image {
+  width: 48px;
+  height: 48px;
+}
+.audio_start_box text {
+  /* 点击录音 */
+
+  width: 56px;
+  height: 18px;
+
+  /* 简体中文/标签/中 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 18px;
+  /* identical to box height, or 129% */
+  text-align: center;
+
+  /* Neutral/5 */
+  color: #75828a;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+.audio_icon {
+  width: 36px;
+  height: 36px;
+}
+.record_statistics_box {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 80px;
+  height: 82px;
+}
+.record_length_text {
+  width: 80px;
+  height: 48px;
+  line-height: 48px;
+  text-align: center;
+  background: #009eff;
+  border-radius: 45px;
+  border: 10px solid #e5f5ff;
+  color: #e5f5ff;
+}
+.record_statistics_box text {
+  /* 正在录音 */
+
+  width: 56px;
+  height: 18px;
+
+  /* 简体中文/标签/中 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 500;
+  font-size: 14px;
+  line-height: 18px;
+  /* identical to box height, or 129% */
+  text-align: center;
+
+  /* Neutral/5 */
+  color: #75828a;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+</style>

emChat/emChatContainer/emInputBarContainer/replyMessageContainer/index.vue

@@ -0,0 +1,252 @@
+<template>
+  <view class="reply_msg_container" @click="extractMessageBodyValue">
+    <view class="reply_msg_content_box">
+      <view class="reply_msg_content_box_left">
+        <view class="reply_msg_target">
+          <!-- <u-icon
+            name="/static/images/new_ui/message/replyMessage/replying_icon.png"
+            size="16"
+          ></u-icon> -->
+          正在回复：
+          <text class="reply_msg_target_name u-line-1">{{
+            previewMsgFromNickname
+          }}</text>
+        </view>
+        <view class="reply_msg_content u-line-1"
+          >{{ previewText }}
+          <!-- 音频length含展示length -->
+          <text
+            class="reply_msg_audio_length"
+            v-if="this.checkedPopupMsgBody.length"
+          >
+            {{ this.checkedPopupMsgBody.length }}″</text
+          >
+        </view>
+      </view>
+      <view
+        v-if="this.checkedPopupMsgBody.type !== MESSAGE_TYPE.TEXT"
+        class="reply_msg_content_box_rigth"
+      >
+        <u-icon :name="previewFileIcon" size="36"></u-icon>
+      </view>
+    </view>
+    <u-icon
+      @click="closeReplyMsgContainer"
+      name="/static/images/new_ui/message/replyMessage/close_icon.png"
+      size="20"
+    ></u-icon>
+  </view>
+</template>
+
+<script>
+import {
+  MESSAGE_TYPE,
+  CUSTOM_EVENT_NAME,
+  SESSION_MESSAGE_TYPE,
+} from '@/EaseIM/constant';
+import { CHAT_TYPE } from '../../../../EaseIM/constant';
+
+export default {
+  props: {
+    checkedPopupMsgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      MESSAGE_TYPE,
+      CUSTOM_EVENT_NAME,
+      SESSION_MESSAGE_TYPE,
+      rootImageUrl: '/static/images/new_ui/message/replyMessage/',
+    };
+  },
+  computed: {
+    isSelf() {
+      const checkedPopupMsgBody = this.checkedPopupMsgBody;
+      return (
+        checkedPopupMsgBody.from ===
+        this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+      );
+    },
+    friendUserInfoCollection() {
+      return this.$store.getters.friendUserInfoCollection;
+    },
+    groupMembersProfileData() {
+      return this.$store.getters.groupMembersProfile;
+    },
+    previewText() {
+      if (this.checkedPopupMsgBody?.type === MESSAGE_TYPE.TEXT) {
+        return this.checkedPopupMsgBody?.msg || '';
+      } else if (this.checkedPopupMsgBody?.type === MESSAGE_TYPE.FILE) {
+        return '[文件] ' + this.checkedPopupMsgBody?.filename || '[文件]';
+      } else if (
+        this.checkedPopupMsgBody?.type === MESSAGE_TYPE.CUSTOM &&
+        this.checkedPopupMsgBody.customEvent === CUSTOM_EVENT_NAME.USER_CARD
+      ) {
+        return '[个人名片]';
+      } else if (
+        this.checkedPopupMsgBody?.type === MESSAGE_TYPE.CUSTOM &&
+        this.checkedPopupMsgBody.customEvent === CUSTOM_EVENT_NAME.PRODUCTLINK
+      ) {
+        return '[商品链接]';
+      }else {
+        return SESSION_MESSAGE_TYPE[this.checkedPopupMsgBody?.type] || '';
+      }
+    },
+    previewFileIcon() {
+      if (this.checkedPopupMsgBody?.type === MESSAGE_TYPE.IMAGE) {
+        //图片如果包含缩略图字段则优先展示缩略图作为icon预览
+        if (this.checkedPopupMsgBody?.thumb) {
+          return this.checkedPopupMsgBody.thumb;
+        }
+        return this.rootImageUrl + 'reply_msg_img.png';
+      }
+      if (this.checkedPopupMsgBody?.type === MESSAGE_TYPE.AUDIO) {
+        return this.rootImageUrl + 'reply_msg_audio.png';
+      }
+      if (this.checkedPopupMsgBody?.type === MESSAGE_TYPE.VIDEO) {
+        return this.rootImageUrl + 'reply_msg_video.png';
+      }
+    },
+    previewMsgFromNickname() {
+      if (this.isSelf) {
+        return '我';
+      }
+      if (this.checkedPopupMsgBody?.chatType === CHAT_TYPE.SINGLE_CHAT) {
+        const userId = this.checkedPopupMsgBody.from;
+        if (
+          this.friendUserInfoCollection[userId] &&
+          this.friendUserInfoCollection[userId]?.nickname
+        ) {
+          return this.friendUserInfoCollection[userId].nickname;
+        } else {
+          return userId;
+        }
+      }
+      if (this.checkedPopupMsgBody?.chatType === CHAT_TYPE.GROUP_CHAT) {
+        const groupId = this.checkedPopupMsgBody.to;
+        const userId = this.checkedPopupMsgBody.from;
+        const groupMemberData = this.groupMembersProfileData[groupId];
+        if (groupMemberData) {
+          return (
+            groupMemberData[userId]?.nickName ||
+            groupMemberData[userId]?.nickname ||
+            userId
+          );
+        } else {
+          return userId;
+        }
+      }
+    },
+  },
+  methods: {
+    //关闭消息引用框
+    closeReplyMsgContainer() {
+      this.$emit('onShowReplyMessageContainer');
+    },
+    //提取原始消息内容至待发送的引用参数内
+    extractMessageBodyValue() {
+      const { type, msg: msgContent, id: mid, from } = this.checkedPopupMsgBody;
+      //引用消息必传参数
+      let msgQuote = {
+        msgID: '', //引用消息id
+        msgPreview: '', //引用消息预览
+        msgSender: '', //引用消息发送人
+        msgType: '', //引用消息类型
+      };
+      msgQuote.msgID = mid;
+      msgQuote.msgType = type;
+      msgQuote.msgSender = this.previewMsgFromNickname;
+      if (type === MESSAGE_TYPE.TEXT) {
+        msgQuote.msgPreview = msgContent;
+      } else if (
+        type === MESSAGE_TYPE.CUSTOM &&
+        this.checkedPopupMsgBody.customEvent === CUSTOM_EVENT_NAME.USER_CARD
+      ) {
+        msgQuote.msgPreview = '[个人名片]';
+      } else if(
+		type === MESSAGE_TYPE.CUSTOM &&
+		this.checkedPopupMsgBody.customEvent === CUSTOM_EVENT_NAME.PRODUCTLINK
+	  ){
+		   msgQuote.msgPreview = '[商品链接]';
+	  }else{
+        msgQuote.msgPreview = SESSION_MESSAGE_TYPE[type];
+      }
+      console.log('msgQuote', msgQuote);
+      return msgQuote;
+    },
+  },
+};
+</script>
+
+<style scoped>
+.reply_msg_container {
+  width: 100%;
+  min-height: 52px;
+  box-sizing: border-box;
+  background: #f1f2f3;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 0 5px;
+}
+.reply_msg_content_box {
+  width: 100%;
+  display: flex;
+  flex-direction: row;
+}
+.reply_msg_content_box_left {
+  flex: 1;
+}
+
+.reply_msg_target {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  /* Nickname */
+  height: 16px;
+
+  /* 简体中文/标签/小 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+
+  /* Neutral Special/5 */
+  color: #5270ad;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 3;
+  flex-grow: 0;
+}
+.reply_msg_target_name {
+  font-weight: bold;
+}
+.reply_msg_content {
+  /* 感恩陪伴 */
+  height: 16px;
+
+  /* 简体中文/文本/小 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+
+  /* Neutral/5 */
+  color: #75828a;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 0;
+  flex-grow: 0;
+}
+.reply_msg_audio_length {
+  margin-left: 4px;
+}
+</style>

emChat/emChatContainer/emMessageListContainer/index.css

@@ -0,0 +1,72 @@
+.message_container {
+  width: 100%;
+  background: #f8f9f9;
+}
+.message_list_item {
+  width: 100%;
+  display: flex;
+  /* padding: 0 10px; */
+  box-sizing: border-box;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: flex-end;
+}
+.message_list_item_content {
+  display: flex;
+  flex-direction: column;
+  max-width: 70%;
+}
+.message_list_item_mine {
+  flex-direction: row-reverse;
+}
+.message_list_item_avatar {
+  margin: 0 10px;
+}
+.message_list_item_content_nickname {
+  /* Nickname */
+  height: 16px;
+
+  /* 简体中文/标签/小 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+
+  /* Neutral Special/5 */
+  color: #5270ad;
+}
+.message_list_item_content_nickname_mine {
+  text-align: right;
+}
+.message_time {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 16px;
+  /* Alphabet/Body/Small */
+  font-family: 'SF Pro';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+  /* Neutral/7 */
+  color: #acb4b9;
+  margin: 10px 0 5px 0;
+}
+
+/* 引用消息闪烁 */
+/* 闪烁动画 */
+@keyframes blinkAnimation {
+  50% {
+    background-color: #eff0f1; /* 闪烁颜色 */
+  }
+}
+/* 应用于元素的闪烁效果 */
+.quote_msg_avtive {
+  animation: blinkAnimation 1s; /* 动画持续时间 */
+}

emChat/emChatContainer/emMessageListContainer/index.vue

@@ -0,0 +1,281 @@
+<template>
+  <view>
+    <text v-if="isNeedShowMessageTime" class="message_time">{{
+      messageTime(msgBody.time)
+    }}</text>
+    <view
+      :class="[
+        'message_list_item',
+        !isSelf(msgBody) || 'message_list_item_mine',
+        msgBody.id == quoteMsgId && 'quote_msg_avtive',
+      ]"
+    >
+      <!--user avatar -->
+      <view class="message_list_item_avatar">
+        <u-avatar
+          :src="messageItemAvatar"
+          shape="square"
+          :size="28"
+          @click="entryContactsDetailPage"
+        />
+      </view>
+      <view class="message_list_item_content" @longpress="callMessagePopup">
+        <text
+          :class="[
+            'message_list_item_content_nickname',
+            isSelf(msgBody) && 'message_list_item_content_nickname_mine',
+          ]"
+          >{{ messageItemNickName }}</text
+        >
+
+        <!-- 文本消息 -->
+        <template v-if="msgBody.type === MESSAGE_TYPE.TEXT">
+          <text-msg-item :msgBody="msgBody" />
+        </template>
+        <!-- 图片消息 -->
+        <template v-if="msgBody.type === MESSAGE_TYPE.IMAGE">
+          <image-msg-item :msgBody="msgBody" />
+        </template>
+        <!-- 语音消息 -->
+        <template v-if="msgBody.type === MESSAGE_TYPE.AUDIO">
+          <audio-msg-item
+            :msgBody="msgBody"
+            :playAudioMid="playAudioMid"
+            @onClickPlayAudio="onClickPlayAudio"
+          />
+        </template>
+        <!-- 附件消息 -->
+
+        <template v-if="msgBody.type === MESSAGE_TYPE.FILE">
+          <file-msg-item :msgBody="msgBody" />
+        </template>
+
+        <!-- 个人名片 -->
+        <template
+          v-if="
+            msgBody.type === MESSAGE_TYPE.CUSTOM &&
+            msgBody.customEvent === CUSTOM_EVENT_NAME.USER_CARD
+          "
+        >
+          <user-card-msg-item
+            @click.native="entryContactsDetailPage(CUSTOM_EVENT_NAME.USER_CARD)"
+            :msgBody="msgBody"
+          />
+        </template>
+		
+		<!-- 商品链接 -->
+		<template
+		  v-if="
+		    msgBody.type === MESSAGE_TYPE.CUSTOM &&
+		    msgBody.customEvent === CUSTOM_EVENT_NAME.PRODUCTLINK
+		  "
+		>
+		  <product-card-item
+			 @click.native="entryProductDetailPage(CUSTOM_EVENT_NAME.PRODUCTLINK)"
+		    :msgBody="msgBody"
+		  />
+		  
+		</template>
+		
+		
+        <msg-quote-container
+          v-if="msgBody.ext && msgBody.ext.msgQuote"
+          :msgQuoteContent="msgBody.ext.msgQuote"
+          @click.native="callScrollToQuoteMsg(msgBody.ext.msgQuote)"
+        />
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { MESSAGE_TYPE, CUSTOM_EVENT_NAME, CHAT_TYPE } from "@/EaseIM/constant";
+import TextMsgItem from "./messagesItem/textMsgItem";
+import ImageMsgItem from "./messagesItem/imageMsgItem";
+import AudioMsgItem from "./messagesItem/audioMsgItem";
+import FileMsgItem from "./messagesItem/fileMsgItem";
+import UserCardMsgItem from "./messagesItem/userCardItem";
+import ProductCardItem from "./messagesItem/productCardItem";
+import MsgQuoteContainer from "./msgQuoteContainer";
+import { EMClient } from "@/EaseIM";
+export default {
+  components: {
+    TextMsgItem,
+    ImageMsgItem,
+    AudioMsgItem,
+    FileMsgItem,
+    UserCardMsgItem,
+	ProductCardItem,
+    MsgQuoteContainer,
+  },
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+      required: true,
+    },
+    isNeedShowMessageTime: {
+      type: Boolean,
+      default: false,
+    },
+    quoteMsgId: {
+      type: String,
+      default: "",
+    },
+  },
+
+  data() {
+    return {
+      MESSAGE_TYPE,
+      CUSTOM_EVENT_NAME,
+      playAudioMid: "",
+	
+      // defaultAvatar: "/static/images/new_ui/defaultAvatar.png",
+	  defaultAvatar:uni.getStorageSync('nowConversationIntem').avatarurl,
+      defaultAvatarMe: uni.getStorageSync('selectmerchant').merchantIntention.logo,
+      defaultNicknameMe: uni.getStorageSync('selectmerchant').merchantIntention.mer_name,
+    };
+  },
+  computed: {
+    isSelf() {
+      return (item) => {
+        return (
+          item.from ===
+          this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+        );
+      };
+    },
+    loginUserProfiles() {
+      return this.$store.state.LoginStore.loginUserProfiles;
+    },
+    messageTime() {
+      return (time) => {
+        return this.$u.timeFrom(time);
+      };
+    },
+
+    friendUserInfoCollection() {
+      return this.$store.getters.friendUserInfoCollection;
+    },
+    groupMembersProfileData() {
+      return this.$store.getters.groupMembersProfile;
+    },
+    messageItemAvatar() {
+      if (this.isSelf(this.msgBody)) {
+        return this.loginUserProfiles?.avatarurl || this.defaultAvatarMe;
+      }
+      if (this.msgBody.chatType === CHAT_TYPE.SINGLE_CHAT) {
+        const userId = this.msgBody.from;
+        if (
+          this.friendUserInfoCollection[userId] &&
+          this.friendUserInfoCollection[userId]?.avatarurl
+        ) {
+          return (
+            this.friendUserInfoCollection[userId].avatarurl ||
+            this.defaultAvatar
+          );
+        } else {
+          return this.defaultAvatar;
+        }
+      }
+      if (this.msgBody.chatType === CHAT_TYPE.GROUP_CHAT) {
+        const groupId = this.msgBody.to;
+        const userId = this.msgBody.from;
+        const groupMemberData = this.groupMembersProfileData[groupId];
+        if (groupMemberData) {
+          return groupMemberData[userId]?.avatarurl || this.defaultAvatar;
+        } else {
+          return this.defaultAvatar;
+        }
+      }
+    },
+    messageItemNickName() {
+      if (this.isSelf(this.msgBody)) {
+		// console.log('this.loginUserProfiles>>>>>>>>>>>>',this.loginUserProfiles)
+		// console.log('EMClient.user>>>>>>>>>>>>',EMClient.user)
+        return this.loginUserProfiles?.nickname || this.defaultNicknameMe;
+      }
+      if (this.msgBody.chatType === CHAT_TYPE.SINGLE_CHAT) {
+        // const userId = this.msgBody.from;
+		const userId=uni.getStorageSync('nowConversationIntem').nickname
+		
+        if (
+          this.friendUserInfoCollection[userId] &&
+          this.friendUserInfoCollection[userId]?.nickname
+        ) {
+          // return this.friendUserInfoCollection[userId].nickname;
+          return uni.getStorageSync('nowConversationIntem').nickname;
+        } else {
+          return userId;
+        }
+      }
+      if (this.msgBody.chatType === CHAT_TYPE.GROUP_CHAT) {
+        const groupId = this.msgBody.to;
+        const userId = this.msgBody.from;
+        const groupMemberData = this.groupMembersProfileData[groupId];
+        if (groupMemberData) {
+          return (
+            groupMemberData[userId]?.nickName ||
+            groupMemberData[userId]?.nickname ||
+            userId
+          );
+        } else {
+          return userId;
+        }
+      }
+    },
+  },
+  methods: {
+    onClickPlayAudio(mid) {
+      this.playAudioMid = mid;
+      console.log("mid", mid);
+      console.log("++++++++");
+    },
+    callMessagePopup() {
+      this.$emit("alertMessagePopup", this.msgBody);
+    },
+    callScrollToQuoteMsg(msgQuote) {
+      this.$emit("scrollToQuoteMessge", msgQuote);
+    },
+    //前往联系人详情页面
+    entryContactsDetailPage(type) {
+      if (type === CUSTOM_EVENT_NAME.USER_CARD) {
+        const {
+          customExts: { uid: userId },
+        } = this.msgBody;
+        uni.navigateTo({
+          url: `../contactsDetail/index?userId=${userId}`,
+        });
+      } else {
+        if (this.msgBody.from === EMClient.user) return;
+        const userId = this.msgBody.from;
+        uni.navigateTo({
+          url: `../contactsDetail/index?userId=${userId}`,
+        });
+      }
+    },
+	//跳转商品详情
+	entryProductDetailPage(){
+		const {
+		  customExts: { uid: uid,productId:productId },
+		} = this.msgBody;
+		uni.navigateToMiniProgram({
+			      appId: 'wx9082e5ac2fdb513f',
+			      path: `pages/store/product/detail?id=${productId}`,
+			  	  envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+			      success(res) {
+			        // 打开成功
+			        console.log(res);
+			      },
+			      fail: (error) => {
+			        console.log(error);
+			      }
+		})
+	}
+  },
+};
+</script>
+
+<style scoped>
+@import "./index.css";
+</style>

emChat/emChatContainer/emMessageListContainer/messagesItem/audioMsgItem/index.css

@@ -0,0 +1,80 @@
+.audio_msg_container {
+  width: 125px;
+  height: 36px;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 8px;
+  align-items: center;
+}
+.audio_msg_container_mine {
+  color: #f9fafa;
+  background: #009eff;
+  border-radius: 16px 12px 4px 16px;
+}
+.audio_msg_container_other {
+  flex-direction: row-reverse;
+  color: #171a1c;
+  background: #e5f5ff;
+  border-radius: 12px 16px 16px 4px;
+}
+.audio_msg_play_icon {
+  width: 16px;
+  height: 15px;
+}
+/* mine */
+.audio_msg_play_icon_mine {
+  background: url('~@/static/images/new_ui/message/audio/mine_playing_icon.png')
+    no-repeat;
+  background-size: 100% 100%;
+}
+
+@keyframes mine_play_icon {
+  0% {
+    background: url('~@/static/images/new_ui/message/audio/mine_playing2_icon.png')
+      no-repeat;
+
+    background-size: 100% 100%;
+  }
+  50% {
+    background: url('~@/static/images/new_ui/message/audio/mine_playing_icon.png')
+      no-repeat;
+    background-size: 100% 100%;
+  }
+  100% {
+    background: url('~@/static/images/new_ui/message/audio/mine_playing2_icon.png')
+      no-repeat;
+    background-size: 100% 100%;
+  }
+}
+.start_mine_play_audio {
+  animation: mine_play_icon 2s;
+  animation-iteration-count: infinite;
+}
+/* other */
+.audio_msg_play_icon_other {
+  background: url('~@/static/images/new_ui/message/audio/other_playing_icon.png')
+    no-repeat;
+  background-size: 100% 100%;
+}
+@keyframes other_play_icon {
+  0% {
+    background: url('~@/static/images/new_ui/message/audio/other_playing2_icon.png')
+      no-repeat;
+
+    background-size: 100% 100%;
+  }
+  50% {
+    background: url('~@/static/images/new_ui/message/audio/other_playing_icon.png')
+      no-repeat;
+    background-size: 100% 100%;
+  }
+  100% {
+    background: url('~@/static/images/new_ui/message/audio/other_playing2_icon.png')
+      no-repeat;
+    background-size: 100% 100%;
+  }
+}
+.start_other_play_audio {
+  animation: other_play_icon 2s;
+  animation-iteration-count: infinite;
+}

emChat/emChatContainer/emMessageListContainer/messagesItem/audioMsgItem/index.vue

@@ -0,0 +1,118 @@
+<template>
+  <view
+    :class="[
+      'audio_msg_container',
+      isSelf ? 'audio_msg_container_mine' : 'audio_msg_container_other',
+    ]"
+    @click="playAudioMessage"
+  >
+    <view
+      :class="[
+        'audio_msg_play_icon',
+        isSelf ? 'audio_msg_play_icon_mine' : 'audio_msg_play_icon_other',
+        playAudioMid == msgBody.id
+          ? isSelf
+            ? 'start_mine_play_audio'
+            : 'start_other_play_audio'
+          : '',
+      ]"
+    >
+    </view>
+    <view class="audio_msg_length">{{ audioLength }}''</view>
+  </view>
+</template>
+
+<script>
+import { EMClient } from '@/EaseIM';
+const loginAccessToken = EMClient.token;
+
+export default {
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+    playAudioMid: {
+      type: String,
+      default: '',
+    },
+  },
+
+  data() {
+    return {
+      innerAudioContext: null,
+      isPlaying: false,
+    };
+  },
+  computed: {
+    isSelf() {
+      const { from } = this.msgBody;
+      return (
+        from === this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+      );
+    },
+    audioLength() {
+      const { length, body } = this.msgBody;
+      return length || body?.length;
+    },
+  },
+  mounted() {
+    this.innerAudioContext = uni.createInnerAudioContext({
+      obeyMuteSwitch: false,
+    });
+    this.innerAudioContext.onPlay(() => {
+      console.log('>>>>>播放中');
+    });
+    this.innerAudioContext.onEnded(() => {
+      this.$emit('onClickPlayAudio', '');
+    });
+    this.innerAudioContext.onError((res) => {
+      console.log(res.errMsg);
+      uni.showToast({ title: '播放失败', icon: 'none' });
+    });
+  },
+  methods: {
+    //转换为mp3格式
+    formatAudioToMp3() {
+      const { url, body } = this.msgBody;
+      uni.downloadFile({
+        url: url || body?.url,
+        header: {
+          'X-Requested-With': 'XMLHttpRequest',
+          Accept: 'audio/mp3',
+          Authorization: 'Bearer ' + loginAccessToken,
+        },
+
+        success: (res) => {
+          console.log('>>>>>成功拿到播放地址', res);
+          const tempFilePath = res.tempFilePath;
+          this.innerAudioContext.src = tempFilePath;
+          console.log(this.innerAudioContext.src);
+          this.innerAudioContext.play();
+        },
+
+        fail: (e) => {
+          console.log('downloadFile failed', e);
+          uni.showToast({
+            title: '语音转mp3失败',
+            duration: 2000,
+          });
+        },
+      });
+    },
+    playAudioMessage() {
+      const { id } = this.msgBody;
+      this.formatAudioToMp3();
+      console.log('>>>>>通知进行播放');
+      this.$emit('onClickPlayAudio', id);
+    },
+  },
+  beforeDestroy() {
+    this.innerAudioContext && this.innerAudioContext.destroy();
+  },
+};
+</script>
+
+<style scoped>
+@import './index.css';
+</style>

emChat/emChatContainer/emMessageListContainer/messagesItem/fileMsgItem/index.vue

@@ -0,0 +1,247 @@
+<template>
+  <view
+    :class="[
+      'file_msg_container',
+      isSelf ? 'file_msg_container_mine' : 'file_msg_container_other',
+    ]"
+    @tap="previewFile"
+  >
+    <view class="file_msg_content">
+      <text class="name u-line-1">
+        {{ msgBody.filename || msgBody.body.filename }}
+      </text>
+      <text class="size">{{
+        formatMoney(msgBody.file_length || msgBody.body.file_length)
+      }}</text>
+    </view>
+    <image
+      class="file_msg_icon"
+      src="/static/images/new_ui/message/file_msg_icon.png"
+    />
+  </view>
+</template>
+
+<script>
+import formatFileSize from "@/utils/formatFileSize";
+const ATTACH_KEY = "filePathCache";
+export default {
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    isSelf() {
+      const { from } = this.msgBody;
+      return (
+        from === this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+      );
+    },
+    formatMoney() {
+      return (value) => {
+        return formatFileSize(value);
+      };
+    },
+  },
+  methods: {
+    storageFilePath({ id, path }) {
+      uni.getStorage({
+        key: ATTACH_KEY,
+        success: (res) => {
+          let dt = res.data || {};
+          uni.setStorage({
+            key: ATTACH_KEY,
+            data: {
+              ...dt,
+              [id]: path,
+            },
+          });
+        },
+        fail: (e) => {
+          uni.setStorage({
+            key: ATTACH_KEY,
+            data: {
+              [id]: path,
+            },
+          });
+        },
+      });
+    },
+    downloadFile() {
+      // 下载完存储filePath，下次预览直接访问
+      console.log("this.msgBody?.url", this.msgBody?.url);
+      uni.downloadFile({
+        url: `${this.msgBody?.url}`,
+        success: (res) => {
+          console.log("downloadFile", res);
+          let filePath = res.tempFilePath;
+          // #ifdef MP-WEIXIN  || MP-TOUTIAO || MP-QQ
+          this.saveFileUseManager(filePath);
+          // #endif
+          // #ifndef MP-WEIXIN  || MP-TOUTIAO || MP-QQ
+          this.saveFile(filePath);
+          // #endif
+        },
+        fail: (err) => {
+          console.log(">>>>>文件下载失败", err);
+          uni.hideLoading();
+          uni.showToast({
+            icon: "none",
+            title: "失败请重新下载",
+          });
+        },
+      });
+    },
+    saveFile(filePath) {
+      uni.saveFile({
+        tempFilePath: filePath,
+        success: (res) => {
+          let savedFilePath = res.savedFilePath;
+          this.storageFilePath({
+            id: this.msgBody.id,
+            path: savedFilePath,
+          });
+          this.openFile(savedFilePath);
+        },
+        fail: function (e) {
+          uni.hideLoading();
+          uni.showToast({
+            icon: "none",
+            title: "保存失败",
+          });
+        },
+      });
+    },
+    saveFileUseManager(filePath) {
+      console.log(">>>>小程序保存文件调用", filePath);
+      const fileExtension =
+        this.msgBody.filename.split(".").pop() ||
+        this.msgBody.body.filename.split(".").pop();
+      const savedFilePath =
+        uni.env.USER_DATA_PATH + "/document." + fileExtension;
+
+      uni.getFileSystemManager().copyFile({
+        srcPath: filePath,
+        destPath: savedFilePath,
+        success: () => {
+          console.log(">>>>>小程序savedFilePath", savedFilePath);
+          this.storageFilePath({
+            id: this.msgBody.id,
+            path: savedFilePath,
+          });
+          this.openFile(savedFilePath);
+        },
+        fail: (e) => {
+          uni.showToast({
+            title: "下载失败",
+            icon: "none",
+          });
+        },
+      });
+    },
+    openFile(filePath) {
+      uni.openDocument({
+        filePath,
+        success: function (res) {
+          uni.hideLoading();
+        },
+        fail(e) {
+          uni.showToast({
+            title: "暂不支持此类型",
+            duration: 2000,
+          });
+          uni.hideLoading();
+        },
+      });
+    },
+    previewFile() {
+      let sysInfo = uni.getSystemInfoSync();
+      if (sysInfo.uniPlatform === "web") {
+        uni.showToast({
+          title: "H5暂不支持预览文件消息",
+          duration: 2000,
+          icon: "none",
+        });
+        return;
+      }
+      uni.showLoading();
+      uni.getStorage({
+        key: ATTACH_KEY,
+        success: (res) => {
+          let dt = res.data || {};
+          let path = dt[this.msgBody.id];
+          if (path) {
+            this.openFile(path);
+          } else {
+            this.downloadFile();
+          }
+        },
+        fail: (e) => {
+          this.downloadFile();
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style>
+.file_msg_container {
+  width: 245px;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0 8px;
+  box-sizing: border-box;
+}
+.file_msg_container_mine {
+  flex-direction: row-reverse;
+  color: #f9fafa;
+  background-color: #009eff;
+  border-radius: 16px 12px 4px 16px;
+}
+.file_msg_container_other {
+  color: #171a1c;
+  background-color: #e5f5ff;
+  border-radius: 12px 16px 16px 4px;
+}
+.file_msg_icon {
+  width: 44px;
+  height: 44px;
+}
+.file_msg_content {
+  display: flex;
+  flex-direction: column;
+  height: 42px;
+  align-items: flex-start;
+}
+.file_msg_content .name {
+  /* Credo dalle tre alle */
+
+  height: 24px;
+
+  /* 简体中文/次级标题/中 */
+  font-family: "PingFang SC";
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+}
+.file_msg_content .size {
+  /* Alphabet/Body/Medium */
+  font-family: "SF Pro";
+  font-style: normal;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 18px;
+  /* identical to box height, or 129% */
+  letter-spacing: 0.001em;
+
+  /* Neutral/95 */
+}
+</style>

emChat/emChatContainer/emMessageListContainer/messagesItem/imageMsgItem/index.vue

@@ -0,0 +1,63 @@
+<template>
+  <view class="image_msg_container">
+    <u--image
+      @click="onPrevieImage"
+      mode="aspectFit"
+      :src="msgBody.thumb || msgBody.url"
+      :width="imgSize.width"
+      :height="imgSize.height"
+      :radius="5 + 'px'"
+    >
+    </u--image>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  computed: {
+    imgSize() {
+      let imgSize = {
+        width: '',
+        height: '',
+      };
+      if (this.msgBody.width > 1000 || this.msgBody.height > 1000) {
+        imgSize.width = this.msgBody.width / 10 + 'px';
+        imgSize.height = this.msgBody.height / 10 + 'px';
+      } else if (
+        this.msgBody.width > 800 < 1000 ||
+        this.msgBody.height > 800 < 1000
+      ) {
+        imgSize.width = this.msgBody.width / 3 + 'px';
+        imgSize.height = this.msgBody.height / 3 + 'px';
+      } else if (this.msgBody.width < 100 || this.msgBody.height < 100) {
+        imgSize.width = this.msgBody.width + 'px';
+        imgSize.height = this.msgBody.height + 'px';
+      } else {
+        imgSize.width = this.msgBody.width / 2 + 'px';
+        imgSize.height = this.msgBody.height / 2 + 'px';
+      }
+      return imgSize;
+    },
+  },
+  data() {
+    return {
+      src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+    };
+  },
+  methods: {
+    onPrevieImage() {
+      uni.previewImage({
+        urls: [this.msgBody.url],
+      });
+    },
+  },
+};
+</script>
+
+<style scoped></style>

emChat/emChatContainer/emMessageListContainer/messagesItem/productCardItem/index.vue

@@ -0,0 +1,120 @@
+<template>
+ <!-- <view
+    :class="[
+      'user_card_msg_container',
+      isSelf ? 'user_card_msg_container_mine' : 'user_card_msg_container_other',
+    ]"
+  > -->
+  <view>
+   <!-- <view class="user_card_content">
+      <view class="user_card_content_header">
+        <u-avatar shape="square" :src="avatarUrl" size="30"></u-avatar>
+        <text class="nickName">{{ msgBody.nickName }} {{msgBody}}</text>
+      </view>
+      <u-line></u-line>
+      <text class="user_card_footer">商品卡片</text>
+    </view> -->
+	<view class="user_card_content">
+			<view class="title">商品名称:{{msgBody.customExts.title}}</view>
+			<view>商品价格：¥{{msgBody.customExts.price}}</view>
+			<view class="img">
+				<img :src="msgBody.customExts.image" alt="">
+			</view>
+			<!-- <view class="">
+				msgBody.from:{{msgBody.from}}
+			</view> -->
+	</view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      defaultAvatar: 'https://app.bjtdba.com/uploads/logo.jpg', //默认头像
+    };
+  },
+  computed: {
+    // isSelf() {
+    //   const { from } = this.msgBody;
+    //   return (
+    //     from === this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+    //   );
+    // },
+    // avatarUrl() {
+    //   return this.msgBody?.customExts?.avatarurl || this.defaultAvatar;
+    // },
+    // nickName() {
+    //   return (
+    //     this.msgBody?.customExts?.nickname || this.msgBody?.customExts?.uid
+    //   );
+    // },
+  },
+};
+</script>
+
+<style scoped>
+.user_card_msg_container {
+  width: 245px;
+  height: 60px;
+  padding: 5px 8px;
+  box-sizing: border-box;
+  flex-direction: column;
+  align-items: center;
+}
+.user_card_msg_container_mine {
+  flex-direction: row-reverse;
+  color: #f9fafa;
+  background-color: #009eff;
+  border-radius: 16px 12px 4px 16px;
+}
+.user_card_msg_container_other {
+  color: #171a1c;
+  background-color: #e5f5ff;
+  border-radius: 12px 16px 16px 4px;
+}
+.user_card_content {
+  width:100%;
+  height: 100%;
+  display: flex;
+  box-sizing: border-box;
+  padding:10px;
+  flex-direction: column;
+  justify-content: space-around;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+  background: #eee;
+}
+.title{
+	margin-bottom: 10px;
+}
+.img{
+	width: 200px;
+}
+.img img{
+	width:100%;
+	box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+	margin-top: 10px;
+}
+.user_card_content_header {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.user_card_content_header text {
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  margin: 0 4px;
+}
+.user_card_footer {
+  font-size: 12px;
+}
+</style>

emChat/emChatContainer/emMessageListContainer/messagesItem/textMsgItem/index.vue

@@ -0,0 +1,149 @@
+<template>
+  <view
+    :class="[
+      'text_msg_contatiner',
+      isSelf(msgBody)
+        ? 'text_msg_contatiner_mine'
+        : 'text_msg_contatiner_other',
+    ]"
+  >
+    {{ msgBody.msg }}
+    <text
+      :class="isSelf(msgBody) ? 'edited_text_msg' : 'edited_text_msg_other'"
+      v-if="msgBody.modifiedInfo"
+      >已编辑</text
+    >
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    isSelf() {
+      return (item) => {
+        return (
+          item.from ===
+          this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+        );
+      };
+    },
+  },
+  methods: {},
+};
+</script>
+
+<style scoped>
+.text_msg_contatiner {
+  /* 简体中文/文本/大 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  /* or 138% */
+
+  /* Neutral/1 */
+  color: #171a1c;
+  /* Inside auto layout */
+  flex: none;
+  order: 0;
+  flex-grow: 0;
+}
+.text_msg_contatiner_other {
+  /* Frame 613 */
+
+  /* Auto layout */
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  padding: 7px 12px;
+  /* Primary/5 */
+
+  background: #e6f5ff;
+  border-radius: 12px 16px 16px 4px;
+
+  /* Alphabet/Body/Large */
+  font-family: 'SF Pro';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  /* or 138% */
+  letter-spacing: 0.002em;
+
+  /* Neutral/98 */
+  color: #171a1c;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 0;
+  flex-grow: 0;
+}
+.text_msg_contatiner_mine {
+  /* Frame 613 */
+
+  /* Auto layout */
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  padding: 7px 12px;
+
+  /* Primary/95 */
+  background: #009eff;
+  border-radius: 16px 12px 4px 16px;
+
+  /* Sei la cosa più bella che mi sia mai capitata, non so stare senza te. */
+
+  /* Alphabet/Body/Large */
+  font-family: 'SF Pro';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  /* or 138% */
+  letter-spacing: 0.002em;
+
+  /* Neutral/1 */
+  color: #f9fafa;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 0;
+  flex-grow: 0;
+}
+.edited_text_msg,
+.edited_text_msg_other {
+  /* 已编辑 */
+  width: 100%;
+  /* 简体中文/文本/超小 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 11px;
+  line-height: 14px;
+  /* identical to box height, or 127% */
+  text-align: right;
+
+  /* Neutral Special/98 */
+  color: #f8f9fc;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+  text-align: right;
+}
+.edited_text_msg_other {
+  color: #5270ad;
+  text-align: left;
+}
+</style>

emChat/emChatContainer/emMessageListContainer/messagesItem/userCardItem/index.vue

@@ -0,0 +1,93 @@
+<template>
+  <view
+    :class="[
+      'user_card_msg_container',
+      isSelf ? 'user_card_msg_container_mine' : 'user_card_msg_container_other',
+    ]"
+  >
+    <view class="user_card_content">
+      <view class="user_card_content_header">
+        <u-avatar shape="square" :src="avatarUrl" size="30"></u-avatar>
+        <text class="nickName">{{ nickName }}</text>
+      </view>
+      <u-line></u-line>
+      <text class="user_card_footer">个人名片</text>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: {
+    msgBody: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  data() {
+    return {
+      defaultAvatar: '/static/images/new_ui/defaultAvatar.png',
+    };
+  },
+  computed: {
+    isSelf() {
+      const { from } = this.msgBody;
+      return (
+        from === this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+      );
+    },
+    avatarUrl() {
+      return this.msgBody?.customExts?.avatarurl || this.defaultAvatar;
+    },
+    nickName() {
+      return (
+        this.msgBody?.customExts?.nickname || this.msgBody?.customExts?.uid
+      );
+    },
+  },
+};
+</script>
+
+<style scoped>
+.user_card_msg_container {
+  width: 245px;
+  height: 60px;
+  padding: 5px 8px;
+  box-sizing: border-box;
+  flex-direction: column;
+  align-items: center;
+}
+.user_card_msg_container_mine {
+  flex-direction: row-reverse;
+  color: #f9fafa;
+  background-color: #009eff;
+  border-radius: 16px 12px 4px 16px;
+}
+.user_card_msg_container_other {
+  color: #171a1c;
+  background-color: #e5f5ff;
+  border-radius: 12px 16px 16px 4px;
+}
+.user_card_content {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+}
+.user_card_content_header {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.user_card_content_header text {
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  margin: 0 4px;
+}
+.user_card_footer {
+  font-size: 12px;
+}
+</style>

emChat/emChatContainer/emMessageListContainer/msgQuoteContainer/index.vue

@@ -0,0 +1,54 @@
+<template>
+  <view class="msg_quote_container u-line-2">
+    <text>{{ msgQuoteContent.msgSender }}</text
+    >：<text>{{ msgQuotePreview }}</text></view
+  >
+</template>
+
+<script>
+import { MESSAGE_STATUS } from '@/EaseIM/constant';
+
+export default {
+  props: {
+    msgQuoteContent: {
+      type: Object,
+      default: () => ({
+        msgID: '', //引用消息id
+        msgPreview: '', //引用消息预览
+        msgSender: '', //引用消息发送人
+        msgType: '', //引用消息类型
+      }),
+      required: true,
+    },
+  },
+  computed: {
+    messageStatusCollection() {
+      return this.$store.getters.messageStatusCollection;
+    },
+    msgQuotePreview() {
+      if (
+        this.messageStatusCollection[this.msgQuoteContent.msgID] ===
+        MESSAGE_STATUS.RECALL
+      ) {
+        return '消息被撤回';
+      } else {
+        return this.msgQuoteContent.msgPreview;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.msg_quote_container {
+  width: 100%;
+  max-width: 70%;
+  min-width: 100px;
+  background-color: #f1f2f3;
+  border-radius: 4px;
+  color: #75828a;
+  padding: 8px 12px 8px 12px;
+  font-size: 14px;
+  word-break: break-all;
+}
+</style>

emChat/emChatContainer/emMessagePopup/index.vue

@@ -0,0 +1,273 @@
+<template>
+  <view>
+    <u-popup round="16" :show="show" @close="close" @open="open">
+      <view class="message_more_func_container">
+        <!-- 复制 -->
+        <view
+          v-if="msgBody.type === MESSAGE_TYPE.TEXT"
+          class="message_more_func_item u-border-bottom"
+          @click="copyTextMessage"
+        >
+          <u-icon
+            class="message_more_func_item_content_icon"
+            size="24"
+            name="/static/images/new_ui/message/messagPopup/copy_msg_icon.png"
+          ></u-icon>
+          <text class="message_more_func_item_title">复制</text>
+        </view>
+        <!-- 回复 -->
+        <view
+          class="message_more_func_item u-border-bottom"
+          @click="replyMessage"
+        >
+          <u-icon
+            class="message_more_func_item_content_icon"
+            size="24"
+            name="/static/images/new_ui/message/messagPopup/reply_msg_icon.png"
+          ></u-icon>
+          <text class="message_more_func_item_title">回复</text>
+        </view>
+        <!-- 编辑 -->
+        <view
+          v-if="isSelf && msgBody.type === MESSAGE_TYPE.TEXT"
+          class="message_more_func_item u-border-bottom"
+          @click="editMessage"
+        >
+          <u-icon
+            class="message_more_func_item_content_icon"
+            size="24"
+            name="/static/images/new_ui/message/messagPopup/edit_msg_icon.png"
+          ></u-icon>
+          <text class="message_more_func_item_title">编辑</text>
+        </view>
+        <!-- 删除 -->
+        <view
+          class="message_more_func_item u-border-bottom"
+          @click="alertSencondConfirmModal"
+        >
+          <u-icon
+            class="message_more_func_item_content_icon"
+            size="24"
+            name="/static/images/new_ui/message/messagPopup/del_msg_icon.png"
+          ></u-icon>
+          <text class="message_more_func_item_title">删除</text>
+        </view>
+        <!-- 撤回 -->
+        <view
+          v-if="isSelf"
+          class="message_more_func_item u-border-bottom"
+          @click="recallMessage"
+        >
+          <u-icon
+            class="message_more_func_item_content_icon"
+            size="24"
+            name="/static/images/new_ui/message/messagPopup/recall_msg_icon.png"
+          ></u-icon>
+          <text class="message_more_func_item_title">撤回</text>
+        </view>
+      </view>
+    </u-popup>
+    <u-modal
+      :show="isShowSencondConfirmModal"
+      :zoom="true"
+      title="确认删除这条消息？"
+      content="删除后，对方依旧可以看到这条消息。"
+      confirm-text="确认"
+      cancel-text="取消"
+      show-cancel-button
+      @confirm="deleteLocalMessage"
+      @cancel="isShowSencondConfirmModal = false"
+    >
+    </u-modal>
+  </view>
+</template>
+
+<script>
+import { EMClient } from '@/EaseIM';
+import { getEMKey } from '@/EaseIM/utils';
+import { emAboutAck } from '@/EaseIM/emApis';
+import { MESSAGE_TYPE, MESSAGE_STATUS } from '@/EaseIM/constant';
+const { sendRecallAckMsg } = emAboutAck();
+export default {
+  data() {
+    return {
+      MESSAGE_TYPE,
+      show: false,
+      isShowSencondConfirmModal: false,
+      msgBody: {},
+    };
+  },
+  computed: {
+    isSelf() {
+      const { from } = this.msgBody;
+      return (
+        from === this.$store.state.LoginStore.loginUserBaseInfos.loginUserId
+      );
+    },
+  },
+  methods: {
+    open() {
+      // console.log('open');
+    },
+    close() {
+      this.show = false;
+    },
+    alertMessagePopup(msgBody) {
+      this.msgBody = Object.assign({}, msgBody);
+      this.show = true;
+    },
+    //复制文本消息至剪切板
+    copyTextMessage() {
+      uni.setClipboardData({
+        data: this.msgBody.msg,
+        success: (res) => {
+          uni.showToast({
+            title: '已复制',
+            icon: 'none',
+          });
+        },
+        fail: (e) => {
+          console.log('文本复制失败', e);
+          uni.showToast({
+            title: '复制失败',
+            icon: 'none',
+          });
+        },
+        complete: () => {
+          this.show = false;
+        },
+      });
+    },
+    //回复消息
+    replyMessage() {
+      this.$emit('callReplyMessage');
+      this.show = false;
+    },
+    //编辑消息
+    editMessage() {
+      this.$emit('callEditMessage');
+      this.show = false;
+    },
+    //弹出二次确认模态框【删除消息】
+    alertSencondConfirmModal() {
+      this.isShowSencondConfirmModal = true;
+      this.show = false;
+    },
+    //删除本地消息
+    deleteLocalMessage() {
+      const key = getEMKey(
+        EMClient.user,
+        this.msgBody.from,
+        this.msgBody.to,
+        this.msgBody.chatType
+      );
+      const params = {
+        key: key,
+        mid: this.msgBody.id,
+      };
+      this.$store.commit('DELETE_MESSAGE_FROM_COLLECTION', params);
+      uni.showToast({
+        icon: 'none',
+        title: '删除成功',
+      });
+      this.isShowSencondConfirmModal = false;
+    },
+    //撤回消息
+    async recallMessage() {
+      try {
+        const params = {
+          mid: this.msgBody.id,
+          to: this.msgBody.to,
+          chatType: this.msgBody.chatType,
+        };
+        await sendRecallAckMsg(params);
+        uni.showToast({
+          title: '撤回成功',
+          icon: 'none',
+        });
+        //向消息状态集合缓存中更新该条消息的状态
+        this.$store.commit('UPDATE_MESSAGE_COLLECTION_STATUS', {
+          key: params.mid,
+          status: MESSAGE_STATUS.RECALL,
+        });
+      } catch (error) {
+        console.log('撤回失败', error);
+        if (error?.type === 504) {
+          uni.showToast({
+            title: '已超过可撤回时间',
+            icon: 'none',
+          });
+          return false;
+        }
+        uni.showToast({
+          title: '撤回失败',
+          icon: 'none',
+        });
+      } finally {
+        this.show = false;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.message_more_func_container {
+  width: 100%;
+  padding: 20px 15px 20px 15px;
+}
+.message_more_func_item {
+  display: flex;
+  flex-direction: row;
+  justify-content: flex-start;
+  align-items: center;
+  width: 100%;
+  height: 56px;
+}
+.message_more_func_item_title {
+  /* Enabled */
+
+  width: 32px;
+  height: 22px;
+
+  /* 简体中文/文本/大 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 16px;
+  line-height: 22px;
+  /* identical to box height, or 138% */
+  text-align: center;
+
+  /* Neutral/1 */
+  color: #171a1c;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+.modal_text_content {
+  /* A message should be a short, complete sentence. */
+
+  width: 308.28px;
+  height: 18px;
+
+  /* 简体中文/标签/中 */
+  font-family: 'PingFang SC';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 14px;
+  line-height: 18px;
+  /* identical to box height, or 129% */
+  text-align: center;
+
+  /* Neutral/5 */
+  color: #75828a;
+
+  /* Inside auto layout */
+  flex: none;
+  order: 1;
+  flex-grow: 0;
+}
+</style>

emChat/emChatContainer/emSelectUserCard/index.vue

@@ -0,0 +1,270 @@
+<template>
+  <view>
+    <u-navbar
+      title="选择朋友"
+      :safeAreaInsetTop="true"
+      :placeholder="true"
+      :fixed="true"
+      leftIcon="close"
+      :autoBack="true"
+    >
+    </u-navbar>
+    <!-- 好友列表 -->
+    <view>
+      <u-list @scrolltolower="scrolltolower">
+        <u-list-item v-for="(friendItem, index) in friendList" :key="index">
+          <!-- 展示的cell不能为当前聊天中的好友 -->
+          <u-cell
+            v-if="chattingId !== friendItem.userId"
+            @click="openWaitSendModal(friendItem.userId)"
+          >
+            <u-avatar
+              slot="icon"
+              shape="square"
+              size="40"
+              :src="showFriendAvatar(friendItem)"
+              customStyle="margin: -3px 5px -3px 0"
+            ></u-avatar>
+            <view slot="title">
+              <u--text
+                :lines="1"
+                :text="showFriendNickname(friendItem)"
+                iconStyle="margin-left: 2px;"
+              ></u--text>
+            </view>
+          </u-cell>
+        </u-list-item>
+      </u-list>
+    </view>
+    <!-- 待发送modal -->
+    <u-modal
+      :show="isShowWaitSendModal"
+      :zoom="true"
+      title="发送名片"
+      async-close
+      show-cancel-button
+      confirm-text="发送"
+      cancel-text="取消"
+      @confirm="sendUserCardMessage"
+      @cancel="closeWaitSendModal"
+    >
+      <view class="content_box">
+        <text class="send_target_title">发送给：</text>
+        <view class="send_target_user_info">
+          <image
+            class="send_target_avatar"
+            :src="showFriendAvatar(chattingId)"
+          ></image>
+          <text class="send_target_nickname">{{
+            showFriendNickname({ userId: chattingId })
+          }}</text>
+        </view>
+        <text class="wait_send_user_nickname"
+          >[个人名片] {{ waitSendUserNickname || waitSendUserId || '' }}</text
+        >
+        <u-input
+          class="leave_message_input"
+          v-model="leaveMessageInput"
+          placeholder="给朋友留言"
+          type="text"
+          maxlength="100"
+        />
+      </view>
+    </u-modal>
+  </view>
+</template>
+
+<script>
+import { emMessages } from '@/EaseIM/emApis';
+import { MESSAGE_TYPE } from '@/EaseIM/constant';
+const { sendDisplayMessages } = emMessages();
+export default {
+  data() {
+    return {
+      sendTargetInfo: {
+        userId: '',
+        chatType: '',
+      },
+      isShowWaitSendModal: false,
+      waitSendUserId: '',
+      waitSendUserNickname: '',
+      leaveMessageInput: '',
+      defaultAvatar: '/static/images/new_ui/defaultAvatar.png',
+    };
+  },
+
+  computed: {
+    chattingId() {
+      return this.$store.getters.chattingId;
+    },
+    chattingChatType() {
+      return this.$store.getters.chattingChatType;
+    },
+    //好友列表
+    friendList() {
+      return this.$store.state.ContactsStore.friendList;
+    },
+    friendUserInfoCollection() {
+      return this.$store.getters.friendUserInfoCollection;
+    },
+    //好友头像展示
+    showFriendAvatar() {
+      return (hxId) => {
+        if (
+          this.friendUserInfoCollection[hxId] &&
+          this.friendUserInfoCollection[hxId]?.avatarurl
+        ) {
+          return this.friendUserInfoCollection[hxId].avatarurl;
+        } else {
+          return this.defaultAvatar;
+        }
+      };
+    },
+    //好友昵称展示
+    showFriendNickname() {
+      return (userItem) => {
+        const { userId, remark } = userItem;
+        if (remark) {
+          return remark;
+        }
+        if (
+          this.friendUserInfoCollection[userId] &&
+          this.friendUserInfoCollection[userId]?.nickname
+        ) {
+          return this.friendUserInfoCollection[userId].nickname;
+        } else {
+          return userId;
+        }
+      };
+    },
+  },
+  methods: {
+    scrolltolower() {},
+    loginUserAvactar() {
+      return (
+        this.$store.state.LoginStore.loginUserProfiles?.avatarurl ||
+        this.defaultAvatar
+      );
+    },
+    openWaitSendModal(userId) {
+      console.log('>>>>>>>111', userId);
+      this.isShowWaitSendModal = true;
+      this.$nextTick(() => {
+        this.waitSendUserId = userId;
+        this.getWaitSendUserInfo(userId);
+      });
+    },
+    getWaitSendUserInfo(userId) {
+      if (this.friendUserInfoCollection[userId]) {
+        this.waitSendUserNickname =
+          this.friendUserInfoCollection[userId].nickname;
+        return this.friendUserInfoCollection[userId];
+      }
+    },
+    closeWaitSendModal() {
+      this.isShowWaitSendModal = false;
+      this.waitSendUserId = '';
+      this.waitSendUserNickname = '';
+    },
+    async sendUserCardMessage() {
+      const customEvent = 'userCard';
+      if (!this.chattingId) return;
+      const friendInfo = this.getWaitSendUserInfo(this.waitSendUserId);
+      const customExtParams = {
+        uid: this.waitSendUserId,
+        ...friendInfo,
+      };
+      const params = {
+        type: MESSAGE_TYPE.CUSTOM,
+        // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+        to: this.chattingId,
+        // 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+        chatType: this.chattingChatType,
+        customEvent,
+        customExts: { ...customExtParams },
+      };
+      try {
+        await sendDisplayMessages({ ...params });
+        if (this.leaveMessageInput) {
+          this.sendLeaveTextMessage();
+        }
+      } catch (error) {
+        uni.showToast({
+          title: '消息发送失败',
+          icon: 'none',
+        });
+      } finally {
+        this.isShowWaitSendModal = false;
+        uni.navigateBack();
+      }
+    },
+    async sendLeaveTextMessage() {
+      const params = {
+        // 消息类型。
+        type: 'txt',
+        // 消息内容。
+        msg: this.leaveMessageInput,
+        // 消息接收方：单聊为对方用户 ID，群聊和聊天室分别为群组 ID 和聊天室 ID。
+        to: this.chattingId,
+        // 会话类型：单聊、群聊和聊天室分别为 `singleChat`、`groupChat` 和 `chatRoom`。
+        chatType: this.chattingChatType,
+      };
+      try {
+        const res = await sendDisplayMessages({ ...params });
+        console.log('>>>>>留言消息发送成功', res);
+      } catch (error) {
+        console.log('>>>>>留言消息发送失败', error);
+        uni.showToast({
+          title: '消息发送失败',
+          icon: 'none',
+        });
+      } finally {
+        this.leaveMessageInput = '';
+        uni.hideKeyboard && uni.hideKeyboard();
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.content_box {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+}
+.send_target_user_info {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  border-bottom: 1rpx solid #eee;
+}
+.send_target_title {
+  font-size: 33rpx;
+  color: #333;
+  font-weight: 600;
+}
+.send_target_avatar {
+  width: 60rpx;
+  height: 60rpx;
+  border-radius: 50%;
+  margin-right: 20rpx;
+}
+.send_target_nickname {
+  font-size: 35rpx;
+  color: #333;
+  font-weight: 500;
+}
+.wait_send_user_nickname {
+  font-size: 22rpx;
+  color: rgba(51, 51, 51, 0.6);
+  font-weight: 500;
+  overflow: hidden;
+  margin-top: 20rpx;
+}
+.leave_message_input {
+  margin-top: 10rpx;
+  background-color: #f7f7f7;
+  border-radius: 5rpx;
+}
+</style>

emChat/emChatContainer/index.css

@@ -0,0 +1,18 @@
+page {
+  background-color: #fafafa;
+  height: 100%;
+}
+.click_more_history_box {
+  /* Mth DD, HH:MM */
+  /* Alphabet/Body/Small */
+  font-family: 'SF Pro';
+  font-style: normal;
+  font-weight: 400;
+  font-size: 12px;
+  line-height: 16px;
+  /* identical to box height, or 133% */
+  text-align: center;
+
+  /* Neutral/7 */
+  color: #acb4b9;
+}

emChat/emChatContainer/index.vue

@@ -0,0 +1,421 @@
+<template>
+  <view>
+    <!-- <em-chat /> -->
+    <z-paging
+      ref="paging"
+      v-model="dataList"
+      use-chat-record-mode
+      :default-page-size="20"
+      :safe-area-inset-bottom="true"
+      @query="queryList"
+      use-page-scroll
+    >
+      <template #top>
+        <em-chat-navbar :targetId="targetId" :chatType="chatType" />
+      </template>
+      <!-- 聊天item，:id="`z-paging-${index}`"必须加 -->
+      <view
+        class="click_more_history_box"
+        v-if="isLoadingLocalMsgList"
+        @click="onClickLoadMore"
+        >如无更多，试试点击加载更多</view
+      >
+      <view
+        v-for="(msgBody, index) in dataList"
+        :key="msgBody.id"
+        :id="'mid' + msgBody.id"
+      >
+        <em-message-list-container
+          ref="emMessageListComps"
+          v-show="
+            isShowMessageItem(msgBody) &&
+            msgBody.type !== MESSAGE_TYPE.GRAY_INFORM
+          "
+          :msgBody="msgBody"
+          :isNeedShowMessageTime="isNeedShowMessageTime(msgBody, index)"
+          :quoteMsgId="quoteMsgId"
+          @alertMessagePopup="alertMessagePopup"
+          @scrollToQuoteMessge="scrollToQuoteMessge"
+        />
+        <!-- 灰色系统通知类型消息 -->
+        <em-gray-message-container
+          v-show="
+            !isShowMessageItem(msgBody) ||
+            msgBody.type === MESSAGE_TYPE.GRAY_INFORM
+          "
+          :msgBody="msgBody"
+          @reEditTextMessage="reEditTextMessage"
+        />
+      </view>
+      <!-- 底部聊天输入框 -->
+      <template #bottom>
+        <em-input-bar-container
+          ref="emInputBarComps"
+          @resetScrollHeight="resetScrollHeight"
+          :checkedPopupMsgBody="checkedPopupMsgBody"
+        />
+        <em-message-popup
+          ref="emMessagePopupComps"
+          @callReplyMessage="callReplyMessage"
+          @callEditMessage="callEditMessage"
+        />
+      </template>
+    </z-paging>
+  </view>
+</template>
+
+<script>
+
+import EmChatNavbar from "./emChatNavbar";
+import EmMessageListContainer from "./emMessageListContainer";
+import EmInputBarContainer from "./emInputBarContainer";
+import EmGrayMessageContainer from "./emGrayMessageContainer";
+import EmMessagePopup from "./emMessagePopup";
+import { CHAT_TYPE, MESSAGE_STATUS } from "@/EaseIM/constant";
+import { EVENT_BUS_NAME } from "@/constant";
+import { MESSAGE_TYPE } from "../../EaseIM/constant";
+import { ZPaging } from "@/uni_modules/z-paging/components/z-paging/z-paging";
+export default {
+  components: {
+    EmChatNavbar,
+    EmMessageListContainer,
+    EmInputBarContainer,
+    EmGrayMessageContainer,
+    EmMessagePopup,
+	ZPaging
+  },
+  data() {
+    return {
+      MESSAGE_STATUS,
+      MESSAGE_TYPE,
+      targetId: "",
+      chatType: "",
+	 
+      //v-model绑定的这个变量不要在分页请求结束中自己赋值！！！
+      dataList: [],
+      isLoadingLocalMsgList: false,
+      checkedPopupMsgBody: {}, //当msg popup弹起时选中的消息体
+      quoteMsgId: "",
+    };
+  },
+
+  onLoad(option) {
+    console.log(option);
+    this.targetId = option.targetId;
+    this.chatType = option.chatType;
+	
+    this.$store.commit("SET_CHATING_USER_INFO", {
+      targetId: this.targetId,
+      chatType: this.chatType,
+	 
+    });
+  },
+  onPageScroll(e) {
+    //更新z-paging内部scrollTop
+    this.$refs.paging.updatePageScrollTop(e.scrollTop);
+    //如果滚动到顶部，触发加载更多聊天记录
+    if (e.scrollTop < 10) {
+      this.$refs.paging.doChatRecordLoadMore();
+    }
+  },
+  provide() {
+    return {
+      targetId: () => this.targetId,
+      chatType: () => this.chatType,
+    };
+  },
+  mounted() {
+    uni.$on(
+      EVENT_BUS_NAME.EASEIM_MESSAGE_COLLECTION_UPDATE,
+      this.appentNewMessage
+    );
+    uni.$on(
+      EVENT_BUS_NAME.EASEIM_MESSAGE_COLLECTION_DELETE,
+      this.onDeleteMessage
+    );
+    uni.$on(
+      EVENT_BUS_NAME.EASEIM_MESSAGE_COLLECTION_MODIFY,
+      this.onModifyMessage
+    );
+  },
+  computed: {
+    joinedGroupList() {
+      return this.$store.state.GroupStore.joinedGroupList;
+    },
+    friendUserInfoCollection() {
+      return this.$store.getters.friendUserInfoCollection;
+    },
+    messageList() {
+      return this.$store.state.MessageStore.messageCollection[this.targetId];
+    },
+    messageCollectionStatus() {
+      return this.$store.getters.messageStatusCollection;
+    },
+    //recall delete 两种消息状态不展示对应消息item
+    isShowMessageItem() {
+      return (msgBody) => {
+        if (!msgBody.id) return false;
+        if (
+          this.messageCollectionStatus &&
+          this.messageCollectionStatus[msgBody.id] === MESSAGE_STATUS.DELETE
+        ) {
+          return false;
+        } else if (
+          this.messageCollectionStatus &&
+          this.messageCollectionStatus[msgBody.id] === MESSAGE_STATUS.RECALL
+        ) {
+          return false;
+        } else {
+          return true;
+        }
+      };
+    },
+    //两条消息之差大于5min，方可展示消息时间。
+    isNeedShowMessageTime() {
+      return (msgBody, index) => {
+        const { time } = msgBody;
+
+        if (index !== 0) {
+          const lastTime = this.dataList[index - 1]?.time;
+
+          if (time - lastTime > 300000) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          return true;
+        }
+      };
+    },
+  },
+  watch: {
+    messageList() {
+      console.log(">>>>监听到消息列表变化");
+      this.$store.dispatch("updateConversationLastMsg", {
+        conversationId: this.targetId,
+      });
+    },
+  },
+  methods: {
+    getGroupName(groupid) {
+      let groupName = "";
+      if (this.joinedGroupList.length) {
+        this.joinedGroupList.forEach((item) => {
+          if (item.groupid === groupid) {
+            console.log(item.groupname);
+            return (groupName = item.groupname);
+          }
+        });
+        console.log("groupName", groupName);
+        return groupName;
+      } else {
+        return groupid;
+      }
+    },
+    getTheIdName(targetId, chatType) {
+      if (chatType === CHAT_TYPE.SINGLE_CHAT) {
+        const friendInfo = this.friendUserInfoCollection[targetId];
+		
+        return friendInfo?.nickname || targetId;
+      }
+      if (chatType === CHAT_TYPE.GROUP_CHAT) {
+        return this.getGroupName(targetId);
+      }
+      switch (chatType) {
+        case CHAT_TYPE.SINGLE_CHAT:
+          const friendInfo = this.friendUserInfoCollection[targetId];
+          friendInfo?.nickname || targetId;
+          break;
+        case CHAT_TYPE.GROUP_CHAT:
+          console.log(">>>>>>> Group");
+          this.getGroupName(targetId);
+          break;
+        default:
+          return null;
+      }
+    },
+    async queryList(pageNo, pageSize, from) {
+      /* from  0.用户主动下拉刷新 1.通过reload触发 2.通过refresh触发 3.通过滚动到底部加载更多或点击底部加载更多触发) */
+      console.log(pageNo, pageSize, from);
+      /* 初始化时获取数据 */
+      if (from === 1) {
+        if (!this.messageList?.length) {
+          try {
+            const messages = await this.getMoreHistoryMessages();
+            this.$refs.paging.complete([...messages]);
+            //补充滚动置底，防止图片消息撑开内容导致，未滚动置底
+            setTimeout(() => {
+              this.$refs.paging.scrollToBottom();
+            }, 500);
+          } catch (error) {
+            console.log("漫游加载失败", error);
+            this.$refs.paging.complete(false);
+          }
+        } else {
+          /* 设置本地分页，请求结束(成功或者失败)调用此方法，将请求的结果传递给z-paging作分页处理 */
+          this.isLoadingLocalMsgList = true;
+          this.$refs.paging.setLocalPaging([...this.messageList]);
+          //补充滚动置底，防止图片消息撑开内容导致，未滚动置底
+          setTimeout(() => {
+            this.$refs.paging.scrollToBottom();
+          }, 500);
+
+          console.log(">>>>加载本地已有历史记录。");
+        }
+      }
+      if (from === 2) {
+        return;
+      }
+      /* 触顶加载更多消息时获取数据 */
+      if (from === 3) {
+        console.log(">>>>触顶加载更多");
+        try {
+          const messages = await this.getMoreHistoryMessages();
+          this.$refs.paging.complete([...messages]);
+        } catch (error) {
+          console.log("漫游加载失败", error);
+          this.$refs.paging.complete(false);
+        }
+      }
+    },
+    async getMoreHistoryMessages() {
+      const params = {
+        targetId: this.targetId,
+        chatType: this.chatType,
+      };
+      return new Promise((resolve, reject) => {
+        this.$store
+          .dispatch("fetchHistroyMessageListFromServer", params)
+          .then((res) => {
+            resolve(res.messages);
+          })
+          .catch((err) => {
+            console.log(err);
+            reject(err);
+          });
+      });
+    },
+    //执行新增消息
+    appentNewMessage(data) {
+      console.log(">>>>>新消息添加", data);
+      const { msgBody } = data;
+      this.$refs.paging.addChatRecordData({
+        ...msgBody,
+      });
+    },
+    //监听删除消息更新当前list
+    async onDeleteMessage() {
+      this.isLoadingLocalMsgList = true;
+      const res = await this.$refs.paging.setLocalPaging([...this.messageList]);
+    },
+    //监听编辑消息更新item
+    onModifyMessage(data) {
+      /**
+       * @function updateChatRecordData
+       * @description 此方法为自己往插件库中新增的一个方法，主要为更新本地分页数据中已存在的消息体。
+       */
+      //    updateChatRecordData(data) {
+      //   if (!this.useChatRecordMode) return;
+      //   const _index = this.totalData.findIndex((o) => o.id === data.id);
+      //   _index >= 0 && (this.totalData[_index] = data);
+      // }
+      this.$refs.paging.updateChatRecordData(data);
+    },
+    async onClickLoadMore() {
+      try {
+        const messages = await this.getMoreHistoryMessages();
+        if (messages.length) {
+          this.$refs.paging.addDataFromTop([...messages]);
+          this.$refs.paging.doChatRecordLoadMore();
+        } else {
+          this.isLoadingLocalMsgList = false;
+          uni.showToast({
+            title: "真的没有更多了",
+            icon: "none",
+            duration: 2000,
+          });
+          return;
+        }
+      } catch (error) {
+        console.log("漫游加载失败", error);
+        this.$refs.paging.complete(false);
+      }
+    },
+    //重新编辑
+    reEditTextMessage(msgContent) {
+      this.$refs.emInputBarComps.appendReEditTextMessage(msgContent);
+    },
+    resetScrollHeight(height) {
+      this.$nextTick(() => {
+        this.$refs.paging.updatePageScrollTopHeight();
+        console.log(this.scrollHeight);
+      });
+    },
+    //弹出消息对应popup
+    alertMessagePopup(msgBody) {
+      this.$refs.emMessagePopupComps.alertMessagePopup(msgBody);
+      this.checkedPopupMsgBody = msgBody;
+    },
+    //调起消息回复模式
+    callReplyMessage() {
+      this.$refs.emInputBarComps.onShowReplyMessageContainer();
+    },
+    callEditMessage(msgBody) {
+      this.$refs.emInputBarComps.onShowEditMessageContainer(msgBody);
+    },
+    //滚动至引用消息所在位置
+    scrollToQuoteMessge(msgQuote) {
+      const { msgID } = msgQuote;
+      if (msgID) {
+        const dom = uni
+          .createSelectorQuery()
+          .in(this)
+          .select("#mid" + msgID);
+        dom
+          .boundingClientRect((data) => {
+            if (data) {
+              this.$refs.paging.scrollIntoViewByNodeTop(data.top, 50);
+              //闪烁该条引用消息
+              this.setQuoteMessageId(msgID);
+            } else {
+              uni.showToast({
+                icon: "none",
+                title: "没有回复的消息",
+              });
+            }
+          })
+          .exec();
+      }
+    },
+    //设置引用消息ID从而引起消息气泡闪烁
+    setQuoteMessageId(quoteMsgId) {
+      this.quoteMsgId = quoteMsgId;
+      //引起子组件增加闪烁样式后，延时半秒自定清空设置的引用消息id
+      setTimeout(() => {
+        this.quoteMsgId = "";
+      }, 500);
+    },
+  },
+  onUnload() {
+    //置空正在沟通中的用户信息
+    this.$store.commit("SET_CHATING_USER_INFO", {});
+    uni.$off(
+      EVENT_BUS_NAME.EASEIM_MESSAGE_COLLECTION_UPDATE,
+      this.appentNewMessage
+    );
+    uni.$off(
+      EVENT_BUS_NAME.EASEIM_MESSAGE_COLLECTION_DELETE,
+      this.onDeleteMessage
+    );
+    uni.$off(
+      EVENT_BUS_NAME.EASEIM_MESSAGE_COLLECTION_MODIFY,
+      this.onModifyMessage
+    );
+  },
+};
+</script>
+
+<style scoped>
+@import "./index.css";
+</style>

encryption/index.js

@@ -0,0 +1,26 @@
+import CryptoJS from '../node_modules/crypto-js/crypto-js.js'
+// var keyvi = '12345678';
+// DES加密
+export const encryptDes = (message, key) => {
+	// var key = CryptoJS.MD5(keyvi).toString();
+	const keyHex = CryptoJS.enc.Utf8.parse(key);
+	const encrypted = CryptoJS.DES.encrypt(message, keyHex, {
+		mode: CryptoJS.mode.ECB,
+		padding: CryptoJS.pad.Pkcs7
+	});
+	return encrypted.toString();
+}
+
+// DES解密
+export const decryptDes = (ciphertext, key) => {
+	const keyHex = CryptoJS.enc.Utf8.parse(key);
+	// direct decrypt ciphertext
+	const decrypted = CryptoJS.DES.decrypt({
+		ciphertext: CryptoJS.enc.Base64.parse(ciphertext)
+	}, keyHex, {
+		mode: CryptoJS.mode.ECB,
+		padding: CryptoJS.pad.Pkcs7
+	});
+	return decrypted.toString(CryptoJS.enc.Utf8);
+}
+

index.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <script>
+      var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') ||
+        CSS.supports('top: constant(a)'))
+      document.write(
+        '<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' +
+        (coverSupport ? ', viewport-fit=cover' : '') + '" />')
+    </script>
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>

main.js

@@ -0,0 +1,29 @@
+import App from './App'
+
+// #ifndef VUE3
+import Vue from 'vue'
+import time from '@/commit/item.js';
+import store from '@/store/index.js'
+import uView from '@/uni_modules/uview-ui';
+
+Vue.config.productionTip = false
+Vue.prototype.$time = time 
+Vue.prototype.$store = store 
+App.mpType = 'app'
+Vue.use(uView);
+const app = new Vue({
+    ...App,
+	   store
+})
+app.$mount()
+// #endif
+
+// #ifdef VUE3
+import { createSSRApp } from 'vue'
+export function createApp() {
+  const app = createSSRApp(App)
+  return {
+    app
+  }
+}
+// #endif

manifest.json

@@ -0,0 +1,116 @@
+{
+    "name" : "yhc-merchantapplet",
+    "appid" : "__UNI__9DFEEAF",
+    "description" : "",
+    "versionName" : "1.0.0",
+    "versionCode" : 309,
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueStyleCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Payment" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx9a3e4ab07f8a9ba2",
+                        "UniversalLinks" : ""
+                    }
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wxf0e56f6522030c66",
+        "__usePrivacyCheck__" : true,
+        "setting" : {
+            "urlCheck" : false
+        },
+        "usingComponents" : true,
+        "optimization" : {
+            "subPackages" : true
+        }
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false
+    },
+    "vueVersion" : "2",
+    "h5" : {
+        "devServer" : {
+            "https" : false,
+            "proxy" : {
+                // 自行修改下方的 /web
+                "/gateway" : {
+                    // "secure": false,
+                    // "target": "https://api.gdjbp.com"
+                    "target" : "https://api.hebeiyhc.com"
+                },
+                // "target": "http://8.141.0.149:9000",
+                // "target": "https://app.bjtdba.com"
+                // "pathRewrite": {
+                // 	//路径重写
+                // 	"^/gateway": ""
+                // }
+                // 自行修改下方的 /api
+                "/api" : {
+                    "target" : "服务器地址",
+                    "pathRewirte" : {
+                        //路径重写
+                        "^/api" : "/"
+                    }
+                }
+            }
+        },
+        "router" : {
+            "base" : "./"
+        }
+    }
+}

openmerchant/amountopening/index.vue

@@ -0,0 +1,528 @@
+<template>
+	<view class="amountopening">
+		<view class="amountopening-back">
+			<image src="https://cdn.bjtdba.com/vod/image/2022-08-10/20220810090332606.png" mode="widthFix"></image>
+			<view class="amountopening-header">
+				<view class="amountopening-header-icon" @click="returns">
+					<image src="https://cdn.bjtdba.com/vod/image/2022-08-10/20220810090600249.png" mode="widthFix">
+					</image>
+				</view>
+				<view class="amountopening-header-text">
+					开通商户
+				</view>
+			</view>
+			<view class="amountopening-icon">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-10/20220810090719212.png" mode="widthFix"></image>
+				<view class="amountopening-jinggao">
+					<view class="amountopening-jinggao-top">
+						开通电商商户
+					</view>
+					<view class="amountopening-jinggao-bot">
+						¥19800/年
+					</view>
+				</view>
+				<view class="amountopening-kaiqi">
+					<view class="amountopening-kaiqi-text">
+						开通商户立享八项功能权益
+					</view>
+					<view class="amountopening-kaiqi-iocnr" @click="activiteCard = false">
+						我有激活码
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="amountopening-quanyi">
+			尊享权益
+		</view>
+		<view class="amountopening-list">
+			<view class="amountopening-list-is" v-for="(item,index) in mus" :key="index">
+				<view class="amountopening-list-is-top">
+					<image :src="item.url" mode="widthFix"></image>
+				</view>
+				<view class="amountopening-list-is-bto">
+					{{item.name}}
+				</view>
+			</view>
+		</view>
+		<!-- <view class="amountopening-kaitong" @click="payment">
+			<image src="https://cdn.bjtdba.com/vod/image/2022-08-10/20220810105617180.png" mode="widthFix">
+
+			</image>
+			<view class="kaitong-amount">
+				<span class="kaitong-money">¥3990</span>
+				<span>/年</span>
+			</view>
+		</view> -->
+		<view class="amountopening-anniu" @click="payment">
+			立即开通
+		</view>
+
+		<view :class="[activiteCard ? 'dis-activite' : '', 'activite-code' ]" @touchmove.stop.prevent="moveHandle">
+			<view class="activite-code-mask" @click="activiteCard = true"></view>
+			<view class="bottomss">
+				<view class="top">
+					兑换激活码
+				</view>
+				<view class="cv">
+					<view class="cv-title">输入激活码，兑换储蓄保一壶茶商户</view>
+					<input class="cv-input" type="text" placeholder="输入激活码" v-model="useCode">
+				</view>
+				<view class="ft" @click="immediateUse">
+					立即使用
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		updateActivationCode,
+		insterMerchantOrder,
+		selectMerchant
+	} from '@/commit/api.js';
+	
+	export default {
+		data() {
+			return {
+				userinfo: [],
+				activiteCard: true,
+				useCode: '',
+				code: '',
+				mus: [{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101724170.png',
+						name: '线上商城'
+					},
+					{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101550963.png',
+						name: '店务管理'
+					},
+					{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101703873.png',
+						name: '锁定客户'
+					},
+					{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101751275.png',
+						name: '员工管理'
+					},
+					{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101615531.png',
+						name: '经营报表'
+					},
+					{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101653529.png',
+						name: '数据分析'
+					},
+					{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101604267.png',
+						name: '会员管理'
+					},
+					{
+						url: 'https://cdn.bjtdba.com/vod/image/2022-08-10/20220810101713873.png',
+						name: '推广引流'
+					},
+				]
+			}
+		},
+		onLoad() {
+			this.userinfo = uni.getStorageSync('userinfo')
+		},
+		onShow() {
+			    
+		},
+		methods: {
+			moveHandle() {},
+			returns() {
+				uni.redirectTo({
+					url: "/openmerchant/guide/index"
+				})
+			},
+			immediateUse() {
+
+				if (this.useCode == "") return uni.showToast({
+					title: "请输入激活码",
+					icon: "none"
+				});
+				updateActivationCode({
+					code: this.useCode,
+					uid: this.userinfo.uid
+				}).then(res => {
+					console.log('激活码激活 -->',res)
+					if (res.data.status == 200) {
+						this.useCode = "";
+						this.activiteCard = true;
+						//获取merId进行存储
+						let UserSelectmerchant = uni.getStorageSync('selectmerchant')
+						let selectmerchant = {
+							status:UserSelectmerchant.status,
+							merId:res.data.data.mer_id,
+							pay_type:res.data.data.pay_type,
+							msg:UserSelectmerchant.msg
+						}
+						if(res.data.data.pay_type=="2"){
+							this.$store.commit('changeMerchantsStatus', 1);
+						}
+						uni.setStorageSync('selectmerchant', selectmerchant);
+						uni.redirectTo({
+							url: "/openmerchant/shopentry/process?mer_id=" + res.data.mer_id
+						})
+					}
+				}, fail => {
+					console.log('激活码激活 -->',fail)
+				})
+			},
+			payment() {
+				let userInfo = uni.getStorageSync('userinfo')
+				// 用户状态判断
+				selectMerchant({
+					uid: userInfo.uid
+				}).then(data => {
+					console.log('data = ',data)
+					if (data.data.status == 200) {
+						if (data.data.data.status == -1) {
+							this.pushToUserApplet()
+						} else {
+							uni.redirectTo({
+								url: '/openmerchant/shopentry/process?mer_id=' + data.data.data.merId //已开通商户未填写资料
+							});
+							return
+						}
+					}
+				}, fail => {
+					uni.showToast({
+						title: fail,
+						icon: "none"
+					})
+				}).catch(err => {
+					console.log(err)
+				})
+				
+				
+			},
+			
+			pushToUserApplet() {
+				uni.navigateToMiniProgram({
+					// appid  写你要跳转的小程序的 appid
+					appId:'wx9082e5ac2fdb513f',
+					// 路径写  src下的路径,假如你跳转的是pages下的页面,就可以写pages/index
+					// path: 'pagesA/oderPay/oder_nian',
+					path: 'pages/chuangke/index?type=100',
+					// 这个不写的话会显示开发环境,不能正常跳转,写上就能正常跳转了
+					envVersion: 'trial',  // develop（开发版），trial（体验版），release（正式版）
+					// envVersion: 'release',  // develop（开发版），trial（体验版），release（正式版）
+					success(res) {
+						// 打开成功
+						uni.showToast({
+							title: '跳转成功'
+						})
+					},
+					fail(err) {
+						console.log(err)
+						// 打开失败/取消
+						uni.showToast({
+							title: '跳转不成功'
+						})
+					}
+				})
+			},
+			
+			pay(appId, timeStamp, nonceStr, pack, signType, paySign) {
+				wx.requestPayment({
+					'appId': appId,
+					'timeStamp': timeStamp,
+					'nonceStr': nonceStr,
+					'package': pack,
+					'signType': signType,
+					'paySign': paySign,
+					success: function(res) {
+						uni.showToast({
+							title: "支付成功",
+							icon: 'none',
+						})
+						this.$store.commit('changeMerchantsStatus', 0);
+						uni.redirectTo({
+							url: "/openmerchant/shopentry/process?mer_id=539"
+						})
+					},
+					fail: function(res) {
+						uni.showToast({
+							title: res.data,
+							duration: 2000
+						})
+					},
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.amountopening {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.amountopening-back {
+			width: 100%;
+			height: 347rpx;
+			position: relative;
+			display: flex;
+			justify-content: center;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+
+			.amountopening-header {
+				position: absolute;
+				width: 686rpx;
+				height: 100rpx;
+				// top: 37rpx;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+
+				.amountopening-header-icon {
+					width: 36rpx;
+					height: 36rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.amountopening-header-text {
+					font-size: 36rpx;
+					font-weight: 500;
+					color: #FFFFFF;
+					margin-left: 26rpx;
+				}
+			}
+
+			.amountopening-icon {
+				width: 686rpx;
+				height: 320rpx;
+				position: absolute;
+				top: 108rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+
+				.amountopening-jinggao {
+					position: absolute;
+					top: 36rpx;
+					left: 32rpx;
+					height: 99rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: flex-start;
+
+					.amountopening-jinggao-top {
+						font-size: 42rpx;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.amountopening-jinggao-bot {
+						font-size: 38rpx;
+						font-weight: 400;
+						color: #333333;
+					}
+				}
+
+				.amountopening-kaiqi {
+					position: absolute;
+					width: 622rpx;
+					left: 32rpx;
+					bottom: 28rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.amountopening-kaiqi-text {
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #333333;
+					}
+
+					.amountopening-kaiqi-iocnr {
+						width: 189rpx;
+						height: 64rpx;
+						background: linear-gradient(175deg, #FFF8E0 0%, #EAD6AE 100%);
+						border-radius: 31px;
+						line-height: 64rpx;
+						text-align: center;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #333333;
+					}
+				}
+			}
+		}
+
+		.amountopening-quanyi {
+			width: 686rpx;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #333333;
+			margin-top: 113rpx;
+			display: flex;
+			justify-content: flex-start;
+		}
+
+		.amountopening-list {
+			width: 686rpx;
+			// height: 555rpx;
+			border-radius: 16rpx;
+			border: 1rpx solid #FEB84A;
+			margin-top: 32rpx;
+			display: flex;
+			flex-wrap: wrap;
+
+			.amountopening-list-is {
+				width: 110rpx;
+				height: 131rpx;
+				display: flex;
+				margin: 12rpx 31rpx 12rpx 31rpx;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+
+				.amountopening-list-is-top {
+					width: 86rpx;
+					height: 86rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.amountopening-list-is-bto {
+					font-size: 26rpx;
+					font-weight: 400;
+					color: #333333;
+				}
+			}
+		}
+
+		.amountopening-kaitong {
+			width: 686rpx;
+			height: 88rpx;
+			margin-top: 280rpx;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+
+			.kaitong-amount {
+				position: absolute;
+				top: 20rpx;
+				left: 175rpx;
+				color: #FFFFFF;
+				font-size: 32rpx;
+				line-height: 48rpx;
+				display: flex;
+
+				.kaitong-money {
+					color: #FBDD99;
+					font-size: 48rpx;
+					margin-right: 8rpx;
+				}
+			}
+		}
+		.amountopening-anniu{
+			width: 686rpx;
+			height: 88rpx;
+			background: #45495A;
+			border-radius: 44rpx;
+			text-align: center;
+			line-height: 88rpx;
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #FFFFFF;
+			margin-top: 343rpx;
+		}
+
+		.dis-activite {
+			display: none !important;
+		}
+
+		.activite-code {
+			width: 100%;
+			height: 100%;
+			background: transparent;
+			position: fixed;
+			margin: auto;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			z-index: 111;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.activite-code-mask {
+				width: 100%;
+				height: 100%;
+				background: rgba(0, 0, 0, 0.5);
+				position: fixed;
+			}
+
+			.bottomss {
+				width: 560rpx;
+				// height: 408rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				text-align: center;
+				padding-top: 50rpx;
+				z-index: 112;
+
+				.top {
+					font-size: 36rpx;
+				}
+
+				.cv {
+					width: 100%;
+					box-sizing: border-box;
+					padding: 35rpx 22rpx 40rpx 26rpx;
+					border-bottom: 1rpx solid #E5E5E5;
+					text-align: left;
+
+					.cv-title {
+						font-size: 30rpx;
+						margin-bottom: 32rpx;
+					}
+
+					.cv-input {
+						border-radius: 8rpx;
+						border: 2px solid #999999;
+						width: 508rpx;
+						height: 86rpx;
+						padding-left: 25rpx;
+						box-sizing: border-box;
+						font-size: 26rpx;
+					}
+				}
+
+				.ft {
+					width: 100%;
+					padding: 31rpx 0;
+					color: #1F7CFF;
+					font-size: 36rpx;
+				}
+			}
+		}
+	}
+</style>

openmerchant/guide/index.vue

@@ -0,0 +1,88 @@
+<template>
+	<view class="guide">
+		<view class="guide_header">
+			<view class="">
+				请立即开通店铺！
+			</view>
+			<view class="">
+				开通后才可以正常使用！
+			</view>
+		</view>
+		<view class="guide_icon">
+			<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809174136233.png" mode="widthFix"></image>
+		</view>
+		<view class="guide_bottom" @click="activatenow">
+			立即开通
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onLoad() {
+			
+		},
+		methods: {
+			activatenow(){
+				uni.navigateTo({
+					url:"/openmerchant/amountopening/index"
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #1F7CFF;
+	}
+</style>
+<style lang="scss" scoped>
+
+	.guide{
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		background-color: #1F7CFF;
+		.guide_header{
+			width: 462rpx;
+			height: 108rpx;
+			margin: 279rpx 0 125rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+			font-size: 42rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+		}
+		.guide_icon{
+			width: 750rpx;
+			height: 520rpx;
+			margin-bottom: 168rpx;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.guide_bottom{
+			width: 686rpx;
+			height: 98rpx;
+			border-radius: 8rpx;
+			border: 2rpx solid #FFFFFF;
+			font-size: 36rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 98rpx;
+		}
+	}
+</style>

openmerchant/shopentry/process.vue

@@ -0,0 +1,884 @@
+<template>
+	<view class="process">
+		<view class="process-header">
+			<view class="process-header-text">
+				<view class="process-header-text-neishi" @click="topgi">
+					<view class="process-header-text-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+				<view class="process-header-text-title">
+					店铺入驻
+				</view>
+			</view>
+		</view>
+		<view class="process-zhuti">
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					商家类型
+				</view>
+				<view class="process-zhuti-yi-input">
+					<view class="business-type" @click="isShowType = true">
+						<view v-if="!businessData">请选择商家类型</view>
+						<view v-else class="business-type-value">{{businessData.text}}</view>
+					</view>
+					<view class="type-mask" v-if="isShowType" @click="isShowType = false"></view>
+					<view class="business-type-list" v-if="isShowType">
+						<view v-for="(item,index) in businessType"
+							:class="[businessData.value == item.value ? 'business-type-item-active' : '', 'business-type-item' ]"
+							@click="changeType(item)">
+							<image v-if="businessData.value == item.value"
+								src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822161754617.png" mode=""></image>
+							<image v-else src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822155008662.png"
+								mode=""></image>
+							{{item.text}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					商家名称
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写商家名称" v-model="merchantsIn.mer_name">
+				</view>
+			</view>
+			<view class="process-zhuti-yi" v-if="enterpriseType">
+				<view class="process-zhuti-yi-text">
+					营业执照
+				</view>
+				<view class="process-zhuti-yi-upload" @click="businessLicense">
+					<image v-if="merchantsIn.business_license" :src="merchantsIn.business_license" mode=""></image>
+					<image v-else src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822142852637.png" mode="">
+					</image>
+				</view>
+			</view>
+			<view class="process-zhuti-yi" v-if="enterpriseType">
+				<view class="process-zhuti-yi-text">
+					社会信用代码
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写社会信用代码" v-model="merchantsIn.credit_code">
+				</view>
+			</view>
+			<view class="process-zhuti-yi" v-if="enterpriseType">
+				<view class="process-zhuti-yi-text">
+					社会信用证有效期
+				</view>
+				<view class="process-zhuti-yi-input"  style="display: flex;">
+					<!-- <uni-datetime-picker v-model="range" type="daterange" @change="changeLog">
+						<input placeholder="请填写社会信用证有效期" v-model="range" disabled>
+					</uni-datetime-picker> -->
+					<uni-datetime-picker type="date" :clear-icon="false" v-model="merchantsIn.merc_start_time" @maskClick="maskClick">
+						<input placeholder="有效期限开始" v-model="merchantsIn.merc_start_time" disabled>
+					</uni-datetime-picker>
+					<view class="" style="width: 120rpx;height: 100%;background-color: rgba(31, 124, 255, 0.1); display: flex;justify-content: center;align-items: center; color: #B6B6B6;">
+							——
+					</view>
+					<uni-datetime-picker type="date" :clear-icon="false" v-model="merchantsIn.merc_end_time" @maskClick="maskClick" end="2099-12-31">
+						
+						<input placeholder="有效期限结束" v-model="merchantsIn.merc_end_time" disabled>
+					</uni-datetime-picker>
+				</view>
+			</view>
+			<view class="process-zhuti-yi" v-if="enterpriseType" @click="miiim">
+				<view class="process-zhuti-yi-text">
+					营业执照地址
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写营业执照地址" v-model="merchantsIn.business_addr">
+				</view>
+			</view>
+			<view class="process-zhuti-yi" v-if="enterpriseType">
+				<view class="process-zhuti-yi-text">
+					结算类型
+				</view>
+				<view class="process-zhuti-yi-input">
+					<uni-data-checkbox v-model="merchantsIn.acc_type" :localdata="sex"></uni-data-checkbox>
+				</view>
+			</view>
+			<view class="process-zhuti-yi" v-if="enterpriseType">
+				<view class="process-zhuti-yi-text">
+					开户许可证
+				</view>
+				<view class="process-zhuti-yi-upload" @click="accountLicense">
+					<image v-if="merchantsIn.open_account" :src="merchantsIn.open_account" mode=""></image>
+					<image v-else src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822142837323.png" mode="">
+					</image>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text" v-if="enterpriseType">开户账号</view>
+				<view class="process-zhuti-yi-text" v-else>银行卡号</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写银行卡号" v-model="merchantsIn.bank_account">
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					所属银行
+				</view>
+				<view class="process-zhuti-yi-input">
+					<view class="back-combox">
+						<view class="back-combox__input-box">
+							<input class="back-combox__input" placeholder="请选择开户行" v-model="city.bank_name"
+								@input="onInput" @focus="onFocus" cursor-spacing="350" />
+						</view>
+						<view class="back-combox__selector" v-if="showSelector">
+							<view class="activite-code-mask" @click="showSelector = false"></view>
+							<view class="back-popper__arrow"></view>
+							<scroll-view scroll-y="true" class="back-combox__selector-scroll">
+								<view class="back-combox__selector-empty" v-if="filterCandidatesLength === 0">
+									<text>无匹配内容</text>
+								</view>
+								<view class="back-combox__selector-item" v-for="(item,index) in filterCandidates"
+									:key="index" @click="onSelectorClick(item)">
+									<text>{{item.bank_name}}</text>
+								</view>
+							</scroll-view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					开户行所在地
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写开户行地址" v-model="merchantsIn.bank_location">
+				</view>
+			</view>
+		</view>
+		<view :class="[btnBir ? 'btn-bir' : '', 'process-zhuti-btn' ]" @click=" btnBir ? nextStep() : '' ">
+			下一步
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		uploadPicture,
+		settlementBank,
+		selectMerchaSettlen,
+		selectMerchant
+	} from '@/commit/api.js';
+	import {
+		mapMutations
+	} from 'vuex'
+	export default {
+		data() {
+			return {
+				merchantsIn: {
+					type: '', // 商家类型
+					mer_name: '', // 商户名称
+					business_license: '', // 营业执照url
+					credit_code: '', // 社会信誉代码
+					merc_start_time: '', // 营业执照开始时间yyyy-MM-dd
+					merc_end_time: '', // 营业执照结束时间yyyy-MM-dd
+					business_addr: '', // 营业执照地址
+					acc_type: '10A', // 结算类型
+					open_account: '', // 开户许可证
+					bank_account: '', // 开户账号
+					bank_deposit: '', // 开户行
+					bank_name: '', //银行编码
+					bank_location: '', // 开户行所在地
+				},
+				value: 0,
+				range: [],
+				sex: [{
+					text: '对公',
+					value: '10A'
+				}, {
+					text: '对私',
+					value: '10B'
+				}],
+				businessData: '',
+				isShowType: false,
+				businessType: [{
+						value: 1,
+						text: "企业入驻"
+					},
+					{
+						value: 3,
+						text: "个人入驻"
+					}
+				],
+				enterpriseType: true,
+				candidates: [],
+				city: {},
+				showSelector: false,
+				fxmerchantsInData: {},
+				btnBir: false,
+				merchantsPass: false,
+				is: ''
+			}
+		},
+		mounted() {
+
+		},
+		onLoad(opsition) {
+			this.is = opsition.is
+			if (opsition.mer_id > 0) {
+				console.log("-----------" + opsition.mer_id)
+				this.jiance(opsition.mer_id)
+				
+			} else {
+				// 获取本地
+				const fanxian = uni.getStorageSync('merchants_in');
+				if (fanxian) {
+					if (fanxian.type == 1) {
+						this.changeType({
+							value: 1,
+							text: "企业入驻"
+						})
+						this.merchantsIn.acc_type = '10A';
+					} else {
+						this.changeType({
+							value: 3,
+							text: "个人入驻"
+						})
+						this.merchantsIn.acc_type = '10B';
+					}
+					this.range = [fanxian.merc_start_time, fanxian.merc_end_time];
+					this.city = {
+						bank_name: fanxian.bank_deposit,
+						code: fanxian.bank_name
+					};
+					this.merchantsIn = fanxian;
+				}
+			}
+			// // 新加 8.29
+			// let selectMerchantInfo = uni.getStorageSync('selectmerchant')
+			// let merchantsDatas = selectMerchantInfo.merchantIntention;
+			// console.log(merchantsDatas)
+			// if (merchantsDatas.type == 1) {
+			// 	this.changeType({
+			// 		value: 1,
+			// 		text: "企业入驻"
+			// 	})
+			// } else {
+			// 	this.changeType({
+			// 		value: 3,
+			// 		text: "个人入驻"
+			// 	})
+			// }
+			// this.range = [merchantsDatas.merc_start_time, merchantsDatas.merc_end_time];
+			// this.city = {
+			// 	bank_name: merchantsDatas.bank_deposit,
+			// 	code: merchantsDatas.bank_name
+			// };
+			// this.merchantsIn.mer_name = merchantsDatas.mer_name; // 商户名称
+			// this.merchantsIn.business_license = merchantsDatas.business_license; // 营业执照url
+			// this.merchantsIn.credit_code = merchantsDatas.credit_code; // 社会信誉代码
+			// this.merchantsIn.merc_start_time = merchantsDatas.merc_start_time; // 营业执照开始时间
+			// this.merchantsIn.merc_end_time = merchantsDatas.merc_end_time; // 营业执照结束时间
+			// this.merchantsIn.business_addr = merchantsDatas.business_addr; // 营业执照地址
+			// this.merchantsIn.acc_type = merchantsDatas.acc_type; // 结算类型
+			// this.merchantsIn.open_account = merchantsDatas.open_account; // 开户许可证
+			// this.merchantsIn.bank_account = merchantsDatas.bank_account; // 开户账号
+			// this.merchantsIn.bank_deposit = merchantsDatas.bank_deposit; // 开户行
+			// this.merchantsIn.bank_name = merchantsDatas.bank_name; // 银行编码
+			// this.merchantsIn.bank_location = merchantsDatas.bank_location; // 开户行所在地
+			// this.merchantsIn.type = merchantsDatas.type;
+		},
+		computed: {
+			filterCandidates() {
+				let map = new Map();
+				for (let item of this.candidates) {
+					map.set(item.id, item);
+				}
+				this.candidates = [...map.values()];
+				return this.candidates
+			},
+			filterCandidatesLength() {
+				return this.filterCandidates.length
+			}
+		},
+		watch: {
+			merchantsIn: {
+				handler: function(val) {
+					this.isShow(val)
+				},
+				deep: true
+			}
+		},
+		methods: {
+			maskClick(e){
+				console.log('maskClick事件:', e);
+			},
+			jiance(e) {
+				selectMerchaSettlen({
+					mer_id: e
+				}).then(res => {
+					if (res.data.status == 200 && res.data.data.merchantIntention != "") {
+						this.$store.commit('changeMerchants', res.data.data.merchantIntention);
+						
+						let merchantsDatas = res.data.data.merchantIntention;
+						
+						if (merchantsDatas.type == 1) {
+							this.changeType({
+								value: 1,
+								text: "企业入驻"
+							})
+						} else {
+							this.changeType({
+								value: 3,
+								text: "个人入驻"
+							})
+						}
+						this.range = [merchantsDatas.merc_start_time, merchantsDatas.merc_end_time];
+						this.city = {
+							bank_name: merchantsDatas.bank_deposit,
+							code: merchantsDatas.bank_name
+						};
+						// this.merchantsIn = merchantsDatas;
+
+						this.merchantsIn.mer_name = merchantsDatas.mer_name; // 商户名称
+						this.merchantsIn.business_license = merchantsDatas.business_license; // 营业执照url
+						this.merchantsIn.credit_code = merchantsDatas.credit_code; // 社会信誉代码
+						this.merchantsIn.merc_start_time = merchantsDatas.merc_start_time; // 营业执照开始时间
+						this.merchantsIn.merc_end_time = merchantsDatas.merc_end_time; // 营业执照结束时间
+						this.merchantsIn.business_addr = merchantsDatas.business_addr; // 营业执照地址
+						this.merchantsIn.acc_type = merchantsDatas.acc_type; // 结算类型
+						this.merchantsIn.open_account = merchantsDatas.open_account; // 开户许可证
+						this.merchantsIn.bank_account = merchantsDatas.bank_account; // 开户账号
+						this.merchantsIn.bank_deposit = merchantsDatas.bank_deposit; // 开户行
+						this.merchantsIn.bank_name = merchantsDatas.bank_name; // 银行编码
+						this.merchantsIn.bank_location = merchantsDatas.bank_location; // 开户行所在地
+
+						this.merchantsPass = true;
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+
+			topgi() {
+				if (this.is) {
+					uni.navigateBack({
+						delta: 1
+					})
+				} else {
+					uni.showToast({
+						title: "已开通请完善信息...",
+						icon: "none"
+					});
+				}
+
+			},
+			isShow(list) {
+				let temp = true
+				if (list && this.merchantsIn.type == 1) {
+					// for (let i in list) {
+					// 	console.log(list[i])
+					// 	if ((i[10] == "" || i.bank_deposit == null) ||  (i.bank_name == "" || i.bank_name == null)  ) {
+					// 		break
+					// 	}
+					// 	if (list[i] == "" || list[i] == null) {
+					// 		temp = false
+					// 	}
+					// }
+					
+					if ((list.acc_type == "" || list.acc_type == null) 
+							|| (list.bank_account == "" || list.bank_account == null) 
+							|| (list.bank_location == "" || list.bank_location == null) 
+							|| (list.business_addr == "" || list.business_addr == null) 
+							|| (list.business_license == "" || list.business_license == null) 
+							|| (list.credit_code == "" || list.credit_code == null) 
+							|| (list.mer_name == "" || list.mer_name == null) 
+							|| (list.merc_end_time == "" || list.merc_end_time == null) 
+							|| (list.merc_start_time == "" || list.merc_start_time == null)
+							|| (list.open_account == "" || list.open_account == null)
+							|| (list.type == "" || list.type == null)) {
+						temp = false
+						console.log("设置了 false")
+					}
+					
+				} else if (list && this.merchantsIn.type == 3) {
+					console.log("进来了")
+					// if ((list.mer_name == "" || list.mer_name == null) || (list.bank_account == "" || list.bank_account ==
+					// 		null) || (list.bank_deposit == "" || list.bank_deposit == null) || (list.bank_name == "" ||
+					// 		list.bank_name == null) || (list.bank_location == "" || list.bank_location == null)) {
+					// 	temp = false
+					// 	console.log("设置了 false")
+					// }
+					
+					if ((list.mer_name == "" || list.mer_name == null) || (list.bank_account == "" || list.bank_account ==
+							null) || (list.bank_location == "" || list.bank_location == null)) {
+						temp = false
+						console.log("设置了 false")
+					}
+					
+				}
+				this.btnBir = temp
+			},
+			onFocus() {
+				this.showSelector = true
+			},
+			onBlur() {
+				this.showSelector = false
+			},
+			onSelectorClick(data) {
+				this.showSelector = false;
+				this.city = data;
+				this.merchantsIn.bank_deposit = data.bank_name;
+				this.merchantsIn.bank_name = data.code;
+			},
+			onInput(e) {
+				let name = e.detail.value
+				if (name) {
+					settlementBank({
+						bank_name: name
+					}).then(res => {
+						if (res.data.status == 200) {
+							this.candidates = res.data.data;
+						}
+					}, fail => {
+						console.log(fail)
+					})
+				}
+			},
+			// 商家类型
+			changeType(data) {
+				if (data.value != this.merchantsIn.type) {
+					this.merchantsIn = this.$options.data().merchantsIn;
+
+					this.range = [];
+					this.city = {};
+				}
+				this.businessData = data;
+				this.merchantsIn.type = data.value;
+				this.isShowType = false;
+				if (data.value == 3) {
+					this.enterpriseType = false;
+				} else {
+					this.enterpriseType = true;
+				}
+			},
+			miiim(){
+				console.log(this.merchantsIn)
+			},
+			// 营业执照
+			businessLicense() {
+				console.log('点击了upload营业执照')
+				let that = this;
+				that.$time.uploadPictures(res => {
+					console.log(res)
+					that.merchantsIn.business_license = res;
+				});
+			},
+			// 社会信用证有效期
+			changeLog(e) {
+				this.merchantsIn.merc_start_time = e[0];
+				this.merchantsIn.merc_end_time = e[1];
+			},
+			// 开户许可证
+			accountLicense() {
+				let that = this;
+				that.$time.uploadPictures(res => {
+					that.merchantsIn.open_account = res;
+				});
+			},
+			nextStep() {
+				
+				if (this.merchantsIn.bank_name == "" || this.merchantsIn.bank_name == null || this.merchantsIn.bank_deposit == "" || this.merchantsIn.bank_deposit == null) return uni.showToast({
+					title: "请选择所属银行",
+					icon: "none"
+				}); 
+				
+				if (this.merchantsIn.type == "") return uni.showToast({
+					title: "请选择商家类型",
+					icon: "none"
+				});
+				if (this.merchantsIn.type == 1) {
+					if (this.merchantsIn.mer_name == "") return uni.showToast({
+						title: "请填写商家名称",
+						icon: "none"
+					});
+					if (this.merchantsIn.business_license == "") return uni.showToast({
+						title: "请上传营业执照",
+						icon: "none"
+					});
+					if (this.merchantsIn.credit_code == "") return uni.showToast({
+						title: "请填写社会信用代码",
+						icon: "none"
+					});
+					if (this.merchantsIn.merc_end_time == "" && this.merchantsIn.merc_start_time == "") return uni
+						.showToast({
+							title: "请选取社会信用证有效期",
+							icon: "none"
+						});
+					if (this.merchantsIn.business_addr == "") return uni.showToast({
+						title: "请填写营业执照地址",
+						icon: "none"
+					});
+					if (this.merchantsIn.open_account == "") return uni.showToast({
+						title: "请上传开户许可证",
+						icon: "none"
+					});
+					if (this.merchantsIn.bank_account == "") return uni.showToast({
+						title: "请填写开户账号",
+						icon: "none"
+					});
+					if (this.merchantsIn.bank_deposit == "" && this.merchantsIn.bank_name == "") return uni.showToast({
+						title: "请选择开户行",
+						icon: "none"
+					});
+					if (this.merchantsIn.bank_location == "") return uni.showToast({
+						title: "请填写开户行所在地",
+						icon: "none"
+					});
+				} else if (this.merchantsIn.type == 3) {
+					if (this.merchantsIn.mer_name == "") return uni.showToast({
+						title: "请填写商家名称",
+						icon: "none"
+					});
+					if (this.merchantsIn.bank_account == "") return uni.showToast({
+						title: "请填写银行卡号",
+						icon: "none"
+					});
+					if (this.merchantsIn.bank_deposit == "" && this.merchantsIn.bank_name == "") return uni.showToast({
+						title: "请选择开户行",
+						icon: "none"
+					});
+					if (this.merchantsIn.bank_location == "") return uni.showToast({
+						title: "请填写开户行所在地",
+						icon: "none"
+					});
+				}
+				
+				
+				
+				uni.setStorage({
+					key: 'merchants_in',
+					data: this.merchantsIn
+				});
+
+				// if(this.merchantsPass){
+				// 	uni.navigateTo({
+				// 		url: `./processstore?positionResult=${JSON.stringify(this.merchantsIn)}`
+				// 	});
+				// }else{
+				uni.navigateTo({
+					url: `./processstore`
+				});
+				// }
+
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.process {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.process-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 100rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.process-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				// margin-top: 107rpx;
+				align-items: center;
+
+				.process-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.process-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+
+			}
+		}
+
+		.process-zhuti {
+			width: 100%;
+			height: auto;
+			margin-top: 102rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 0 40rpx;
+			padding-bottom: 40rpx;
+			background: #FFFFFF;
+
+			.process-zhuti-yi {
+				width: 686rpx;
+				// height: 150rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: flex-start;
+				margin-top: 32rpx;
+
+				.process-zhuti-yi-text {
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #333333;
+					margin-bottom: 26rpx;
+				}
+
+				.process-zhuti-yi-input {
+					width: 100%;
+					height: 94rpx;
+					// background: #1F7CFF;
+					// 31 124 255 10
+					border-radius: 8rpx;
+					// opacity: 0.1;
+
+					.business-type {
+						height: 94rpx;
+						background: rgba(31, 124, 255, 0.1);
+						padding-left: 32rpx;
+						color: #B6B6B6;
+						border-radius: 8rpx;
+						line-height: 94rpx;
+
+						.business-type-value {
+							color: #333333;
+						}
+					}
+
+					.business-type-list {
+						// display: none;
+						background: #FFFFFF;
+						position: absolute;
+						z-index: 10;
+						box-shadow: 0 3rpx 11rpx 0 rgba(0, 0, 0, 0.15);
+						border-radius: 8px;
+
+						.business-type-item {
+							width: 686rpx;
+							height: 94rpx;
+							line-height: 94rpx;
+
+							image {
+								width: 28rpx;
+								height: 28rpx;
+								margin: 0 16rpx 0 32rpx;
+								vertical-align: middle;
+							}
+						}
+
+						.business-type-item-active {
+							background: #1F7CFF;
+						}
+
+						.business-type-item:first-child {
+							border-radius: 8rpx 8rpx 0 0;
+						}
+
+						.business-type-item:last-child {
+							border-radius: 0 0 8rpx 8rpx;
+						}
+					}
+
+					// /deep/.uni-select{
+					// 	height: 94rpx;
+					// 	background: rgba(31, 124, 255, 0.1);
+					// 	border: none;
+					// 	padding-left: 32rpx;
+					// }
+					input {
+						width: 100%;
+						height: 94rpx;
+						background: rgba(31, 124, 255, 0.1);
+						border-radius: 8rpx;
+						box-sizing: border-box;
+						padding-left: 32rpx;
+					}
+
+					/deep/.uni-data-checklist {
+						padding-left: 32rpx;
+						height: 94rpx;
+						background: rgba(31, 124, 255, 0.1);
+						border-radius: 8rpx;
+					}
+
+					/deep/.uni-data-checklist .checklist-group {
+						height: 94rpx;
+					}
+				}
+
+				.process-zhuti-yi-upload {
+					width: 100%;
+					height: 404rpx;
+					background: rgba(31, 124, 255, 0.1);
+					border-radius: 8rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					image {
+						width: 500rpx;
+						height: 340rpx;
+					}
+				}
+			}
+		}
+
+		.activite-code-mask {
+			width: 100%;
+			height: 100%;
+			background: transparent;
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+
+		.process-zhuti-btn {
+			width: 686rpx;
+			height: 98rpx;
+			background: rgba(31, 124, 255, 0.4);
+			margin: 50rpx 0 94rpx;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 98rpx;
+			border-radius: 8rpx;
+		}
+
+		// 选择开户行
+		.back-combox {
+			position: relative;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			width: 100%;
+			height: 94rpx;
+			// background: rgba(31, 124, 255, 0.1);
+			border-radius: 8rpx;
+			box-sizing: border-box;
+		}
+
+		.back-combox__input-box {
+			position: relative;
+			display: flex;
+			flex: 1;
+			flex-direction: row;
+			align-items: center;
+		}
+
+		.back-combox__input {
+			flex: 1;
+			font-size: 30rpx;
+			height: 94rpx;
+			line-height: 94rpx;
+		}
+
+		.back-combox__selector {
+			box-sizing: border-box;
+			position: absolute;
+			top: calc(100% + 24rpx);
+			left: 0;
+			width: 100%;
+			background-color: #FFFFFF;
+			border: 1px solid #EBEEF5;
+			border-radius: 12rpx;
+			box-shadow: 0 4rpx 24rpx 0 rgba(0, 0, 0, 0.1);
+			z-index: 1000;
+			padding: 8rpx 0;
+		}
+
+		.back-combox__selector-scroll {
+			max-height: 400rpx;
+			box-sizing: border-box;
+		}
+
+		.back-combox__selector-empty,
+		.back-combox__selector-item {
+			display: flex;
+			cursor: pointer;
+			line-height: 72rpx;
+			font-size: 28rpx;
+			text-align: center;
+			padding: 0px 20rpx;
+		}
+
+		.back-combox__selector-item:hover {
+			background-color: #f9f9f9;
+		}
+
+		.back-combox__selector-empty:last-child,
+		.back-combox__selector-item:last-child {
+			border-bottom: none;
+		}
+
+		// picker 弹出层通用的指示小三角
+		.back-popper__arrow,
+		.back-popper__arrow::after {
+			position: absolute;
+			display: block;
+			width: 0;
+			height: 0;
+			border-color: transparent;
+			border-style: solid;
+			border-width: 12rpx;
+		}
+
+		.back-popper__arrow {
+			filter: drop-shadow(0 4rpx 24rpx rgba(0, 0, 0, 0.03));
+			top: -12rpx;
+			left: 10%;
+			margin-right: 6rpx;
+			border-top-width: 0;
+			border-bottom-color: #EBEEF5;
+		}
+
+		.back-popper__arrow::after {
+			content: " ";
+			top: 2rpx;
+			margin-left: -12rpx;
+			border-top-width: 0;
+			border-bottom-color: #fff;
+		}
+
+		.back-combox__no-border {
+			border: none;
+		}
+
+		.type-mask {
+			width: 100%;
+			height: 100vh;
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+
+		.btn-bir {
+			background: #1F7CFF;
+		}
+	}
+</style>

openmerchant/shopentry/processaudit.vue

@@ -0,0 +1,244 @@
+<template>
+	<view class="process">
+		<view class="process-header">
+			<view class="process-header-text">
+				<view class="process-header-text-icon" @click="topgi">
+					<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+					</image>
+				</view>
+				<view class="process-header-text-title">
+					店铺入驻
+				</view>
+			</view>
+		</view>
+		<view class="process-zhuti">
+			<!-- 提交资料 -->
+			<view class="process-audit" v-if="submitCode == 1">
+				<image class="process-auditimg" src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822183048362.png"
+					mode=""></image>
+				<view class="process-audittitle">恭喜，您的资料提交成功！</view>
+				<view class="process-auditintroduce">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
+			</view>
+			<!-- 审核中 -->
+			<view class="process-audit" v-else-if="submitCode == 3">
+				<image class="process-auditimg" src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822182939278.png"
+					mode=""></image>
+				<view class="process-audittitle">店铺审核中！</view>
+				<view class="process-auditintroduce">提交日期：{{selectmerchant.merchantIntention.create_time}}，5个工作日内审核完毕！
+				</view>
+			</view>
+			<!-- 审核失败 -->
+			<view class="process-audit" v-else>
+				<image class="process-auditimg" src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822183146760.png"
+					mode=""></image>
+				<view class="process-audittitle">审核失败</view>
+				<view class="process-auditintroduce">原因：{{selectmerchant.merchantIntention.check_result}}</view>
+				<view class="process-audit-update" @click="amendMerchants">点击修改信息</view>
+			</view>
+			<view class="process-audit-service">
+				<view class="process-audit-serviceimg">
+					<image src="https://cdn.bjtdba.com/vod/image/2022-09-02/20220902132546705.png" mode="widthFix">
+					</image>
+				</view>
+				<view class="process-audit-servicetext">专属客服微信</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		selectMerchant
+	} from '@/commit/api.js'
+	export default {
+		data() {
+			return {
+				value: 0,
+				submitCode: 1,
+				selectmerchant: [],
+				authorization: ""
+			}
+		},
+		onLoad(opsition) {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			});
+			this.submitCode = opsition.submitCode;
+			this.selectmerchant = uni.getStorageSync('selectmerchant')
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 700);
+		},
+		onShow() {
+			let userinfo = uni.getStorageSync('userinfo')
+			this.authorization = uni.getStorageSync('authorization')
+			this.panduanshuhju(userinfo.uid)
+		},
+
+		methods: {
+			panduanshuhju(e) {
+				selectMerchant({
+					uid: e
+				}).then(data => {
+					if (data.data.status == 200) {
+						let selectmerchant = data.data.data
+						uni.setStorageSync('selectmerchant', selectmerchant)
+						if (this.authorization && e) {
+							if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+								uni.redirectTo({
+									url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+								});
+								return
+							} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+								uni.switchTab({
+									url: '/pages/cashier/index' //已开通商户
+								});
+								return
+							} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+								uni.redirectTo({
+									url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant
+										.merId //已开通商户未填写资料
+								});
+								return
+							}
+						} else {
+							uni.redirectTo({
+								url: "/pages/user/login/index"
+							});
+						}
+					}
+				}, fail => {
+					uni.showToast({
+						title: fail,
+						icon: "none"
+					})
+				}).catch(err => {
+					console.log(err)
+				})
+			},
+			topgi() {
+				uni.showToast({
+					title: "请耐心等待...",
+					icon: "none"
+				});
+			},
+			amendMerchants() {
+				this.$store.commit('changeMerchantsStatus', 1);
+				uni.navigateTo({
+					url: './process?mer_id=' + this.selectmerchant.merId + '&is=' + 1
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.process {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.process-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.process-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.process-header-text-icon {
+					width: 36rpx;
+					height: 36rpx;
+					margin-right: 26rpx;
+					line-height: 36rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.process-zhuti {
+			width: 100%;
+			height: 100%;
+			position: fixed;
+			top: 0;
+			left: 0;
+			margin-top: 202rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 0 40rpx;
+			padding-bottom: 40rpx;
+			background: #FFFFFF;
+			text-align: center;
+
+			.process-audit {
+				padding: 0 97rpx 0 98rpx;
+
+				.process-auditimg {
+					margin: 101rpx 0 20rpx 0;
+					width: 199rpx;
+					height: 226rpx;
+				}
+
+				.process-audittitle {
+					font-size: 38rpx;
+				}
+
+				.process-auditintroduce {
+					font-size: 28rpx;
+					color: #B6B6B6;
+					margin-top: 70rpx;
+				}
+
+				.process-audit-update {
+					width: 330rpx;
+					height: 98rpx;
+					line-height: 98rpx;
+					color: #FFFFFF;
+					background: #1F7CFF;
+					margin: auto;
+					margin-top: 108rpx;
+				}
+			}
+
+			.process-audit-service {
+				.process-audit-serviceimg {
+					width: 210rpx;
+					height: 210rpx;
+					margin: 50rpx 0 20rpx 0;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+	}
+</style>

openmerchant/shopentry/processidentity.vue

@@ -0,0 +1,591 @@
+<template>
+	<view class="process">
+		<view class="process-header">
+			<view class="process-header-text">
+				<view class="process-header-text-neishi" @click="topgi">
+					<view class="process-header-text-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+				<view class="process-header-text-title">
+					店铺入驻
+				</view>
+			</view>
+		</view>
+		<view class="process-zhuti">
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					请上传身份证人像面：
+				</view>
+				<view class="process-zhuti-yi-upload" @click="cardPositivePerson">
+					<image v-if="merchantspersonal.card_positive_person" :src="merchantspersonal.card_positive_person"
+						mode=""></image>
+					<image v-else src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822174457868.png" mode="">
+					</image>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					请上传身份证国徽面：
+				</view>
+				<view class="process-zhuti-yi-upload" @click="cardBackPerson">
+					<image v-if="merchantspersonal.card_back_person" :src="merchantspersonal.card_back_person" mode="">
+					</image>
+					<image v-else src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822174524262.png" mode="">
+					</image>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					身份证号
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写身份证号" v-model="merchantspersonal.idcard_no">
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					身份证有效期限
+				</view>
+				<view class="process-zhuti-yi-input" style="display: flex;">
+					<uni-datetime-picker type="date" :clear-icon="false" v-model="merchantspersonal.identification_valid_date_start" @maskClick="maskClick">
+						<input placeholder="有效期限开始" v-model="merchantspersonal.identification_valid_date_start" disabled>
+					</uni-datetime-picker>
+					<view class="" style="width: 100rpx;height: 100%;background-color: rgba(31, 124, 255, 0.1); display: flex;justify-content: center;align-items: center; color: #B6B6B6;">
+							——
+					</view>
+					<!-- :disabled="merchantspersonal.identification_valid_date_end == '长期' ? true : false" -->
+					<uni-datetime-picker type="date" :clear-icon="false" v-model="merchantspersonal.identification_valid_date_end" @maskClick="maskClick">
+						<input placeholder="有效期限结束" v-model="merchantspersonal.identification_valid_date_end" disabled>
+					</uni-datetime-picker>
+					<checkbox-group style="line-height: 94rpx;background: rgba(31, 124, 255, 0.1);padding: 0 20rpx;" @change="checkboxChange">
+						<label>
+							<checkbox value="2099-12-31" />长期
+						</label>
+					</checkbox-group>
+					<!-- <uni-datetime-picker v-model="range" type="date"  @change="changeLog" style="display: flex;">
+						<input placeholder="请填写身份证有效期限" v-model="merchantspersonal.identification_valid_date_start" disabled>
+					</uni-datetime-picker>
+					<uni-datetime-picker v-model="range" type="date"  @change="changeLog" style="display: flex;">
+						<input placeholder="请填写身份证有效期限" v-model="merchantspersonal.identification_valid_date_end" disabled>
+					</uni-datetime-picker> -->
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					联系人姓名
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写联系人姓名" v-model="merchantspersonal.name">
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					联系人手机号
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写联系人手机号" maxlength="11" v-model="merchantspersonal.phone" @input="inputPhone">
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					联系人邮箱
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写联系人邮箱" v-model="merchantspersonal.email">
+				</view>
+			</view>
+		</view>
+		<view class="process-zhuti-fot">
+			<view class="process-zhuti-fottext">
+				<view class="fottext-img" @click="agreement = !agreement">
+					<image v-if="agreement" src="https://cdn.bjtdba.com/vod/image/2022-08-23/20220823132347513.png"
+						mode=""></image>
+					<image v-else src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822155008662.png" mode="">
+					</image>
+				</view>
+				<view class="fottext-nav">
+					点击表示同意<span style="color: #1f7cff" @click="xieyi()">《商家入驻协议》</span>
+				</view>
+			</view>
+			<view class="process-zhuti-btnbox">
+				<view class="process-zhuti-btn backbtn" @click="backStep">
+					上一步
+				</view>
+				<view :class="[btnBir ? 'btn-bir' : '', 'process-zhuti-btn' ]" @click="btnBir ? goIdentity() : ''">
+					立即申请
+				</view>
+			</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		merchaSettlen,
+		updateMerchaSettlen
+	} from '@/commit/api.js';
+	import {
+		mapGetters
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				merchantspersonal: {
+					card_positive_person: '', // 身份证正面
+					card_back_person: '', // 身份证反面
+					idcard_no: '', // 身份证号
+					identification_valid_date_start: '', // 身份证开始时间
+					identification_valid_date_end: '', // 身份证结束时间
+					name: '', //姓名
+					phone: '', // 手机号
+					email: '', // 邮箱
+					uid: ''
+				},
+				longtime:'',
+				value: 0,
+				range: [],
+				agreement: false,
+				merchantData: {},
+				btnBir: false,
+				nextMerchantsData: {}
+			}
+		},
+		computed: {
+			...mapGetters(['merchantsDataAlls'])
+		},
+		onLoad(opsition) {
+			this.identification_valid_date_end
+			console.log(this.merchantspersonal.identification_valid_date_end,"989898")
+			let userinfo = uni.getStorageSync('userinfo')
+			this.merchantspersonal.uid = userinfo.uid
+			const merchantsDataAll = this.merchantsDataAlls.merchantsDataAll;
+			if (JSON.stringify(merchantsDataAll) != "{}") {
+				this.range = [merchantsDataAll.identification_valid_date_start, merchantsDataAll
+					.identification_valid_date_end
+				];
+				this.merchantspersonal.card_positive_person = merchantsDataAll.card_positive_person; // 身份证正面
+				this.merchantspersonal.card_back_person = merchantsDataAll.card_back_person; // 身份证反面
+				this.merchantspersonal.idcard_no = merchantsDataAll.idcard_no; // 身份证号
+				this.merchantspersonal.identification_valid_date_start = merchantsDataAll.identification_valid_date_start; // 身份证开始时间
+				this.merchantspersonal.identification_valid_date_end = merchantsDataAll.identification_valid_date_end; // 身份证结束时间
+				this.merchantspersonal.name = merchantsDataAll.name; // 姓名
+				this.merchantspersonal.phone = merchantsDataAll.phone; // 手机号
+				this.merchantspersonal.email = merchantsDataAll.email; // 邮箱
+			}
+		},
+		watch: {
+			merchantspersonal: {
+				handler: function(val) {
+					this.isShow(val)
+				},
+				deep: true
+			},
+			agreement: {
+				handler: function(val) {
+					this.isShow()
+				}
+			}
+		},
+		methods: {
+			maskClick(e){
+				console.log('maskClick事件:', e);
+			},
+			checkboxChange: function (e) {
+				if(e.detail.value){
+					this.longtime = e.detail.value[0];
+				}else{
+					this.longtime = "";
+				}
+			},
+			topgi() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			//商户协议
+			xieyi() {
+				uni.setStorageSync('agreementType','6')
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=6" 
+				})
+			},
+			isShow(list) {
+				let temp = true
+				if (list) {
+
+					for (let i in list) {
+						if (list[i] == "" || list[i] == null) {
+							temp = false
+						}
+					}
+				}
+
+				if (!this.agreement) {
+					temp = false
+				}
+				this.btnBir = temp
+			},
+			// 身份证正面
+			cardPositivePerson() {
+				let that = this;
+				that.$time.uploadPictures(res => {
+					that.merchantspersonal.card_positive_person = res;
+				});
+			},
+			// 身份证反面
+			cardBackPerson() {
+				let that = this;
+				that.$time.uploadPictures(res => {
+					that.merchantspersonal.card_back_person = res;
+				});
+			},
+			// 身份证有效期
+			changeLog(e) {
+				// this.merchantspersonal.identification_valid_date_start = e[0];
+				// this.merchantspersonal.identification_valid_date_end = e[1];
+			},
+			// 手机号
+			inputPhone(e) {
+				this.$nextTick(function() {
+					this.merchantspersonal.phone = e.target.value.replace(/[^\d]/g, '');
+				})
+			},
+			backStep() {
+				uni.navigateBack({
+					delta: 1
+				});
+			},
+			goIdentity() {
+				let that = this;
+				if (that.merchantspersonal.card_positive_person == "") return uni.showToast({
+					title: "请上传身份证人像面",
+					icon: "none"
+				});
+				if (that.merchantspersonal.card_back_person == "") return uni.showToast({
+					title: "请上传身份证国徽面",
+					icon: "none"
+				});
+				if (that.merchantspersonal.idcard_no == "") return uni.showToast({
+					title: "请填写身份证号",
+					icon: "none"
+				});
+				if (!/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{5}\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{2}$)/
+					.test(that.merchantspersonal.idcard_no)) {
+					uni.showToast({
+						title: "请填写有效身份证号",
+						icon: "none"
+					});
+					 return
+				}
+				if (that.merchantspersonal.identification_valid_date_start == "" && (that.merchantspersonal
+					.identification_valid_date_end == "" || this.longtime == "")) return uni.showToast({
+					title: "请选择身份证有效期限",
+					icon: "none"
+				});
+				if (that.merchantspersonal.name == "") return uni.showToast({
+					title: "请填写联系人姓名",
+					icon: "none"
+				});
+				if (that.merchantspersonal.phone == "")
+					return uni.showToast({
+						title: "请填写联系人手机号",
+						icon: "none"
+					});
+				if (!/^1[3456789]\d{9}$/.test(that.merchantspersonal.phone)) {
+					uni.showToast({
+						title: "请填写有效联系人手机号",
+						icon: "none"
+					});
+					return
+				}
+				if (that.merchantspersonal.email == "") {
+					uni.showToast({
+						title: "请填写联系人邮箱",
+						icon: "none"
+					});
+					return
+				}
+				if (!/^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/.test(
+						that.merchantspersonal.email)) {
+					uni.showToast({
+						title: "请填写有效联系人邮箱",
+						icon: "none"
+					});
+					return
+				}
+				if (!that.agreement) return uni.showToast({
+					title: "请阅读并勾选同意《商家入驻协议》",
+					icon: "none"
+				});
+				if(that.longtime){
+					that.merchantspersonal.identification_valid_date_end = that.longtime;
+				}
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				});
+				uni.getStorage({
+					key: 'merchants_in',
+					success: function(res) {
+						that.merchantData = Object.assign(that.merchantData, res.data)
+
+						uni.getStorage({
+							key: 'merchants_in_store',
+							success: function(res) {
+								that.merchantData = Object.assign(that.merchantData, res.data, that
+									.merchantspersonal)
+								let selectmerchant = uni.getStorageSync('selectmerchant')
+								let merchantsStatus = that.merchantsDataAlls.merchantsStatus;
+								if (merchantsStatus == 1) {
+									//修改信息
+									that.merchantData = Object.assign(that.merchantData, {
+										mer_id: selectmerchant.merId
+									})
+									updateMerchaSettlen(that.merchantData).then(res => {
+										if (res.data.status == 200) {
+											console.log('成功', res);
+											uni.removeStorage({
+												key: 'merchants_in'
+											});
+											uni.removeStorage({
+												key: 'merchants_in_store'
+											});
+											uni.redirectTo({
+												url: './processaudit?submitCode=1'
+											});
+											uni.hideLoading();
+										}
+									}, fail => {
+										console.log('fail', fail)
+										uni.hideLoading();
+									})
+								} else {
+									if (selectmerchant.pay_type == 2) {
+										//修改信息
+										that.merchantData = Object.assign(that.merchantData, {
+											mer_id: selectmerchant.merId
+										})
+										updateMerchaSettlen(that.merchantData).then(res => {
+											if (res.data.status == 200) {
+												console.log('成功', res);
+												uni.removeStorage({
+													key: 'merchants_in'
+												});
+												uni.removeStorage({
+													key: 'merchants_in_store'
+												});
+												uni.redirectTo({
+													url: './processaudit?submitCode=1'
+												});
+												uni.hideLoading();
+											}
+										}, fail => {
+											console.log('fail', fail)
+											uni.hideLoading();
+										})
+									} else {
+										// 新增信息
+										merchaSettlen(that.merchantData).then(res => {
+											console.log('res', res)
+											if (res.data.status == 200) {
+												console.log('成功', res);
+												uni.removeStorage({
+													key: 'merchants_in'
+												});
+												uni.removeStorage({
+													key: 'merchants_in_store'
+												});
+												uni.redirectTo({
+													url: './processaudit?submitCode=1'
+												});
+												uni.hideLoading();
+											}
+										}, fail => {
+											console.log('fail', fail)
+											uni.hideLoading();
+										})
+									}
+								}
+							}
+						});
+
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.process {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.process-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.process-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.process-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.process-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.process-zhuti {
+			width: 100%;
+			height: auto;
+			margin-top: 202rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 0 40rpx;
+			padding-bottom: 40rpx;
+			background: #FFFFFF;
+
+			.process-zhuti-yi {
+				width: 686rpx;
+				// height: 150rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: flex-start;
+				margin-top: 32rpx;
+
+				.process-zhuti-yi-text {
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #333333;
+					margin-bottom: 26rpx;
+				}
+
+				.process-zhuti-yi-input {
+					width: 100%;
+					height: 94rpx;
+					// background: #1F7CFF;
+					// 31 124 255 10
+					border-radius: 8rpx;
+					// opacity: 0.1;
+
+					input {
+						width: 100%;
+						height: 94rpx;
+						background: rgba(31, 124, 255, 0.1);
+						border-radius: 8rpx;
+						box-sizing: border-box;
+						padding-left: 32rpx;
+					}
+				}
+
+				.process-zhuti-yi-upload {
+					width: 100%;
+					// height: 404rpx;
+					// background: rgba(31, 124, 255, 0.1);
+					border-radius: 8rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+
+					image {
+						width: 520rpx;
+						height: 279rpx;
+						border: 1rpx dashed #aaa;
+					}
+				}
+			}
+		}
+
+		.process-zhuti-fot {
+			margin: 50rpx 0 94rpx;
+		}
+
+		.process-zhuti-fottext {
+			font-size: 24rpx;
+			margin-bottom: 20rpx;
+
+			.fottext-img {
+				display: inline-block;
+				vertical-align: middle;
+
+				image {
+					width: 28rpx;
+					height: 28rpx;
+					margin-right: 15rpx;
+				}
+			}
+
+			.fottext-nav {
+				display: inline-block;
+			}
+		}
+
+		.process-zhuti-btnbox {
+			color: #FFFFFF;
+			display: flex;
+			justify-content: space-between;
+		}
+
+		.process-zhuti-btn {
+			width: 330rpx;
+			height: 98rpx;
+			background: rgba(31, 124, 255, 0.4);
+			text-align: center;
+			line-height: 98rpx;
+			border-radius: 8rpx;
+		}
+
+		.backbtn {
+			margin-right: 26rpx;
+			background: #1F7CFF;
+		}
+
+		.btn-bir {
+			background: #1F7CFF;
+		}
+	}
+	/deep/.uni-date{
+		width: 50%;
+		display: inline-block;
+	}
+</style>

openmerchant/shopentry/processstore.vue

@@ -0,0 +1,733 @@
+<template>
+	<view class="process">
+		<view class="process-header">
+			<view class="process-header-text">
+				<view class="process-header-text-neishi" @click="topgi">
+					<view class="process-header-text-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+				<view class="process-header-text-title">
+					店铺入驻
+				</view>
+			</view>
+		</view>
+		<view class="process-zhuti">
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					店铺LOGO
+				</view>
+				<view class="process-zhuti-yi-upload" @click="storeLogo">
+					<image v-if="merchantsInStore.logo" :src="merchantsInStore.logo" mode=""></image>
+					<image v-else src="https://cdn.bjtdba.com/vod/image/2022-08-22/20220822172529458.png" mode=""></image>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					门店简称
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写门店简称" v-model="merchantsInStore.mer_short_name">
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					门店简介
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写门店简介" v-model="merchantsInStore.mark">
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					门店分类
+				</view>
+				<view class="process-zhuti-yi-input">
+					<picker class="process-zhuti-yi-picker" @change="changeStoretype" :value="storeTypeindex" :range="storeTypeData" :range-key="'category_name'">
+						<view v-if="storeTypeindex === null" class="uni-input int-col">请选择门店分类</view>
+						<view v-else class="uni-input">{{storeTypeData[storeTypeindex].category_name}}</view>
+					</picker>
+					<!-- <view class="back-combox">
+						<view class="back-combox__input-box">
+							<input class="back-combox__input" placeholder="请选择门店分类" disabled v-model="storeType.category_name" @click="showSelector = true" />
+						</view>
+						<view class="back-combox__selector" v-if="showSelector">
+							<view class="back-popper__arrow"></view>
+							<scroll-view scroll-y="true" class="back-combox__selector-scroll">
+								<view class="back-combox__selector-item" v-for="(item,index) in storeTypeData" :key="index" @click="onSelectorClick(item)">
+									<text>{{item.category_name}}</text>
+								</view>
+							</scroll-view>
+						</view>
+					</view> -->
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					选择省份
+				</view>
+				<view class="process-zhuti-yi-input">
+					<picker class="process-zhuti-yi-picker" @change="changeProvince" :value="provinceListindex" :range="provinceList" :range-key="'name'">
+						<view v-if="provinceListindex === null" class="uni-input int-col">请选择省份</view>
+						<view v-else class="uni-input">{{provinceList[provinceListindex].name}}</view>
+					</picker>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					选择城市
+				</view>
+				<view class="process-zhuti-yi-input">
+					<picker class="process-zhuti-yi-picker" @change="changeCity" :value="cityListindex" :range="cityList" :range-key="'name'">
+						<view v-if="cityListindex === null" class="uni-input int-col">请选择城市</view>
+						<view v-else class="uni-input">{{cityList[cityListindex].name}}</view>
+					</picker>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					选择区
+				</view>
+				<view class="process-zhuti-yi-input">
+					<picker class="process-zhuti-yi-picker" @change="changeArea" :value="areaListindex" :range="areaList" :range-key="'name'">
+						<view v-if="areaListindex === null" class="uni-input int-col">请选择区</view>
+						<view v-else class="uni-input">{{areaList[areaListindex].name}}</view>
+					</picker>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					选择街道
+				</view>
+				<view class="process-zhuti-yi-input">
+					<picker class="process-zhuti-yi-picker" @change="changeStreet" :value="streetListindex" :range="streetList" :range-key="'name'">
+						<view v-if="streetListindex === null" class="uni-input int-col">请选择街道</view>
+						<view v-else class="uni-input">{{streetList[streetListindex].name}}</view>
+					</picker>
+				</view>
+			</view>
+			<view class="process-zhuti-yi">
+				<view class="process-zhuti-yi-text">
+					详细地址
+				</view>
+				<view class="process-zhuti-yi-input">
+					<input placeholder="请填写详细地址" v-model="merchantsInStore.addr">
+				</view>
+			</view>
+		</view>
+		<view class="process-zhuti-btnbox">
+			<view class="process-zhuti-btn backbtn" @click="backStep()">
+				上一步
+			</view>
+			<view :class="[btnBir ? 'btn-bir' : '', 'process-zhuti-btn' ]" @click=" btnBir ? nextStep() : '' ">
+				下一步
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import { addressList, selectMerchantSort } from '@/commit/api.js';
+	import { mapGetters } from 'vuex'
+	export default {
+		data() {
+			return {
+				merchantsInStore: {
+					logo: '', // 店铺logoURL
+					mer_short_name: '', // 门店简称
+					mark: '', // 门店简介
+					cate_id: '', // 门店分类
+					province_id: 0, // 省ID
+					city_id: 0, // 市ID
+					area_id: 0, // 区ID
+					street_id: 0, // 街道ID
+					addr: '', // 详细地址
+				},
+				showSelector: false,
+				storeTypeData: [],
+				storeTypeindex: null,
+				storeType: {},
+				value: 0,
+				addressData: [], //城市区列表
+				provinceList:[{name:'暂无数据'}],
+				provinceListindex: null,
+				cityList:[{name:'暂无数据'}],
+				cityListindex: null,
+				areaList:[{name:'暂无数据'}],
+				areaListindex: null,
+				streetList:[{name:'暂无数据'}],
+				streetListindex: null,
+				btnBir: false,
+				nextMerchantsData: {},
+				merchantsPass: false
+			}
+		},
+		onLoad(opsition) {
+			const fanxian = uni.getStorageSync('merchants_in_store');
+			const merchantsDataAll = this.merchantsDataAlls.merchantsDataAll;
+			
+			if(JSON.stringify(merchantsDataAll)!="{}"){
+				// 获取门店分类反显
+				selectMerchantSort().then(res => {
+					if(res.data.status==200){
+						this.storeTypeData = res.data.data.merchantCategory;
+						this.storeTypeData.filter((item,index) => {
+							if(item.merchant_category_id == merchantsDataAll.cate_id){
+								return this.storeTypeindex = index
+							}
+						})
+					}
+				}, fail => {
+					console.log(fail)
+				})
+				
+				// 获取省市区街道反显
+				addressList({id:1}).then(res => {
+					if(res.data.status==200){
+						this.provinceList = res.data.data.addressList;
+						this.provinceListindex = Number(merchantsDataAll.provinceMap.index);
+						
+						addressList({id:2, code: merchantsDataAll.province_id}).then(res => {
+							if(res.data.status==200){
+								this.cityList = res.data.data.addressList;
+								this.cityListindex = Number(merchantsDataAll.cityMap.index);
+								
+								addressList({id:3, code: merchantsDataAll.city_id}).then(res => {
+									if(res.data.status==200){
+										this.areaList = res.data.data.addressList;
+										this.areaListindex = Number(merchantsDataAll.areaMap.index);
+										
+										addressList({id:4, code: merchantsDataAll.area_id}).then(res => {
+											if(res.data.status==200){
+												this.streetList = res.data.data.addressList;
+												this.streetListindex = Number(merchantsDataAll.streetMap.index);
+											}
+										}, fail => {
+											console.log(fail)
+										})
+									}
+								}, fail => {
+									console.log(fail)
+								})
+							}
+						}, fail => {
+							console.log(fail)
+						})
+					}
+				}, fail => {
+					console.log(fail)
+				})
+				// this.merchantsInStore = this.nextMerchantsData;
+				
+				this.merchantsInStore.logo = merchantsDataAll.logo; // 店铺logoURL
+				this.merchantsInStore.mer_short_name = merchantsDataAll.mer_short_name;// 门店简称
+				this.merchantsInStore.mark = merchantsDataAll.mark; // 门店简介
+				this.merchantsInStore.cate_id = merchantsDataAll.cate_id; // 门店分类
+				this.merchantsInStore.province_id = merchantsDataAll.province_id; // 省ID
+				this.merchantsInStore.city_id = merchantsDataAll.city_id; // 市ID
+				this.merchantsInStore.area_id = merchantsDataAll.area_id; // 区ID
+				this.merchantsInStore.street_id = merchantsDataAll.street_id; // 街道ID
+				this.merchantsInStore.addr = merchantsDataAll.addr; // 详细地址
+				// this.merchantsPass = true;
+				
+			}else if(fanxian){
+				// 获取门店分类反显
+				selectMerchantSort().then(res => {
+					if(res.data.status==200){
+						this.storeTypeData = res.data.data.merchantCategory;
+						this.storeTypeData.filter((item,index) => {
+							if(item.merchant_category_id == fanxian.cate_id){
+								return this.storeTypeindex = index
+							}
+						})
+					}
+				}, fail => {
+					console.log(fail)
+				})
+				
+				// 获取省市区街道反显
+				addressList({id:1}).then(res => {
+					if(res.data.status==200){
+						this.provinceList = res.data.data.addressList;
+						this.provinceList.filter((item,index) => {
+							if(item.code == fanxian.province_id){
+								return this.provinceListindex = index
+							}
+						})
+						
+						addressList({id:2, code: fanxian.province_id}).then(res => {
+							if(res.data.status==200){
+								this.cityList = res.data.data.addressList;
+								this.cityList.filter((item,index) => {
+									if(item.code == fanxian.city_id){
+										return this.cityListindex = index
+									}
+								})
+								
+								addressList({id:3, code: fanxian.city_id}).then(res => {
+									if(res.data.status==200){
+										this.areaList = res.data.data.addressList;
+										this.areaList.filter((item,index) => {
+											if(item.code == fanxian.area_id){
+												return this.areaListindex = index
+											}
+										})
+										
+										addressList({id:4, code: fanxian.area_id}).then(res => {
+											if(res.data.status==200){
+												this.streetList = res.data.data.addressList;
+												this.streetList.filter((item,index) => {
+													if(item.code == fanxian.street_id){
+														return this.streetListindex = index
+													}
+												})
+											}
+										}, fail => {
+											console.log(fail)
+										})
+									}
+								}, fail => {
+									console.log(fail)
+								})
+							}
+						}, fail => {
+							console.log(fail)
+						})
+					}
+				}, fail => {
+					console.log(fail)
+				})
+				
+				this.merchantsInStore = fanxian;
+			}else{
+				// 获取门店分类
+				selectMerchantSort().then(res => {
+					if(res.data.status==200){
+						this.storeTypeData = res.data.data.merchantCategory;
+					}
+				}, fail => {
+					console.log(fail)
+				})
+				
+				// 获取省
+				addressList({id:1}).then(res => {
+					if(res.data.status==200){
+						this.provinceList = res.data.data.addressList;
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			}
+		},
+		onShow(){
+		},
+		computed:{
+			...mapGetters(['merchantsDataAlls'])
+		},
+		watch: {
+			merchantsInStore:{
+				handler: function(val) {
+					this.isShow(val)
+				},
+				deep: true
+			}
+		},
+		methods: {
+			topgi(){
+				uni.navigateBack({
+					delta:1
+				});
+			},
+			isShow(list) {
+				let temp = true
+				if(list){
+					for(let i in list){
+						if(list[i] == "" || list[i] == null){
+							temp = false
+						}
+					}
+				}
+				this.btnBir = temp
+			},
+			// 店铺logoURL
+			storeLogo(){
+				let that = this;
+				that.$time.uploadPictures(res => {
+					that.merchantsInStore.logo = res;
+				});
+			},
+			// 选择门店分类
+			// onSelectorClick(data) {
+			// 	this.showSelector = false;
+			// 	this.storeType = data;
+			// 	this.merchantsInStore.cate_id = data.merchant_category_id;
+			// },
+			changeStoretype(e){
+				this.storeTypeindex = e.detail.value;
+				this.merchantsInStore.cate_id = this.storeTypeData[this.storeTypeindex].merchant_category_id;
+			},
+			//选择省份
+			changeProvince(e) {
+				if(this.provinceList[0].name == '暂无数据'){
+					return false
+				}
+				this.provinceListindex = e.detail.value;
+				this.merchantsInStore.province_id = this.provinceList[this.provinceListindex].code;
+				addressList({id:2 , code:this.merchantsInStore.province_id}).then(res => {
+					if(res.data.status==200){
+						this.cityList = res.data.data.addressList;
+						
+						this.cityListindex = null;
+						this.areaList = [{name:'暂无数据'}];
+						this.areaListindex = null;
+						this.streetList = [{name:'暂无数据'}];
+						this.streetListindex = null;
+					}
+				}, fail => {
+					console.log(fail)
+				})
+				
+			},
+			// 选择城市
+			changeCity(e){
+				if(this.cityList[0].name == '暂无数据'){
+					return false
+				}
+				this.cityListindex = e.detail.value;
+				this.merchantsInStore.city_id = this.cityList[this.cityListindex].code;
+				addressList({id:3 , code:this.merchantsInStore.city_id}).then(res => {
+					if(res.data.status==200){
+						this.areaList = res.data.data.addressList;
+						
+						this.areaListindex = null;
+						this.streetList = [{name:'暂无数据'}];
+						this.streetListindex = null;
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			// 选择区
+			changeArea(e){
+				if(this.areaList[0].name == '暂无数据'){
+					return false
+				}
+				this.areaListindex = Number(e.detail.value);
+				this.merchantsInStore.area_id = this.areaList[this.areaListindex].code;
+				addressList({id:4 , code:this.merchantsInStore.area_id}).then(res => {
+					if(res.data.status==200){
+						this.streetList = res.data.data.addressList;
+						
+						this.streetListindex = null;
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			// 选择街道
+			changeStreet(e){
+				if(this.streetList[0].name == '暂无数据'){
+					return false
+				}
+				this.streetListindex = Number(e.detail.value);
+				this.merchantsInStore.street_id = this.streetList[this.streetListindex].code;
+			},
+			// 上一步
+			backStep(){
+				// uni.request({
+				// 	url: 'https://kfcs.bjtdba.com/sys/captcha',
+				// 	method: 'POST',
+				// 	header:{
+						
+				// 	},
+				// 	data: {
+						
+				// 	},
+				// 	success: (res) => {
+							
+				// 	}
+				// });
+				// return
+				uni.navigateBack({
+					delta:1
+				});
+			},
+			// 下一步
+			nextStep(){
+				if(this.merchantsInStore.logo == "" )return uni.showToast({ title: "请上传店铺LOGO", icon: "none" });
+				if(this.merchantsInStore.mer_short_name == "" ) return uni.showToast({ title: "请填写门店简称", icon: "none" });
+				if(this.merchantsInStore.mark == "" ) return uni.showToast({ title: "请填写门店简介", icon: "none" });
+				if(this.merchantsInStore.cate_id == "" ) return uni.showToast({ title: "请选择门店分类", icon: "none" });
+				if(this.merchantsInStore.province_id == 0 ) return uni.showToast({ title: "请选择省份", icon: "none" });
+				if(this.merchantsInStore.city_id == 0 ) return uni.showToast({ title: "请选择城市", icon: "none" });
+				if(this.merchantsInStore.area_id == 0 ) return uni.showToast({ title: "请选择街道", icon: "none" });
+				if(this.merchantsInStore.addr == "" ) return uni.showToast({ title: "请填写详细地址", icon: "none" });
+				
+				uni.setStorage({
+					key: 'merchants_in_store',
+					data: this.merchantsInStore
+				});
+				
+				// if(this.merchantsPass){
+				// 	this.merchantsInStore = Object.assign(this.merchantsInStore, this.nextMerchantsData)
+				// 	uni.navigateTo({
+				// 		url: `./processidentity?positionResult=${JSON.stringify(this.merchantsInStore)}`
+				// 	});
+				// }else{
+					uni.navigateTo({
+						url: './processidentity'
+					});
+				// }
+				
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.process {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.process-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.process-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.process-header-text-neishi{
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+					.process-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+					
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.process-zhuti {
+			width: 100%;
+			height: auto;
+			margin-top: 202rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// padding: 32rpx 0 40rpx;
+			padding-bottom: 40rpx;
+			background: #FFFFFF;
+
+			.process-zhuti-yi {
+				width: 686rpx;
+				// height: 150rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: flex-start;
+				margin-top: 32rpx;
+
+				.process-zhuti-yi-text {
+					font-size: 30rpx;
+					font-weight: 500;
+					color: #333333;
+					margin-bottom: 26rpx;
+				}
+
+				.process-zhuti-yi-input {
+					width: 100%;
+					height: 94rpx;
+					// background: #1F7CFF;
+					// 31 124 255 10
+					border-radius: 8rpx;
+					// opacity: 0.1;
+					
+					input{
+						width: 100%;
+						height: 94rpx;
+						background: rgba(31, 124, 255, 0.1);
+						border-radius: 8rpx;
+						box-sizing: border-box;
+						padding-left: 32rpx;
+					}
+				}
+				
+				.process-zhuti-yi-upload{
+					width: 100%;
+					height: 404rpx;
+					background: rgba(31, 124, 255, 0.1);
+					border-radius: 8rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					
+					image{
+						width: 500rpx;
+						height: 340rpx;
+					}
+				}
+				.process-zhuti-yi-picker{
+					height: 94rpx;
+					background: rgba(31, 124, 255, 0.1);
+					padding-left: 32rpx;
+					line-height: 94rpx;
+					border-radius: 8rpx;
+				}
+				.int-col{
+					color: #999999;
+				}
+			}
+		}
+		.process-zhuti-btnbox{
+			margin: 50rpx 0 94rpx;
+			color: #FFFFFF;
+			display: flex;
+			justify-content: space-between;
+		}
+		.process-zhuti-btn{
+			width: 330rpx;
+			height: 98rpx;
+			background: rgba(31, 124, 255, 0.4);
+			text-align: center;
+			line-height: 98rpx;
+			border-radius: 8rpx;
+		}
+		.backbtn{
+			margin-right: 26rpx;
+			background: #1F7CFF;
+		}
+		
+		.back-combox {
+			position: relative;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			width: 100%;
+			height: 94rpx;
+			// background: rgba(31, 124, 255, 0.1);
+			border-radius: 8rpx;
+			box-sizing: border-box;
+		}
+		
+		.back-combox__input-box {
+			position: relative;
+			display: flex;
+			flex: 1;
+			flex-direction: row;
+			align-items: center;
+		}
+		
+		.back-combox__input {
+			flex: 1;
+			font-size: 30rpx;
+			height: 94rpx;
+			line-height: 94rpx;
+		}
+		
+		.back-combox__selector {
+			box-sizing: border-box;
+			position: absolute;
+			top: calc(100% + 24rpx);
+			left: 0;
+			width: 100%;
+			background-color: #FFFFFF;
+			border: 1px solid #EBEEF5;
+			border-radius: 12rpx;
+			box-shadow: 0 4rpx 24rpx 0 rgba(0, 0, 0, 0.1);
+			z-index: 1000;
+			padding: 8rpx 0;
+		}
+		
+		.back-combox__selector-scroll {
+			max-height: 400rpx;
+			box-sizing: border-box;
+		}
+		
+		.back-combox__selector-empty,
+		.back-combox__selector-item {
+			display: flex;
+			cursor: pointer;
+			line-height: 72rpx;
+			font-size: 28rpx;
+			text-align: center;
+			padding: 0px 20rpx;
+		}
+		
+		.back-combox__selector-item:hover {
+			background-color: #f9f9f9;
+		}
+		
+		.back-combox__selector-empty:last-child,
+		.back-combox__selector-item:last-child {
+			border-bottom: none;
+		}
+		
+		// picker 弹出层通用的指示小三角
+		.back-popper__arrow,
+		.back-popper__arrow::after {
+			position: absolute;
+			display: block;
+			width: 0;
+			height: 0;
+			border-color: transparent;
+			border-style: solid;
+			border-width: 12rpx;
+		}
+		
+		.back-popper__arrow {
+			filter: drop-shadow(0 4rpx 24rpx rgba(0, 0, 0, 0.03));
+			top: -12rpx;
+			left: 10%;
+			margin-right: 6rpx;
+			border-top-width: 0;
+			border-bottom-color: #EBEEF5;
+		}
+		
+		.back-popper__arrow::after {
+			content: " ";
+			top: 2rpx;
+			margin-left: -12rpx;
+			border-top-width: 0;
+			border-bottom-color: #fff;
+		}
+		
+		.back-combox__no-border {
+			border: none;
+		}
+		
+		.btn-bir{
+			background: #1F7CFF;
+		}
+	}
+</style>

package.json

@@ -0,0 +1,9 @@
+{
+  "dependencies": {
+    "base-64": "^1.0.0",
+    "crypto-js": "^4.1.1",
+    "easemob-websdk": "^4.6.0",
+    "html2canvas": "^1.4.1",
+    "pinia": "^2.1.0"
+  }
+}

pages.json

@@ -0,0 +1,274 @@
+{
+    "pages" : [
+        //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+		    "path" : "pages/my/index",
+		    "style" : {
+		        // "navigationBarTitleText": "服务中心"
+		        "navigationStyle" : "custom"
+		    }
+		},
+        {
+            "path" : "pages/index/index",
+            "style" : {
+                "navigationBarTitleText" : "启动"
+            }
+        },
+        // "navigationBarBackgroundColor": "#FFFF"
+        {
+            "path" : "pages/index/bottombat",
+            "style" : {
+                "navigationBarTitleText" : ""
+            }
+        },
+        // "navigationBarBackgroundColor": "#FFFF"
+        {
+            "path" : "pages/cashier/index",
+            "style" : {
+                // "navigationBarTitleText": "收银台",
+                "navigationStyle" : "custom",
+                "enablePullDownRefresh" : true
+            }
+        },
+        {
+            "path" : "pages/storemanagement/index",
+            "style" : {
+                "navigationBarTitleText": ""
+            }
+        },
+        {
+            "path" : "pages/ordermanagement/index",
+            "style" : {
+                // "navigationBarTitleText": "订单管理"
+                "navigationStyle" : "custom"
+            }
+        }
+        
+    ],
+    "subPackages" : [
+        //用户登陆--分包
+        {
+            "root" : "pages/user",
+            "pages" : [
+                {
+                    "path" : "login/index",
+                    "style" : {
+                        "navigationBarTitleText" : "登录"
+                    }
+                }
+            ]
+        },
+        // "navigationBarBackgroundColor": "#FFFF"
+        //开通商户--分包
+        {
+            "root" : "openmerchant",
+            "pages" : [
+                {
+                    "path" : "guide/index", //指引开通
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "amountopening/index", //电商支付
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "shopentry/process", //店铺入驻流程
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "shopentry/processstore", //店铺入驻流程-门店信息
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "shopentry/processidentity", //店铺入驻流程-身份信息
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "shopentry/processaudit", //店铺入驻流程-审核
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                }
+            ]
+        },
+        //收银台--流程
+        {
+            "root" : "shop",
+            "pages" : [
+                {
+                    "path" : "perating/activitecode", //聚合码
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "perating/statement", //经营报表
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "perating/consumption", //开通消费分
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "perating/consumptionbreakdown", //开通消费分
+                    "style" : {
+                        "navigationStyle" : "custom",
+                        "enablePullDownRefresh" : true
+                    }
+                },
+                {
+                    "path" : "department/management", //部门管理
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "department/managementadd", //添加部门
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "employee/list", //员工管理
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "employee/listadd", //添加员工
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "services/setting", //分润设置
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "services/lockuser", //锁定用户
+                    "style" : {
+                        "navigationStyle" : "custom",
+                        "enablePullDownRefresh" : true
+                    }
+                },
+                {
+                    "path" : "services/mystereo", //得我音响
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                },
+                {
+                    "path" : "commodity/order", //我的订单
+                    "style" : {
+                        "navigationStyle" : "custom",
+                        "enablePullDownRefresh" : true
+                    }
+                },
+                {
+                    "path" : "commodity/details", //订单详情
+                    "style" : {
+                        "navigationStyle" : "custom"
+                    }
+                }
+            ]
+        },
+		//会话
+		{
+		    "root" : "chat",
+		    "pages" : [
+		        {
+		            "path": "contacts/contacts",
+		            "style": {
+		              "navigationStyle": "custom",
+		              "navigationBarTextStyle": "white",
+		              "app-plus": {
+		                "bounce": "none"
+		              }
+		            }
+		        }
+		    ]
+		}
+		// {
+		//     "root" : "emChat",
+		//     "pages" : [
+		//        {
+		//          "path": "emChatContainer/index",
+		//          "style": {
+		//            "navigationStyle": "custom",
+		//            "navigationBarTextStyle": "white",
+		//            "app-plus": {
+		//              "bounce": "none"
+		//            }
+		//          }
+		//        }
+		//     ]
+		// },
+		// {
+		//     "root" : "chatIndex",
+		//     "pages" : [
+		//        {
+		// 		   "path" : "storemanagement/index",
+		// 		   "style" : {
+		// 			   "navigationStyle": "custom"
+		// 		   }
+		// 	   }
+		//     ]
+		// }
+		
+    ],
+    "globalStyle" : {
+        "navigationBarTextStyle" : "black",
+        "navigationBarTitleText" : "uni-app",
+        "navigationBarBackgroundColor" : "#F8F8F8",
+        "backgroundColor" : "#F8F8F8"
+    },
+    "navigateToMiniProgramAppIdList" : [ "wxfb755febdb800f23" ],
+    "tabBar" : {
+        "borderStyle" : "black",
+        "backgroundColor" : "#FFFFFF",
+        "color" : "#4D4D4D",
+        "selectedColor" : "#1F7CFF",
+        "list" : [
+            {
+                "pagePath" : "pages/cashier/index",
+                "iconPath" : "static/tab/tai1.png",
+                "selectedIconPath" : "static/tab/tai.png",
+                "text" : "收银台"
+            },
+            {
+                "pagePath" : "pages/storemanagement/index",
+                "iconPath" : "static/tab/dian.png",
+                "selectedIconPath" : "static/tab/dian1.png",
+                "text" : "消息"
+            },
+            {
+                "pagePath" : "pages/ordermanagement/index",
+                "iconPath" : "static/tab/daing.png",
+                "selectedIconPath" : "static/tab/ding1.png",
+                "text" : "订单管理"
+            },
+            {
+                "pagePath" : "pages/my/index",
+                "iconPath" : "static/tab/wo.png",
+                "selectedIconPath" : "static/tab/wo1.png",
+                "text" : "服务中心"
+            }
+        ]
+    }
+}

pages/cashier/index.vue

@@ -0,0 +1,742 @@
+<template>
+	<view class="cashier">
+		<view class="cashier-topin" v-if="logintext">
+			<view class="tegyhsj">
+				收银台
+			</view>
+		</view>
+		<view class="cashier-header">
+			<view class="cashier-header-text" v-if="toptext">
+				收银台
+			</view>
+			<view class="cashier-tablin">
+				<view class="cashier-tablin-nie">
+					<view class="cashier-tablin-nie-left">
+						<view class="cashier-tablin-nie-left-icon">
+							<image :src="merchantCashierShow.logo" mode="widthFix">
+							</image>
+						</view>
+						<view class="cashier-tablin-nie-left-text">
+							<view class="cashier-tablin-nie-left-text-top">
+								{{merchantCashierShow.mer_name==undefined?'...':merchantCashierShow.mer_name}}
+							</view>
+							<view class="cashier-tablin-nie-left-text-bottom">
+								<view class="cashier-tablin-nie-left-text-bottom-in">
+									{{merchantCashierShow.category_name==undefined?'...':merchantCashierShow.category_name}}
+								</view>
+								<view class="cashier-tablin-nie-left-text-bottom-it">
+									加入日期:{{merchantCashierShow.create_time==undefined?'...':merchantCashierShow.create_time}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- <view class="cashier-tablin-nie-right" @click="activitecode(merchantCashierShow)" v-if="merchantCashierShow.merchant_level==1"> -->
+					<!-- <view class="cashier-tablin-nie-right" @click="activitecode(merchantCashierShow)">
+						<image :src="merchantCashierShow.qrcode_src" mode="widthFix">
+						</image>
+					</view> -->
+				</view>
+			</view>
+		</view>
+		<view class="cashier-list"  v-if="Number(zhuangi)!=7?false:true">
+			<view class="cashier-list-top">
+				<view class="cashier-list-top-left">
+					<view class="yi" v-for="(item,index) in items" @click="dianji(index)"
+						　:style="index==indexs?'font-weight: 600;':'font-weight: 300;'">
+						{{item.name}}
+						<view class="cashier-list-top-left-yisss" v-if="index==indexs?true:false">
+						</view>
+					</view>
+
+				</view>
+				<view class="cashier-list-top-right" @click="peratingt">
+					<view class="cashier-list-top-right-text">
+						经营报表
+					</view>
+					<view class="cashier-list-top-right-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811110111315.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+			</view>
+			<view class="cashier-list-tbot">
+				<view class="yis">
+					<view class="sgjd">
+						¥{{dataList.orderLineOrderSun.orderLine==undefined?0:dataList.orderLineOrderSun.orderLine}}
+					</view>
+					<view class="sf">
+						线上营收
+					</view>
+				</view>
+				<view class="yis">
+					<view class="sgjd">
+						¥{{dataList.belowTheLineSum.belowTheLine==undefined?0:dataList.belowTheLineSum.belowTheLine}}
+					</view>
+					<view class="sf">
+						线下营收
+					</view>
+				</view>
+				<!-- <view class="yis" @click="xiaofeifen">
+					<view class="sgjd">
+						¥{{dataList.consumption==null?0:dataList.consumption}}
+					</view>
+					<view class="sf">
+						消费分
+					</view>
+				</view> -->
+				<view class="yis">
+					<view class="sgjd">
+						{{dataList.sun==undefined?0:dataList.sun}}
+					</view>
+					<view class="sf">
+						锁定会员数
+					</view>
+				</view>
+				<view class="yis">
+					<view class="sgjd">
+						{{dataList.visitorNumber==undefined?0:dataList.visitorNumber}}
+					</view>
+					<view class="sf">
+						访客数
+					</view>
+				</view>
+				<view class="yis">
+					<view class="sgjd">
+						{{dataList.number==undefined?0:dataList.number}}
+					</view>
+					<view class="sf">
+						支付人数
+					</view>
+				</view>
+				<!-- 默认 -->
+				<view class="yis">
+					<view class="sgjd">
+						
+					</view>
+					<view class="sf">
+						
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="cashier-jilu" :style="Number(zhuangi)!=7?'margin-top:170rpx':''">
+			<view class="cashier-jilu-top">
+				最新记录
+			</view>
+			<view class="cashier-jilu-nei">
+				<view class="cashier-jilu-nei-yis" v-for="(item,index) in List" :key="index">
+					<view class="cashier-jilu-nei-yis-left">
+						<view class="cashier-jilu-nei-yis-left-mei">
+							<image :src="item.avatar" mode="widthFix"></image>
+						</view>
+						<view class="cashier-jilu-nei-yis-left-yins">
+							<view class="tetxsad">
+								{{item.nickname}}
+							</view>
+							<view class="sdffget">
+								ID:{{item.account.substr(0, 3) + '****' + item.account.substr(7)}}
+							</view>
+						</view>
+					</view>
+					<view class="cashier-jilu-nei-yis-right">
+						{{item.type}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="" v-if="tihsi==0" style="margin: 60rpx 0 20rpx 0; color: #999999; font-size: 26rpx;">
+			—— 已经到最底部了哦 ——
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		selectMerchant,
+		selectMerchantOrder,
+		payUserList
+	} from '@/commit/shop.js'
+	export default {
+		data() {
+			return {
+				is_panudn: true,
+				start_time: "",
+				end_time: "",
+				mer_id: "", //店铺ID
+				logintext: false,
+				toptext: true,
+				indexs: 0,
+				merchantCashierShow: [], // 店铺信息头
+				dataList: [], //今日昨日收益
+				page: 1,//默认1页
+				limit: 10,//默认10条数据
+				items: [{
+						name: "今日"
+					},
+					{
+						name: "昨日"
+					}
+				],
+				List: [],//列表数据
+				tihsi: "",
+				zhuangi:""
+			}
+		},
+		onLoad() {
+			let daySart = new Date
+			this.start_time = this.$time.dateFormat("yyyy-MM-dd", daySart)
+			this.end_time = this.$time.dateFormat("yyyy-MM-dd", daySart)
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			this.mer_id = selectmerchant.merId
+			let jurisdiction = uni.getStorageSync('jurisdiction')
+			
+			if(jurisdiction!=null){
+			jurisdiction.forEach((res,index)=>{
+				if(res==7){
+					this.zhuangi = res
+				}
+			})
+			}
+		},
+		onShow() {
+			let authorization = uni.getStorageSync('authorization')
+			let userinfo = uni.getStorageSync('userinfo')
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			let uid = userinfo.uid
+			if (authorization && uid) {
+				if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+					uni.redirectTo({
+						url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+					});
+					return
+				} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+					uni.showLoading({
+						title: '加载中',
+						mask: true
+					});
+					this.selectMerchant()
+					this.selectMerchantOrder()
+					this.payUserList()
+					return
+				} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
+					});
+					return
+				} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
+					});
+					return
+				} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
+					});
+					return
+				}
+
+			} else {
+				uni.redirectTo({
+					url: "/pages/user/login/index"
+				});
+			}
+		},
+		//监听tab 分类
+		onPageScroll(res) {
+			const query = uni.createSelectorQuery().in(this);
+			query.select('.cashier-header').boundingClientRect(data => {
+				if (data.top < 0) {
+					this.toptext = false
+					this.logintext = true
+				} else if (data.top <= 1) {
+					this.toptext = true
+					this.logintext = false
+				}
+			}).exec();
+		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+			});
+			this.page = 1
+			this.is_panudn = true
+			this.List = []
+			this.payUserList();
+			this.selectMerchant();
+			this.selectMerchantOrder()
+		},
+
+		onReachBottom() {
+			if (this.is_panudn == true) {
+				this.page++;
+				this.payUserList();
+			} else {
+				return
+			}
+		},
+		methods: {
+			// 店铺信息头
+			selectMerchant() {
+				selectMerchant({
+					mer_id: this.mer_id
+				}).then(res => {
+					console.log(res)
+					if (res.data.status == 200) {
+						this.merchantCashierShow = res.data.data.merchantCashierShow
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			activitecode(e) {
+				uni.navigateTo({
+					url: "/shop/perating/activitecode?qrcode_src=" + e.qrcode_src + '&code_id=' + e.code_id
+				})
+			},
+			peratingt() {
+				uni.navigateTo({
+					url: "/shop/perating/statement?sna=" + "1"
+				})
+			},
+			xiaofeifen() {
+				uni.navigateTo({
+					url: "/shop/perating/consumption"
+				})
+			},
+			// 今日昨日收益
+			selectMerchantOrder() {
+				uni.showLoading({
+					title: '加载中',
+				});
+				selectMerchantOrder({
+					start_time: this.start_time,
+					end_time: this.start_time,
+					mer_id: this.mer_id
+				}).then(res => {
+					if (res.data.status == 200) {
+						this.dataList = res.data.data
+						uni.hideLoading();
+					}
+				}, fail => {
+					console.log(fail)
+					uni.hideLoading();
+				})
+			},
+			//点击今日昨日收益
+			dianji(e) {
+				this.indexs = e
+				let daySart = new Date
+				if (e == 0) {
+					this.start_time = this.$time.dateFormat("yyyy-MM-dd", daySart)
+					this.end_time = this.$time.dateFormat("yyyy-MM-dd", daySart)
+					this.selectMerchantOrder()
+				} else {
+					var date = new Date();
+					var y = date.getFullYear();
+					var m = date.getMonth() + 1;
+					var d = date.getDate() - 1;
+					if (d == "0") {
+						m = m - 1;
+						var temp = new Date(y, m, d);
+						d = temp.getDate();
+					}
+					var Yesterday = [y, m, d];
+					Yesterday = Yesterday.join("/");
+					this.start_time = this.$time.dateFormat("yyyy-MM-dd", Yesterday)
+					this.end_time = this.$time.dateFormat("yyyy-MM-dd", Yesterday)
+					this.selectMerchantOrder()
+				}
+			},
+			// 最新纪录列表
+			payUserList() {
+				payUserList({
+					mer_id: this.mer_id,
+					pageNum: this.page,
+					pageSize: this.limit,
+				}).then(res => {
+					uni.stopPullDownRefresh();
+					if (res.data.status == 200) {
+						this.tihsi = res.data.data.pageInfo.list.length
+						if (res.data.data.pageInfo.list.length > 0) { //分页处理
+							if (this.page == 1) {
+								this.List = res.data.data.pageInfo.list
+							} else {
+								this.List = this.List.concat(res.data.data.pageInfo.list)
+							}
+						} else {
+							this.is_panudn = false
+						}
+						uni.hideLoading();
+					}
+				}, fail => {
+					uni.hideLoading()
+					console.log(fail)
+				})
+			},
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+
+<style lang="scss" scoped>
+	.cashier-topin {
+		width: 100%;
+		height: 176rpx;
+		background-color: #FFFFFF;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9;
+		font-size: 36rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		text-align: center;
+
+		.tegyhsj {
+			margin-top: 107rpx;
+		}
+	}
+
+	.cashier {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.cashier-header {
+			width: 100%;
+			height: 328rpx;
+			background: linear-gradient(180deg, rgba(31, 124, 255, 0.2200) 0%, rgba(255, 255, 255, 0.1500) 100%);
+			position: relative;
+			display: flex;
+			justify-content: center;
+
+			.cashier-header-text {
+				position: absolute;
+				font-size: 46rpx;
+				font-weight: 500;
+				color: #333333;
+				top: 102rpx;
+				left: 64rpx;
+			}
+
+			.cashier-tablin {
+				position: absolute;
+				top: 198rpx;
+				width: 686rpx;
+				height: 210rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+
+				.cashier-tablin-nie {
+					width: 634rpx;
+					height: 146rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+
+					.cashier-tablin-nie-left {
+						width: 409rpx;
+						height: 100%;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.cashier-tablin-nie-left-icon {
+							width: 146rpx;
+							height: 146rpx;
+							border-radius: 20rpx;
+							overflow: hidden;
+
+							image {
+								width: 100%;
+								height: 100%;
+								height: auto;
+								border-radius: 20rpx;
+							}
+						}
+
+						.cashier-tablin-nie-left-text {
+							width: 247rpx;
+							height: 100%;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+							align-items: flex-start;
+
+							.cashier-tablin-nie-left-text-top {
+								width: 100%;
+								font-size: 36rpx;
+								font-weight: 500;
+								color: #333333;
+								display: inline-block;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+							}
+
+							.cashier-tablin-nie-left-text-bottom {
+								width: 100%;
+								height: 69rpx;
+								display: flex;
+								flex-direction: column;
+								align-items: flex-start;
+								justify-content: space-between;
+								color: #333333;
+								font-size: 24rpx;
+
+								.cashier-tablin-nie-left-text-bottom-in {
+									width: 100%;
+									display: inline-block;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									white-space: nowrap;
+								}
+
+								.cashier-tablin-nie-left-text-bottom-it {
+									width: 100%;
+									display: inline-block;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									white-space: nowrap;
+								}
+							}
+						}
+					}
+
+					.cashier-tablin-nie-right {
+						width: 146rpx;
+						height: 100%;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.cashier-list {
+			width: 686rpx;
+			height: 365rpx;
+			background-color: #FFFFFF;
+			margin-top: 206rpx;
+			border-radius: 16rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-around;
+			align-items: center;
+
+			.cashier-list-top {
+				width: 634rpx;
+				height: 30rpx;
+				margin-top: 10rpx;
+				display: flex;
+				justify-content: space-between;
+
+				.cashier-list-top-left {
+					font-size: 30rpx;
+					width: 150rpx;
+					height: 100%;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.yi {
+						position: relative;
+
+						.cashier-list-top-left-yisss {
+							position: absolute;
+							top: 39rpx;
+							width: 100%;
+							height: 6rpx;
+							background: #1F7CFF;
+							border-radius: 3rpx;
+						}
+					}
+
+				}
+
+				.cashier-list-top-right {
+					width: 124rpx;
+					height: 100%;
+					display: flex;
+					justify-content: space-between;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #999999;
+
+					.cashier-list-top-right-icon {
+						width: 16rpx;
+						height: 16rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+
+			.cashier-list-tbot {
+				width: 570rpx;
+				height: 250rpx;
+				display: flex;
+				align-content: space-between;
+				flex-wrap: wrap;
+				justify-content: space-between;
+				
+				.yis {
+					width: 33%;
+					height: 82rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: center;
+					color: #333333;
+
+					.sgjd {
+						font-size: 36rpx;
+						font-weight: bold;
+					}
+
+					.sf {
+						font-size: 26rpx;
+						font-weight: 400;
+					}
+				}
+
+				// .cashier-list-tbot-sjd {
+				// 	width: 100%;
+				// 	height: 88rpx;
+				// 	display: flex;
+				// 	justify-content: space-between;
+				// 	align-items: center;
+					// .yis {
+					// 	height: 100%;
+					// 	display: flex;
+					// 	flex-direction: column;
+					// 	justify-content: space-between;
+					// 	align-items: center;
+					// 	color: #333333;
+
+					// 	.sgjd {
+					// 		font-size: 36rpx;
+					// 		font-weight: bold;
+					// 	}
+
+					// 	.sf {
+					// 		font-size: 26rpx;
+					// 		font-weight: 400;
+					// 	}
+					// }
+				// }
+			}
+		}
+
+		.cashier-jilu {
+			width: 686rpx;
+			height: 100%;
+			background: #FFFFFF;
+			border-radius: 16rpx;
+			margin: 26rpx 0 26rpx 0;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.cashier-jilu-top {
+				width: 634rpx;
+				margin-top: 49rpx;
+				display: flex;
+				justify-content: flex-start;
+				font-size: 30rpx;
+				font-weight: 600;
+				align-items: center;
+				color: #333333;
+			}
+
+			.cashier-jilu-nei {
+				width: 634rpx;
+				margin-top: 32rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.cashier-jilu-nei-yis {
+					width: 100%;
+					height: 86rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					margin-bottom: 65rpx;
+
+					.cashier-jilu-nei-yis-left {
+						width: 289rpx;
+						height: 100%;
+						display: flex;
+
+						.cashier-jilu-nei-yis-left-mei {
+							width: 86rpx;
+							height: 86rpx;
+							border-radius: 100%;
+							overflow: hidden;
+
+							image {
+								width: 100%;
+								height: 100%;
+								border-radius: 100%;
+								overflow: hidden;
+							}
+						}
+
+						.cashier-jilu-nei-yis-left-yins {
+							width: 187rpx;
+							height: 86rpx;
+							margin-left: 16rpx;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-around;
+							align-items: flex-start;
+
+							.tetxsad {
+								display: inline-block;
+								width: 100%;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+								font-size: 30rpx;
+								font-weight: 500;
+								color: #333333;
+
+							}
+
+							.sdffget {
+								font-size: 26rpx;
+								font-weight: normal;
+								color: #999999;
+							}
+						}
+					}
+
+					.cashier-jilu-nei-yis-right {
+						height: 100%;
+						font-size: 30rpx;
+						font-weight: normal;
+						color: #333333;
+						line-height: 86rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/index/bottombat.vue

@@ -0,0 +1,102 @@
+<template>
+	<view class="cashier">
+
+		<web-view :webview-styles="webviewStyles" :src="url"></web-view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				url:""
+			}
+		},
+		onLoad(options) {
+			
+			let type = uni.getStorageSync('agreementType')
+			this.url= 'https://api.hebeiyhc.com/api/agreement?type=' + type
+			
+			console.log('url = ',this.url)
+		},
+		methods: {
+
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+
+<style lang="scss" scoped>
+	.activite {
+		color: #1F7CFF;
+	}
+
+	.content {
+		width: 686rpx;
+		background-color: #1F7CFF;
+		color: red;
+	}
+
+	.scroll-view_H {
+		white-space: nowrap;
+		width: 100%;
+		color: #333333;
+	}
+
+	.scroll-view-item_H {
+		display: inline-block;
+		width: 20%;
+		height: 30rpx;
+		line-height: 30rpx;
+		text-align: center;
+		padding: 28rpx 0 38rpx 0;
+		font-size: 32rpx;
+	}
+
+	.cashier {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.cashier-bottom {
+			width: 100%;
+			height: 171rpx;
+			position: fixed;
+			bottom: 0;
+			display: flex;
+			justify-content: space-around;
+			align-items: flex-start;
+			background-color: #FFFFFF;
+
+			.cashier-bottom-yi {
+				height: 70rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+
+				.cashier-bottom-yi-top {
+					width: 40rpx;
+					height: 40rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.cashier-bottom-yi-bot {
+					font-size: 20rpx;
+					font-weight: 400;
+				}
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -0,0 +1,142 @@
+<template>
+	<view class="contentindex">
+		<view class="box-header">
+			<view class="images">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809134301741.gif" mode="widthFix"></image>
+			</view>
+			<view class="texts">
+				正在加载…
+			</view>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	import {
+		selectMerchant
+	} from '@/commit/api.js'
+	import {
+		encryptDes,
+		decryptDes
+	} from '@/encryption/index.js' // 引用路径根据自己的文件结构而定
+	import
+	Base64
+	from 'base-64'
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		onLoad() {
+			
+			console.log('进来了')
+			
+			let authorization = uni.getStorageSync('authorization')
+			let userinfo = uni.getStorageSync('userinfo')
+			let uid = userinfo.uid
+			// 用户状态判断
+			if (authorization) {
+				selectMerchant({
+					uid: uid
+				}).then(data => {
+					if (data.data.status == 200) {
+						let selectmerchant = data.data.data
+						uni.setStorageSync('selectmerchant', selectmerchant)
+						if (authorization && uid) {
+							if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+								uni.redirectTo({
+									url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+								});
+								return
+							} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+								uni.switchTab({
+									url: '/pages/cashier/index' //已开通商户
+								});
+								return
+							} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+								uni.redirectTo({
+									url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
+								});
+								return
+							} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+								uni.redirectTo({
+									url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
+								});
+								return
+							} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+								uni.redirectTo({
+									url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
+								});
+								return
+							}
+
+						} else {
+							uni.redirectTo({
+								url: "/pages/user/login/index"
+							});
+						}
+					}
+				}, fail => {
+					uni.showToast({
+						title: fail,
+						icon: "none"
+					})
+				}).catch(err => {
+					console.log(err)
+				})
+			} else {
+				uni.redirectTo({
+					url: "/pages/user/login/index"
+				});
+			}
+		},
+		methods: {}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.contentindex {
+		width: 100%;
+		height: 100%;
+		background: transparent;
+		position: fixed;
+		margin: auto;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+
+		.box-header {
+			text-align: center;
+			line-height: 100rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: center;
+
+			.images {
+				width: 128rpx;
+				height: 128rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.texts {
+				width: 150rpx;
+				height: 42rpx;
+				font-size: 30rpx;
+				line-height: 42rpx;
+				color: #333333;
+				margin-top: 61rpx;
+			}
+		}
+	}
+</style>

pages/my/index.vue

@@ -0,0 +1,338 @@
+<template>
+	<view class="storemanagement">
+		<view class="storemanagement-header">
+			<view class="storemanagement-header-text">
+				服务中心
+			</view>
+			<view class="storemanagement-list">
+				<view class="storemanagement-list-yi" v-for="(item,index) in mnu" :key="index" @click="jinru(item.pages,item.name)" v-if="item.show">
+					<view class="storemanagement-list-yi-text">
+						{{item.name}}
+					</view>
+					<view class="storemanagement-list-yi-image">
+						<image :src="item.url" mode="widthFix"></image>
+					</view>
+				</view>
+			</view>
+			<view class="listadd-annkiu" @click="logoutAction" v-if="uid">
+				退出登录
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { emConnect } from '@/EaseIM/emApis';
+	import readAppInfo from '@/utils/readAppInfo.js';
+	const { loginWithPassword,closeEaseIM } = emConnect();
+	export default {
+		data() {
+			return {
+				mnu: [{
+						name: "分润设置",
+						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161807687.png",
+						pages:"/shop/services/setting",
+						show:true,
+						id: "3",
+					},
+					{
+						name: "我的音响",
+						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161749139.png",
+						pages:"/shop/services/mystereo",
+						show:true,
+						id: "0",
+					},
+					{
+						name: "锁定用户",
+						url: "https://cdn.bjtdba.com/vod/image/2022-08-12/20220812161733260.png",
+						pages:"/shop/services/lockuser",
+						show:true,
+						id: "0",
+					}
+				],
+				uid: '',
+				authorization: ''
+			}
+		},
+		async onLoad() {
+			console.log('进了我的页面了')
+			// uni.showLoading({
+			// 	title: '加载中',
+			// 	mask: true
+			// });
+			
+			await readAppInfo();
+			
+			let jurisdiction = uni.getStorageSync('jurisdiction')
+			console.log('jurisdiction', jurisdiction)
+			let mnuList = this.mnu
+			if (jurisdiction!=null) {
+				jurisdiction.forEach((res, index) => {
+					mnuList.forEach((result, i) => {
+						if (res == result.id) {
+							result.show = true
+						}
+						return result
+					})
+					return res
+				})
+				this.mnu = mnuList
+			}
+			
+			console.log(this.mnu)
+			
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 700);
+			
+			
+			console.log('我的show===>>>>>>')
+				
+			
+			this.authorization = uni.getStorageSync('authorization')
+			let userinfo = uni.getStorageSync('userinfo')
+			this.uid = userinfo.uid
+			console.log('onshow')
+			
+			let authorization = uni.getStorageSync('authorization')
+			// let userinfo = uni.getStorageSync('userinfo')
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			let uid = userinfo.uid
+			console.log(selectmerchant, authorization, userinfo)
+			if (authorization && uid) {
+				if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+					uni.redirectTo({
+						url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+					});
+					return
+				} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+					
+					return
+				} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
+					});
+					return
+				} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
+					});
+					return
+				} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
+					});
+					return
+				}
+			
+			} 
+		},
+		onShow() {
+			return;
+			
+			// 以下逻辑在onload处理
+			
+			this.authorization = uni.getStorageSync('authorization')
+			let userinfo = uni.getStorageSync('userinfo')
+			this.uid = userinfo.uid
+			
+			let authorization = uni.getStorageSync('authorization')
+			// let userinfo = uni.getStorageSync('userinfo')
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			let uid = userinfo.uid
+			console.log(selectmerchant, authorization, userinfo)
+			if (authorization && uid) {
+				if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+					uni.redirectTo({
+						url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+					});
+					return
+				} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+					
+					return
+				} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
+					});
+					return
+				} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
+					});
+					return
+				} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+					uni.redirectTo({
+						url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
+					});
+					return
+				}
+			
+			} 
+			
+			
+		},
+		methods: {
+			// 退出登录
+			logoutAction(){
+				uni.removeStorageSync('userinfo');//清除用户信息
+				uni.removeStorageSync('authorization');//清除authorization
+				uni.removeStorageSync('selectmerchant');//清除商户数据
+				uni.removeStorageSync('storeStaff');//部门id对应权限
+				uni.removeStorageSync('jurisdiction');//管理员状态
+				uni.removeStorageSync('mer_id');//环信和项目连接的id,登录环信需要
+				//断开连接
+				closeEaseIM();
+				// this.$store.commit('SET_PIN_CONVERSATION_LIST', []);
+				this.authorization = ''
+				this.uid = ''
+				
+				
+				
+				uni.showToast({
+					title: "退出成功",
+					icon: "none"
+				})
+				// setTimeout(function() {
+				// 	uni.redirectTo({
+				// 		url: "/pages/user/login/index"
+				// 	});
+				// }, 700);
+			},
+			jinru(n,p){
+				let name = p
+				let page = n
+				if(name=="分润设置") {
+					let authorization = uni.getStorageSync('authorization')
+					let userinfo = uni.getStorageSync('userinfo')
+					let selectmerchant = uni.getStorageSync('selectmerchant')
+					let uid = userinfo.uid
+					if (authorization && uid) {
+						if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+							uni.redirectTo({
+								url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+							});
+							return
+						} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+							uni.redirectTo({
+								url:page
+							})
+							return
+						} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+							uni.redirectTo({
+								url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
+							});
+							return
+						} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+							uni.redirectTo({
+								url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
+							});
+							return
+						} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+							uni.redirectTo({
+								url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
+							});
+							return
+						}
+					
+					} else {
+						uni.navigateTo({
+							url: "/pages/user/login/index?type=1"
+						});
+						return
+					}
+					
+				}else if(name=="锁定用户"){
+					uni.redirectTo({
+						url:page
+					})
+				}else{
+					uni.redirectTo({
+						url:page
+					})
+				}
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.storemanagement {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.storemanagement-header {
+			width: 100%;
+			height: 328rpx;
+			background: linear-gradient(180deg, rgba(31, 124, 255, 0.2200) 0%, rgba(255, 255, 255, 0.1500) 100%);
+			position: relative;
+			display: flex;
+			justify-content: center;
+
+			.storemanagement-header-text {
+				position: absolute;
+				font-size: 46rpx;
+				font-weight: 500;
+				color: #333333;
+				top: 202rpx;
+				left: 64rpx;
+			}
+
+			.storemanagement-list {
+				width: 690rpx;
+				height: 262rpx;
+				position: absolute;
+				top: 298rpx;
+				display: flex;
+				flex-flow: wrap;
+				justify-content: space-between;
+
+				.storemanagement-list-yi {
+					margin-bottom: 26rpx;
+					width: 330rpx;
+					height: 118rpx;
+					background: #FFFFFF;
+					border-radius: 8rpx;
+					display: flex;
+					justify-content: space-around;
+					align-items: center;
+
+					.storemanagement-list-yi-text {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.storemanagement-list-yi-image {
+						width: 92rpx;
+						height: 92rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+		.listadd-annkiu {
+			width: 686rpx;
+			height: 98rpx;
+			background: #1F7CFF;
+			border-radius: 8rpx;
+			position: fixed;
+			bottom: 26rpx;
+			font-size: 36rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 98rpx;
+		}
+	}
+</style>

pages/ordermanagement/index.vue

@@ -0,0 +1,403 @@
+<template>
+	<view class="ordermanagement">
+		<view class="ordermanagement-header">
+			<view class="ordermanagement-header-text">
+				订单管理
+			</view>
+			<view class="ordermanagement-list">
+				<view class="ordermanagement-list-yi">
+					<view class="ordermanagement-list-yi-top">
+						{{num.orderPayment==undefined?0:num.orderPayment}}
+					</view>
+					<view class="ordermanagement-list-yi-bottom">
+						已支付订单数
+					</view>
+				</view>
+				<view class="ordermanagement-list-yi">
+					<view class="ordermanagement-list-yi-top">
+						{{num.payPrice==undefined?0:num.payPrice}}
+					</view>
+					<view class="ordermanagement-list-yi-bottom">
+						实际支付金额
+					</view>
+				</view>
+				<view class="ordermanagement-list-yi">
+					<view class="ordermanagement-list-yi-top">
+						{{num.refundPrice==undefined?0:num.refundPrice}}
+					</view>
+					<view class="ordermanagement-list-yi-bottom">
+						已退款金额
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="ordermanagement-ding">
+			<view class="ordermanagement-ding-text">
+				我的订单
+			</view>
+			<view class="ordermanagement-ding-nei">
+				<view class="ordermanagement-yisdf" v-for="(item,index) in dingdan" :key="index" @click="jiru(item.status,index)">
+					<view class="ordermanagement-img">
+						<image :src="item.img" mode="widthFix"></image>
+						<view class="ordermanagement-img-biao" v-if="item.num==0?false:true">
+							{{item.num}}
+						</view>
+					</view>
+					<view class="">
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 		<view class="ordermanagement-dingsss">
+			<view class="ordermanagement-ding-text">
+				售后管理
+			</view>
+			<view class="ordermanagement-ding-nei">
+				<view class="ordermanagement-yisdf" v-for="(item,index) in dingdansss" :key="dingdan">
+					<view class="ordermanagement-img">
+						<image :src="item.img" mode="widthFix"></image>
+					</view>
+					<view class="">
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderStstusAmount
+	} from '@/commit/order.js'
+	export default {
+		data() {
+			return {
+				num: [], //正向订单状态数
+				mer_id: 264,
+				dingdan: [{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154736170.png',
+						name: '待付款',
+					},
+					{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154723185.png',
+						name: '待发货',
+					},
+					{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154804269.png',
+						name: '待收货',
+					},
+					{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154750259.png',
+						name: '待评价',
+					}
+					// ,
+					// {
+					// 	img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154847886.png',
+					// 	name: '已退款'
+					// }
+				],
+				dingdansss: [{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154904247.png',
+						name: '待审核'
+					},
+					{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154932244.png',
+						name: '未通过'
+					},
+					{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154949118.png',
+						name: '已通过'
+					},
+					{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154918922.png',
+						name: '待收货'
+					},
+					{
+						img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812155008586.png',
+						name: '已完成'
+					}
+				]
+			}
+		},
+		onLoad() {
+			
+		},
+		onShow() {
+			uni.showLoading({
+				title: '加载中',
+			});
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			this.mer_id = selectmerchant.merId
+			this.getOrderStstusAmount()
+			
+			
+			
+			
+		},
+		methods: {
+			// 正向订单状态数
+			getOrderStstusAmount() {
+				getOrderStstusAmount({
+					mer_id: this.mer_id
+				}).then(res => {
+					if (res.data.status == 200) {
+						this.num = res.data.data
+						this.dingdan = [{
+								img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154736170.png',
+								name: '待付款',
+								num: this.num.orderPrepPayment,
+								status:5
+							},
+							{
+								img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154723185.png',
+								name: '待发货',
+								num: this.num.orderForDelivery,
+								status:0
+							},
+							{
+								img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154804269.png',
+								name: '待收货',
+								num: this.num.orderForReceived,
+								status:1
+							},
+							{
+								img: 'https://cdn.bjtdba.com/vod/image/2022-08-12/20220812154750259.png',
+								name: '待评价',
+								num: this.num.orderForSpeech,
+								status:2
+							}
+						]
+						uni.hideLoading();
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			jiru(e,i) {
+				
+				
+				let authorization = uni.getStorageSync('authorization')
+				let userinfo = uni.getStorageSync('userinfo')
+				let selectmerchant = uni.getStorageSync('selectmerchant')
+				let uid = userinfo.uid
+				if (authorization && uid) {
+					if (selectmerchant.merId >= 0 && selectmerchant.status == -1) {
+						uni.redirectTo({
+							url: "/openmerchant/guide/index" //有或者没有商户 没有金额支付and激活码支付
+						});
+						return
+					} else if (selectmerchant.merId > 0 && (selectmerchant.status == 1 || selectmerchant.status == 5)) {
+						uni.redirectTo({
+							url: "../../shop/commodity/order?status="+e + "&index="+ i
+						})
+						return
+					} else if (selectmerchant.merId >= 0 && (selectmerchant.status == 3 || selectmerchant.status == 4)) {
+						uni.redirectTo({
+							url: '/openmerchant/shopentry/process?mer_id=' + selectmerchant.merId //已开通商户未填写资料
+						});
+						return
+					} else if (selectmerchant.merId > 0 && selectmerchant.status == 0) {
+						uni.redirectTo({
+							url: '/openmerchant/shopentry/processaudit?submitCode=' + 3 //已开通商户待审核
+						});
+						return
+					} else if (selectmerchant.merId > 0 && selectmerchant.status == 2) {
+						uni.redirectTo({
+							url: '/openmerchant/shopentry/processaudit?submitCode=' + 2 //已开通商户审核拒绝
+						});
+						return
+					}
+				
+				} else {
+					uni.navigateTo({
+						url: "/pages/user/login/index?type=1"
+					});
+					return
+				}
+				
+				
+			}
+		}
+	}
+</script>
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.ordermanagement {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.ordermanagement-header {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			width: 100%;
+			height: 328rpx;
+			background: linear-gradient(180deg, rgba(31, 124, 255, 0.2200) 0%, rgba(255, 255, 255, 0.1500) 100%);
+			position: relative;
+			display: flex;
+			justify-content: center;
+
+			.ordermanagement-header-text {
+				position: absolute;
+				font-size: 46rpx;
+				font-weight: 500;
+				color: #333333;
+				top: 202rpx;
+				left: 64rpx;
+			}
+
+			.ordermanagement-list {
+				position: absolute;
+				top: 298rpx;
+				width: 686rpx;
+				height: 150rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+
+				.ordermanagement-list-yi {
+					height: 70rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: center;
+
+					.ordermanagement-list-yi-top {
+						font-size: 36rpx;
+						font-weight: bold;
+						color: #333333;
+					}
+
+					.ordermanagement-list-yi-bottom {
+						font-size: 26rpx;
+						font-weight: 400;
+						color: #333333;
+					}
+				}
+			}
+		}
+
+		.ordermanagement-ding {
+			width: 686rpx;
+			height: 216rpx;
+			margin: 156rpx 0 32rpx 0;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: flex-start;
+
+			.ordermanagement-ding-text {
+				font-size: 30rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.ordermanagement-ding-nei {
+				width: 100%;
+				height: 160rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+
+				.ordermanagement-yisdf {
+					height: 96rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #5F6060;
+
+					.ordermanagement-img {
+						width: 48rpx;
+						height: 48rpx;
+						position: relative;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+
+						.ordermanagement-img-biao {
+							position: absolute;
+							left: 40rpx;
+							bottom: 31rpx;
+							width: 30rpx;
+							height: 30rpx;
+							border-radius: 50%;
+							background: #FE0032;
+							font-size: 20rpx;
+							font-weight: 400;
+							color: #FFFFFF;
+							display: flex;
+							justify-content: center;
+							align-items: center;
+						}
+					}
+				}
+			}
+		}
+
+		.ordermanagement-dingsss {
+			width: 686rpx;
+			height: 216rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: flex-start;
+
+			.ordermanagement-ding-text {
+				font-size: 30rpx;
+				font-weight: 600;
+				color: #333333;
+			}
+
+			.ordermanagement-ding-nei {
+				width: 100%;
+				height: 160rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				display: flex;
+				justify-content: space-around;
+				align-items: center;
+
+				.ordermanagement-yisdf {
+					height: 96rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #5F6060;
+
+					.ordermanagement-img {
+						width: 48rpx;
+						height: 48rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

pages/storemanagement/index.vue

@@ -0,0 +1,50 @@
+<template>
+  <view class="box">
+	<!-- <u-loading size="100" :show="true"></u-loading> -->
+	<!-- <view @click="gotoPage()">跳转</view> -->
+  </view>
+</template>
+
+<script>
+
+
+export default {
+  data() {
+    return {
+		
+    };
+  },
+  components: {
+   
+  },
+  onShow() {
+	uni.showLoading({
+		title: '加载中',
+	});
+  	this.gotoPage();
+  },
+  computed: {
+    
+  },
+  created() {
+   
+  },
+  methods: {
+	gotoPage(){
+		setTimeout(()=>{
+			uni.navigateTo({
+			  url: '../../chatIndex/storemanagement/index',
+			});
+		},1000)
+	}
+    
+   
+  },
+};
+</script>
+<style>
+	.box{
+		margin:0 auto;
+	}
+ 
+</style>

pages/user/login/index - 副本.vue

@@ -0,0 +1,502 @@
+<template>
+	<view class="login">
+		<view class="login_header">
+			<view class="login_header_top">
+				<image src="https://cdn.bjtdba.com/vod/image/2024-04-12/20240412151953641.png" mode="widthFix"></image>
+			</view>
+			<!-- <view class="login_header_botom">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809135451815.png" mode="widthFix"></image>
+			</view> -->
+		</view>
+		<view class="input-home">
+			<view class="input">
+				<input placeholder="请输入手机号" type="number" maxlength="11" focus="true"
+					placeholder-style="color:#9E9E9E;font-size:30rpx" v-model="form.phone" @input="inputphone">
+				<view class="input_code">
+					<span v-show="show" @click="getCode"
+						　:style="form.phone.length==11?'color:#1F7CFF':'color:#9E9E9E'">获取验证码</span>
+					<span v-show="!show" class="count" style="color:#9E9E9E">重新发送({{count}}S)</span>
+				</view>
+			</view>
+			<view class="input">
+				<input type="number" placeholder="请输入验证码" maxlength="4"
+					placeholder-style="color:#9E9E9E;font-size:30rpx;" v-model="form.sms_code" @input="inputcode">
+			</view>
+		</view>
+		<view class="login-singn" @click="login" :style="form.sms_code.length == 4 ? 'background-color:#1F7CFF':'background-color:rgba(31, 124, 255, 0.3)'">
+			<view class="login-singn-text" :style="form.sms_code.length == 4 ? 'color:#FFF':'color: #333'">
+				登录
+			</view>
+		</view>
+		<view class="bottom-index">
+			<view class="bottom-index-in">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809155152572.png" v-if="is_wei"
+					@click="gou" mode="widthFix"></image>
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809155125568.png" v-if="is_yes"
+					@click="gou" mode="widthFix"></image>
+			</view>
+			<view class="bottom-index-ri">
+				我已经阅读并同意<span style="color: #1f7cff" @click="xieyi()">《注册协议》</span >、<span style="color: #1f7cff" @click="yincang()">《隐私协议》</span>、<span style="color: #1f7cff" @click="ruzhuxieyi()">《商家入驻协议》</span>
+			</view>
+			
+
+		</view>
+		
+		<view class="unLogin-singn" @click="unLogin">
+			<view class="login-singn-text">
+				暂不登录
+			</view>
+		</view>
+		
+		
+		<!-- #ifdef MP-WEIXIN -->
+			<ws-wx-privacy id="privacy-popup"></ws-wx-privacy>
+		<!-- #endif -->
+
+
+	</view>
+
+</template>
+
+<script>
+	import {
+		userPhoneLogOnCode,
+		userPhoneLogOn,
+		selectMerchant,
+		queryStoreBranch,
+		getImUser
+	} from '@/commit/api.js'
+	import emHandleReconnect from '@/EaseIM/utils/emHandleReconnect';
+	import { emConnect } from '@/EaseIM/emApis';
+	import wxPrivacy from '@/uni_modules/ws-wx-privacy/components/ws-wx-privacy/ws-wx-privacy.vue'
+	export default {
+		data() {
+			return {
+				show: true,
+				count: '',
+				timer: null,
+				is_wei: true,
+				is_yes: false,
+				form: {
+					phone: uni.getStorageSync("user_phone").length == 0?'':uni.getStorageSync("user_phone"),
+					sms_code: '',
+					type: '1'
+				},
+				
+				type: ''
+			}
+		},
+		onLoad(options) {
+			//#ifdef MP-WEIXIN        
+			wx.requirePrivacyAuthorize({            
+			  success: () => {                
+			    console.log('点击同意');            
+			 },            
+			  fail: () => {                
+			    console.log('点击拒绝');                            
+			 },             
+			  complete: () => {                
+			    console.log('用户已点击');            
+			 }       
+			})
+			//#endif
+			
+			this.type = options.type
+			console.log(options.type)
+			console.log(this.type)
+		},
+		components: {
+			wxPrivacy
+		},
+		methods: {
+			handleDisagree() {
+			    // 处理用户不同意隐私协议的逻辑
+			},
+			handleAgree() {
+			    // 处理用户同意隐私协议的逻辑
+		    },
+			
+			
+			getCode() {
+				var mobileReg = /^1[3456789]\d{9}$/;
+				if (this.form.phone == "") {
+					uni.showToast({
+						title: "手机号不能为空",
+						icon: "none"
+					})
+				} else if (!mobileReg.test(this.form.phone)) {
+					uni.showToast({
+						title: "手机号格式有误",
+						icon: "none"
+					})
+				} else {
+					// 点击获取验证码后 保存手机号
+					uni.setStorageSync('user_phone',this.form.phone);
+					const TIME_COUNT = 60;
+					if (!this.timer) {
+						this.count = TIME_COUNT;
+						this.show = false;
+						if (this.show == false) {
+							// 获取验证码
+							userPhoneLogOnCode({
+								phone: this.form.phone
+							}).then(res => {
+								if (res.data.status == 200) {
+									uni.showToast({
+										title: res.data.data.message,
+										icon: "none"
+									})
+								}
+							}, fail => {
+								uni.showToast({
+									title: fail,
+									icon: "error"
+								})
+							}).catch(err => {
+								console.log(err)
+							})
+						}
+						this.timer = setInterval(() => {
+							if (this.count > 0 && this.count <= TIME_COUNT) {
+								this.count--;
+							} else {
+								this.show = true;
+								clearInterval(this.timer);
+								this.timer = null;
+							}
+						}, 1000)
+					}
+				}
+			},
+			inputphone(e) {
+				const o = e.target;
+				const inputRule = /[^\d]/g
+				this.$nextTick(function() {
+					this.form.phone = o.value.replace(inputRule, '');
+					if (this.form.phone.length < 11) {
+						if(this.show==false){
+							this.show = true;
+							clearInterval(this.timer);
+							this.timer = null;
+						}
+					}
+				})
+			},
+			inputcode(e) {
+				const o = e.target;
+				const inputRule = /[^\d]/g
+				this.$nextTick(function() {
+					this.form.sms_code = o.value.replace(inputRule, '');
+				})
+			},
+			xieyi() {
+				
+				uni.setStorageSync('agreementType','2')
+				
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=2" 
+				})
+			},
+			yincang() {
+				uni.setStorageSync('agreementType','1')
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=1"
+				})
+			},
+			ruzhuxieyi() {
+				uni.setStorageSync('agreementType','6')
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=6" 
+				})
+			},
+			gou() {
+				if (this.is_wei == true) {
+					this.is_wei = false;
+					this.is_yes = true;
+				} else {
+					this.is_wei = true;
+					this.is_yes = false;
+				}
+			},
+			// 暂不登录
+			unLogin() {
+				setTimeout(function() {
+					uni.switchTab({
+						url: '../../my/index'
+					});
+				}, 300);
+			},
+			loginWithUserId (){
+				try {
+				  uni.setStorage({
+				    key: 'myUsername',
+				    data: loginState.name.toLowerCase(),
+				  });
+				  console.log('22222');
+				  loginStore.setLoginUserBaseInfos({ loginUserId: loginState.name });
+				  setUserTokenToStorage(loginState.name.toLowerCase(), res.accessToken);
+				} catch (error) {
+				  console.log('>>>>>>', error);
+				  uni.showToast({
+				    title: '登录失败',
+				    icon: 'none',
+				  });
+				  console.log('33333');
+				} finally {
+				  loginState.name = '';
+				  loginState.psd = '';
+				}
+			},
+			login() {
+				 const { actionEMReconnect } = emHandleReconnect();
+				var mobileReg = /^1[3456789]\d{9}$/;
+				if (this.form.phone == "") {
+					uni.showToast({
+						title: "手机号不能为空",
+						icon: "none"
+					})
+				} else if (!mobileReg.test(this.form.phone)) {
+					uni.showToast({
+						title: "手机号格式有误",
+						icon: "none"
+					})
+				} else if (this.form.sms_code == "") {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none"
+					})
+				} else if (this.is_wei == true) {
+					uni.showToast({
+						title: "请勾选协议",
+						icon: "none"
+					})
+					return;
+				} else {
+					// 登录注册
+					userPhoneLogOn(this.form).then(res => {
+						console.log(res)
+						if (res.data.status == 200 && JSON.stringify(res.data.data) != "{}") {
+							uni.setStorageSync('userinfo', res.data.data.user);
+							uni.setStorageSync('authorization', res.data.data.x_token);
+							uni.setStorageSync('storeStaff', res.data.data.storeStaff);
+							// 用户状态判断
+							selectMerchant({
+								uid: res.data.data.user.uid
+							}).then(data => {
+								uni.setStorage({
+								  key: 'myUsername',
+								  data: JSON.stringify(uni.getStorageSync('userinfo').uid),
+								});
+								getImUser({
+									mer_id:	data.data.data.merId
+								}).then(data=>{
+									console.log('getImUser======',data.data.data);
+									actionEMReconnect();
+									 // this.loginWithUserId()
+									const { loginWithPassword } = emConnect();
+									uni.setStorage({
+										key: 'im_userid',
+										data:data.data.data.im_userid
+									})
+									uni.setStorage({
+										key: 'im_pass',
+										data:data.data.data.im_pass
+									})
+									
+									// loginWithPassword( data.data.data.im_userid,data.data.data.im_pass);
+									// getApp().globalData.conn.open({
+									//   apiUrl: WebIM.config.apiURL,
+									//   appKey: "1154240320150538#cxb-yhc",
+									//   pwd: "123456",
+									//   user: JSON.stringify(uni.getStorageSync('userinfo').uid),
+									//   success: (res) => {
+									// 	  console.log('1111');
+									// 	  console.log('uni.WebIM.conn.open-----',res);
+									// 	  const {
+									// 		  access_token
+									// 	  } = res
+									// 	  uni.setStorageSync('imToken', access_token)
+									//   },
+									//   error:(err)=>{
+									// 	  console.log('2222');
+									// 	  console.log(err);
+									//   }
+									// });
+								})
+								if (data.data.status == 200) {
+									uni.setStorageSync('selectmerchant', data.data.data);
+									let storeStaff = uni.getStorageSync('storeStaff')
+									if (storeStaff != null) {
+										queryStoreBranch({
+											id: storeStaff.department
+										}).then(res => {
+											if (res.data.status == 200) {
+												uni.setStorageSync('jurisdiction', res.data.data.jurisdiction);
+											}
+										})
+									} else {
+										uni.setStorageSync('jurisdiction', [7, 9, 5, 3]);
+									}
+									uni.showToast({
+										title: res.data.message,
+										icon: "none"
+									})
+									
+									console.log(this.type)
+									
+									if (this.type == 1) {
+										
+										console.log('返回上一页')
+										uni.navigateBack({
+											delta: 1
+										})
+									} else {
+										setTimeout(function() {
+											uni.switchTab({
+												url: '../../cashier/index'
+											});
+										}, 700);
+									}
+								}
+							}, fail => {
+								uni.showToast({
+									title: fail,
+									icon: "none"
+								})
+							}).catch(err => {
+								console.log(err)
+							})
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: "none"
+							})
+						}
+					}, fail => {
+						uni.showToast({
+							title: fail,
+							icon: "none"
+						})
+					}).catch(data => {
+						console.log(data)
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.login_header {
+			height: 211rpx;
+			margin-top: 74rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: center;
+
+			.login_header_top {
+				width: 216rpx;
+				height: 242rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.login_header_botom {
+				width: 156rpx;
+				height: 48rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.input-home {
+			width: 658rpx;
+			height: 238rpx;
+			margin-top: 67rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-between;
+
+			.input {
+				width: 100%;
+				height: 118rpx;
+				border-bottom: 1rpx solid #E5E5E5;
+				position: relative;
+
+				input {
+					width: 485rpx;
+					height: 100rpx;
+					margin: 20rpx 0 0 10rpx;
+					color: #333333;
+				}
+
+				.input_code {
+					position: absolute;
+					top: 55rpx;
+					right: 15rpx;
+					font-size: 30rpx;
+					font-weight: 400;
+				}
+			}
+		}
+
+		.login-singn {
+			width: 658rpx;
+			height: 88rpx;
+			background-color: rgba(31, 124, 255, 0.3);
+			border-radius: 10rpx;
+			margin-top: 70rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #333333;
+		}
+
+		.unLogin-singn {
+			margin-top: 88rpx;
+		}
+		.bottom-index {
+			width: 658rpx;
+			height: 33rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 60rpx;
+
+			.bottom-index-in {
+				width: 32rpx;
+				height: 32rpx;
+				line-height: 33rpx;
+				transform: sale(2);
+				image {
+					width: 100%;
+					height: 100%;
+				}
+				margin-right: 20rpx;
+				// position: relative;
+			}
+
+			.bottom-index-ri {
+				height: 100%;
+				font-size: 24rpx;
+			}
+		}
+	}
+</style>

pages/user/login/index.vue

@@ -0,0 +1,543 @@
+<template>
+	<view class="login">
+		<view class="login_header">
+			<view class="login_header_top">
+				<image src="https://cdn.bjtdba.com/vod/image/2024-04-12/20240412151953641.png" mode="widthFix"></image>
+			</view>
+			<!-- <view class="login_header_botom">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809135451815.png" mode="widthFix"></image>
+			</view> -->
+		</view>
+		<view class="input-home">
+			<view class="input">
+				<input placeholder="请输入手机号" type="number" maxlength="11" focus="true"
+					placeholder-style="color:#9E9E9E;font-size:30rpx" v-model="form.phone" @input="inputphone">
+				<view class="input_code">
+					<span v-show="show" @click="getCode"
+						　:style="form.phone.length==11?'color:#1F7CFF':'color:#9E9E9E'">获取验证码</span>
+					<span v-show="!show" class="count" style="color:#9E9E9E">重新发送({{count}}S)</span>
+				</view>
+			</view>
+			<view class="input">
+				<input type="number" placeholder="请输入验证码" maxlength="4"
+					placeholder-style="color:#9E9E9E;font-size:30rpx;" v-model="form.sms_code" @input="inputcode">
+			</view>
+		</view>
+		<view class="login-singn" @click="login" :style="form.sms_code.length == 4 ? 'background-color:#1F7CFF':'background-color:rgba(31, 124, 255, 0.3)'">
+			<view class="login-singn-text" :style="form.sms_code.length == 4 ? 'color:#FFF':'color: #333'">
+				登录
+			</view>
+		</view>
+		<view class="bottom-index">
+			<view class="bottom-index-in">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809155152572.png" v-if="is_wei"
+					@click="gou" mode="widthFix"></image>
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-09/20220809155125568.png" v-if="is_yes"
+					@click="gou" mode="widthFix"></image>
+			</view>
+			<view class="bottom-index-ri">
+				我已经阅读并同意<span style="color: #1f7cff" @click="xieyi()">《注册协议》</span >、<span style="color: #1f7cff" @click="yincang()">《隐私协议》</span>、<span style="color: #1f7cff" @click="ruzhuxieyi()">《商家入驻协议》</span>
+			</view>
+		</view>
+		
+		<view class="unLogin-singn" @click="unLogin">
+			<view class="login-singn-text">
+				暂不登录
+			</view>
+		</view>
+		
+		
+		<!-- #ifdef MP-WEIXIN -->
+			<ws-wx-privacy id="privacy-popup"></ws-wx-privacy>
+		<!-- #endif -->
+
+
+	</view>
+
+</template>
+
+<script>
+	import {
+		userPhoneLogOnCode,
+		userPhoneLogOn,
+		selectMerchant,
+		queryStoreBranch,
+		getImUser
+	} from '@/commit/api.js'
+	import emHandleReconnect from '@/EaseIM/utils/emHandleReconnect'; 
+	import { emConnect,emUserInfos } from '@/EaseIM/emApis';
+	const { updateUserInfosFromServer } = emUserInfos();
+	const { loginWithPassword } = emConnect();
+	import wxPrivacy from '@/uni_modules/ws-wx-privacy/components/ws-wx-privacy/ws-wx-privacy.vue'
+	export default {
+		data() {
+			return {
+				show: true,
+				count: '',
+				timer: null,
+				is_wei: true,
+				is_yes: false,
+				form: {
+					phone: uni.getStorageSync("user_phone").length == 0?'':uni.getStorageSync("user_phone"),
+					sms_code: '',
+					type: '1'
+				},
+				
+				type: ''
+			}
+		},
+		onLoad(options) {
+			//#ifdef MP-WEIXIN        
+			wx.requirePrivacyAuthorize({            
+			  success: () => {                
+			    console.log('点击同意');            
+			 },            
+			  fail: () => {                
+			    console.log('点击拒绝');                            
+			 },             
+			  complete: () => {                
+			    console.log('用户已点击');            
+			 }       
+			})
+			//#endif
+			
+			this.type = options.type
+			console.log(options.type)
+			console.log(this.type)
+		},
+		components: {
+			wxPrivacy
+		},
+		methods: {
+			
+			handleDisagree() {
+			    // 处理用户不同意隐私协议的逻辑
+			},
+			handleAgree() {
+			    // 处理用户同意隐私协议的逻辑
+		    },
+			
+			
+			getCode() {
+				var mobileReg = /^1[3456789]\d{9}$/;
+				if (this.form.phone == "") {
+					uni.showToast({
+						title: "手机号不能为空",
+						icon: "none"
+					})
+				} else if (!mobileReg.test(this.form.phone)) {
+					uni.showToast({
+						title: "手机号格式有误",
+						icon: "none"
+					})
+				} else {
+					// 点击获取验证码后 保存手机号
+					uni.setStorageSync('user_phone',this.form.phone);
+					const TIME_COUNT = 60;
+					if (!this.timer) {
+						this.count = TIME_COUNT;
+						this.show = false;
+						if (this.show == false) {
+							// 获取验证码
+							userPhoneLogOnCode({
+								phone: this.form.phone
+							}).then(res => {
+								if (res.data.status == 200) {
+									uni.showToast({
+										title: res.data.data.message,
+										icon: "none"
+									})
+								}
+							}, fail => {
+								uni.showToast({
+									title: fail,
+									icon: "error"
+								})
+							}).catch(err => {
+								console.log(err)
+							})
+						}
+						this.timer = setInterval(() => {
+							if (this.count > 0 && this.count <= TIME_COUNT) {
+								this.count--;
+							} else {
+								this.show = true;
+								clearInterval(this.timer);
+								this.timer = null;
+							}
+						}, 1000)
+					}
+				}
+			},
+			inputphone(e) {
+				const o = e.target;
+				const inputRule = /[^\d]/g
+				this.$nextTick(function() {
+					this.form.phone = o.value.replace(inputRule, '');
+					if (this.form.phone.length < 11) {
+						if(this.show==false){
+							this.show = true;
+							clearInterval(this.timer);
+							this.timer = null;
+						}
+					}
+				})
+			},
+			inputcode(e) {
+				const o = e.target;
+				const inputRule = /[^\d]/g
+				this.$nextTick(function() {
+					this.form.sms_code = o.value.replace(inputRule, '');
+				})
+			},
+			xieyi() {
+				
+				uni.setStorageSync('agreementType','2')
+				
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=2" 
+				})
+			},
+			yincang() {
+				uni.setStorageSync('agreementType','1')
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=1"
+				})
+			},
+			ruzhuxieyi() {
+				uni.setStorageSync('agreementType','6')
+				uni.navigateTo({
+					url: "/pages/index/bottombat?type=6" 
+				})
+			},
+			gou() {
+				if (this.is_wei == true) {
+					this.is_wei = false;
+					this.is_yes = true;
+				} else {
+					this.is_wei = true;
+					this.is_yes = false;
+				}
+			},
+			// 暂不登录
+			unLogin() {
+				setTimeout(function() {
+					uni.switchTab({
+						url: '../../my/index'
+					});
+				}, 300);
+			},
+			//lww
+			// loginWithUserId (){
+			// 	try {
+			// 	  uni.setStorage({
+			// 	    key: 'myUsername',
+			// 	    data: loginState.name.toLowerCase(),
+			// 	  });
+			// 	  console.log('22222');
+			// 	  loginStore.setLoginUserBaseInfos({ loginUserId: loginState.name });
+			// 	  setUserTokenToStorage(loginState.name.toLowerCase(), res.accessToken);
+			// 	} catch (error) {
+			// 	  console.log('>>>>>>', error);
+			// 	  uni.showToast({
+			// 	    title: '登录失败',
+			// 	    icon: 'none',
+			// 	  });
+			// 	  console.log('33333');
+			// 	} finally {
+			// 	  loginState.name = '';
+			// 	  loginState.psd = '';
+			// 	}
+			// },
+			//lww
+			async loginWithUserId() {
+			 this.loginEaseIMId =uni.getStorageSync('im_userid')
+			  try {
+			    const res = await loginWithPassword(
+			      this.loginEaseIMId,
+			      uni.getStorageSync('im_pass')
+			    );
+			    this.$store.commit('SET_LOGIN_USER_BASE_INFOS', {
+			      loginUserId:  this.loginEaseIMId,
+			    });
+			    this.setEMUserLoginInfosToStorage(
+			      this.loginEaseIMId.toLowerCase(),
+			      res.accessToken
+				  //注意：res.accessToken
+			    );
+				// this.updateHXUser();
+			  } catch (error) {
+			    console.log('>>>>>>', error);
+			    uni.showToast({
+			      title: '登录失败',
+			      icon: 'none',
+			    });
+			  } finally {
+			    this.loginEaseIMId = '';
+			  }
+			},
+			setEMUserLoginInfosToStorage(userId, token) {
+			  const params = {
+			    key: `EM_LOGIN_INFOS`,
+			    data: { userId: userId, token: token },
+			  };
+			  uni.setStorage({ ...params });
+			},
+			updateHXUser(){
+				console.log('修改环信的昵称');
+				updateUserInfosFromServer({nickname: JSON.stringify(uni.getStorageSync('userinfo')).nickname,avatarurl:JSON.stringify(uni.getStorageSync('userinfo')).avatar});
+				// {nickname: JSON.stringify(uni.getStorageSync('userinfo')).nickname,avatar:JSON.stringify(uni.getStorageSync('userinfo')).avatar}
+			},
+			//lww结束
+			login() {
+				 const { actionEMReconnect } = emHandleReconnect();
+				var mobileReg = /^1[3456789]\d{9}$/;
+				if (this.form.phone == "") {
+					uni.showToast({
+						title: "手机号不能为空",
+						icon: "none"
+					})
+				} else if (!mobileReg.test(this.form.phone)) {
+					uni.showToast({
+						title: "手机号格式有误",
+						icon: "none"
+					})
+				} else if (this.form.sms_code == "") {
+					uni.showToast({
+						title: "请输入验证码",
+						icon: "none"
+					})
+				} else if (this.is_wei == true) {
+					uni.showToast({
+						title: "请勾选协议",
+						icon: "none"
+					})
+					return;
+				} else {
+					// 登录注册
+					userPhoneLogOn(this.form).then(res => {
+						console.log(res)
+						if (res.data.status == 200 && JSON.stringify(res.data.data) != "{}") {
+							uni.setStorageSync('userinfo', res.data.data.user);
+							uni.setStorageSync('authorization', res.data.data.x_token);
+							uni.setStorageSync('storeStaff', res.data.data.storeStaff);
+							// 用户状态判断
+							selectMerchant({
+								uid: res.data.data.user.uid
+							}).then(data => {
+								uni.setStorage({
+								  key: 'myUsername',
+								  data: JSON.stringify(uni.getStorageSync('userinfo').uid),
+								});
+								uni.setStorage({
+								  key: 'mer_id',
+								  data: data.data.data.merchantIntention.mer_id,
+								});
+								
+								if (data.data.status == 200) {
+									uni.setStorageSync('selectmerchant', data.data.data);
+									//lww
+									
+									getImUser({
+										mer_id:	uni.getStorageSync('mer_id'),
+									}).then(data=>{
+										console.log('getImUser======',data.data.data);
+										// actionEMReconnect();
+										 // this.loginWithUserId()
+										const { loginWithPassword } = emConnect();
+										uni.setStorage({
+											key: 'im_userid',
+											data:data.data.data.im_userid
+										})
+										uni.setStorage({
+											key: 'im_pass',
+											data:data.data.data.im_pass
+										})
+										uni.setStorage({
+											key: 'im_uuid',
+											data:data.data.data.im_uuid
+										})
+										//环信注册成功 登录
+										if(data.data.status==200){
+											console.log('>>>>>>>>环信注册成功 登录')
+											this.loginWithUserId()
+											//更新环信的用户信息 头像，昵称
+											
+										}
+									})
+									//lww
+									let storeStaff = uni.getStorageSync('storeStaff')
+									if (storeStaff != null) {
+										queryStoreBranch({
+											id: storeStaff.department
+										}).then(res => {
+											if (res.data.status == 200) {
+												uni.setStorageSync('jurisdiction', res.data.data.jurisdiction);
+											}
+										})
+									} else {
+										uni.setStorageSync('jurisdiction', [7, 9, 5, 3]);
+									}
+									uni.showToast({
+										title: res.data.message,
+										icon: "none"
+									})
+									
+									console.log(this.type, 'this.type')
+									
+									if (this.type == 1) {
+										
+										console.log('返回上一页')
+										uni.navigateBack({
+											delta: 1
+										})
+									} else {
+										setTimeout(function() {
+											uni.switchTab({
+												url: '../../cashier/index'
+											});
+										}, 700);
+									}
+								}
+							}, fail => {
+								uni.showToast({
+									title: fail,
+									icon: "none"
+								})
+							}).catch(err => {
+								console.log(err)
+							})
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: "none"
+							})
+						}
+					}, fail => {
+						uni.showToast({
+							title: fail,
+							icon: "none"
+						})
+					}).catch(data => {
+						console.log(data)
+					})
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.login_header {
+			height: 211rpx;
+			margin-top: 74rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: space-between;
+			align-items: center;
+
+			.login_header_top {
+				width: 216rpx;
+				height: 242rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+			.login_header_botom {
+				width: 156rpx;
+				height: 48rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.input-home {
+			width: 658rpx;
+			height: 238rpx;
+			margin-top: 67rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: space-between;
+
+			.input {
+				width: 100%;
+				height: 118rpx;
+				border-bottom: 1rpx solid #E5E5E5;
+				position: relative;
+
+				input {
+					width: 485rpx;
+					height: 100rpx;
+					margin: 20rpx 0 0 10rpx;
+					color: #333333;
+				}
+
+				.input_code {
+					position: absolute;
+					top: 55rpx;
+					right: 15rpx;
+					font-size: 30rpx;
+					font-weight: 400;
+				}
+			}
+		}
+
+		.login-singn {
+			width: 658rpx;
+			height: 88rpx;
+			background-color: rgba(31, 124, 255, 0.3);
+			border-radius: 10rpx;
+			margin-top: 70rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #333333;
+		}
+
+		.unLogin-singn {
+			margin-top: 88rpx;
+		}
+		.bottom-index {
+			width: 658rpx;
+			height: 33rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 60rpx;
+
+			.bottom-index-in {
+				width: 32rpx;
+				height: 32rpx;
+				line-height: 33rpx;
+				transform: sale(2);
+				image {
+					width: 100%;
+					height: 100%;
+				}
+				margin-right: 20rpx;
+				// position: relative;
+			}
+
+			.bottom-index-ri {
+				height: 100%;
+				font-size: 24rpx;
+			}
+		}
+	}
+</style>

project.config.json

@@ -0,0 +1,30 @@
+{
+    "appid": "touristappid",
+    "compileType": "miniprogram",
+    "libVersion": "2.25.3",
+    "packOptions": {
+        "ignore": [],
+        "include": []
+    },
+    "setting": {
+        "coverView": true,
+        "es6": true,
+        "postcss": true,
+        "minified": true,
+        "enhance": true,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmRelationList": [],
+		"ignoreDevUnusedFiles":false,
+		"ignoreUploadUnusedFiles":false,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
+        }
+    },
+    "condition": {},
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 4
+    }
+}

project.private.config.json

@@ -0,0 +1,7 @@
+{
+    "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "projectname": "merchantapplet",
+    "setting": {
+        "compileHotReLoad": true
+    }
+}

shop/commodity/details.vue

@@ -0,0 +1,685 @@
+<template>
+	<view class="details">
+		<view class="details-header">
+			<view class="details-header-text">
+				<view class="details-header-text-neishi">
+					<view class="details-header-text-icon" @click="topgi">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+
+				<view class="details-header-text-title">
+					订单详情
+				</view>
+			</view>
+		</view>
+		<view class="details-back">
+			<image src="https://cdn.bjtdba.com/vod/image/2022-08-13/20220813171413571.png" mode="widthFix"></image>
+			<view class="details-back-biaohsi">
+				<view class="details-back-biaohsi-kuan">
+					<image src="https://cdn.bjtdba.com/vod/image/2022-08-15/20220815143421834.png" mode="widthFix">
+					</image>
+				</view>
+				<view class="details-back-biaohsi-zhuanbgtia">
+					<view class="details-back-biaohsi-zhuanbgtia-top">
+						{{orderList.status}}
+					</view>
+					<view class="details-back-biaohsi-zhuanbgtia-bot">
+						等待卖家付款
+					</view>
+				</view>
+			</view>
+			<view class="details-back-url">
+				<view class="order-list-yi-bot-xiangxi">
+					<view class="order-list-yi-bot-xiangxier">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-13/20220813164638215.png" mode="widthFix">
+						</image>
+					</view>
+					<view class="order-list-yi-bot-xadasrfe">
+						<view class="order-list-yi-bot-xadasrfe-top">
+							{{orderList.user_address}}
+						</view>
+						<view class="order-list-yi-bot-xadasrfe-bot">
+							<view class="">
+								{{orderList.real_name}}
+							</view>
+							<view class="" style="margin-left: 32rpx;">
+								{{orderList.user_phone!=undefined?orderList.user_phone.substr(0, 3) + '****' + orderList.user_phone.substr(7):"..."}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- details-xiangqing -->
+		<view :class="orderList.status=='待发货'?downP:incrseP">
+			<view class="details-xiangqing-top">
+				<view class="details-xiangqing-top-let">
+					<image :src="orderList.mer_avatar" mode="widthFix"></image>
+				</view>
+				<view class="details-xiangqing-top-in">
+					{{orderList.mer_name}}
+				</view>
+				<view class="details-xiangqing-top-rigt">
+					<image src="https://cdn.bjtdba.com/vod/image/2022-08-15/20220815143434822.png" mode="widthFix">
+					</image>
+				</view>
+			</view>
+			<view class="details-xiangqing-niri">
+				<view class="order-list-yi-in-neibu"  v-for="(item,index) in orderList.procductList" :key="index">
+					<view class="order-list-yi-in-neibu-left">
+						<view class="order-list-yi-in-neibu-left-img">
+							<image :src="item.image" mode="widthFix"></image>
+						</view>
+						<view class="order-list-yi-in-neibu-left-url">
+							<view class="order-list-yi-in-neibu-left-url-top">
+								{{item.store_name}}
+							</view>
+						</view>
+					</view>
+					<view class="order-list-yi-in-neibu-right">
+						<view class="order-list-yi-in-neibu-right-im">
+							¥{{item.pay_price}}
+						</view>
+						<view class="order-list-yi-in-neibu-right-in">
+							共{{item.cart_num}}件
+						</view>
+					</view>
+				</view>
+				<view v-if="orderList.status=='待发货'?true:false"
+					style="margin-top: 26rpx; width: 142rpx;height: 58rpx;border-radius: 30rpx;border: 1rpx solid #999999;font-size: 24rpx;font-weight: 400;color: #333333;text-align: center;line-height: 58rpx;">
+					立即发货
+				</view>
+				<view class="details-xiangqing-shujussss">
+					<view class="details-xiangqing-shujussss-yis">
+						<view class="">
+							商品总额
+						</view>
+						<view class="">
+							+¥{{orderList.pay_price}}
+						</view>
+					</view>
+					<view class="details-xiangqing-shujussss-yis">
+						<view class="">
+							优惠金额
+						</view>
+						<view class="">
+							-¥0.00
+						</view>
+					</view>
+					<view class="details-xiangqing-shujussss-yis">
+						<view class="">
+							订单编号
+						</view>
+						<view class="" @click="copy(orderList.order_id)">
+							{{orderList.order_id}} | 复制
+						</view>
+					</view>
+					<view class="details-xiangqing-shujussss-yis">
+						<view class="">
+							下单时间
+						</view>
+						<view class="">
+							{{orderList.pay_time}}
+						</view>
+					</view>
+					<view class="details-xiangqing-shujussss-yis">
+						<view class="">
+							支付方式
+						</view>
+						<view class="">
+							{{orderList.pay_type}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getOrderDetails
+	} from '@/commit/order.js'
+	export default {
+		data() {
+			return {
+				order_id: '', //订单ID
+				is_limin: true,
+				incrseP: 'details-xiangqing',
+				downP: 'details-xiangqingsssss',
+				orderList: [],
+				indexs: '',
+				status: ''
+			}
+		},
+		onLoad(e) {
+			this.order_id = e.order_id
+			this.indexs = e.indexs
+			this.status = e.status
+			this.getOrderDetails()
+		},
+		methods: {
+			copy(value) {
+				uni.setClipboardData({
+					data: value,
+					success: function() {
+						console.log('success');
+					}
+				})
+			},
+			// 订单详情页面
+			getOrderDetails() {
+				getOrderDetails({
+					order_id: this.order_id
+				}).then(res => {
+					if (res.data.status == 200) {
+						this.orderList = res.data.data.order
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			topgi() {
+				uni.redirectTo({
+					url: './order?status=' + this.status + '&index=' + this.indexs
+					// url: './order'
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.details {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.details-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.details-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.details-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.details-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.details-back {
+			width: 100%;
+			height: 277rpx;
+			margin-top: 176rpx;
+			display: flex;
+			justify-content: center;
+			position: relative;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+
+			.details-back-biaohsi {
+				position: absolute;
+				height: 80rpx;
+				top: 55rpx;
+				left: 43rpx;
+				display: flex;
+				align-items: flex-start;
+
+				.details-back-biaohsi-kuan {
+					width: 38rpx;
+					height: 38rpx;
+					margin-top: 6rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.details-back-biaohsi-zhuanbgtia {
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+					align-items: flex-start;
+					margin-left: 8rpx;
+
+					.details-back-biaohsi-zhuanbgtia-top {
+						font-size: 36rpx;
+						font-weight: 600;
+						color: #FFFFFF;
+					}
+
+					.details-back-biaohsi-zhuanbgtia-bot {
+						font-size: 26rpx;
+						font-weight: 400;
+						color: #FFFFFF;
+					}
+				}
+			}
+
+			.details-back-url {
+				width: 686rpx;
+				height: 176rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				position: absolute;
+				top: 189rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.order-list-yi-bot-xiangxi {
+					width: 634rpx;
+					height: 112rpx;
+					display: flex;
+					align-items: flex-start;
+
+					.order-list-yi-bot-xiangxier {
+						width: 38rpx;
+						height: 38rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.order-list-yi-bot-xadasrfe {
+						width: 544rpx;
+						height: 100%;
+						margin-left: 16rpx;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						align-items: flex-start;
+
+						.order-list-yi-bot-xadasrfe-top {
+							width: 100%;
+							font-size: 26rpx;
+							font-weight: 400;
+							color: #333333;
+							display: -webkit-box;
+							-webkit-box-orient: vertical;
+							-webkit-line-clamp: 2;
+							overflow: hidden;
+						}
+
+						.order-list-yi-bot-xadasrfe-bot {
+							font-size: 28rpx;
+							font-weight: 400;
+							color: #999999;
+							display: flex;
+						}
+					}
+				}
+			}
+		}
+
+		.details-xiangqing {
+			width: 686rpx;
+			// height: 719rpx;
+			background: #FFFFFF;
+			border-radius: 16px;
+			margin-top: 114rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-bottom: 50rpx;
+
+			.details-xiangqing-top {
+				width: 100%;
+				// height: 90rpx;
+				padding: 32rpx 0 32rpx 0;
+				border-bottom: 1rpx solid #E5E5E5;
+				display: flex;
+				align-items: center;
+				color: #333333;
+
+				.details-xiangqing-top-let {
+					width: 32rpx;
+					height: 32rpx;
+					font-size: 11rpx;
+					font-weight: 400;
+					margin-left: 28rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.details-xiangqing-top-in {
+					width: 364rpx;
+					font-size: 28rpx;
+					font-weight: 600;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					margin-left: 6rpx;
+				}
+
+				.details-xiangqing-top-rigt {
+					width: 36rpx;
+					height: 36rpx;
+					margin-left: 8rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+			.details-xiangqing-niri {
+				width: 634rpx;
+				// height: 548rpx;
+				margin: 26rpx 0 50rpx 0;
+				display: flex;
+				flex-direction: column;
+
+				// background-color: orangered;
+				.order-list-yi-in-neibu {
+					width: 634rpx;
+					height: 158rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: flex-start;
+					// background-color: aqua;
+					margin: 10rpx 0 10rpx 0;
+
+					.order-list-yi-in-neibu-left {
+						width: 474rpx;
+						height: 100%;
+						display: flex;
+						align-items: flex-start;
+						justify-content: space-between;
+
+						.order-list-yi-in-neibu-left-img {
+							width: 158rpx;
+							height: 158rpx;
+							overflow: hidden;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+
+						.order-list-yi-in-neibu-left-url {
+							width: 290rpx;
+							display: flex;
+
+							.order-list-yi-in-neibu-left-url-top {
+								width: 100%;
+								font-weight: 400;
+								color: #333333;
+								font-size: 28rpx;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								-webkit-line-clamp: 2;
+								overflow: hidden;
+								justify-content: space-between;
+							}
+
+							.order-list-yi-in-neibu-left-url-top-bot {
+								width: 100%;
+								font-size: 24rpx;
+								font-weight: 400;
+								color: #666666;
+								display: inline-block;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+							}
+						}
+					}
+
+					.order-list-yi-in-neibu-right {
+						height: 73rpx;
+						font-size: 28rpx;
+						font-weight: 500;
+						color: #333333;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						align-items: flex-end;
+
+						.order-list-yi-in-neibu-right-im {
+							font-size: 28rpx;
+							font-weight: 500;
+							color: #333333;
+						}
+
+						.order-list-yi-in-neibu-right-in {
+							font-size: 24rpx;
+							font-weight: 400;
+							color: #666666;
+						}
+					}
+				}
+
+				.details-xiangqing-shujussss {
+					width: 634rpx;
+					height: 340rpx;
+					margin-top: 50rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.details-xiangqing-shujussss-yis {
+						width: 100%;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #333333;
+					}
+				}
+			}
+		}
+
+		.details-xiangqingsssss {
+			width: 686rpx;
+			// height: 779rpx;
+			background: #FFFFFF;
+			border-radius: 16px;
+			margin-top: 114rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			margin-bottom: 50rpx;
+
+			.details-xiangqing-top {
+				width: 100%;
+				// height: 90rpx;
+				padding: 32rpx 0 32rpx 0;
+				border-bottom: 1rpx solid #E5E5E5;
+				display: flex;
+				align-items: center;
+				color: #333333;
+
+				.details-xiangqing-top-let {
+					width: 32rpx;
+					height: 32rpx;
+					font-size: 11rpx;
+					font-weight: 400;
+					margin-left: 28rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.details-xiangqing-top-in {
+					width: 364rpx;
+					font-size: 28rpx;
+					font-weight: 600;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+					margin-left: 6rpx;
+				}
+
+				.details-xiangqing-top-rigt {
+					width: 36rpx;
+					height: 36rpx;
+					margin-left: 8rpx;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+
+			.details-xiangqing-niri {
+				width: 634rpx;
+				// height: 548rpx;
+				margin-top: 26rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: flex-end;
+				margin: 26rpx 0 50rpx 0;
+
+				.order-list-yi-in-neibu {
+					width: 634rpx;
+					height: 158rpx;
+					display: flex;
+					justify-content: space-between;
+					align-items: flex-start;
+					margin: 10rpx 0 10rpx 0;
+
+					.order-list-yi-in-neibu-left {
+						width: 474rpx;
+						height: 100%;
+						display: flex;
+						align-items: flex-start;
+						justify-content: space-between;
+
+						.order-list-yi-in-neibu-left-img {
+							width: 158rpx;
+							height: 158rpx;
+							overflow: hidden;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+
+						.order-list-yi-in-neibu-left-url {
+							width: 290rpx;
+							display: flex;
+
+							.order-list-yi-in-neibu-left-url-top {
+								width: 100%;
+								font-weight: 400;
+								color: #333333;
+								font-size: 28rpx;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								-webkit-line-clamp: 2;
+								overflow: hidden;
+								justify-content: space-between;
+							}
+
+							.order-list-yi-in-neibu-left-url-top-bot {
+								width: 100%;
+								font-size: 24rpx;
+								font-weight: 400;
+								color: #666666;
+								display: inline-block;
+								overflow: hidden;
+								text-overflow: ellipsis;
+								white-space: nowrap;
+							}
+						}
+					}
+
+					.order-list-yi-in-neibu-right {
+						height: 73rpx;
+						font-size: 28rpx;
+						font-weight: 500;
+						color: #333333;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						align-items: flex-end;
+
+						.order-list-yi-in-neibu-right-im {
+							font-size: 28rpx;
+							font-weight: 500;
+							color: #333333;
+						}
+
+						.order-list-yi-in-neibu-right-in {
+							font-size: 24rpx;
+							font-weight: 400;
+							color: #666666;
+						}
+					}
+				}
+
+				.details-xiangqing-shujussss {
+					width: 634rpx;
+					height: 340rpx;
+					margin-top: 50rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: space-between;
+
+					.details-xiangqing-shujussss-yis {
+						width: 100%;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						font-size: 28rpx;
+						font-weight: 400;
+						color: #333333;
+					}
+				}
+			}
+		}
+	}
+</style>

shop/commodity/order.vue

@@ -0,0 +1,676 @@
+<template>
+	<view class="order">
+		<view class="order-header">
+			<view class="order-header-text">
+				<view class="order-header-text-neishi" @click="topgi">
+					<view class="order-header-text-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+				<view class="order-header-text-title">
+					我的订单
+				</view>
+			</view>
+		</view>
+		<view class="order-nbeirong">
+			<view class="order-nbeirong-yi" v-for="(item,index) in num" :key="index" @click="ysne(index,item.status)"
+				:style="index==indexs?'font-weight: 500;color: #1F7CFF;':'font-weight: 400;color: #333333;'">
+				{{item.name}}
+				<view class="order-nbeirong-yi-xiabiapo" v-if="index==indexs?true:false">
+
+				</view>
+			</view>
+		</view>
+		<view class="order-list">
+			<view :class="item.status=='待发货'?downP:incrseP" v-for="(item,index) in list" :key="index"
+				@click="details(item.order_id)">
+				<view class="order-list-yi-top">
+					<view class="order-list-yi-top-left">
+						订单编号：{{item.order_id}}
+					</view>
+					<view class="order-list-yi-top-right">
+						{{item.status}}
+					</view>
+				</view>
+				<view class="order-list-yi-in">
+					<view class="osjdhujfhueihfg">
+						<view class="order-list-yi-in-neibu" v-for="(items,indexs) in item.procductList" :key="indexs">
+							<view class="order-list-yi-in-neibu-left">
+								<view class="order-list-yi-in-neibu-left-img">
+									<image :src="items.image" mode="widthFix"></image>
+								</view>
+								<view class="order-list-yi-in-neibu-left-url">
+									<view class="order-list-yi-in-neibu-left-url-top">
+										{{items.store_name}}
+									</view>
+									<view class="order-list-yi-in-neibu-left-url-top-bot">
+										{{items.sku}}
+									</view>
+								</view>
+							</view>
+							<view class="order-list-yi-in-neibu-right">
+								<view class="order-list-yi-in-neibu-right-im">
+									¥{{items.pay_price}}
+								</view>
+								<view class="order-list-yi-in-neibu-right-in">
+									共{{items.cart_num}}件
+								</view>
+							</view>
+						</view>
+						
+						<view class="" v-if="item.status=='待发货'?true:false"
+							style="width: 142rpx;height: 58rpx;border-radius: 30rpx;border: 1rpx solid #999999;font-size: 24rpx;font-weight: 400;color: #333333;text-align: center;line-height: 58rpx;">
+							立即发货
+						</view>
+					</view>
+				</view>
+				<view class="order-list-yi-bot">
+					<view class="order-list-yi-bot-xiangxi">
+						<view class="order-list-yi-bot-xiangxier">
+							<image src="https://cdn.bjtdba.com/vod/image/2022-08-13/20220813164638215.png"
+								mode="widthFix"></image>
+						</view>
+						<view class="order-list-yi-bot-xadasrfe">
+							<view class="order-list-yi-bot-xadasrfe-top">
+								{{item.user_address}}
+							</view>
+							<view class="order-list-yi-bot-xadasrfe-bot">
+								<view class="">
+									{{item.real_name}}
+								</view>
+								<view class="" style="margin-left: 32rpx;">
+									{{item.user_phone.substr(0, 3) + '****' + item.user_phone.substr(7)}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="" v-if="tihsi==0" style="margin: 60rpx 0 30rpx 0; color: #999999; font-size: 26rpx;">
+				—— 已经到最底部了哦 ——
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		orderList
+	} from '@/commit/order.js'
+	export default {
+		data() {
+			return {
+				page: 1,
+				limit: 10,
+				tihsi: '',
+				is_panudn: true,
+				//uid: 11, //	用户ID 查询用户订单列表需要传
+				mer_id: '', //商户ID    查询商户订单列表的时候需要传
+				status: '', //0：待发货；1：待收货；2：待评价；3：已完成；4已申请退款；-1：已退款）5未支付WADDW
+				indexs: 0,
+				// sty: true,
+				incrseP: 'order-list-yi',
+				downP: 'order-list-yissss',
+				list: [],
+				num: [{
+						name: "待付款",
+						status: 5
+					},
+					{
+						name: "待发货",
+						status: 0
+					},
+					{
+						name: "待收货",
+						status: 1
+					},
+					{
+						name: "待评价",
+						status: 2
+					},
+					// {
+					// 	name: "已完成"
+					// }
+				]
+			}
+		},
+		onLoad(e) {
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			this.mer_id = selectmerchant.merId
+			this.status = e.status //进入状态
+			this.indexs = e.index
+			this.orderList()
+		},
+		onPullDownRefresh() {
+			uni.showLoading({
+				title: '加载中',
+			});
+			this.page = 1
+			this.is_panudn = true
+			this.list = []
+			this.orderList();
+		},
+		onReachBottom() {
+			if (this.is_panudn == true) {
+				this.page++;
+				this.orderList();
+			} else {
+				return
+			}
+		},
+		methods: {
+			// 正向订单列表
+			orderList() {
+				uni.showLoading({
+					title: '加载中',
+				});
+				orderList({
+					pageNum: this.page,
+					pageSize: this.limit,
+					mer_id: this.mer_id,
+					status: this.status
+				}).then(res => {
+					uni.stopPullDownRefresh();
+					if (res.data.status == 200) {
+						this.tihsi = res.data.data.pageInfo.list.length
+						if (res.data.data.pageInfo.list.length > 0) {
+							if (this.page == 1) {
+								this.list = res.data.data.pageInfo.list
+							} else {
+								this.list = this.list.concat(res.data.data.pageInfo.list)
+							}
+						} else {
+							if (this.page == 1) {
+								this.list = []
+							}
+							this.is_panudn = false
+						}
+						uni.hideLoading();
+					}
+				}, fail => {
+					console.log(fail)
+					uni.hideLoading();
+				})
+			},
+			details(e) {
+				uni.redirectTo({
+					// + "&status=" + this.status + "&indexs=" + this.indexs
+					url: './details?order_id=' + e + "&status=" + this.status + "&indexs=" + this.indexs
+				});
+			},
+			ysne(e, i) {
+				this.status = i
+				this.indexs = e
+				this.page = 1
+				this.is_panudn = true
+				this.orderList()
+			},
+			topgi() {
+				uni.switchTab({
+					url: '../../pages/ordermanagement/index'
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.order {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.order-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.order-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.order-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.order-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.order-nbeirong {
+			width: 686rpx;
+			height: 30rpx;
+			margin: 204rpx 0 38rpx 0;
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+
+			.order-nbeirong-yi {
+				font-size: 30rpx;
+				position: relative;
+				display: flex;
+				justify-content: center;
+
+				.order-nbeirong-yi-xiabiapo {
+					position: absolute;
+					top: 45rpx;
+					width: 50rpx;
+					height: 6rpx;
+					background: #1F7CFF;
+					border-radius: 3rpx;
+				}
+			}
+		}
+
+		.order-list {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.order-list-yi {
+				width: 686rpx;
+				// height: 472rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				margin-bottom: 20rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+
+				.order-list-yi-top {
+					width: 100%;
+					// height: 90rpx;
+					padding: 32rpx 0 32rpx 0;
+					border-bottom: 1rpx solid #E5E5E5;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 26rpx;
+
+					.order-list-yi-top-left {
+						font-weight: 500;
+						color: #333333;
+						margin-left: 26rpx;
+					}
+
+					.order-list-yi-top-right {
+						font-weight: 400;
+						color: #1F7CFF;
+						margin-right: 26rpx;
+					}
+				}
+
+				.order-list-yi-in {
+					width: 100%;
+					// height: 210rpx;
+					padding: 26rpx 0 26rpx 0;
+					border-bottom: 1rpx solid #E5E5E5;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.order-list-yi-in-neibu {
+						width: 634rpx;
+						height: 158rpx;
+						display: flex;
+						margin: 10rpx 0 10rpx 0;
+						justify-content: space-between;
+						align-items: flex-start;
+
+						.order-list-yi-in-neibu-left {
+							width: 474rpx;
+							height: 100%;
+							display: flex;
+							align-items: flex-start;
+							justify-content: space-between;
+
+							.order-list-yi-in-neibu-left-img {
+								width: 158rpx;
+								height: 158rpx;
+								overflow: hidden;
+
+								image {
+									width: 100%;
+									height: 100%;
+								}
+							}
+
+							.order-list-yi-in-neibu-left-url {
+								width: 290rpx;
+								height: 70rpx;
+								display: flex;
+								flex-direction: column;
+								justify-content: space-between;
+
+								.order-list-yi-in-neibu-left-url-top {
+									width: 100%;
+									font-weight: 400;
+									color: #333333;
+									font-size: 28rpx;
+									display: inline-block;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									white-space: nowrap;
+								}
+
+								.order-list-yi-in-neibu-left-url-top-bot {
+									width: 100%;
+									font-size: 24rpx;
+									font-weight: 400;
+									color: #666666;
+									display: inline-block;
+									overflow: hidden;
+									text-overflow: ellipsis;
+									white-space: nowrap;
+								}
+							}
+						}
+
+						.order-list-yi-in-neibu-right {
+							height: 73rpx;
+							font-size: 28rpx;
+							font-weight: 500;
+							color: #333333;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+							align-items: flex-end;
+
+							.order-list-yi-in-neibu-right-im {
+								font-size: 28rpx;
+								font-weight: 500;
+								color: #333333;
+							}
+
+							.order-list-yi-in-neibu-right-in {
+								font-size: 24rpx;
+								font-weight: 400;
+								color: #666666;
+							}
+						}
+					}
+				}
+
+				.order-list-yi-bot {
+					width: 100%;
+					// height: 170rpx;
+					padding: 26rpx 0 32rpx 0;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.order-list-yi-bot-xiangxi {
+						width: 634rpx;
+						height: 112rpx;
+						display: flex;
+						align-items: flex-start;
+
+						.order-list-yi-bot-xiangxier {
+							width: 38rpx;
+							height: 38rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+
+						.order-list-yi-bot-xadasrfe {
+							width: 544rpx;
+							height: 100%;
+							margin-left: 16rpx;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+							align-items: flex-start;
+
+							.order-list-yi-bot-xadasrfe-top {
+								width: 100%;
+								font-size: 26rpx;
+								font-weight: 400;
+								color: #333333;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								-webkit-line-clamp: 2;
+								overflow: hidden;
+							}
+
+							.order-list-yi-bot-xadasrfe-bot {
+								font-size: 28rpx;
+								font-weight: 400;
+								color: #999999;
+								display: flex;
+							}
+						}
+					}
+				}
+			}
+
+			.order-list-yissss {
+				width: 686rpx;
+				// height: 556rpx;
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				margin-bottom: 20rpx;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				align-items: center;
+
+				.order-list-yi-top {
+					width: 100%;
+					// height: 90rpx;
+					padding: 32rpx 0 32rpx 0;
+					border-bottom: 1rpx solid #E5E5E5;
+					display: flex;
+					justify-content: space-between;
+					align-items: center;
+					font-size: 26rpx;
+
+					.order-list-yi-top-left {
+						font-weight: 500;
+						color: #333333;
+						margin-left: 26rpx;
+					}
+
+					.order-list-yi-top-right {
+						font-weight: 400;
+						color: #1F7CFF;
+						margin-right: 26rpx;
+					}
+				}
+
+				.order-list-yi-in {
+					width: 100%;
+					// height: 294rpx;
+					border-bottom: 1rpx solid #E5E5E5;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					padding: 26rpx 0 26rpx 0;
+
+					.osjdhujfhueihfg {
+						width: 634rpx;
+						// height: 272rpx;
+
+						display: flex;
+						flex-direction: column;
+						justify-content: space-between;
+						align-items: flex-end;
+
+
+						.order-list-yi-in-neibu {
+							width: 634rpx;
+							height: 158rpx;
+							// background-color: #1F7CFF;
+							display: flex;
+							justify-content: space-between;
+							align-items: flex-start;
+							padding: 10rpx 0 10rpx 0;
+
+							.order-list-yi-in-neibu-left {
+								width: 474rpx;
+								height: 100%;
+								display: flex;
+								align-items: flex-start;
+								justify-content: space-between;
+
+								.order-list-yi-in-neibu-left-img {
+									width: 158rpx;
+									height: 158rpx;
+									// background-color: #1F7CFF;
+									overflow: hidden;
+
+									image {
+										width: 100%;
+										height: auto;
+									}
+								}
+
+								.order-list-yi-in-neibu-left-url {
+									width: 290rpx;
+									height: 70rpx;
+									display: flex;
+									flex-direction: column;
+									justify-content: space-between;
+
+									.order-list-yi-in-neibu-left-url-top {
+										width: 100%;
+										font-weight: 400;
+										color: #333333;
+										font-size: 28rpx;
+										display: inline-block;
+										overflow: hidden;
+										text-overflow: ellipsis;
+										white-space: nowrap;
+									}
+
+									.order-list-yi-in-neibu-left-url-top-bot {
+										width: 100%;
+										font-size: 24rpx;
+										font-weight: 400;
+										color: #666666;
+										display: inline-block;
+										overflow: hidden;
+										text-overflow: ellipsis;
+										white-space: nowrap;
+									}
+								}
+							}
+
+							.order-list-yi-in-neibu-right {
+								height: 73rpx;
+								font-size: 28rpx;
+								font-weight: 500;
+								color: #333333;
+								display: flex;
+								flex-direction: column;
+								justify-content: space-between;
+								align-items: flex-end;
+
+								.order-list-yi-in-neibu-right-im {
+									font-size: 28rpx;
+									font-weight: 500;
+									color: #333333;
+								}
+
+								.order-list-yi-in-neibu-right-in {
+									font-size: 24rpx;
+									font-weight: 400;
+									color: #666666;
+								}
+							}
+						}
+					}
+
+				}
+
+				.order-list-yi-bot {
+					width: 100%;
+					height: 170rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					.order-list-yi-bot-xiangxi {
+						width: 634rpx;
+						height: 112rpx;
+						display: flex;
+						align-items: flex-start;
+
+						.order-list-yi-bot-xiangxier {
+							width: 38rpx;
+							height: 38rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+
+						.order-list-yi-bot-xadasrfe {
+							width: 544rpx;
+							height: 100%;
+							margin-left: 16rpx;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+							align-items: flex-start;
+
+							.order-list-yi-bot-xadasrfe-top {
+								width: 100%;
+								font-size: 26rpx;
+								font-weight: 400;
+								color: #333333;
+								display: -webkit-box;
+								-webkit-box-orient: vertical;
+								-webkit-line-clamp: 2;
+								overflow: hidden;
+							}
+
+							.order-list-yi-bot-xadasrfe-bot {
+								font-size: 28rpx;
+								font-weight: 400;
+								color: #999999;
+								display: flex;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

shop/department/management.vue

@@ -0,0 +1,188 @@
+<template>
+	<view class="management">
+		<view class="management-header">
+			<view class="management-header-text">
+				<view class="management-header-text-neishi" @click="topgi">
+					<view class="management-header-text-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+
+				<view class="management-header-text-title">
+					部门管理
+				</view>
+			</view>
+		</view>
+		<view class="management-bumen">
+			<view class="management-bumen-text">
+				添加部门
+			</view>
+			<view class="management-bumen-icon" @click="tinjia">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811165146454.png" mode="widthFix"></image>
+			</view>
+		</view>
+		<view class="management-list">
+			<view class="kuil" v-for="(item,index) in systemRoleList" :key="index">
+				<view class="kuil-left">
+					部门
+				</view>
+				<view class="kuil-right">
+					{{item.branch}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		queryStoreBranchBymerid
+	} from '@/commit/api.js'
+	export default {
+		data() {
+			return {
+				merid: '',
+				systemRoleList: []
+			}
+		},
+		onLoad() {
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			this.merid = selectmerchant.merId
+			this.queryStoreBranchBymerid()
+		},
+		methods: {
+			//根据门店查询所有部门
+			queryStoreBranchBymerid() {
+				queryStoreBranchBymerid({
+					merId: this.merid
+				}).then(res => {
+					if (res.data.status == 200) {
+						this.systemRoleList = res.data.data.systemRoleList
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			topgi() {
+				uni.switchTab({
+					url: '../../pages/storemanagement/index'
+				});
+			},
+			tinjia() {
+				uni.redirectTo({
+					url: '/shop/department/managementadd'
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.management {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.management-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.management-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.management-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.management-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+				}
+
+			}
+		}
+
+		.management-bumen {
+			width: 686rpx;
+			font-size: 32rpx;
+			font-weight: 400;
+			color: #333333;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin: 202rpx 0 32rpx 0;
+
+			.management-bumen-icon {
+				width: 28rpx;
+				height: 28rpx;
+				margin-left: 12rpx;
+				line-height: 28rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.management-list {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.kuil {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 686rpx;
+				height: 118rpx;
+				background: #FFFFFF;
+				border-radius: 8rpx;
+				margin-bottom: 26rpx;
+				font-size: 30rpx;
+				font-weight: 400;
+				color: #333333;
+
+				.kuil-left {
+					margin-left: 32rpx;
+				}
+
+				.kuil-right {
+					margin-right: 32rpx;
+				}
+			}
+		}
+	}
+</style>

shop/department/managementadd.vue

@@ -0,0 +1,262 @@
+<template>
+	<view class="managementadd">
+		<view class="managementadd-header">
+			<view class="managementadd-header-text">
+
+				<view class="managementadd-header-text-neishi">
+					<view class="managementadd-header-text-icon" @click="topgi">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+
+				<view class="managementadd-header-text-title">
+					添加部门
+				</view>
+			</view>
+		</view>
+		<view class="managementadd-list">
+			<view class="managementadd-list-let">
+				部门
+			</view>
+			<view class="managementadd-list-rig">
+				<input class="uni-input" focus="true" placeholder="请填写" v-model="from.branch" style="text-align:right"
+					placeholder-class="plaClss" placeholder-style="color:#333333;font-size:30rpx" />
+			</view>
+		</view>
+		<view class="managementadd-title">
+			部门权限
+		</view>
+		<view class="managementadd-neirong">
+			<!-- <radio-group @change="radioChange"> -->
+			<label style="" v-for="(item, index) in jurisdictionList" :key="index" @click="oncliki(item)"
+				style="display: flex;">
+				<view style="margin:32rpx 0 22rpx 32rpx">
+					<radio :value="item.name" color="#1F7CFF" :checked="item.checked" />
+				</view>
+				<view style="margin:32rpx 0 22rpx 32rpx">{{item.name}}</view>
+			</label>
+			<!-- </radio-group> -->
+		</view>
+
+
+		<view class="managementadd-annkiu" @click="addto">
+			确认添加
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		addStoreBranch,
+		queryJurisdiction
+	} from '@/commit/api.js'
+	export default {
+		data() {
+			return {
+				jurisdictionList: [],
+				current: false,
+				from: {
+					merId: "330",
+					branch: "",
+					jurisdiction: ""
+				},
+				jurisdictionId: []
+
+			}
+		},
+		onLoad() {
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			this.from.merId = selectmerchant.merId
+			this.jurisdiction()
+		},
+		methods: {
+			//查询所有权限
+			jurisdiction() {
+				queryJurisdiction().then(res => {
+					if (res.data.status == 200) {
+						this.jurisdictionList = res.data.data.jurisdictionList
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			//添加部门
+			addto() {
+				let jurisdictionId = this.jurisdictionId
+				this.from.jurisdiction = jurisdictionId.toString()
+				if (this.from.branch == "") {
+					uni.showToast({
+						title: "请选择部门",
+						icon: 'none'
+					})
+				} else if (this.from.jurisdiction == "") {
+					uni.showToast({
+						title: "请选择部门权限",
+						icon: 'none'
+					})
+				} else {
+					addStoreBranch(this.from).then(res => {
+						if (res.data.status == 200) {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'success',
+							})
+							setTimeout(function() {
+								uni.redirectTo({
+									url: "/shop/department/management"
+								})
+							}, 600);
+						}
+					}, fail => {
+						console.log(fail)
+					})
+				}
+			},
+			oncliki(e) {
+				let tath = this
+				let id = e.id;
+				let a = this.jurisdictionList
+				let array = this.jurisdictionId
+				a.forEach((item,index) => {
+					if (id == item.id) {
+						if (item.checked == true) {
+							item.checked = false
+							array.forEach((itms,inds)=>{
+								if(id == itms){
+									array.splice(inds, 1);
+								}
+							})
+						} else {
+							item.checked = true
+							array.push(item.id)
+						}
+						return item
+					}
+				})
+				this.jurisdictionList = []
+				this.jurisdictionList = a
+				this.jurisdictionId = array
+			},
+			topgi() {
+				uni.redirectTo({
+					url: './management'
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+
+	.plaClss {
+		text-align: right;
+	}
+</style>
+<style lang="scss" scoped>
+	.managementadd {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.managementadd-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.managementadd-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.managementadd-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.managementadd-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.managementadd-list {
+			width: 686rpx;
+			height: 118rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			margin: 202rpx 0 32rpx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #333333;
+
+			.managementadd-list-let {
+				margin-left: 32rpx;
+			}
+
+			.managementadd-list-rig {
+				margin-right: 32rpx;
+
+				input {
+					width: 200rpx;
+				}
+			}
+		}
+
+		.managementadd-title {
+			width: 686rpx;
+			margin: 32rpx 0 26rpx 0;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #333333;
+		}
+
+		.managementadd-neirong {
+			width: 686rpx;
+			height: 100%;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+
+		}
+
+		.managementadd-annkiu {
+			width: 686rpx;
+			height: 98rpx;
+			background: #1F7CFF;
+			border-radius: 8rpx;
+			position: fixed;
+			bottom: 94rpx;
+			font-size: 36rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 98rpx;
+		}
+	}
+</style>

shop/employee/list.vue

@@ -0,0 +1,280 @@
+<template>
+	<view class="list">
+		<view class="list-header">
+			<view class="list-header-text">
+				<view class="list-header-text-neishi" @click="topgi">
+					<view class="list-header-text-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+
+				<view class="list-header-text-title">
+					员工管理
+				</view>
+			</view>
+		</view>
+		<view class="list-bumen">
+			<view class="list-bumen-text">
+				添加员工
+			</view>
+			<view class="list-bumen-icon" @click="tinjia">
+				<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811165146454.png" mode="widthFix"></image>
+			</view>
+		</view>
+		<view class="list-neilist">
+			<view class="list-neilist-nibu" v-for="(item,index) in list" :key="index">
+				<view class="nribyu">
+					<view class="nribyu-left">
+						<view class="nribyu-left-icon">
+							<image :src="item.avatar" mode="widthFix"></image>
+						</view>
+						<view class="nribyu-left-jias">
+							<view class="">
+								部 门: {{item.departmentName}}
+							</view>
+							<view class="">
+								姓 名: {{item.name}}
+							</view>
+							<view class="">
+								手机号: {{item.phone.substr(0, 3) + '****' + item.phone.substr(7)}}
+							</view>
+							<!-- 	<view class="">
+								密 码:
+							</view> -->
+						</view>
+					</view>
+					<view class="nribyu-right">
+						<view class="nribyu-right-img">
+							<image src="https://cdn.bjtdba.com/vod/image/2022-08-12/20220812110126708.png"
+								mode="widthFix"></image>
+						</view>
+						<view class="" @click="Update(item)">
+							编辑
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		queryStoreStaff
+	} from '@/commit/api.js'
+	export default {
+		data() {
+			return {
+				merId: '',
+				list: []
+			}
+		},
+		onLoad() {
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			this.merId = selectmerchant.merId
+			this.queryStoreStaff()
+		},
+		methods: {
+			// 根据部门id查询所有员工
+			queryStoreStaff() {
+				queryStoreStaff({
+					merId: this.merId
+				}).then(res => {
+					console.log(res.data.data, 99)
+					if (res.data.status == 200) {
+						this.list = res.data.data.storeStaffList
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+			// 修改门店员工信息
+			Update(e) {
+				console.log(e)
+				let id = e.id
+				let merId = e.merId
+				let name = e.name
+				let phone = e.phone
+				let department = e.department
+				let departmentName = e.departmentName
+				uni.redirectTo({
+					url: './listadd?id=' + id + "&merId=" + merId + "&name=" + name + "&phone=" + phone +
+						"&department=" + department + "&departmentName=" + departmentName + "&can=" +
+						1
+				});
+			},
+			tinjia() {
+				uni.redirectTo({
+					url: './listadd'
+				});
+			},
+			topgi() {
+				uni.switchTab({
+					url: '../../pages/storemanagement/index'
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.list {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.list-header {
+
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			display: flex;
+			justify-content: center;
+
+			.list-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.list-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.list-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.list-bumen {
+			width: 686rpx;
+			font-size: 32rpx;
+			font-weight: 400;
+			color: #333333;
+			display: flex;
+			justify-content: flex-start;
+			align-items: center;
+			margin: 202rpx 0 32rpx 0;
+
+			.list-bumen-icon {
+				width: 28rpx;
+				height: 28rpx;
+				margin-left: 12rpx;
+				line-height: 28rpx;
+
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+		}
+
+		.list-neilist {
+			width: 100%;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.list-neilist-nibu {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 686rpx;
+				height: 232rpx;
+				background: #FFFFFF;
+				border-radius: 8rpx;
+				margin-bottom: 26rpx;
+
+				.nribyu {
+					width: 640rpx;
+					height: 180rpx;
+					display: flex;
+					align-items: flex-start;
+					justify-content: space-between;
+
+					.nribyu-left {
+						width: 532rpx;
+						height: 100%;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+
+						.nribyu-left-icon {
+							width: 180rpx;
+							height: 180rpx;
+							border-radius: 12rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+								height: 100%;
+								border-radius: 12rpx;
+								overflow: hidden;
+							}
+						}
+
+						.nribyu-left-jias {
+							width: 327rpx;
+							height: 100%;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+							align-content: flex-start;
+							font-size: 30rpx;
+							font-weight: 400;
+							color: #333333;
+						}
+					}
+
+					.nribyu-right {
+						width: 86rpx;
+						height: 26rpx;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						font-size: 26rpx;
+						font-weight: 400;
+						color: #333333;
+
+						.nribyu-right-img {
+							width: 26rpx;
+							height: 26rpx;
+							line-height: 26rpx;
+
+							image {
+								width: 100%;
+								height: 100%;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

shop/employee/listadd.vue

@@ -0,0 +1,328 @@
+<template>
+	<view class="listadd">
+		<view class="listadd-header">
+			<view class="listadd-header-text">
+				<view class="listadd-header-text-neishi">
+					<view class="listadd-header-text-icon" @click="topgi">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+				<view class="listadd-header-text-title">
+					{{can==""?'添加员工':'编辑员工'}}
+				</view>
+			</view>
+		</view>
+		<view class="listadd-list" style="margin-top: 206rpx;">
+			<view class="listadd-list-let">
+				姓名
+			</view>
+			<view class="listadd-list-rig">
+				<input class="uni-input" style="text-align:right" focus="true" v-model="from.name" placeholder="请填写"
+					maxlength="6" placeholder-style="color:#333333;font-size:30rpx;" />
+			</view>
+		</view>
+		<view class="listadd-list">
+			<view class="listadd-list-let">
+				部门
+			</view>
+			<view class="listadd-list-rig">
+				<picker class="#1F7CFF" @change="bindPickerChange" :value="index" :range="array">
+					<!-- &&array[index]=="请选择" -->
+					<view class="uni-input">{{departmentName}}</view>
+				</picker>
+			</view>
+		</view>
+		<view class="listadd-list">
+			<view class="listadd-list-let">
+				手机号
+			</view>
+			<view class="listadd-list-rig">
+				<input class="uni-input" placeholder="请填写" maxlength="11" style="text-align:right"
+					placeholder-style="color:#333333;font-size:30rpx;" v-model="from.phone" @input="inputphone" />
+			</view>
+		</view>
+		<view class="listadd-buxiugai">
+			手机号为员工登录账号，不可修改
+		</view>
+		<view class="listadd-annkiu" @click="addto">
+			{{can==""?'确认添加':'保存'}}
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		storeStafAdd,
+		queryStoreBranchBymerid,
+		updateStoreStaff
+	} from '@/commit/api.js'
+	export default {
+		data() {
+			return {
+				can: "",
+				merId: '',
+				showPassword: true,
+				array: ["请选择"],
+				arrayid: ["1"],
+				index: 0,
+				from: {
+					name: "", //员工名称
+					department: "", //部门id
+					phone: "", //手机号
+					merId: "", //门店id
+					// pawss: "" //密码
+				},
+				departmentName: "请选择",
+				id: "",
+			}
+		},
+		onLoad(e) {
+			let selectmerchant = uni.getStorageSync('selectmerchant')
+			this.merId = selectmerchant.merId
+			this.from.merId = selectmerchant.merId
+			this.queryStoreBranchBymerid()
+			this.can = e.can
+			if (e.can == 1) {
+				console.log(e.department)
+				this.id = e.id
+				this.from.name = e.name
+				this.from.phone = e.phone
+				this.from.department = e.department
+				this.departmentName = e.departmentName
+				console.log(this.departmentName)
+			}
+		},
+		methods: {
+			inputphone(e) {
+				const o = e.target;
+				const inputRule = /[^\d]/g
+				this.$nextTick(function() {
+					this.from.phone = o.value.replace(inputRule, '');
+				})
+			},
+			inputpawss(e) {
+				const o = e.target;
+				const inputRule = /[^\w_]/g
+				this.$nextTick(function() {
+					this.from.pawss = o.value.replace(inputRule, '');
+				})
+			},
+			// 根据门店查询所有部门
+			queryStoreBranchBymerid() {
+				queryStoreBranchBymerid({
+					merId: this.merId
+				}).then(res => {
+					if (res.data.status == 200) {
+						let indexS = 0
+						res.data.data.systemRoleList.forEach((res => {
+							if (this.from.department == res.id) {
+								this.index = indexS + 1
+							}
+							this.array.push(res.branch)
+							this.arrayid.push(res.id)
+							indexS++
+						}))
+					}
+				}, fail => {
+					console.log(fail)
+				})
+			},
+
+			//添加员工
+			addto() {
+				var mobileReg = /^1[3456789]\d{9}$/;
+				if (this.from.name == "") {
+					uni.showToast({
+						title: "请填写姓名",
+						icon: 'none'
+					})
+					console.log(this.arrayid)
+				} else if (this.from.department == "" || this.from.department == 1) {
+					uni.showToast({
+						title: "请选择部门",
+						icon: 'none'
+					})
+				} else if (this.from.phone == "") {
+					uni.showToast({
+						title: "请填写手机号",
+						icon: 'none'
+					})
+				} else if (!mobileReg.test(this.from.phone)) {
+					uni.showToast({
+						title: "手机号格式有误",
+						icon: "none"
+					})
+				} else {
+					if (this.can == undefined) {
+						storeStafAdd(this.from).then(res => {
+							if (res.data.status == 200) {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'success',
+								})
+								setTimeout(function() {
+									uni.redirectTo({
+										url: "/shop/employee/list"
+									})
+								}, 600);
+							}
+
+						}, fail => {
+							console.log(fail)
+						})
+					} else if (this.can == 1) {
+						// 修改门店员工信息
+						let department = this.from.department
+						let name = this.from.name
+						let phone = this.from.phone
+						let id = this.id
+						updateStoreStaff({
+							department: department,
+							name: name,
+							phone: phone,
+							id: id
+						}).then(res => {
+							if (res.data.status == 200) {
+								uni.showToast({
+									title: res.data.message,
+									icon: 'success',
+								})
+								setTimeout(function() {
+									uni.redirectTo({
+										url: "/shop/employee/list"
+									})
+								}, 600);
+							}
+						}, fail => {
+							console.log(fail)
+						})
+					}
+
+				}
+			},
+			bindPickerChange: function(e) {
+				this.from.department = this.arrayid[e.detail.value]
+
+				if (this.can == 1) {
+					if (this.from.department == 1) {
+						this.departmentName = "请选择"
+					}
+				}
+				this.departmentName = this.array[e.detail.value]
+				this.index = e.detail.value
+			},
+			showPwd: function() {
+				this.showPassword = !this.showPassword;
+			},
+			topgi() {
+				uni.redirectTo({
+					url: './list'
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.listadd {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+		.listadd-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.listadd-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.listadd-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.listadd-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.listadd-list {
+			width: 686rpx;
+			height: 118rpx;
+			background: #FFFFFF;
+			border-radius: 8rpx;
+			margin: 26rpx 0 0 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #333333;
+
+			.listadd-list-let {
+				margin-left: 32rpx;
+			}
+
+			.listadd-list-rig {
+				margin-right: 32rpx;
+
+				input {
+					width: 200rpx;
+					// color: #B6B6B6;
+				}
+			}
+		}
+
+		.listadd-buxiugai {
+			width: 686rpx;
+			font-size: 30rpx;
+			font-weight: 400;
+			color: #B6B6B6;
+			margin-top: 26rpx;
+		}
+
+		.listadd-annkiu {
+			width: 686rpx;
+			height: 98rpx;
+			background: #1F7CFF;
+			border-radius: 8rpx;
+			position: fixed;
+			bottom: 94rpx;
+			font-size: 36rpx;
+			font-weight: 400;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 98rpx;
+		}
+	}
+</style>

shop/perating/activitecode.vue

@@ -0,0 +1,537 @@
+<template>
+	<view class="process" v-if="status==1">
+		<view class="process-header">
+			<view class="process-header-text">
+				<view class="process-header-text-neishi" @click="topgi">
+					<view class="process-header-text-icon">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-11/20220811133828415.png" mode="widthFix">
+						</image>
+					</view>
+				</view>
+				<view class="process-header-text-title">
+					聚合码
+				</view>
+			</view>
+		</view>
+		<view class="activite-nav">
+			<view class="activite-card">
+				<image class="activite-card-logo"
+					src="https://cdn.bjtdba.com/vod/image/2024-04-18/20240418171035764.png" mode=""></image>
+				<view class="activite-cardImg">
+					<image :src="qrcode_src" mode="widthFix"></image>
+				</view>
+				<view class="activite-cardText">{{code_id}}</view>
+				<view class="activite-cardBtn">
+					扫码即得养老金
+				</view>
+				<view class="activite-cardPrompt">
+					<view class="activite-prompt">
+						<view class="activite-prompt-left"></view>
+						<view class="activite-prompt-title">支持以下付款</view>
+						<view class="activite-prompt-right"></view>
+					</view>
+					<view class="activite-prompt-img">
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-23/20220823141611538.png" mode=""></image>
+						<image src="https://cdn.bjtdba.com/vod/image/2022-08-23/20220823141556288.png" mode=""></image>
+					</view>
+				</view>
+
+			</view>
+
+			<view class="downLoadButton" @click="clickGeneratePicture">
+				<image class="downLoad-image" src="../../static/saveImage.png" mode=""></image>
+				<view class="downLoad-text">
+					保存图片
+				</view>
+			</view>
+
+		</view>
+
+
+		<!-- ************************* 海报画板 **********************-->
+		<view style="position: absolute; bottom:10%; left: 0%;" v-show="flag">
+			<l-painter :board="poster" css="width: 750rpx;" isCanvasToTempFilePath @success="handleSuccess($event)"
+				@fail="handleError($event)" @progress="handleProgress($event)" ref="poster">
+			</l-painter>
+		</view>
+		<!-- ************************* 海报画板 **********************-->
+	</view>
+</template>
+
+<script>
+	import {
+		queryByKey
+	} from '@/commit/shop.js'
+	import lPainter from "@/uni_modules/lime-painter/components/l-painter/l-painter.vue"
+	export default {
+		components: {
+			lPainter
+		},
+		data() {
+			return {
+				isShowType: false,
+				qrcode_src: '',
+				code_id: '',
+				status: '',
+				imageUrl: '',
+				picture: '',
+				isHide: true,
+				poster: {},
+				image: "",
+				flag:false,
+			}
+		},
+		onLoad(e) {
+			uni.showLoading({
+				title: '加载中',
+				mask: true
+			});
+			this.queryByKey()
+			this.qrcode_src = e.qrcode_src
+			this.code_id = e.code_id
+		},
+		methods: {
+			
+			queryByKey() {
+				queryByKey({
+					key: "merchant_xiaochengxu_shenhe"
+				}).then(res => {
+					if (res.data.status == 200) {
+						this.status = res.data.data.status
+						uni.hideLoading();
+
+						this.drawPoster();
+					}
+				}, fail => {
+					console.log(fail)
+					uni.hideLoading();
+				})
+			},
+
+			// 绘制图片
+			drawPoster() { //获取数据后，开始绘画
+				this.poster = {
+					width: '750rpx',
+					height: '1448rpx',
+					background: '#1F7CFF', //画布背景色
+					// radius: '20rpx',//画布的圆角
+
+					views: [{ //绘制图片，白色圆角背景
+						type: 'image', //绘画的类型，具体官网查看
+						src: 'https://cdn.bjtdba.com/vod/image/2022-08-23/20220823134038776.png', //图片路径
+						mode: 'scaleToFill',
+						css: { //css需要使用驼峰命名
+							marginLeft: '31rpx',
+							marginTop: '154rpx',
+							width: '688rpx',
+							height: '1053rpx'
+						},
+						views: [{ //绘制图片，logo
+								type: 'image', //绘画的类型，具体官网查看
+								src: 'https://cdn.bjtdba.com/vod/image/2022-08-23/20220823134835742.png', //图片路径
+								css: { //css需要使用驼峰命名
+									marginLeft: '271rpx',
+									marginTop: '-52rpx',
+									width: '144rpx',
+									height: '144rpx'
+								}
+							},
+							{ //绘制图片，二维码
+								type: 'image', //绘画的类型，具体官网查看
+								src: this.qrcode_src, //图片路径
+								css: { //css需要使用驼峰命名
+									marginLeft: '164rpx',
+									marginTop: '52rpx',
+									width: '360rpx',
+									height: '360rpx',
+								}
+							},
+							{ //绘制图片，扫码即得养老金 提示背景
+								type: 'image', //绘画的类型，具体官网查看
+								src: 'https://cdn.bjtdba.com/vod/image/2022-08-23/20220823140132620.png', //图片路径
+								css: { //css需要使用驼峰命名
+									marginLeft: '71rpx',
+									marginTop: '111rpx',
+									width: '546rpx',
+									height: '94rpx'
+								},
+								views: [{ //绘制图片，扫码即得养老金 提示
+									type: 'text', //绘画的类型，具体官网查看
+									text: '扫码即得养老金',
+									css: { //css需要使用驼峰命名
+										marginLeft: '10rpx',
+										marginTop: '18rpx',
+										width: '526rpx',
+										height: '50rpx',
+										fontSize: '36rpx',
+										color: '#ffffff',
+										textAlign: "center",
+									}
+								}, ]
+							},
+							{ //绘制图片，支付类型选择背景
+								type: 'view',
+								css: {
+									marginLeft: '82rpx',
+									marginTop: '24rpx',
+									width: '526rpx',
+									height: '206rpx',
+									background: '#DFEAFD',
+									radius: '30rpx 30rpx 30rpx 30rpx',
+								},
+								views: [{ //绘制图片，支持以下付款 提示
+										type: 'text', //绘画的类型，具体官网查看
+										text: '支持以下付款', //图片路径
+										css: { //css需要使用驼峰命名
+											marginLeft: '10rpx',
+											marginTop: '32rpx',
+											width: '506rpx',
+											height: '40rpx',
+											fontSize: '28rpx',
+											color: '#333333',
+											textAlign: "center",
+										}
+									},
+									{ //绘制图片，支付宝logo
+										type: 'image', //绘画的类型，具体官网查看
+										src: 'https://cdn.bjtdba.com/vod/image/2022-08-23/20220823141611538.png', //图片路径
+										css: { //css需要使用驼峰命名
+											marginLeft: '176rpx',
+											marginTop: '32rpx',
+											width: '70rpx',
+											height: '70rpx'
+										}
+									},
+									{ //绘制图片，微信logo
+										type: 'image', //绘画的类型，具体官网查看
+										src: 'https://cdn.bjtdba.com/vod/image/2022-08-23/20220823141556288.png', //图片路径
+										css: { //css需要使用驼峰命名
+											marginLeft: '32rpx',
+											marginTop: '32rpx',
+											width: '70rpx',
+											height: '70rpx'
+										}
+									},
+
+								]
+							},
+
+						]
+					}, ]
+				}
+			},
+
+			topgi() { // 返回按钮事件
+				uni.switchTab({
+					url: '/pages/cashier/index'
+				});
+			},
+			change(e) {
+				console.log("e:", e);
+			},
+
+			// 海报  l-painter回调函数
+			handleSuccess(path) {
+				uni.hideLoading();
+				console.log('完成图片绘制')
+			},
+			handleProgress(number) {
+				this.progressNum = number
+			},
+			handleError(error) {
+				uni.hideLoading();
+			},
+
+			// 点击保存图片 - 1.base64字符串转成url地址
+			clickGeneratePicture() {
+				this.$refs.poster.canvasToTempFilePathSync({
+					fileType: 'jpg',
+					quality: 1,
+					pathType: 'url',
+					success: (res) => {
+						console.log(res.tempFilePath)
+						this.picture = res.tempFilePath
+						// 2.保存
+						this.saveImage()
+					},
+					fail(e) {
+						console.log('???????????', e)
+					}
+				})
+			},
+
+			// 保存图片
+			saveImage() {
+				let that = this
+				if (that.picture !== "") {
+					uni.hideLoading();
+
+					uni.getSetting({
+						success(res) {
+							if (res.authSetting['scope.writePhotosAlbum']) {
+								that.saveImageToAlbum();
+							} else if (res.authSetting['scope.writePhotosAlbum'] === undefined) {
+								uni.authorize({
+									scope: 'scope.writePhotosAlbum',
+									success() {
+										uni.showModal({
+											title: "保存成功",
+											content: "图片已成功保存到相册，快去分享到您的圈子吧",
+											showCancel: false,
+										})
+									},
+									fail() {
+										that.authConfirm()
+									}
+								})
+							} else {
+								that.authConfirm()
+							}
+						}
+					})
+				} else {
+					uni.showModal({
+						title: '提示',
+						content: "生成海报失败,请重试",
+						showCancel: false,
+					})
+				}
+			},
+			
+			// 未授权相册功能 重新弹窗
+			authConfirm() {
+				let that = this
+				wx.showModal({
+					content: '检测到您没打开保存图片权限，是否去设置打开？',
+					confirmText: "确认",
+					cancelText: "取消",
+					success: function(res) {
+						if (res.confirm) {
+							wx.openSetting({
+								success(res) {
+									if (res.authSetting['scope.writePhotosAlbum']) {
+										that.saveImg();
+									} else {
+										uni.showModal({
+											title: '保存失败',
+											content: "您没有授权，无法保存到相册",
+											showCancel: false
+										})
+									}
+								}
+							})
+						} else {
+							uni.showModal({
+								title: '保存失败',
+								content: "您没有授权，无法保存到相册",
+								showCancel: false
+							})
+						}
+					}
+				});
+			},
+
+			// 保存到相册
+			saveImageToAlbum() {
+				uni.saveImageToPhotosAlbum({
+					filePath: this.picture,
+					success: () => {
+						uni.showModal({
+							title: "保存成功",
+							content: "图片已成功保存到相册，快去分享到您的圈子吧",
+							showCancel: false,
+						})
+					}
+				});
+			}
+		},
+
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F8FC;
+	}
+</style>
+<style lang="scss" scoped>
+	.process {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+
+		.process-header {
+			position: fixed;
+			top: 0;
+			left: 0;
+			z-index: 111;
+			width: 100%;
+			height: 176rpx;
+			background: #FFFFFF;
+			display: flex;
+			justify-content: center;
+
+			.process-header-text {
+				width: 686rpx;
+				font-size: 36rpx;
+				font-weight: 500;
+				color: #333333;
+				display: flex;
+				margin-top: 107rpx;
+				align-items: center;
+
+				.process-header-text-neishi {
+					width: 45rpx;
+					height: 45rpx;
+					margin-right: 17rpx;
+
+					.process-header-text-icon {
+						width: 36rpx;
+						height: 36rpx;
+						margin-top: 2rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+			}
+		}
+
+		.activite-nav {
+			width: 100%;
+			height: 100%;
+			margin-top: 176rpx;
+			background-color: red;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			background: url('https://cdn.bjtdba.com/vod/image/2022-08-23/20220823132549341.png') no-repeat;
+			background-size: 100%;
+			padding-bottom: 242rpx;
+
+			.activite-card {
+				width: 688rpx;
+				margin-top: 154rpx;
+				height: 1053rpx;
+				background: url('https://cdn.bjtdba.com/vod/image/2022-08-23/20220823134038776.png') no-repeat;
+				background-size: 100%;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				position: relative;
+
+				.activite-card-logo {
+					width: 144rpx;
+					height: 144rpx;
+					position: absolute;
+					top: -52rpx;
+					left: 50%;
+					transform: translate(-50%, 0);
+				}
+
+				.activite-cardImg {
+					width: 360rpx;
+					height: 360rpx;
+					background: #D8D8D8;
+					margin: 144rpx auto 52rpx auto;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.activite-cardText {
+					line-height: 45rpx;
+					font-size: 32rpx;
+				}
+
+				.activite-cardBtn {
+					width: 546rpx;
+					height: 94rpx;
+					background: url('https://cdn.bjtdba.com/vod/image/2022-08-23/20220823140132620.png') no-repeat;
+					background-size: 100%;
+					color: #FFFFFF;
+					font-size: 36rpx;
+					text-align: center;
+					padding: 20rpx 0 24rpx;
+				}
+
+				.activite-cardPrompt {
+					width: 526rpx;
+					// height: 206rpx;
+					background: #DFEAFD;
+					border-radius: 30rpx;
+					padding: 32rpx 0;
+
+					.activite-prompt {
+						display: flex;
+						align-items: center;
+						justify-content: center;
+
+						.activite-prompt-left {
+							width: 50rpx;
+							height: 2rpx;
+							background: linear-gradient(90deg, rgba(223, 234, 253, 0) 0%, #1F7CFF 100%);
+							border-radius: 1rpx;
+						}
+
+						.activite-prompt-title {
+							font-size: 28rpx;
+							margin: 0 16rpx;
+						}
+
+						.activite-prompt-right {
+							width: 50rpx;
+							height: 2rpx;
+							background: linear-gradient(270deg, rgba(223, 234, 253, 0) 0%, #1F7CFF 100%)
+						}
+					}
+
+					.activite-prompt-img {
+						margin-top: 32rpx;
+						text-align: center;
+
+						image {
+							width: 70rpx;
+							height: 70rpx;
+						}
+
+						:first-child {
+							margin-right: 32rpx;
+						}
+					}
+				}
+			}
+
+			.downLoadButton {
+				width: 128rpx;
+				height: 165rpx;
+				margin-top: 9rpx;
+				// background-color: red;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.downLoad-image {
+					width: 128rpx;
+					height: 128rpx;
+					position: absolute;
+				}
+
+				.downLoad-text {
+					margin-top: 128rpx;
+					color: #FFFFFF;
+					font-size: 26rpx;
+					text-align: center;
+				}
+			}
+
+		}
+	}
+</style>