5.5号

TUIKit/components/TUIContact/contact-list/index.vue

@@ -234,6 +234,7 @@ function selectItem(item: any) {
         (item: IContactInfoType) => (item as Friend)?.userID === (currentContactInfo.value as Friend)?.userID,
       );
     } else if ((currentContactInfo.value as IGroupModel)?.groupID) {
+     
       targetListItem = contactListMap.value?.groupList?.list?.find(
         (item: IContactInfoType) => (item as IGroupModel)?.groupID === (currentContactInfo.value as IGroupModel)?.groupID,
       );

TUIKit/components/TUIContact/select-friend/index.vue

@@ -1,4 +1,5 @@
 <template>
+  <!-- <div></div> -->
   <SelectUser
     :isRadio="selectOptions.isRadio"
     :isNeedSearch="selectOptions.isNeedSearch"
@@ -55,8 +56,9 @@ watchEffect(() => {
     generateSearchServer(params.isNeedSearch);
   }
   TUIFriendService.getFriendList().then((res: any) => {
-    friendList.value = res.data.map((item: any) => item.profile);
+
-    userList.value = friendList.value;
+    // friendList.value = res.data.map((item: any) => item.profile);
+    userList.value = res.data;
     
   }).catch((err: any) => {
     console.warn('getFriendList error:', err);

TUIKit/components/TUIContact/select-friend/index1.vue

@@ -57,8 +57,8 @@
       generateSearchServer(params.isNeedSearch);
     }
     TUIFriendService.getFriendList().then((res: any) => {
-      friendList.value = res.data.map((item: any) => item.profile);
+      // friendList.value = res.data.map((item: any) => item.profile);
-      userList.value = friendList.value;
+      userList.value =res.data;
     }).catch((err: any) => {
       console.warn('getFriendList error:', err);
     });

TUIKit/components/TUIGroup/manage-group/index.vue

@@ -368,6 +368,7 @@ TUIStore.watch(StoreName.GRP, {
     }
   },
   currentGroupMemberList: (memberList: IGroupMember[]) => {
+    console.log('memberList', memberList);
     groupMemberList.value = memberList;
     member.value = {
       admin: [],
@@ -549,7 +550,8 @@ const toggleMask = async (type?: string) => {
 
 const friendList = async () => {
   const imResponse = await TUIFriendService.getFriendList();
-  const friendList = imResponse.data.map((item: any) => item?.profile);
+  // const friendList = imResponse.data.map((item: any) => item?.profile);
+  const friendList = imResponse.data
   return friendList.filter(
     (item: any) =>
       !userInfo.value.list.some(

TUIKit/components/TUIGroup/manage-group/manage-member.vue

@@ -139,6 +139,7 @@ const selfValue = ref<IGroupSelfInfo>({});
 watchEffect(() => {
   totalMember.value = props.total;
   isShowDeleteBtn.value = props.isShowDel;
+  console.log('-------------', props.list);
   memberList.value = props.list as Array<IGroupMember>;
   selfValue.value = props.self;
 });

TUIKit/components/common/SelectUser/index.vue

@@ -50,7 +50,6 @@ const props = defineProps({
     default: 0,
   },
 });
-
 const reset = () => {
   emits('complete', [],0);
 };

TUIKit/components/common/Transfer/index.vue

@@ -79,7 +79,7 @@
                   "
                   onerror="this.onerror=null;this.src='https://web.sdk.qcloud.com/component/TUIKit/assets/avatar_21.png'"
                 />
-                <span class="name">{{ item.nick || item.userID }}</span>
+                <span class="name">{{ item.remark || item.userID }}</span>
                 <span v-if="item.isDisabled"
                   >（{{ TUITranslateService.t("component.已在群中") }}）</span
                 >
@@ -251,6 +251,7 @@ watchEffect(() => {
         // eslint-disable-next-line vue/no-mutating-props
         props.list.splice(index, 1);
       }
+      console.log("++++++++++", props.list);
       transferList.value = props.list as ITransferListItem[];
     }
   } else {

TUIKit/locales/zh_cn/TUIContact.ts

@@ -4,7 +4,7 @@ const TUIContact = {
   "群聊通知": "群聊通知",
   "系统通知": "系统通知",
   "我的群聊": "我的群聊",
-  "输入ID": "请输入用户/群聊 ID，回车搜索",
+  "输入ID": "请输入用户手机号回车搜索",
   "群名称": "群名称",
   "群ID": "群ID",
   "加入群聊": "加入群聊",

config/api.js

@@ -18,6 +18,11 @@ const dev = {
 };
 // 生产环境
 const prod = {
+	// common: "http://192.168.1.211:8890",
+	// buyer: "http://192.168.1.211:8888",
+	// vlog: "http://192.168.1.211:8099",
+	// web: "http://192.168.1.211:8099",
+	// seller: "http://192.168.1.211:8889",
 	// common: "http://192.168.1.211:8890",
 	// buyer: "http://192.168.1.211:8888",
 	common: "http://43.143.227.203:8890",

pages/mine/openShop/ThirdApply.vue

@@ -224,11 +224,11 @@ export default {
           applyThird(params)
             .then((res) => {
               this.loading = false;
-              // uni.showToast({
+              uni.showToast({
-              //   title: "请正确输入",
+                title: "提交成功",
-              //   icon: "none",
+                icon: "none",
-              //   duration: 1500,
+                duration: 1500,
-              // });
+              });
               setTimeout(() => {
                 uni.navigateTo({
                   url: "/pages/tabbar/user/my",

pages/mine/openShop/index.vue

@@ -377,10 +377,10 @@ export default {
           if (
             this.form.legalPhoto != "" &&
             this.form.legalId != "" &&
-            this.form.legalName != ""
+            this.form.legalName != "" &&
+            this.form.linkName!= "" &&
+            this.form.linkPhone!= "" 
           ) {
-            console.log(params,'========');
-            
             applyFirst(params)
               .then((res) => {
                 if (res.data.success) {

utils/request.js

@@ -3,9 +3,6 @@ import {
 	refreshTokenFn
 } from "@/api/login.js";
 import storage from "@/utils/storage.js";
-import {
-	logout
-} from '@/api/login';
 import {
 	md5
 } from "@/utils/md5.js";
@@ -208,30 +205,28 @@ http.interceptors.response.use(
 				(response.statusCode == 200 && !response.data.success) ||
 				response.statusCode == 400
 			) {
-				if (response.data.message) {
+				if (response.data.code == 408) {
-					if (response.data.code == 408) {
+					uni.showModal({
-						uni.showModal({
+						title: '提示',
-							title: '提示',
+						content: response.data.message,
-							content: response.data.message,
+						showCancel: false,
-							showCancel: false,
+						success() {
-							success() {
+							logout().then(() => {
-								logout().then(() => {
+								cleanStorage();
-									cleanStorage();
+							});
-								});
+						}
-							}
+					})
-						})
+					uni.showToast({
-						uni.showToast({
+						title: response.data.message,
-							title: response.data.message,
+						icon: "none",
-							icon: "none",
+						duration: 1500,
-							duration: 1500,
+					});
-						});
+				} else {
-					} else {
+					uni.showToast({
-						uni.showToast({
+						title: response.data.message,
-							title: response.data.message,
+						icon: "none",
-							icon: "none",
+						duration: 1500,
-							duration: 1500,
+					});
-						});
-					}
 				}
 			} else if (response.data.code == 502) {
 				cleanStorage();