修改密码

common/js/env.js

@@ -2,8 +2,8 @@
 
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn`
 // let baseUrl = `https://jje.admin.xinyuekj.com.cn/test-api`
-let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
-// let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
+// let baseUrl = `http://65i1sxopd9qp.ngrok.xiaomiqiu123.top`
+let baseUrl = `https://jje.xinyuekj.com.cn/prod-api`
 
 
 

pages/index/index.vue

@@ -471,7 +471,8 @@
 			},
 
 			settle() {
-				if (!this.currService){
+				let that = this
+				if (!that.currService){
 					uni.showToast({
 						icon: 'error',
 						duration: 2000,
@@ -479,14 +480,23 @@
 					});
 					return
 				}
-
-				this.previousServiceOrderId = this.currService.serviceObjectId
-				this.$api.service.settle({
-					orderServiceId: this.currService.orderServiceId
-				}).then(res => {
-					this.currServiceInfo()
-					this.$refs.reminderPopup.open()
+				uni.showModal({
+					title:'温馨提示',
+					content:'是否确定结算',
+					editable:false,
+					success:(e)=>{
+						if (e.confirm){
+							that.previousServiceOrderId = that.currService.serviceObjectId
+							that.$api.service.settle({
+								orderServiceId: that.currService.orderServiceId
+							}).then(res => {
+								that.currServiceInfo()
+								that.$refs.reminderPopup.open()
+							})
+						}
+					}
 				})
+
 			},
 			start() {
 				this.$api.service.start({