优化

1 year ago · dd5fc29eda
parent 69e032a4d2
commit dd5fc29eda
8 changed files with 8 additions and 7 deletions
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@ -142,7 +142,7 @@ export default {
 		// #endif
 	},
 	onLoad() {
-	  // this.H5Login()
+	  this.H5Login()
 	},
 	onPageScroll(e){
 		let scrollTop = e.scrollTop;
--- a/pages/my/singleIncome.vue
+++ b/pages/my/singleIncome.vue
@ -7,8 +7,9 @@
 			<view>付款金额：{{incomeDetail.amount}}元</view>
 			<view v-if="incomeDetail.pay_voucher" class="saveBtn other-btn" style="background-color: orange;border: 0;" @click="lookPic">支付凭证</view>
 			
-			<view v-if="incomeDetail.status === 1" class="saveBtn other-btn"  style="top: 50px !important">待付款</view>
-			<view v-else class="saveBtn other-btn"  style="top: 50px !important" @click="sureIncome">确认收款</view>
+			<view v-if="incomeDetail.pay_voucher" class="saveBtn other-btn"  style="top: 50px !important" @click="sureIncome">确认收款</view>
+			<view v-else class="saveBtn other-btn"  style="top: 50px !important">待付款</view>
+			
 		</view>
 		<view v-if="incomeDetail.type === 1" class="info">
 			<!-- <view class="title">测试优先公司</view> -->
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/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=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.c8f4f34d.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=/static/index.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.aabf9ea3.js></script><script src=/static/js/index.42821b43.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.42821b43.js
+++ b/unpackage/dist/build/h5/static/js/index.42821b43.js
--- a/unpackage/dist/build/h5/static/js/pages-home-home.1b424530.js
+++ b/unpackage/dist/build/h5/static/js/pages-home-home.1b424530.js
--- a/unpackage/dist/build/h5/static/js/pages-home-home.460060d0.js
+++ b/unpackage/dist/build/h5/static/js/pages-home-home.460060d0.js
--- a/unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.5921c733.js
+++ b/unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.5921c733.js
--- a/unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.d3f12e84.js
+++ b/unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.d3f12e84.js