转结算

10 months ago · 46843b879e
parent 32809d8fa9
commit 46843b879e
8 changed files with 22 additions and 12 deletions
--- a/package/packageorder/pages/orderinfo/orderinfo.vue
+++ b/package/packageorder/pages/orderinfo/orderinfo.vue
@ -36,8 +36,13 @@
 						v-if="!order.need_agreements">
 						<text class="btnTxt btnConfirmTxt">收款</text>
 					</view>
 				</view>
 				<view class="orderFooter" v-else>
 					<view class="btn btnPay" @click="bindAction" data-type='toRegain' :data-id='order.id'
 						v-if="no_lock_ability">
 						<text class="btnTxt btnConfirmTxt">转待结算</text>
 					</view>
 					<view class="btn btnEdit">
 						<text class="btnTxt btnEditTxt" @click="bindAction" data-type="doNewEdit"
 							:data-id='order.id'>再来一单</text>
@ -260,6 +265,7 @@
 				pageTitle: "订单详情",
 				windowHeight: 720,
 				windowWidth: 720,
 				no_lock_ability:0,
 				order: {
 					"id": 731,
 					"serial": "",
@ -367,6 +373,10 @@
 		},
 		onLoad: function(option) {
 			var that = this;
 			var user = uni.getStorageSync('userInfo');
 			console.log("user",user)
 			this.no_lock_ability = user.user_info.no_lock_ability
 			console.log("user123",this.no_lock_ability)
 			this.windowHeight = app.globalData.winHeight;
 			this.windowWidth = app.globalData.winWidth;
 			this.loadInfo(option.id);
@ -477,7 +487,7 @@
 				var that = this;
 				uni.showModal({
 					title: '提示',
-					content: "确认恢复为待决算",
+					content: "确认恢复为待转结算",
 					confirmText: "确认",
 					confirmColor: "#000",
 					cancelColor: "#eee",
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>护工管理</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.2916c8b2.js></script><script src=/h5/static/js/index.6b26486a.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.2916c8b2.js></script><script src=/h5/static/js/index.402d305a.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/index.402d305a.js
+++ b/unpackage/dist/build/web/static/js/index.402d305a.js
--- a/unpackage/dist/build/web/static/js/package-packageorder-pages-orderinfo-orderinfo.78548924.js
+++ b/unpackage/dist/build/web/static/js/package-packageorder-pages-orderinfo-orderinfo.78548924.js
--- a/unpackage/dist/build/web/static/js/package-packageorder-pages-orderinfo-orderinfo.89321e2f.js
+++ b/unpackage/dist/build/web/static/js/package-packageorder-pages-orderinfo-orderinfo.89321e2f.js
--- a/unpackage/dist/build/web/static/js/package-packageorder-pages-signOrder-signOrder.9382e2b5.js
+++ b/unpackage/dist/build/web/static/js/package-packageorder-pages-signOrder-signOrder.9382e2b5.js
--- a/unpackage/dist/build/web/static/js/pages-order-order.5fef5d4f.js
+++ b/unpackage/dist/build/web/static/js/pages-order-order.5fef5d4f.js
--- a/unpackage/dist/build/web/static/js/pages-order-order.63a51a89.js
+++ b/unpackage/dist/build/web/static/js/pages-order-order.63a51a89.js
`@ -1,2 +1,2 @@`
	`<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>护工管理</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') \|\| CSS.supports('top: constant(a)'))`	`<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>护工管理</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') \|\| CSS.supports('top: constant(a)'))`
	`document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.2916c8b2.js></script><script src=/h5/static/js/index.6b26486a.js></script></body></html>`	`document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.883130ca.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.2916c8b2.js></script><script src=/h5/static/js/index.402d305a.js></script></body></html>`