From 02e7bad05f4012f0e64628b69f6e98b57d1b1c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Mon, 6 Jan 2025 08:46:33 +0800
Subject: [PATCH] 112

---
 manifest.json                                 |  4 ++--
 pages/SecondPhase/slitting/UpperShaftCut2.vue | 10 +++++-----
 vuex/modules/user.js                          |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifest.json b/manifest.json
index 3f34e3c..ae5a674 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__3A002CD",
     "description" : "海亮铜箔二期手持系统",
-    "versionName" : "1.1.1",
-    "versionCode" : 111,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/SecondPhase/slitting/UpperShaftCut2.vue b/pages/SecondPhase/slitting/UpperShaftCut2.vue
index ef1e065..370ddf3 100644
--- a/pages/SecondPhase/slitting/UpperShaftCut2.vue
+++ b/pages/SecondPhase/slitting/UpperShaftCut2.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<!-- <nav-bar title="分切下料"></nav-bar> -->
+		<!-- <nav-bar title="分切上轴2"></nav-bar> -->
 		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
@@ -16,7 +16,7 @@
 						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
-				<view class="msg_item">提示：{{obj.message}}</view>
+				<view class="msg_item">提示：{{obj.tip}}</view>
 			</view>
 		</view>
 		<view class="zd-row submitbar">
@@ -47,7 +47,7 @@
 				index: '',
 				options2: [],
 				index2: '',
-				obj: {message: '-'}
+				obj: {tip: '-'}
 			};
 		},
 		onLoad (options) {
@@ -79,7 +79,7 @@
 				if (e) {
 					this._doUpShaftToSlitterByDeviceTip()
 				} else {
-					this.obj = {message: '-'}
+					this.obj = {tip: '-'}
 				}
 			},
 			toSure () {
@@ -106,7 +106,7 @@
 				this.index = ''
 				this.index2 = ''
 				this.options = []
-				this.obj = {message: '-'}
+				this.obj = {tip: '-'}
 			},
 			async _doUpShaftToSlitterByDeviceTip () {
 				try {
diff --git a/vuex/modules/user.js b/vuex/modules/user.js
index e4dcadd..a093734 100644
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -1,6 +1,6 @@
 import * as types from '../types'
 
-const baseUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.90:8010' : 'http://10.1.3.90:8010'
+const baseUrl = process.env.NODE_ENV === 'development' ? 'http://10.1.3.91:8013' : 'http://10.1.3.91:8013'
 const state = {
 	baseUrl: uni.getStorageSync('baseUrl') || baseUrl,
 	setTime: uni.getStorageSync('setTime') || 5000,