From 9251f202b2b2ba1ee9b8da0bf9618530e4ae047e Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Thu, 14 Nov 2024 21:13:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue  | 31 +++++++++++++++++++++++--------
 src/main.js                       |  6 +++++-
 src/store/getters.js              |  1 +
 src/store/modules/user.js         |  5 +++++
 src/views/login.vue               |  6 +++---
 src/views/register.vue            |  6 +++---
 src/views/system/device/index.vue | 10 ++++++----
 src/views/system/order/index.vue  | 15 ++-------------
 src/views/system/role/index.vue   | 10 +---------
 src/views/system/rule/index.vue   |  8 ++++----
 10 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 466cd98..101e48e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -6,17 +6,10 @@
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
     <div class="right-menu">
+      <span class="dept-name">{{name}}--{{userTypeText}}</span>
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
-        <el-tooltip content="源码地址" effect="dark" placement="bottom">
-          <ruo-yi-git id="ruoyi-git" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
-        <el-tooltip content="文档地址" effect="dark" placement="bottom">
-          <ruo-yi-doc id="ruoyi-doc" class="right-menu-item hover-effect" />
-        </el-tooltip>
-
         <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
@@ -58,6 +51,10 @@ import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
 
 export default {
+  props: {
+    name: String,
+    userType: String
+  },
   components: {
     Breadcrumb,
     TopNav,
@@ -69,9 +66,20 @@ export default {
     RuoYiDoc
   },
   computed: {
+    userTypeText() {
+      const userTypeMap = {
+        "00": "普通用户",
+        "01": "个人用户",
+        "02": "商家",
+        "09": "超级管理员"
+      };
+      return userTypeMap[this.userType] || "未知类型";
+    },
     ...mapGetters([
       'sidebar',
       'avatar',
+      'userType',
+      'name',
       'device'
     ]),
     setting: {
@@ -146,10 +154,17 @@ export default {
   }
 
   .right-menu {
+    display: flex;
+    align-items: center; /* 垂直居中对齐 */
     float: right;
     height: 100%;
     line-height: 50px;
 
+    .dept-name {
+      font-size: 14px;
+      margin-right: 10px;
+    }
+
     &:focus {
       outline: none;
     }
diff --git a/src/main.js b/src/main.js
index 13c6cf2..6bf9ef7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -63,6 +63,10 @@ Vue.use(plugins)
 Vue.use(VueMeta)
 DictData.install()
 
+//点击空白处模态框不消失
+Element.Dialog.props.closeOnClickModal.default = false;
+
+
 /**
  * If you don't want to use mock-server
  * you want to use MockJs for mock api
@@ -73,7 +77,7 @@ DictData.install()
  */
 
 Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
+  size: Cookies.get('size') || 'mini' // set element-ui default size
 })
 
 Vue.config.productionTip = false
diff --git a/src/store/getters.js b/src/store/getters.js
index 8adb1b6..436d926 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -7,6 +7,7 @@ const getters = {
   cachedViews: state => state.tagsView.cachedViews,
   token: state => state.user.token,
   avatar: state => state.user.avatar,
+  userType: state => state.user.userType,
   name: state => state.user.name,
   introduction: state => state.user.introduction,
   roles: state => state.user.roles,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cdbab1e..1d0c612 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,6 +7,7 @@ const user = {
     id: '',
     name: '',
     avatar: '',
+    userType: '',
     roles: [],
     permissions: []
   },
@@ -24,6 +25,9 @@ const user = {
     SET_AVATAR: (state, avatar) => {
       state.avatar = avatar
     },
+    SET_USERTYPE: (state, userType) => {
+      state.userType = userType
+    },
     SET_ROLES: (state, roles) => {
       state.roles = roles
     },
@@ -65,6 +69,7 @@ const user = {
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.userName)
           commit('SET_AVATAR', avatar)
+          commit('SET_USERTYPE', user.userType)
           resolve(res)
         }).catch(error => {
           reject(error)
diff --git a/src/views/login.vue b/src/views/login.vue
index 387b8fd..ac3cfd8 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -55,9 +55,9 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
-    </div>
+<!--    <div class="el-login-footer">-->
+<!--      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>-->
+<!--    </div>-->
   </div>
 </template>
 
diff --git a/src/views/register.vue b/src/views/register.vue
index 96d19f1..83bac3c 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -60,9 +60,9 @@
       </el-form-item>
     </el-form>
     <!--  底部  -->
-    <div class="el-register-footer">
-      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>
-    </div>
+<!--    <div class="el-register-footer">-->
+<!--      <span>Copyright © 2018-2024 ruoyi.vip All Rights Reserved.</span>-->
+<!--    </div>-->
   </div>
 </template>
 
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index f9318d7..3d1a365 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -669,10 +669,12 @@ export default {
     window.removeEventListener('scroll', this.handleScroll, true)
   },
   created() {
-    listHardwareVersion(this.queryParams).then(response => {
-      this.hardwareVersionOptions = response.rows;
-      this.loading2 = false;
-    });
+    if (this.userName === "admin") {
+      listHardwareVersion(this.queryParams).then(response => {
+        this.hardwareVersionOptions = response.rows;
+        this.loading2 = false;
+      });
+    }
     console.log("当前用户信息：",this.$store.state.user.name)
     const sn = this.$route.params && this.$route.params.sn;
     const vehicleNum = this.$route.params && this.$route.params.vehicleNum;
diff --git a/src/views/system/order/index.vue b/src/views/system/order/index.vue
index c386876..6a229c3 100644
--- a/src/views/system/order/index.vue
+++ b/src/views/system/order/index.vue
@@ -304,7 +304,7 @@
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column label="代理商" align="center" prop="agentName" />-->
-      <el-table-column label="店铺" align="center" prop="storeName" />
+<!--      <el-table-column label="店铺" align="center" prop="storeName" />-->
 <!--      <el-table-column label="订单id" align="center" prop="orderId" />-->
       <el-table-column label="订单号" width="150" align="center" prop="orderNo" />
       <el-table-column label="第三方订单号" width="150" align="center" prop="outTradeNo" />
@@ -360,23 +360,12 @@
       </el-table-column>
       <el-table-column label="手续费" align="center" prop="handlingCharge" />
       <el-table-column label="服务费" align="center" prop="platformServiceFee" />
-      <el-table-column label="运营商分账" align="center" prop="operatorDividend" />
-      <el-table-column label="支付渠道id" align="center" prop="payChannel" />
-<!--      <el-table-column label="配送方式" align="center" prop="deliveryMethod">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.rl_distribution_mode" :value="scope.row.deliveryMethod"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="支付渠道" align="center" prop="channelName" />
       <el-table-column label="取车时间" align="center" prop="pickupTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.pickupTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="取车城市" align="center" prop="pickupCity" />-->
-<!--      <el-table-column label="取车地点  " align="center" prop="pickupLoc" />-->
-      <el-table-column label="取车经度" align="center" prop="pickupLon" />
-      <el-table-column label="取车纬度" align="center" prop="pickupLat" />
-      <el-table-column label="租车周期" align="center" prop="rentalPeriod" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 <!--          <el-button-->
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index fb3b5ef..e6531e4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -292,18 +292,10 @@ export default {
           value: "1",
           label: "全部数据权限"
         },
-        {
-          value: "2",
-          label: "自定数据权限"
-        },
         {
           value: "3",
           label: "本部门数据权限"
         },
-        {
-          value: "4",
-          label: "本部门及以下数据权限"
-        },
         {
           value: "5",
           label: "仅本人数据权限"
@@ -602,4 +594,4 @@ export default {
     }
   }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/system/rule/index.vue b/src/views/system/rule/index.vue
index 2df5bd7..2491f1c 100644
--- a/src/views/system/rule/index.vue
+++ b/src/views/system/rule/index.vue
@@ -81,7 +81,7 @@
       </el-table-column>
       <el-table-column label="售价" align="center" prop="price" />
       <el-table-column label="说明" align="center" prop="explain" />
-      <el-table-column label="骑行价格说明" align="center" prop="instructions" />
+<!--      <el-table-column label="骑行价格说明" align="center" prop="instructions" />-->
       <el-table-column label="超出单位" align="center" prop="outUnit" />
       <el-table-column label="超出价格" align="center" prop="outPrice" />
 <!--      <el-table-column label="是否删除：1-删除" align="center" prop="isDeleted" />-->
@@ -132,9 +132,9 @@
         <el-form-item label="说明" prop="explain">
           <el-input v-model="form.explain" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="骑行价格说明" prop="instructions">
-          <el-input v-model="form.instructions" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
+<!--        <el-form-item label="骑行价格说明" prop="instructions">-->
+<!--          <el-input v-model="form.instructions" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
         <el-form-item label="超出单位" prop="outUnit">
           <!-- <el-input v-model="form.outUnit" placeholder="请输入超出单位" /> -->
           <el-select v-model="form.outUnit" placeholder="请选择超出租赁单位">