优化抢购以及收支状态

1 year ago · 69e032a4d2
parent 47ee3edad0
commit 69e032a4d2
8 changed files with 15 additions and 5 deletions
--- a/pages/my/singleIncome.vue
+++ b/pages/my/singleIncome.vue
@ -6,7 +6,9 @@
 			<view style="padding-bottom: 5px;">联系电话：{{incomeDetail.buyer.mobile}}</view>
 			<view>付款金额：{{incomeDetail.amount}}元</view>
 			<view v-if="incomeDetail.pay_voucher" class="saveBtn other-btn" style="background-color: orange;border: 0;" @click="lookPic">支付凭证</view>
-			<view class="saveBtn other-btn"  style="top: 50px !important" @click="sureIncome">确认收款</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>
 		<view v-if="incomeDetail.type === 1" class="info">
 			<!-- <view class="title">测试优先公司</view> -->
--- a/pages/qianggou/qianggou.vue
+++ b/pages/qianggou/qianggou.vue
@ -75,6 +75,7 @@ export default{
 			showList:true,
 			show:false,
 			content:'',
 			userInfo: {},
 		}
 	},
 	methods:{
@ -89,6 +90,7 @@ export default{
 		//获取用户信息
 		getUserInfoHandle(){
 			getUserInfo().then(res=>{
 				this.userInfo = res.data;
 				if(!res.data.sign_image||res.data.sign_status==0){
 					this.showList = false
 				}else{
@ -140,6 +142,12 @@ export default{
 						message:'未到抢购时间'
 					})
 				}else{
 					if(this.userInfo.sign_status !== 1){
 						this.$refs.uToast.show({
 							message:'请先完成签约'
 						})
 						return false
 					}
 					uni.navigateTo({
 						url:'/pages/qianggou/productList?id='+item.id
 					})
--- 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.0afd1cc1.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.c8f4f34d.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.c8f4f34d.js
+++ b/unpackage/dist/build/h5/static/js/index.c8f4f34d.js
--- a/unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.4cf695fc.js
+++ b/unpackage/dist/build/h5/static/js/pages-my-incomeExpenditureDetail.4cf695fc.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
--- a/unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.e3066e2d.js
+++ b/unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.e3066e2d.js
--- a/unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.edbb75be.js
+++ b/unpackage/dist/build/h5/static/js/pages-qianggou-qianggou.edbb75be.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=/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.0afd1cc1.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.c8f4f34d.js></script></body></html>`