106

manifest.json

@@ -2,8 +2,8 @@
     "name" : "海亮铜箔",
     "appid" : "__UNI__3A002CD",
     "description" : "海亮铜箔二期手持系统",
-    "versionName" : "1.0.5",
+    "versionName" : "1.0.6",
-    "versionCode" : 105,
+    "versionCode" : 106,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/SecondPhase/slitting/UpperShaftCut.vue

@@ -23,7 +23,7 @@
 		</view>
 		<view class="zd-row submitbar">
 			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index}" :disabled="disabled" @tap="_doUpShaftToSlitter">上轴</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !index}" :disabled="disabled" @tap="toSure">上轴</button>
 		</view>
 	</view>
 </template>
@@ -110,12 +110,26 @@
 			showSelector () {
 				this.newoptions = this.options
 			},
-			async _doUpShaftToSlitter () {
+			toSure () {
 				this.disabled = true
 				if (!this.index) {
 					this.disabled = false
 					return
 				}
+				uni.showModal({
+					title: '提示',
+					content: '确定呼叫桁架上气胀轴？',
+					confirmColor: '#ff6a00',
+					success: (res) => {
+						if (res.confirm) {
+							this._doUpShaftToSlitter()
+						} else if (res.cancel) {
+							this.disabled = false
+						}
+					}
+				})
+			},
+			async _doUpShaftToSlitter () {
 				try {
 					let res = await doUpShaftToSlitter(this.index)
 					uni.showToast({