Merge branch 'dev-sjf-2023-12-5'

components.d.ts

@@ -11,30 +11,22 @@ declare module 'vue' {
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElCascader: typeof import('element-plus/es')['ElCascader']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
-    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']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElMenu: typeof import('element-plus/es')['ElMenu']
-    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElProgress: typeof import('element-plus/es')['ElProgress']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     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']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     EquipCard: typeof import('./src/components/equipCard.vue')['default']
     EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
     FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']

env/.env.dev

@@ -5,9 +5,9 @@ VITE_BUILD_MODE = 'dev'
 VITE_API_URL = '/proxyApi' 
 
 # 开发环境接口地址
-# VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
+VITE_proxyTarget = 'http://10.40.92.74:8080'  #盛旭
 
-VITE_proxyTarget = 'http://10.40.92.186:8080'  # 赵福海 (登录) 
+# VITE_proxyTarget = 'http://10.40.92.186:8080'  # 赵福海 (登录) 
 
 # VITE_proxyTarget = 'http://10.40.92.185:9206'  # 赵福海 ( 设备类型) 
 # VITE_proxyTarget = 'http://10.40.92.16:9502'  # 牛 (个人中心 基础信息企业申请认证) 

src/main.ts

@@ -10,6 +10,7 @@ import router from './router'
 import 'element-plus/dist/index.css'
 import './style/css/reset.css'
 
+import registerDirectives from 'utils/directive'
 const app = createApp(App)
 for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
     app.component(key, component)
@@ -19,3 +20,6 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 app.use(pinia)
 app.use(router)
 app.mount('#app')
+
+
+registerDirectives(app)

src/utils/directive/authBtn.ts

@@ -0,0 +1,27 @@
+import { ElMessage } from "element-plus"
+import { useStore } from 'store/main'
+import router from "@/router"
+
+export default function (app: any) {
+  app.directive("authBtn", {
+    mounted(el: any, binding: any, vnode: any) {
+      console.log("binding", binding.value)
+      const store = useStore()
+      if (!store.token) {
+        el.addEventListener("click", () => {
+          ElMessage({
+            type: "warning",
+            message: '暂无权限66'
+          })
+          setTimeout(() => {
+            router.push('/login')
+          }, 300);
+
+        })
+      }else{
+        el.addEventListener("click", binding.value())
+      }
+    }
+
+  })
+}

src/utils/directive/index.ts

@@ -0,0 +1,5 @@
+import registerFocus from './authBtn'; // 获取焦点
+ 
+export default function registerDirectives(app: any) {
+    registerFocus(app);
+}

src/views/equip/detail.vue

@@ -35,7 +35,7 @@
                                 <span>{{ pageData.monthLeasePrice }}</span>
                                 /月
                             </div>
-                            <div class="collect" @click="collectChange">
+                            <div class="collect"  v-authBtn="()=>collectChange"  >
                                 <el-icon class="no" v-show="!isCollect">
                                     <Star/>
                                 </el-icon>
@@ -47,7 +47,7 @@
                         </div>
                         <div class="options">
                             <div class="item contact" @click="openPhone">联系商家</div>
-                            <div class="item applyFor" @click="openLease">我要租</div>
+                            <div class="item applyFor" v-authBtn="()=>openLease">我要租</div>
                         </div>
                     </div>
                 </div>