From 842e6ea24b2fccf8c07383d5bfd3b99614582377 Mon Sep 17 00:00:00 2001
From: zcxee <495141071@qq.com>
Date: Thu, 12 Sep 2024 01:59:30 +0800
Subject: [PATCH 1/6] sc

---
 src/views/Profile/NotifyMessageDetail.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/Profile/NotifyMessageDetail.vue b/src/views/Profile/NotifyMessageDetail.vue
index 2def516..769ab2f 100644
--- a/src/views/Profile/NotifyMessageDetail.vue
+++ b/src/views/Profile/NotifyMessageDetail.vue
@@ -1,5 +1,12 @@
+<!--
+ * @Author: riverQiu
+ * @Date: 2024-09-11 18:42:37
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2024-09-11 19:03:23
+ * @Description: 
+-->
 <template>
-  <div class="p-20px">
+  <div class="container">
     <ContentWrap style="max-width: 1000px; margin: 0 auto">
       <div class="text-center">
         <div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
@@ -47,6 +54,11 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
+.container {
+  padding: 20px;
+  max-height: 100%;
+  overflow-y: auto;
+}
 :deep(p) {
   font-size: 14px;
 }

From 187c156e883007588b65c22cab2d728c23f520a4 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 12 Sep 2024 09:45:33 +0800
Subject: [PATCH 2/6] sc

---
 src/api/login/index.ts               |  7 +++++++
 src/views/Basic/User/UserForm.vue    |  3 +--
 src/views/Clue/Order/Comp/Reback.vue |  5 +++++
 src/views/Login/MPLogin.vue          | 28 ++++++++++++++++++++++++----
 src/views/Profile/NotifyMessage.vue  | 13 ++++++++++++-
 5 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index a82c649..82eca97 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -71,3 +71,10 @@ export const getAppInfo = (instanceId: number) => {
     url: '/admin-api/system/serviceInstance/getInstanceInfo?instanceId=' + instanceId
   })
 }
