Merge branch 'hcb' of SH-Arbitrate/miniapp into dev

pages/handlecase/component/confirmPayment.vue

@@ -6,7 +6,8 @@
 					<uni-easyinput v-model="formData.caseNum" type="text" :disabled='true' placeholder="请输入案件编号" />
 				</uni-forms-item>
 				<uni-forms-item label="案件标的:" name="caseSubjectAmount" label-width="80px">
-					<uni-easyinput v-model="formData.caseSubjectAmount" type="text" :disabled='true' placeholder="请输入案件标的" />
+					<uni-easyinput v-model="formData.caseSubjectAmount" type="text" :disabled='true'
+						placeholder="请输入案件标的" />
 				</uni-forms-item>
 				<uni-forms-item label="缴费金额:" name="feePayable" label-width="80px">
 					<uni-easyinput v-model="formData.feePayable" type="text" :disabled='true' placeholder="请输入缴费金额" />
@@ -24,23 +25,17 @@
 					</view>
 				</uni-forms-item>
 				<uni-forms-item label="是否缴费通过" label-width="120px" name="yesOrNo">
-					<uni-data-checkbox class='checkbox' 
+					<uni-data-checkbox class='checkbox' :localdata="yesOrNoObject" v-model="yesOrNo"
-						:localdata="yesOrNoObject"
-						v-model="yesOrNo"
 						@change='clearValidate'></uni-data-checkbox>
 				</uni-forms-item>
 				<uni-forms-item label="驳回原因:" name="reason" label-width="120px" required v-if="refusedisabled"
-				:rules="[{'required': true,errorMessage: '驳回原因不能为空'}]"
+					:rules="[{'required': true,errorMessage: '驳回原因不能为空'}]">
-				>
 					<uni-easyinput v-model="formData.reason" type="textarea" placeholder="请输入驳回原因" />
 				</uni-forms-item>
 			</uni-forms>
 			<view class="determine" style="text-align: center;">
-				<button  class="mini-btn" 
+				<button class="mini-btn" type="primary" size="mini" @tap="confirmPayment">确认缴费</button>
-				type="primary" size="mini" 
+				<button style="margin-left:30rpx;" class="mini-btn" type="default" size="mini"
-				@tap="confirmPayment">确认缴费</button>
-				<button style="margin-left:30rpx;" class="mini-btn" 
-				type="default" size="mini" 
 					@tap="cencalBut">取消</button>
 			</view>
 		</view>
@@ -48,7 +43,11 @@
 </template>
 
 <script>
-	import {selectPaymentDetail,confirmPaid,resConfirmPaid} from '../../../api/handlecase/index.js'
+	import {
+		selectPaymentDetail,
+		confirmPaid,
+		resConfirmPaid
+	} from '../../../api/handlecase/index.js'
 	export default {
 		data() {
 			return {
@@ -75,7 +74,7 @@
 				this.$refs.form.validate().then(res => {
 					if (this.paymentConfirm.caseFlowId == 3) {
 						this.confirmPaymentApplicant()
-						}else if(this.paymentConfirm.caseFlowId==44){
+					} else if (this.paymentConfirm.caseFlowId == 45) {
 						this.confirmPaymentRespondent()
 					}
 					console.log(this.paymentConfirm.caseFlowId)
@@ -147,7 +146,9 @@
 		},
 		onLoad(data) {
 			this.paymentConfirm = data
-			this.paymentDetails({id:data.id})
+			this.paymentDetails({
+				id: data.id
+			})
 		}
 	}
 </script>
@@ -156,6 +157,7 @@
 	page {
 		background-color: #ffffff;
 	}
+
 	.assignrbitrators {
 		margin: 30rpx;
 	}

pages/handlecase/index.vue

@@ -3,8 +3,8 @@
 		<view class="" v-if="sysType == 2">
 			<button type="primary" @tap="newlyAddedCases">新增案件</button>
 		</view>
-		<List class="caseList" @pDeleteCase='deleteCase'  v-for="(item,index) in caseList" :defalutVal='item' :buttonList='buttonList' :key="index"
+		<List class="caseList" @pDeleteCase='deleteCase' v-for="(item,index) in caseList" :defalutVal='item'
-			:sysType='sysType'>
+			:buttonList='buttonList' :key="index" :sysType='sysType'>
 		</List>
 		<view class="emptyBox" v-if="caseList.length == 0">
 			<luanqing-empty :show="true" textColor="#000"></luanqing-empty>
@@ -52,6 +52,7 @@
 			},
 			getList(parms) {
 				console.log(111)
+				this.caseList = [];
 				if (this.sysType == 1) {
 					respondentList(parms).then(res => {
 						// this.caseList = res.rows;

unpackage/dist/dev/mp-weixin/app.json

@@ -6,6 +6,7 @@
     "pages/work/index",
     "pages/handlecase/index",
     "pages/handlecase/component/uploadEvidence",
+    "pages/handlecase/component/confirmPayment",
     "pages/handlecase/component/payList",
     "pages/handlecase/component/evidenceList",
     "pages/handlecase/component/obligations",