soobin 1 год назад
Родитель
Сommit
040298936c

+ 10 - 3
src/router/index.js

@@ -19,14 +19,14 @@ const router = createRouter({
       path: "/fife",
       name: "fife",
       component: () => import("@/views/fife/index.vue"),
-      meta: { index: 1, noLogin: true }
+      meta: { index: 1, noLogin: true },
     },
     // 售后部员工修改位置信息
     {
       path: "/modifyLoc",
       name: "modifyLoc",
       component: () => import("@/views/fife/modifyLoc.vue"),
-      meta: { index: 1 }
+      meta: { index: 1 },
     },
     // 登录页面
     {
@@ -68,7 +68,7 @@ const router = createRouter({
       path: "/syncOldData",
       name: "syncOldData",
       component: () => import("@/views/syncOldData/index.vue"),
-      meta: { index: 1},
+      meta: { index: 1 },
     },
     // 修改密码页面
     {
@@ -555,6 +555,13 @@ const router = createRouter({
       meta: { index: 1, noLogin: true },
     },
     // apk管理,广告管理,订单导出 不是所有的帐号能看到
+    // 汇付支付获取openid
+    {
+      path: "/payWechat",
+      name: "payWechat",
+      component: () => import("@/views/payWechat"),
+      meta: { index: 1, noLogin: true },
+    },
   ],
 });
 // 路由守卫处理

+ 0 - 42
src/styles/orderCenter/index.less

@@ -4,28 +4,19 @@
     height: calc(100% - 44px);
     overflow: auto;
     overflow-x: hidden;
-    // background-color: #f5f5f5;
 
     .main3 {
-      // width: 100%;
       height: 60px;
       background: rgba(255, 255, 255, 1) url("../../assets/home/line.png") bottom center no-repeat;
       background-size: 100% auto;
       background-color: #ffffff;
 
       .group4 {
-        // width: 100%;
-        // height: 17px;
         padding: 0 20px;
 
         .ImageText1 {
-          // height: 16px;
-          // margin-top: 1px;
-          // width: 87px;
 
           .outer2 {
-            // width: 50px;
-            // height: 16px;
 
             .block1 {
               width: 15px;
@@ -36,13 +27,8 @@
             }
 
             .TextGroup1 {
-              // height: 14px;
-              // margin-top: 2px;
-              // width: 65px;
 
               .txt1 {
-                // width: 65px;
-                // height: 14px;
                 overflow-wrap: break-word;
                 color: rgba(64, 77, 116, 1);
                 font-size: 14px;
@@ -57,13 +43,10 @@
         }
 
         .main5 {
-          // width: auto;
           cursor: pointer;
 
           .label2 {
             width: 16px;
-            // height: 20px;
-            // margin-right: 5px;
           }
         }
       }
@@ -408,38 +391,17 @@
   }
 
   .orderPopBox {
-    // width: 100%;
     background-color: rgba(255, 255, 255, 1);
-    // border-radius: 1vw 1vw 0 0;
     height: auto;
     padding: 10px 10px;
 
-    // .section1 {
-
-    // .group3 {
 
     .popTopBox {
       height: 70px;
 
       .popTopTxtBox {
-        // height: 71px;
-
-        // .txt4 {
-        //   width: 98px;
-        //   height: 13px;
-        //   overflow-wrap: break-word;
-        //   color: rgba(64, 77, 116, 1);
-        //   font-size: 14px;
-        //   font-family: PingFangSC-Medium;
-        //   text-align: left;
-        //   white-space: nowrap;
-        //   line-height: 14px;
-        //   display: block;
-        // }
 
         .business {
-          // width: 28px;
-          // height: 13px;
           overflow-wrap: break-word;
           color: rgba(64, 77, 116, 1);
           font-size: 15px;
@@ -448,12 +410,9 @@
           white-space: nowrap;
           line-height: 15px;
           display: block;
-          // margin: 5vw 0 0 5vw;
         }
 
         .incomePrice {
-          // width: 68px;
-          // height: 30px;
           overflow-wrap: break-word;
           color: rgba(223, 94, 76, 1);
           font-size: 20px;
@@ -462,7 +421,6 @@
           white-space: nowrap;
           line-height: 20px;
           display: block;
-          // margin: 5px 0 0 15px;
           margin-top: 8px;
         }
       }

+ 6 - 6
src/views/device/index.vue

@@ -80,19 +80,19 @@
                 <!-- 温湿度 -->
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
                   class="txt1 o-mt-10">
-                  {{ $t("device.temperatureInCabinet") + ':' + item.cabinetTm
+                  {{ $t("device.furnaceHeadTemperature") + ':' +
+        item.furnaceTm
         + $t("device.degree") }}
                 </span>
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
                   class="txt1 o-mt-10">
-                  {{ $t("device.humidityInCabinet") + ':' + item.cabinetHd
-        + $t("device.humidity") }}
+                  {{ $t("device.temperatureInCabinet") + ':' + item.cabinetTm
+        + $t("device.degree") }}
                 </span>
                 <span v-if="(item.machineType == '0' || item.machineType == null) && item.equimentType != 'P30'"
                   class="txt1 o-mt-10">
-                  {{ $t("device.furnaceHeadTemperature") + ':' +
-        item.furnaceTm
-        + $t("device.degree") }}
+                  {{ $t("device.humidityInCabinet") + ':' + item.cabinetHd
+        + $t("device.humidity") }}
                 </span>
                 <span v-if="item.machineType == '1' && item.equimentType == 'P30'" class="txt1 o-mt-10">
                   {{ $t("device.cornGeneratorTemperature") + ':' + item.cabinetTm + $t("device.degree") }}

+ 0 - 2
src/views/orderCenter/index.vue

@@ -241,8 +241,6 @@
             {{ $t('orderCenter.initiateRefund') }}
           </van-button>
         </div>
-        <!-- </div> -->
-        <!-- </div> -->
       </div>
     </van-popup>
     <!-- 退款弹窗 -->

+ 1 - 1
src/views/payWechat .vue

@@ -9,7 +9,7 @@ import { useRoute } from "vue-router";
 
 
 export default {
-    name: 'weChatPay',
+    name: 'payWechat',
 
     setup() {
         const route = useRoute();

+ 1 - 1
vue.config.js

@@ -10,7 +10,7 @@ module.exports = {
     //   chunkFilename: `css/[name].${version}.css`
     // }
   },
-  filenameHashing: true,
+  filenameHashing: false,
   configureWebpack: {
     output: {
       // filename: '[name].[hash].js',