Merge branch 'main' into dev-wangyiming

# Conflicts:
#	src/http/api/equip.ts

components.d.ts

@@ -13,25 +13,15 @@ declare module 'vue' {
     ElCascader: typeof import('element-plus/es')['ElCascader']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
->>>>>>> dev-sjf-2023-12-5
-=======
-    ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
-    ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
->>>>>>> dev-songyang
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
-    ElDrawer: typeof import('element-plus/es')['ElDrawer']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
-    ElImg: typeof import('element-plus/es')['ElImg']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -39,31 +29,15 @@ declare module 'vue' {
     ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
->>>>>>> dev-sjf-2023-12-5
-=======
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
->>>>>>> dev-songyang
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
->>>>>>> dev-sjf-2023-12-5
-=======
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
->>>>>>> dev-songyang
     ElUpload: typeof import('element-plus/es')['ElUpload']
     EquipCard: typeof import('./src/components/equipCard.vue')['default']
     EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']

env/.env.dev

@@ -5,7 +5,7 @@ VITE_BUILD_MODE = 'dev'
 VITE_API_URL = '/proxyApi' 
 
 # 开发环境接口地址
-VITE_proxyTarget = 'http://10.40.92.66:9205'  #盛旭
+VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
 
 # VITE_proxyTarget = 'http://10.40.92.185:9200'  # 赵福海 (登录) 
 

src/http/api/equip.ts

@@ -1,24 +1,24 @@
-import { post,get,put } from '../index'
+import { post, get, put } from '../index'
 
 // 获取装备列表
 export const getList = (params = {}) => {
-    return post('/zlpt-equip/dev/list',params)
+    return post('/zlpt-equip/dev/list', params)
 }
 
 //获取装备详情
 export const getDetail = (id = '') => {
-    return get(`/zlpt-equip/dev/${id}`)
+    return get(`/dev/${id}`)
 }
 
 //获取  推荐装备列表
-export  const getHotList = (params) => {
-    return get('/zlpt-equip/dev/hotList',params)
+export const getHotList = (params) => {
+    return get('/dev/hotList', params)
 }
 
 export const equipCollect = (params = {}) => {
-    return put('/collect',params)
+    return put('/collect', params)
 }
 
 export const apiSubmitLease = (params = {}) => {
-    return post('/details',params)
+    return post('/details', params)
 }

src/http/api/login/index.ts

@@ -2,5 +2,5 @@ import { get, post } from '../../index'
 
 // 登录接口
 export const loginApi = (data: any) => {
-    return post('/login', data)
+    return post('/zlpt-auth/login', data)
 }

src/http/api/usercenter/baseinfo.ts

@@ -4,6 +4,6 @@ import { get, post } from '../../index'
 
 // 申请企业信息认证接口
 export const applyAttestationApi = (data: any) => {
-    return post('/company_info/addCompanyInfo', data)
+    return post('/zlpt-company/company_info/addCompanyInfo', data)
 }
 

src/http/index.ts

@@ -21,7 +21,7 @@ const service = axios.create({
 
 service.interceptors.request.use(
     (config) => {
-        config.headers['Authorization'] = VITE_ENV == 'development' && VITE_LocalFlag ? VITE_token : store.token
+        config.headers['Authorization'] = store.token
         return config
     },
     (error) => {

src/store/user.ts

@@ -39,13 +39,13 @@ export const useStore = defineStore('myUser', {
         },
         // 获取省份信息
         async getprovinceList() {
-            const res: any = await post('/baseAddress/selectAddress', {})
+            const res: any = await post('/zlpt-company/baseAddress/selectAddress', {})
             this.provinceList = res.data
 
         },
         // 获取市级信息
         async getmarketList(val: any) {
-            const res: any = await post('/baseAddress/selectAddress', { code: val })
+            const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val })
             console.log(res, '市区信息');
             this.marketList = res.data
 
@@ -53,7 +53,7 @@ export const useStore = defineStore('myUser', {
         },
         // 获取区级信息
         async getareaList(val: any) {
-            const res: any = await post('/baseAddress/selectAddress', { code: val })
+            const res: any = await post('/zlpt-company/baseAddress/selectAddress', { code: val })
             this.areaList = res.data
         },
         // 获取证件类型

src/views/AppMain.vue

@@ -1,12 +1,10 @@
 <script setup lang="ts">
     import FooterInfo from '../components/FooterInfo/index.vue'
-    import {useRouter} from "vue-router";
-    import $bus from "@/utils/bus"
+    import HeaderCom from '../layout/header.vue'
     import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
     const locale = zhCn
 
     const route = useRoute()
-    const router = useRouter()
     // 判断是否是个人中心页面 如果是则隐藏页脚
     const isMyInfoPage = () => {
         if (route.path.indexOf('myuser') === -1) {
@@ -16,103 +14,11 @@
         }
     }
 
-    // 搜索查询绑定值
-    const keywordIptValue = ref('')
-
-    // 输入框下方历史搜索记录
-    const searchHistoryList = ref([
-        { name: '220E履带挖掘机' },
-        { name: '3443挖掘机' },
-        { name: '塔式起重机' },
-        { name: '轮式牵引铲运机' }
-    ])
-
-    // 搜索按钮
-    const searchKeywordBtn = (e) => {
-        if(route.path == '/equipList'){
-            $bus.emit('search',keywordIptValue.value)
-        }else {
-            router.push({
-                name:'equipList',
-                state:{keyWord: keywordIptValue.value}
-            })
-        }
-    }
-
-    // 点击下方搜索记录时
-    const handleHistory = (hisValue: any) => {
-        keywordIptValue.value = hisValue
-    }
-    //页面刷新回显模糊搜索词
-    $bus.on('callBackText',(val) => {
-        nextTick(() => {
-            keywordIptValue.value = val
-        })
-    })
-
-
-    onMounted(() => {
-
-    })
+    onMounted(() => {})
 </script>
 
 <template>
-    <div class="shop-header">
-        <div class="header-box">
-            <ul class="header-wapper">
-                <li>
-                    <span>
-                        <a @click="$router.push('/login')">登录</a>
-                        /
-                        <a style="color: #6d6d6d">注册</a>
-                    </span>
-                </li>
-                <li>
-                    <span @click="$router.push({ name: 'myuser' })">个人中心</span>
-                </li>
-                <li @click="$router.push('/collect')">
-                    <img src="./assets/img/home/2023_12_01_beijing2/shoucang.png" alt="" />
-                    <span>收藏夹</span>
-                </li>
-                <li>
-                    <img src="./assets/img/home/2023_12_01_beijing2/shouji.png" alt="" />
-                    <span class="last-span">手机版</span>
-                </li>
-            </ul>
-        </div>
-
-        <!-- 菜单 -->
-        <div class="shop-menu-box">
-            <div class="shop-menu">
-                <div class="left-logo" @click="$router.push('/home')">
-                    <!-- 首页Logo -->
-                    <img
-                        src="@/assets/img/home/2023_12_01_beijing2/logo.png"
-                        alt="首页"
-                        title="首页" />
-                </div>
-                <input
-                    placeholder="输入设备关键词"
-                    type="text"
-                    v-model="keywordIptValue"
-                    @keydown.enter="searchKeywordBtn" />
-                <button class="search-btn" @click="searchKeywordBtn">搜索</button>
-                <div class="erweima">
-                    <div class="tilte">手机扫码登录</div>
-                    <img src="" alt="" />
-                </div>
-
-                <div class="ipt-down">
-                    <a
-                        @click="handleHistory(item.name)"
-                        v-for="item in searchHistoryList"
-                        :key="item.name">
-                        {{ item.name }}
-                    </a>
-                </div>
-            </div>
-        </div>
-    </div>
+    <HeaderCom />
 
     <div class="container">
         <el-config-provider :locale="locale">
@@ -133,144 +39,4 @@
         padding: 20px 30px;
         box-sizing: border-box;
     }
-
-    .shop-header {
-        // height: 157px;
-        width: 100%;
-        position: sticky;
-        top: 0;
-        left: 0;
-        z-index: 999;
-
-        .header-box {
-            background-color: #f5f5f5;
-            width: 100%;
-
-            .header-wapper {
-                width: 1200px;
-                height: 37px;
-                margin: 0 auto;
-                display: flex;
-                align-items: center;
-                justify-content: flex-end;
-
-                li {
-                    display: flex;
-                    align-items: center;
-                    justify-content: center;
-                    height: 37px;
-                    cursor: pointer;
-                    margin-left: 20px;
-
-                    span {
-                        color: #6d6d6d;
-                        font-size: 14px;
-                        padding: 0 20px 0 3px;
-                        border-right: 1px solid #666655;
-
-                        &:hover {
-                            color: #2282ff;
-                        }
-
-                        a {
-                            text-decoration: none;
-                            color: #2282ff;
-                        }
-                    }
-
-                    .last-span {
-                        border: none;
-                        padding: 0;
-                    }
-                }
-            }
-        }
-
-        .shop-menu-box {
-            background-color: #edeef6;
-
-            .shop-menu {
-                position: relative;
-                width: 1200px;
-                height: 140px;
-                margin: 0 auto;
-                display: flex;
-                align-items: center;
-
-                .left-logo {
-                    color: #999999;
-                    font-weight: bold;
-                    font-size: 20px;
-
-                    img {
-                        width: 176px;
-                        height: 58px;
-                        cursor: pointer;
-                    }
-                }
-
-                input {
-                    width: 700px;
-                    height: 45px;
-                    border: 1px solid #5ca4ff;
-                    border-radius: 45px;
-                    margin-left: 70px;
-                    line-height: 45px;
-                    color: transparent;
-                    text-shadow: 0 0 0 #333;
-                    padding-left: 30px;
-                }
-
-                input:focus {
-                    outline: 1px solid #5ca4ff;
-                }
-
-                input::-webkit-input-placeholder {
-                    color: #949494;
-                }
-
-                .search-btn {
-                    width: 100px;
-                    height: 39px;
-                    transform: translateX(-110px);
-                    border-radius: 39px;
-                    background: linear-gradient(132deg, #6de7ff 0%, #348cff 100%);
-                    box-shadow: 0px 2px 4px 0px rgba(20, 175, 255, 0.5);
-                    border: none;
-                    color: #fff;
-                    cursor: pointer;
-                    font-size: 18px;
-                }
-
-                .erweima {
-                    display: none;
-                    width: 100px;
-                    height: 80px;
-                    margin-left: -20px;
-                    padding: 10px;
-                    background-color: #fff;
-
-                    .tilte {
-                        font-size: 14px;
-                        color: #1f88ff;
-                        text-align: center;
-                    }
-                }
-
-                .ipt-down {
-                    position: absolute;
-                    bottom: 20px;
-                    left: 22%;
-                    overflow: hidden;
-
-                    a {
-                        padding: 0 10px;
-                        color: #727272;
-                        font-size: 14px;
-                        cursor: pointer;
-                    }
-                }
-            }
-        }
-    }
 </style>

src/views/EnterpriseCertification.vue

@@ -455,36 +455,6 @@
                     </template>
                 </el-table-column>
             </el-table>
-
-            <!-- <el-row class="header">
-                <el-col :span="v.span" v-for="(v, i) in bankTableHeader" :key="i">
-                    <div
-                        class="item border-top-left"
-                        :class="i + 1 == bankTableHeader.length && 'border-right'">
-                        {{ v.label }}
-                    </div>
-                </el-col>
-            </el-row>
-            <el-row class="content" v-for="(val, index) in bankTableData" :key="index">
-                <el-col :span="v.span" v-for="(v, i) in bankTableHeader" :key="i">
-                    <div
-                        v-if="!v.slot"
-                        class="item border-top-left"
-                        :class="`${i + 1 == bankTableHeader.length && 'border-right'} ${
-                            index + 1 == bankTableData.length && 'border-bottom'
-                        }`">
-                        {{ val[v.prop] || '' }}
-                    </div>
-                    <div
-                        v-else
-                        class="item border-top-left"
-                        :class="`${i + 1 == bankTableHeader.length && 'border-right'} ${
-                            index + 1 == bankTableData.length && 'border-bottom'
-                        }`">
-                        上传附件
-                    </div>
-                </el-col>
-            </el-row> -->
         </div>
         <el-row style="padding-top: 15px">
             <el-form-item>

src/views/user/orderManagement/index.vue

@@ -2,13 +2,9 @@
     import { ref } from 'vue'
     import PagingComponent from 'components/PagingComponent/index.vue'
     import { useRouter } from 'vue-router'
-    import { useStore } from 'store/main'
     import { getOrderListApi } from 'http/api/usercenter/seekorder'
-    import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
     const queryParams = ref({})
-    const userStore = useStore()
     const router = useRouter()
-    const route = useRoute()
     const pageSize = 20
     const pageNumber = 1
     const total: any = ref(0)
@@ -21,7 +17,7 @@
         total.value = res.total
     }
 
-    // getList()
+    getList()
 
     // 查询按钮
     const queryTableList = () => {
@@ -59,74 +55,68 @@
 
 <template>
     <!-- 订单管理 -->
-    <el-config-provider :locale="zhCn">
-        <el-form :model="queryParams" :inline="true" size="small">
-            <el-form-item label="订单编号：" prop="menuName">
-                <el-input />
-            </el-form-item>
-            <el-form-item label="创建时间：" prop="menuName">
-                <el-date-picker
-                    v-model="time"
-                    type="daterange"
-                    unlink-panels
-                    range-separator="-"
-                    start-placeholder="开始时间"
-                    end-placeholder="结束时间"
-                    style="width: 180px" />
-            </el-form-item>
-            <el-form-item label="状态：" prop="menuName">
-                <el-input />
-            </el-form-item>
-            <el-form-item label="装备类型：" prop="menuName">
-                <el-input />
-            </el-form-item>
-            <el-form-item label="装备名称：" prop="menuName">
-                <el-input />
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="queryTableList">查询</el-button>
-                <el-button type="success">保存</el-button>
-            </el-form-item>
-        </el-form>
+    <el-form :model="queryParams" :inline="true" size="small">
+        <el-form-item label="订单编号：" prop="menuName">
+            <el-input />
+        </el-form-item>
+        <el-form-item label="创建时间：" prop="menuName">
+            <el-date-picker
+                v-model="time"
+                type="daterange"
+                unlink-panels
+                range-separator="-"
+                start-placeholder="开始时间"
+                end-placeholder="结束时间"
+                style="width: 180px" />
+        </el-form-item>
+        <el-form-item label="状态：" prop="menuName">
+            <el-input />
+        </el-form-item>
+        <el-form-item label="装备类型：" prop="menuName">
+            <el-input />
+        </el-form-item>
+        <el-form-item label="装备名称：" prop="menuName">
+            <el-input />
+        </el-form-item>
+        <el-form-item>
+            <el-button type="primary" @click="queryTableList">查询</el-button>
+            <el-button type="success">保存</el-button>
+        </el-form-item>
+    </el-form>
 
-        <!-- 表格 -->
-        <el-table
-            :data="tableData"
-            style="width: 100%"
-            :header-cell-style="{
-                background: '#3E98FF',
-                color: '#fff'
-            }">
-            <el-table-column align="center" prop="code" label="订单编号" />
-            <el-table-column align="center" prop="supplierCompany" label="供应商" />
-            <el-table-column align="center" prop="createTime" label="订单创建日期" />
-            <el-table-column align="center" prop="payType" label="装备类型" />
-            <el-table-column align="center" prop="deviceName" label="装备名称" />
-            <el-table-column align="center" prop="orderStatus" label="订单状态" />
-            <el-table-column align="center" prop="name" label="操作" width="320px">
-                <template #default="scope">
-                    <el-button size="small" type="primary" @click="clickPreviewDetails">
-                        查看
-                    </el-button>
-                    <el-button size="small" type="danger" @click="clickRentingTermination">
-                        退租
-                    </el-button>
-                    <el-button size="small" type="warning" @click="clickRenewalOfLease">
-                        续租
-                    </el-button>
-                    <el-button size="small" type="success" @click="clickConfirmReceipt">
-                        确认收货
-                    </el-button>
-                </template>
-            </el-table-column>
-        </el-table>
+    <!-- 表格 -->
+    <el-table
+        :data="tableData"
+        style="width: 100%"
+        :header-cell-style="{
+            background: '#3E98FF',
+            color: '#fff'
+        }">
+        <el-table-column align="center" prop="code" label="订单编号" />
+        <el-table-column align="center" prop="supplierCompany" label="供应商" />
+        <el-table-column align="center" prop="createTime" label="订单创建日期" />
+        <el-table-column align="center" prop="payType" label="装备类型" />
+        <el-table-column align="center" prop="deviceName" label="装备名称" />
+        <el-table-column align="center" prop="orderStatus" label="订单状态" />
+        <el-table-column align="center" prop="name" label="操作" width="320px">
+            <template #default="scope">
+                <el-button size="small" type="primary" @click="clickPreviewDetails">查看</el-button>
+                <el-button size="small" type="danger" @click="clickRentingTermination">
+                    退租
+                </el-button>
+                <el-button size="small" type="warning" @click="clickRenewalOfLease">续租</el-button>
+                <el-button size="small" type="success" @click="clickConfirmReceipt">
+                    确认收货
+                </el-button>
+            </template>
+        </el-table-column>
+    </el-table>
 
-        <PagingComponent
-            @getList="getList"
-            :pageSize="pageSize"
-            :pageNumber="pageNumber"
-            :total="total" />
-    </el-config-provider>
+    <PagingComponent
+        @getList="getList"
+        :pageSize="pageSize"
+        :pageNumber="pageNumber"
+        :total="total" />
 </template>
 
 <style>