Merge branch 'main' of http://114.55.169.15:3000/qiushanhe/ss-crm-manage-web into dev-cl

# Conflicts:
#	.env.base

.env.base

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
 #VITE_BASE_URL='http://114.55.169.15:48080'
 
 # 上传路径

.env.front

@@ -4,7 +4,8 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径
-VITE_BASE_URL='http://118.31.23.45:48080'
+#VITE_BASE_URL='http://118.31.23.45:48080'
+VITE_BASE_URL='http://localhost:48080'
 
 # 上传路径
 VITE_UPLOAD_URL='http://118.31.23.45:48080/admin-api/system/file/upload'

package.json

@@ -60,6 +60,7 @@
     "min-dash": "^4.1.1",
     "mitt": "^3.0.0",
     "nprogress": "^0.2.0",
+    "or": "^0.2.0",
     "pinia": "^2.1.3",
     "qrcode": "^1.5.3",
     "qs": "^6.11.2",
@@ -69,6 +70,7 @@
     "vue": "3.3.4",
     "vue-amap": "^0.5.10",
     "vue-dompurify-html": "^5.0.1",
+    "vue-draggable-plus": "^0.5.3",
     "vue-i18n": "9.2.2",
     "vue-router": "^4.2.1",
     "vue-types": "^5.0.3",

src/views/Clue/Order/Comp/AfterSales.vue

@@ -83,18 +83,6 @@
           style="width: 240px"
         />
       </el-form-item>
-      <template v-if="appStore.getAppInfo?.instanceType == 1">
-        <el-form-item>
-          <el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
-            <el-option
-              v-for="item in areaOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
-      </template>
       <el-form-item>
         <el-button @click="handleSearch" v-hasPermi="['clue:order:after-sale-search']">
           查询
@@ -201,7 +189,6 @@
 <script setup name="AfterSales">
 import * as AfterSaleApi from '@/api/clue/afterSale'
 import { getSimpleUserList as getUserOption } from '@/api/system/user'
-import { getAreaSimpleList } from '@/api/school/setting/area'
 import { useUserStore } from '@/store/modules/user'
 
 import DialogAfterSaleAudit from './DialogAfterSaleAudit.vue'
@@ -305,12 +292,7 @@ function handleAudit(row) {
   afterSaleAuditDialog.value.open(row)
 }
 
-const areaOptions = ref([])
 function getOptions() {
-  // 区域
-  getAreaSimpleList().then((data) => {
-    areaOptions.value = data
-  })
   getUserOption().then((data) => {
     userOptions.value = data
   })

src/views/Clue/Order/Comp/Reback.vue

@@ -94,16 +94,6 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-select v-model="searchForm.area" placeholder="选择区域" clearable filterable>
-            <el-option
-              v-for="item in areaOptions"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            />
-          </el-select>
-        </el-form-item>
       </template>
       <el-form-item v-else-if="appStore.getAppInfo?.instanceType == 2">
         <el-select
@@ -414,7 +404,6 @@ import * as FeebackApi from '@/api/clue/payment'
 import { getSimpleUserList as getUserOption, getAllUserList } from '@/api/system/user'
 import { getPlaceList } from '@/api/school/place'
 import { getClassTypeList } from '@/api/school/class'
-import { getAreaSimpleList } from '@/api/school/setting/area'
 import { DICT_TYPE, getDictOptions } from '@/utils/dict'
 import { useUserStore } from '@/store/modules/user'
 
@@ -482,7 +471,6 @@ function handleReset() {
     signSchool: undefined,
     signPlace: undefined,
     signClass: undefined,
-    area: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -553,17 +541,12 @@ function handleAudit(row) {
   feebackDialog.value.open(row)
 }
 
-const areaOptions = ref([])
 function getOptions() {
   // 驾校
   getPlaceList({ placeStatus: 0, schoolStatus: 0, isSearchSchool: true }).then((data) => {
     schoolOptions.value = data.schoolList
     allPlaceOptions.value = data.placeList
   })
-  // 区域
-  getAreaSimpleList().then((data) => {
-    areaOptions.value = data
-  })
   getUserOption().then((data) => {
     userOptions.value = data
   })

src/views/Profile/components/UserSocial.vue

@@ -61,8 +61,8 @@ const bindSocial = () => {
   })
 }
 const bind = (row) => {
-  // message.info('暂未开放，敬请期待')
+  message.info('暂未开放，敬请期待')
-  // return
+  return
   const redirectUri = location.origin + '/user/profile?type=' + row.type
   // 进行跳转
   socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => {