1.优化修改结算问题

pages/index/addStore/addStore.vue

@@ -132,6 +132,19 @@
 				<view class="width30 aliitem" @tap="timetype='2'">
 					<radio class="checbox" :checked="timetype == '2'" color="#0083f5" /> 长期有效
 				</view>
+			</view>
+			
+			<view class="username width80">
+				<picker mode="date" class="width40 fotct" :value="start_date" :start="startDate" :end="endDate"
+					@change="bindDateChange">
+					<view class="date">{{start_date}}</view>
+				</picker>
+				<view class="width10 fotct">至</view>
+				<picker v-if="timetype == '1'" mode="date" class="width40 fotct" :value="end_date" :start="startDate"
+					:end="endDate" @change="bindDateChange2">
+					<view class="date">{{end_date}}</view>
+				</picker>
+				<view class="width40 fotct fcor999" v-if="timetype == '2' ">长期有效</view>
 			</view>
 			<view class="titlename font18 fontwig6 fcor333">法人信息</view>
 			<view class="notes font16" style="border-bottom: 0px;">
@@ -191,18 +204,7 @@
 			</view>
 
 			
-			<view class="username width80">
+		
-				<picker mode="date" class="width40 fotct" :value="start_date" :start="startDate" :end="endDate"
-					@change="bindDateChange">
-					<view class="date">{{start_date}}</view>
-				</picker>
-				<view class="width10 fotct">至</view>
-				<picker v-if="timetype == '1'" mode="date" class="width40 fotct" :value="end_date" :start="startDate"
-					:end="endDate" @change="bindDateChange2">
-					<view class="date">{{end_date}}</view>
-				</picker>
-				<view class="width40 fotct fcor999" v-if="timetype == '2' ">长期有效</view>
-			</view>
 
 			<view class="titlename font18 fontwig6 fcor333">结算信息</view>
 			<view class="username">

pages/index/updateSettlement/updateSettlement.vue

@@ -2,15 +2,15 @@
 	<view>
 		<!-- 审核状态回馈 -->
 		<view class="width100 height100p" style="background-color: #eb6a53;"
-			v-if="applyByMerList && (applyByMerList.status == 2 || applyByMerList.status == 4)">
+			v-if="applyByMerList && (applyByMerList.status == 2 || applyByMerList.status == 4 || applyByMerList.status == 6)">
-			<view class="font18 fcorfff paading10 aliitem" v-if="applyByMerList.status == 4">
+			<view class="font18 fcorfff paading10 aliitem" v-if="applyByMerList.status == 4 || applyByMerList.status == 6">
 				<image src='../../../static/img/error.png' mode="widthFix" class="iconw25 marglerig"></image>审核驳回
 			</view>
-			<view class="font14 fcorfff paading10" v-if="applyByMerList.status == 4">{{applyByMerList.rejectReason}}
+			<view class="font14 fcorfff paading10" v-if="applyByMerList.status == 4 || applyByMerList.status == 6">{{applyByMerList.rejectReason}}
 			</view>
-			<view class="font18 fcorfff paddtop35 fotct" v-if="applyByMerList.status == 2">
+			<view class="font18 fcorfff paddtop35 fotct" v-if="applyByMerList.status == 2 || applyByMerList.status == 5">
 				审核中
-			</view>
+			</view>
 		</view>
 
 		<!--第三步 未录入结算信息 -->
@@ -187,7 +187,7 @@
 				</view>
 			</view>
 		</wybPopup>
-		<view class="btn" @tap="submitsotre" v-if="!applyByMerList || applyByMerList.status == 4">提交审核</view>
+		<view class="btn" @tap="submitsotre" v-if="!applyByMerList || applyByMerList.status == 4 || applyByMerList.status == 6">提交审核</view>
 		<view class="height60"></view>
 	</view>
 </template>
@@ -390,10 +390,10 @@
 			//上传图片
 			upload(item) {
 				let that = this;
-				if (that.applyByMerList) {
+				// if (that.applyByMerList) {
-					return;
+				// 	return;
-				}
+				// }
-				if (that.applyByMerList.status == 2) {
+				if (that.applyByMerList.status == 2 || that.applyByMerList.status == 5) {
 					return;
 				}
 				uni.chooseImage({
@@ -809,7 +809,6 @@
 							createApplyUpdateSettle(datas).then(res => {
 								uni.hideLoading();
 								if (res.return_code == '000000') {
-									that.merchart = 4;
 									uni.showToast({
 										title: '提交成功',
 										icon: 'none',

pages/welcome/welcome.vue

@@ -17,9 +17,9 @@
 		},
 		onLoad(options) {
 			let that = this;
-			uni.reLaunch({
+			// uni.reLaunch({
-				url: '../tabBar/home/home'
+			// 	url: '../tabBar/home/home'
-			})
+			// })
 			// #ifdef H5
 			let arr1 = window.location.href;
 			let arr2 = arr1.split('=');

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=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.c02c1e50.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=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.aaeb720f.js></script><script src=/cweb/static/js/index.b5d3f958.js></script></body></html>