Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

main/.env.development

@@ -16,6 +16,6 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
 # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 # 内网接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.88:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
-VITE_APP_UPLOAD_URL = 'http://192.168.18.88:8080'
+VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
 VITE_APP_VIST_URL = 'http://192.168.18.99'

main/src/utils/permission.js

@@ -53,6 +53,7 @@ router.beforeEach(async (to, from, next) => {
     } else {
       next(`/login?redirect=${to.path}`);
     }
+    window.location.reload(); // 强制刷新以重置路由，避免卡在白屏
   }
 });
 

sub-operation-service/src/layouts/component/Header/index.vue

@@ -3,7 +3,7 @@
     <div class="layout-header">
       <div class="layout-header-top">
         <div class="layout-header-top-left">
-          <span class="welcome-msg">您好，欢迎来到农业产业运营平台</span>
+          <span class="welcome-msg">您好，欢迎来到现代农业产业运营平台</span>
           <!-- <div class="left-link">
             <div class="iconfont icon-bigScreen"></div>
             <span>数据大屏</span>

sub-operation-service/src/utils/permission.js

@@ -52,6 +52,7 @@ router.beforeEach(async (to, from, next) => {
     } else {
       next(`/login?redirect=${to.path}`);
     }
+    window.location.reload(); // 强制刷新以重置路由，避免卡在白屏
   }
 });
 

sub-operation-service/src/views/userCenter/addressList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog v-model="dialogVisible" title="地址" width="40%" :before-close="handleClose">
-      <el-form :label-position="labelPosition" label-width="130px" :model="formLabelAlign" style="max-width: 1000px">
+      <el-form label-width="130px" :model="formLabelAlign" style="max-width: 1000px">
         <el-form-item label="联系人" prop="receiverName" :rules="[{ required: true, message: '请输入联系人' }]">
           <el-input v-model="formLabelAlign.receiverName" />
         </el-form-item>
@@ -174,7 +174,6 @@ let page = reactive({
 });
 let ids = ref([]);
 let dialogVisible = ref(false);
