Explorar o código

修复部门id不对

yanghao hai 5 días
pai
achega
9e96ef68f2
Modificáronse 4 ficheiros con 10 adicións e 14 borrados
  1. 2 2
      android/simpleDemo/build.gradle
  2. 2 2
      config/env.dev.js
  3. 2 2
      manifest.json
  4. 4 8
      pages/recordFilling/detail.vue

+ 2 - 2
android/simpleDemo/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 21
         // targetSdkVersion 33
         targetSdk 33
-        versionCode 10209
-        versionName "1.2.9"
+        versionCode 10300
+        versionName "1.3.0"
         multiDexEnabled true
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8

+ 2 - 2
config/env.dev.js

@@ -1,7 +1,7 @@
 // 开发环境配置
 export default {
-	apiUrl: 'http://192.168.188.149:48080',
-	// apiUrl: 'https://iot.deepoil.cc',
+	// apiUrl: 'http://192.168.188.16:8080',
+	apiUrl: 'https://iot.deepoil.cc',
 	// apiUrl: 'https://aims.deepoil.cc', //正式
 	apiUrlSuffix: '/admin-api',
 	// 其他开发环境配置...  

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
 	"name": "DeepOil",
 	"appid": "__UNI__6E4BC49",
 	"description": "",
-	"versionName": "1.2.9",
-	"versionCode": 10209,
+	"versionName": "1.3.0",
+	"versionCode": 10300,
 	"transformPx": false,
 	/* 5+App特有相关 */
 	"app-plus": {

+ 4 - 8
pages/recordFilling/detail.vue

@@ -175,7 +175,6 @@
 </template>
 
 <script setup>
-import { getDeptId } from "@/utils/auth.js";
 import { ref, reactive, getCurrentInstance, watch, onMounted } from "vue";
 import { onReady, onLoad } from "@dcloudio/uni-app";
 import dayjs from "dayjs";
@@ -212,12 +211,6 @@ const accumulatedValues = reactive({
   "当日注气量-方": 0,
 });
 
-onMounted(() => {
-  getDeptName(getDeptId()).then((res) => {
-    deptName.value = res.data;
-  });
-});
-
 onReady(() => {
   console.log("onReady");
 });
@@ -235,7 +228,10 @@ onLoad(async (option) => {
   // 请求工单详情
   if (params.value?.orderId) {
     const detail = (await getRecordFillingDetail(params.value.orderId)).data;
-    console.log("🚀getRecordFillingDetail ~ detail:", detail);
+
+    const data = await getDeptName(detail.deptId);
+    deptName.value = data.data;
+
     params.value = {
       ...params.value,
       ...detail,