+
+export const bindWx = (data: any) => {
+  return request.post({
+    url: '/admin-api/system/user/bing/wx',
+    data
+  })
+}
diff --git a/src/views/Basic/User/UserForm.vue b/src/views/Basic/User/UserForm.vue
index 360f958..967652d 100644
--- a/src/views/Basic/User/UserForm.vue
+++ b/src/views/Basic/User/UserForm.vue
@@ -194,7 +194,6 @@ const submitForm = async () => {
     const data = formData.value as unknown as UserApi.UserVO
     if (formType.value === 'create') {
       const resp = await UserApi.createUser(data)
-      debugger
       if (resp.code == 18888) {
         await message.confirm(resp.msg)
         formData.value.isNewUserConfirm = true
@@ -229,7 +228,7 @@ const resetForm = () => {
     status: CommonStatusEnum.ENABLE,
     roleIds: [],
     hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
-    isNewUserConfirm: undefined
+    isNewUserConfirm: false
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index e7180ac..30323f0 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -7,6 +7,9 @@
       <el-form-item>
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.mobile" placeholder="联系方式" clearable />
+      </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
@@ -331,6 +334,7 @@ const searchForm = ref({
   applyTime: [],
   applyUser: undefined,
   checkTime: [],
+  phone: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -358,6 +362,7 @@ function handleReset() {
     applyTime: [],
     applyUser: undefined,
     checkTime: [],
+    mobile: undefined,
     pageNo: 1,
     pageSize: 20
   }
diff --git a/src/views/Login/MPLogin.vue b/src/views/Login/MPLogin.vue
index 6be8279..7e54f3d 100644
--- a/src/views/Login/MPLogin.vue
+++ b/src/views/Login/MPLogin.vue
@@ -9,12 +9,17 @@
         <el-input v-model="form.password" placeholder="请输入密码" show-password type="password" />
       </el-form-item>
     </el-form>
-    <el-button type="primary" class="w-full" @click="onSubmit">授权登陆</el-button>
-    <div v-if="form.code">code: {{ form.code }}</div>
+    <el-button type="primary" :disabled="formLoading" class="w-full" @click="onSubmit"
+      >授权登陆</el-button
+    >
   </div>
 </template>
 
 <script setup name="MPLogin">
+import { bindWx } from '@/api/login'
+
+const message = useMessage() // 消息弹窗
+
 const form = ref({
   code: undefined,
   username: undefined,
@@ -38,13 +43,28 @@ const params = ref({
   scope: 'snsapi_base' // snsapi_base 静默授权获取 open id ；snsapi_userinfo 需要用户授权，获取详细信息
   // state:'code', // a-zA-Z0-9的参数值，最多128字节
 })
-function onSubmit() {
+
+async function onSubmit() {
   // 这些需要判断没有 code 情况拉起授权登陆，有就结束放在重复拉起授权登陆
   if (!form.value.code) {
     const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
     location.href = access_url
   } else {
-    alert(`授权成功!`)
+    // 校验表单
+    if (!formRef.value) return
+    const valid = await formRef.value.validate()
+    if (!valid) return
+    // 提交请求
+    formLoading.value = true
+    try {
+      await bindWx(form.value)
+      message.success('绑定成功')
+    } catch (error) {
+      console.log(error)
+      message.success('绑定失败')
+    } finally {
+      formLoading.value = false
+    }
   }
 }
 
diff --git a/src/views/Profile/NotifyMessage.vue b/src/views/Profile/NotifyMessage.vue
index 7d1baf6..e9c0c90 100644
--- a/src/views/Profile/NotifyMessage.vue
+++ b/src/views/Profile/NotifyMessage.vue
@@ -122,7 +122,10 @@ const handleQuery = () => {
   getList()
 }
 
-function handleDetail(row: any) {
+async function handleDetail(row: any) {
+  if (!row.readStatus) {
+    await handleReadOne(row.id)
+  }
   const url = router.resolve({
     path: '/nm-detail',
     query: { id: row.id }
@@ -133,6 +136,14 @@ function handleDetail(row: any) {
 const tableRef = ref() // 表格的 Ref
 const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
 
+/** 标记一条站内信已读 */
+const handleReadOne = async (id: number) => {
+  await NotifyMessageApi.updateNotifyMessageRead({
+    ids: [id]
+  })
+  await getList()
+}
+
 /** 标记全部站内信已读 **/
 const handleUpdateAll = async () => {
   await NotifyMessageApi.updateAllNotifyMessageRead({

From cad9fbb0e0067e61ef556845d838fa9234cd0bc8 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Thu, 12 Sep 2024 16:29:50 +0800
Subject: [PATCH 3/6] sc

---
 src/api/login/index.ts      | 2 +-
 src/views/Login/MPLogin.vue | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index 82eca97..38ca856 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -74,7 +74,7 @@ export const getAppInfo = (instanceId: number) => {
 
 export const bindWx = (data: any) => {
   return request.post({
-    url: '/admin-api/system/user/bing/wx',
+    url: '/admin-api/system/user/bind/wx',
     data
   })
 }
diff --git a/src/views/Login/MPLogin.vue b/src/views/Login/MPLogin.vue
index 7e54f3d..0647f2e 100644
--- a/src/views/Login/MPLogin.vue
+++ b/src/views/Login/MPLogin.vue
@@ -9,9 +9,9 @@
         <el-input v-model="form.password" placeholder="请输入密码" show-password type="password" />
       </el-form-item>
     </el-form>
-    <el-button type="primary" :disabled="formLoading" class="w-full" @click="onSubmit"
-      >授权登陆</el-button
-    >
+    <el-button type="primary" :disabled="formLoading" class="w-full" @click="onSubmit">
+      授权登陆
+    </el-button>
   </div>
 </template>
 
@@ -44,6 +44,7 @@ const params = ref({
   // state:'code', // a-zA-Z0-9的参数值，最多128字节
 })
 
+const formLoading = ref(false)
 async function onSubmit() {
   // 这些需要判断没有 code 情况拉起授权登陆，有就结束放在重复拉起授权登陆
   if (!form.value.code) {
@@ -59,9 +60,9 @@ async function onSubmit() {
     try {
       await bindWx(form.value)
       message.success('绑定成功')
+      window.close()
     } catch (error) {
       console.log(error)
-      message.success('绑定失败')
     } finally {
       formLoading.value = false
     }

From 90f7513ca871ccaf4d3fabc0e475fd9f5bb552c8 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 13 Sep 2024 10:18:32 +0800
Subject: [PATCH 4/6] sc

---
 src/views/Clue/Order/Comp/Reback.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/Clue/Order/Comp/Reback.vue b/src/views/Clue/Order/Comp/Reback.vue
index e7180ac..2a6383e 100644
--- a/src/views/Clue/Order/Comp/Reback.vue
+++ b/src/views/Clue/Order/Comp/Reback.vue
@@ -133,8 +133,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="180px" />
-      <el-table-column prop="name" label="线索名称" width="150px" />
+      <el-table-column prop="signId" label="成交单号" min-width="150px" />
+      <el-table-column prop="name" label="线索名称" width="120px" />
       <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
       <el-table-column prop="money" label="回款金额" min-width="120px">
         <template #default="{ row }">
@@ -207,6 +207,12 @@
         label="转化人"
         min-width="90"
       />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="area"
+        label="区域"
+        min-width="90"
+      />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column
         prop="dealDate"

From cab0b3f2eb8544d2e71a84a00e47c2e0ec976ff5 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Fri, 13 Sep 2024 17:41:08 +0800
Subject: [PATCH 5/6] sc

---
 src/views/Basic/Role/Comp/ReportDaily.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/Basic/Role/Comp/ReportDaily.vue b/src/views/Basic/Role/Comp/ReportDaily.vue
index f5ccf52..e3013f6 100644
--- a/src/views/Basic/Role/Comp/ReportDaily.vue
+++ b/src/views/Basic/Role/Comp/ReportDaily.vue
@@ -3,8 +3,8 @@
     <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
       <el-form-item label="开启通知">
         <el-radio-group v-model="form.status">
-          <el-radio :label="1"> 开启 </el-radio>
-          <el-radio :label="0"> 关闭 </el-radio>
+          <el-radio :label="0"> 开启 </el-radio>
+          <el-radio :label="1"> 关闭 </el-radio>
         </el-radio-group>
       </el-form-item>
 

From f6ed6575c4a339b4723da7dcf9ea6b9dcf5c2137 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Sat, 14 Sep 2024 16:37:31 +0800
Subject: [PATCH 6/6] sc

---
 src/views/Basic/Dept/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/Basic/Dept/index.vue b/src/views/Basic/Dept/index.vue
index d40164a..88e4445 100644
--- a/src/views/Basic/Dept/index.vue
+++ b/src/views/Basic/Dept/index.vue
@@ -23,7 +23,11 @@
     <el-table-column prop="name" label="部门名称" />
     <el-table-column prop="leader" label="负责人" width="120" />
     <el-table-column prop="sort" label="排序" width="200" />
-    <el-table-column prop="status" label="状态" width="100" />
+    <el-table-column prop="status" label="状态" width="100">
+      <template #default="{ row }">
+        {{ ['启用', '禁用'][row.status] }}
+      </template>
+    </el-table-column>
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
     <el-table-column label="操作" class-name="fixed-width" width="240">
       <template #default="scope">