-
 let formLabelAlign = reactive({
   receiverName: '',
   receiverPhone: '',
@@ -248,7 +247,7 @@ const showDialogVisible = (data) => {
   dialogVisible.value = true;
   formLabelAlign = data;
   formLabelAlign.isDefault == '1' ? (formLabelAlign.isDefault = true) : (formLabelAlign.isDefault = false);
-  console.log(data);
+  // console.log(data);
 };
 
 const submit = (value) => {
@@ -286,7 +285,7 @@ const getUserAddressList = () => {
     res.data.records.forEach((item) => {
       item.postArea = item.postArea.split(',');
     });
-    console.log(res.data.records);
+    // console.log(res.data.records);
     data.value = res.data.records;
     // addIsCheckProperty(data);
   });
@@ -316,7 +315,7 @@ const getUserAddressList = () => {
 // }
 
 const numberChange = (value, index, indexg) => {
-  console.log(value, index, indexg);
+  // console.log(value, index, indexg);
   if (number.value < value) {
     // addToCart();
   }

sub-operation-service/src/views/warehouseLogistics/warehouse/detail.vue

@@ -237,7 +237,7 @@ const state = reactive({
   data: {
     imageUrl: img1,
     typeId: 1,
-    typeName: '普通仓储',
+    typeName: '常温仓储',
     title: '孟定边贸仓储中心',
     operationUnit: '耿马宏泰物流有限公司 ',
     pricingUnit: '元/㎡·月',
@@ -261,7 +261,7 @@ const allData = ref([
   {
     imageUrl: img1,
     typeId: 1,
-    typeName: '普通仓储',
+    typeName: '常温仓储',
     title: '孟定边贸仓储中心',
     operationUnit: '耿马宏泰物流有限公司 ',
     pricingUnit: '元/㎡·月',
@@ -274,7 +274,7 @@ const allData = ref([
   {
     imageUrl: img2,
     typeId: 2,
-    typeName: '普通仓储',
+    typeName: '常温仓储',
     title: '绿色食品园区集散仓',
     operationUnit: '耿马县供销集团',
     pricingUnit: '元/吨·天',
@@ -284,23 +284,23 @@ const allData = ref([
     price: '￥1.5元/吨/月',
     rank: '2',
   },
-  {
+  // {
-    imageUrl: img3,
+  //   imageUrl: img3,
-    typeId: 3,
+  //   typeId: 3,
-    typeName: '恒温仓储',
+  //   typeName: '恒温仓储',
-    title: '蔗糖储备恒温库',
+  //   title: '蔗糖储备恒温库',
-    operationUnit: '耿马糖业有限公司',
+  //   operationUnit: '耿马糖业有限公司',
-    pricingUnit: '元/托·月',
+  //   pricingUnit: '元/托·月',
-    storageArea: '3,200㎡',
+  //   storageArea: '3,200㎡',
-    usableArea: '800㎡',
+  //   usableArea: '800㎡',
-    location: '耿马糖厂东侧',
+  //   location: '耿马糖厂东侧',
-    price: '￥28元/托/月',
+  //   price: '￥28元/托/月',
-    rank: '3',
+  //   rank: '3',
-  },
+  // },
   {
     imageUrl: img4,
     typeId: 4,
-    typeName: '冷库',
+    typeName: '高标准冷库',
     title: '孟定果蔬冷链中心',
     operationUnit: '临沧边境合作区管委会 ',
     pricingUnit: '元/板·天',
@@ -310,19 +310,19 @@ const allData = ref([
     price: '￥2.8元/板/月',
     rank: '4',
   },
-  {
+  // {
-    imageUrl: img5,
+  //   imageUrl: img5,
-    typeId: 5,
+  //   typeId: 5,
-    typeName: '气调仓储',
+  //   typeName: '气调仓储',
-    title: '高原蔬菜气调保鲜库',
+  //   title: '高原蔬菜气调保鲜库',
-    operationUnit: '耿马高原农业合作社 ',
+  //   operationUnit: '耿马高原农业合作社 ',
-    pricingUnit: '元/吨·月',
+  //   pricingUnit: '元/吨·月',
-    storageArea: '1,800㎡',
+  //   storageArea: '1,800㎡',
-    usableArea: '300㎡',
+  //   usableArea: '300㎡',
-    location: '勐撒镇蔬菜基地',
+  //   location: '勐撒镇蔬菜基地',
-    price: '￥45元/吨/月',
+  //   price: '￥45元/吨/月',
-    rank: '5',
+  //   rank: '5',
-  },
+  // },
 ]);
 const dialogVisible = ref(false);
 const unifiedWidth = '300px';

sub-operation-service/src/views/warehouseLogistics/warehouse/index.vue

@@ -43,11 +43,11 @@
             </div>
             <div class="warehouse-content-box-center">
               <p class="center-title">
-                <span class="highlight">【{{ item.typeName }}】</span>{{ item.title }}
+                {{ item.title }}
               </p>
               <div class="center-text">
-                <div class="center-text-lable">运营单位：</div>
+                <div class="center-text-lable">仓储类型：</div>
-                <div class="flex-1">{{ item.operationUnit }}</div>
+                <div class="flex-1">{{ item.typeName }}</div>
                 <div class="center-text-lable">计价单位：</div>
                 <div class="center-text-cont">{{ item.pricingUnit }}</div>
               </div>
@@ -99,7 +99,7 @@ const router = useRouter();
 
 // const tab0 = reactive(['仓储服务', '仓储需求']);
 const tab0 = reactive(['仓储服务']);
-const tab1 = reactive(['全部', '普通仓储', '恒温仓储', '冷库', '气调仓储']);
+const tab1 = reactive(['全部', '常温仓储', '高标准冷库']);
 const currentTab0 = ref(0);
 const currentTab1 = ref(0);
 const handleClick = (index) => {
@@ -131,7 +131,7 @@ const state = reactive({
     {
       imageUrl: img1,
       typeId: 1,
-      typeName: '普通仓储',
+      typeName: '常温仓储',
       title: '孟定边贸仓储中心',
       operationUnit: '耿马宏泰物流有限公司 ',
       pricingUnit: '元/㎡·月',
@@ -144,7 +144,7 @@ const state = reactive({
     {
       imageUrl: img2,
       typeId: 2,
-      typeName: '普通仓储',
+      typeName: '常温仓储',
       title: '绿色食品园区集散仓',
       operationUnit: '耿马县供销集团',
       pricingUnit: '元/吨·天',
@@ -154,23 +154,23 @@ const state = reactive({
       price: '￥1.5元/吨/月',
       rank: '2',
     },
-    {
+    // {
-      imageUrl: img3,
+    //   imageUrl: img3,
-      typeId: 3,
+    //   typeId: 3,
-      typeName: '恒温仓储',
+    //   typeName: '恒温仓储',
-      title: '蔗糖储备恒温库',
+    //   title: '蔗糖储备恒温库',
-      operationUnit: '耿马糖业有限公司',
+    //   operationUnit: '耿马糖业有限公司',
-      pricingUnit: '元/托·月',
+    //   pricingUnit: '元/托·月',
-      storageArea: '3,200㎡',
+    //   storageArea: '3,200㎡',
-      usableArea: '800㎡',
+    //   usableArea: '800㎡',
-      location: '耿马糖厂东侧',
+    //   location: '耿马糖厂东侧',
-      price: '￥28元/托/月',
+    //   price: '￥28元/托/月',
-      rank: '3',
+    //   rank: '3',
-    },
+    // },
     {
       imageUrl: img4,
       typeId: 4,
-      typeName: '冷库',
+      typeName: '高标准冷库',
       title: '孟定果蔬冷链中心',
       operationUnit: '临沧边境合作区管委会 ',
       pricingUnit: '元/板·天',
@@ -180,19 +180,19 @@ const state = reactive({
       price: '￥2.8元/板/月',
       rank: '4',
     },
-    {
+    // {
-      imageUrl: img5,
+    //   imageUrl: img5,
-      typeId: 5,
+    //   typeId: 5,
-      typeName: '气调仓储',
+    //   typeName: '气调仓储',
-      title: '高原蔬菜气调保鲜库',
+    //   title: '高原蔬菜气调保鲜库',
-      operationUnit: '耿马高原农业合作社 ',
+    //   operationUnit: '耿马高原农业合作社 ',
-      pricingUnit: '元/吨·月',
+    //   pricingUnit: '元/吨·月',
-      storageArea: '1,800㎡',
+    //   storageArea: '1,800㎡',
-      usableArea: '300㎡',
+    //   usableArea: '300㎡',
-      location: '勐撒镇蔬菜基地',
+    //   location: '勐撒镇蔬菜基地',
-      price: '￥45元/吨/月',
+    //   price: '￥45元/吨/月',
-      rank: '5',
+    //   rank: '5',
-    },
+    // },
   ],
 });
 const allData = ref([...state.data]);