订单页面按钮状态

App.vue

@@ -754,9 +754,9 @@ export default {
 @import 'components/colorui/icon.css';
 @import './static/css/common.css';
 @import './static/css/simplepro.css';
-/deep/.uni-scroll-view-content{
+// /deep/.uni-scroll-view-content{
-		height: 350px !important;
+// 		height: 350px !important;
-	}
+// 	}
 page {
 	background-color: #FFFFFF;
 	color: #343546;

common/config.js

@@ -4,8 +4,8 @@
 //测试环境
 const PROT = "http://"
 // const ROOTHOST = "47.75.182.93:8090";
-// const ROOTHOST = "192.168.2.222:8187";
+const ROOTHOST = "192.168.2.222:8187";
-const ROOTHOST = "120.46.52.165";
+// const ROOTHOST = "120.46.52.165";
 // const ROOTHOST = "192.168.0.115:8187";
 // const ROOTHOST = "192.168.1.169:8187";
 // 后端本地张聪

my/order/revenueDetails.vue

@@ -276,11 +276,11 @@
 					服务完成
 				</view>
 				<view class="footers-btn footers-true" @click="nineState(order.ordersId)"
-					 v-if="order.status == 9&&order.refusalContent==''||order.refusalContent==null"
+					 v-if="order.status == 9&& !item.refusalContentl"
 					>
 					确认接单
 				</view>
-				<view class="footers-btn footers-bor"  v-if="order.status == 9&&order.refusalContent==''||order.refusalContent==null"
+				<view class="footers-btn footers-bor"  v-if="order.status == 9&& !item.refusalContentl"
 					@click="toggleJ('bottom',order.ordersId)"
 				>
 					拒单申请

pages/order/index.vue

@@ -79,7 +79,7 @@
 			
 					<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
 
-					<view class="text-green">预约时间：{{ item.serveTime }}</view>S
+					<view class="text-green">预约时间：{{ item.serveTime }}</view>
 					<view v-if="item.status == 9&& item.refusalContent" class="judan">
 						拒单审核中...
 					</view>
@@ -549,8 +549,12 @@
 				this.$Request.getT("/app/artificer/jishiQueren",{
 					ordersId:ordersId
 				}).then(res => {
-					if (res.code == 0) {
+					if (res.code == 200) {
-						that.$queue.showToast(res.msg);
+						console.log("asdsad")
+						uni.showToast({
+							title:'已确认接单'
+						})
+						that.upCallback(1)
 					} else {
 						that.$queue.showToast(res.msg);
 					}
@@ -749,8 +753,7 @@
 				// console.log(this.endTime)
 				this.mescroll.resetUpScroll()
 			},
-			goNav(e, name) {
+			goNav(e,name) {
-				console.log(e)
 				if (this.userId) {
 					uni.navigateTo({
 						url: e

uview-ui/libs/request/index.js

@@ -103,8 +103,8 @@ class Request {
 		this.config = {
 			// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
 			// baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名
-			baseUrl: 'http://120.46.52.165/', // 请求的根域名
+			// baseUrl: 'http://120.46.52.165/', // 请求的根域名
-			// baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
+			baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
 			// 默认的请求头
 			header: {},
 			method: 'POST',