增加群聊功能

http/api/market/chat.js

@@ -0,0 +1,45 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "market";
+
+export function chatCouponCreate(data) {
+  return request({
+    url: urlType + `/admin/chat/coupon/create`,
+    method: "post",
+    data: {
+      ...data,
+    },
+  });
+}
+
+export function chatCouponPage(params) {
+  return request({
+    url: urlType + `/admin/chat/coupon/page`,
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+}
+export function chatCouponExpired(id) {
+  return request({
+    url: urlType + `/admin/chat/coupon/expired/${id}`,
+    method: "delete",
+  });
+}
+
+export function chatCouponGrant(data) {
+  return request({
+    url: urlType + `/admin/chat/coupon/grant`,
+    method: "post",
+    data,
+  });
+}
+
+export function chatCouponRecord(params) {
+  return request({
+    url: urlType + `/admin/chat/coupon/record`,
+    method: "get",
+    params,
+  });
+}

http/api/market/chatCoupon.js

@@ -0,0 +1,14 @@
+import http from "@/http/http.js";
+const request = http.request;
+const urlType = "market";
+
+export function chatCoupon(params) {
+  return request({
+    url: urlType + `/admin/coupon/chatCoupon`,
+    method: "get",
+    params: {
+      ...params,
+    },
+  });
+}
+

http/http.js

@@ -20,7 +20,7 @@ envConfig.changeEnv(storageManage.env("development")); //测试
 
 // 测试服
 // #ifdef H5
-let baseUrl = "/api/";
+let baseUrl = "/javaapi/";
 // #endif
 // #ifndef H5
 // let baseUrl = 'https://tapi.cashier.sxczgkj.cn/'
@@ -204,7 +204,6 @@ function upload(uri, data, file, showLoading = true, extParams = {}) {
   // 放置token
   let headerObject = {};
   // headerObject[appConfig.tokenKey] = storageManage.token()
-
   return commonsProcess(showLoading, () => {
     return uni
       .uploadFile(
@@ -213,7 +212,7 @@ function upload(uri, data, file, showLoading = true, extParams = {}) {
             url: baseUrl + uri,
             formData: data,
             name: "file",
-            filePath: file.path || file.url,
+            filePath: file.path || file.url ||file,
             header: getHeader(),
           },
           extParams

http/php/chat.js

@@ -0,0 +1,87 @@
+import { request } from "./request";
+const prveUrl = "chat/";
+
+/**
+ * 群消息
+ * @param {Object} data 
+ * @returns 
+ */
+export const groupInfo = (data) => {
+  return request(prveUrl + "group/info", "POST", data, true);
+};
+
+export const commonPhrase = (data) => {
+  return request(prveUrl + "common-phrase/index", "POST", data, true);
+};
+export const commonPhraseAdd = (data) => {
+  return request(prveUrl + "common-phrase/add", "POST", data, true);
+};
+
+
+export const commonPhraseDel = (data) => {
+  return request(prveUrl + "common-phrase/del", "POST", data, true);
+};
+
+
+export const groupCreate = (data) => {
+  return request(prveUrl + "group/create", "POST", data, true);
+};
+
+export const groupJoin = (data) => {
+  return request(prveUrl + "group/join", "POST", data, true);
+};
+export const groupGetGroupUrl = (data) => {
+  return request(prveUrl + "group/getgrepurl", "POST", data, true);
+};
+
+export const groupQuit = (data) => {
+  return request(prveUrl + "group/quit", "POST", data, true);
+};
+
+export const groupTarsGroup = (data) => {
+  return request(prveUrl + "group/tarsgroup", "POST", data, true);
+};
+
+export const groupAnnouncement = (data) => {
+  return request(prveUrl + "group/announcement", "POST", data, true);
+};
+export const groupMute = (data) => {
+  return request(prveUrl + "group/mute", "POST", data, true);
+};
+
+export const groupMunute = (data) => {
+  return request(prveUrl + "group/unmute", "POST", data, true);
+};
+
+export const groupKick = (data) => {
+  return request(prveUrl + "group/kick", "POST", data, true);
+};
+
+export const groupMembers = (data) => {
+  return request(prveUrl + "group/members", "POST", data, true);
+};
+
+
+export const messageHistory = (data) => {
+  return request(prveUrl + "message/history", "POST", data, true);
+};
+
+export const messageMarkRead = (data) => {
+  return request(prveUrl + "message/mark-read", "POST", data, true);
+};
+
+export const messageMarkReadAll = (data) => {
+  return request(prveUrl + "message/mark-read-all", "POST", data, true);
+};
+
+export const messageUnreadCount = (data) => {
+  return request(prveUrl + "message/unread-count", "POST", data, true);
+};
+
+export const messageSessionList = (data) => {
+  return request(prveUrl + "message/sessionlist", "POST", data, true);
+};
+
+export const groupDoNotDisturb = (data) => {
+  return request(prveUrl + "group/do-not-disturb", "POST", data, true);
+};

http/php/request.ts

@@ -1,5 +1,9 @@
 //服务器接口地址
-const baseURL : string = 'https://newblockwlx.sxczgkj.cn/index.php/api/'
+// const baseURL : string = 'https://newblockwlx.sxczgkj.cn/index.php/api/'
+let baseURL : string = 'http://192.168.1.42:8787/api/'
+// #ifdef H5
+baseURL='/phpapi/api/'
+// #endif
 // 封装公共请求方法
 function request(url : string, method : "GET" | "POST" | undefined, data : object | any, toast : boolean) {
 	let networkType = ''
@@ -26,7 +30,8 @@ function request(url : string, method : "GET" | "POST" | undefined, data : objec
 		header = {
 			'content-type': 'application/json',
 			'clinttype':uni.getStorageSync('clint_type'),
-			'bausertoken': uni.getStorageSync('phpuserinfo').token
+			'bausertoken': uni.getStorageSync('phpuserinfo').token||'',
+			'token': uni.getStorageSync('iToken').tokenValue||'',
 		};
 		uni.request({
 			url: baseURL + url,
@@ -66,6 +71,7 @@ function request(url : string, method : "GET" | "POST" | undefined, data : objec
 				}
 			},
 			fail(err) {
+				console.log(err)
 				uni.hideLoading()
 				//请求失败
 				uni.showToast({