售后问题

ghsApp/src/admin/notice/index.vue

@@ -93,10 +93,6 @@ export default {
             uni.stopPullDownRefresh()
         }
     },
-    onShow(){
-        this.resetList()
-        this.getNoticeList()
-    },
     methods: {
         setThisClass(info){
             this.$refs.classRef.close()

ghsApp/src/pagesOrder/refundDetail.vue

@@ -57,7 +57,7 @@
 		</view>
 
 		<view style="text-align:center;" v-if="info.status==0">
-			<button class="admin-button-com big blue" style="margin:30upx auto 10upx auto;width:50%;background-color: green;border:1upx solid green;color:white;" @click="pass()">通过</button>
+			<button class="admin-button-com big blue" style="margin:30upx auto 10upx auto;width:50%;background-color: green;border:1upx solid green;color:white;" @click="pass(0)">通过</button>
 		</view>
 		<view style="text-align:center;" v-if="info.status==0">
 			<button class="admin-button-com big blue" style="margin:30upx auto 10upx auto;width:50%;background-color: red;border:1upx solid red;color:white;" @click="reject()">驳回</button>
@@ -171,14 +171,18 @@ export default {
 				})
 			})
 		},
-		pass(){
+		pass(confirm){
 			let that = this
 			this.$util.confirmModal({content:'确认通过？'},() => {
 				uni.showLoading({mask:true})
-				passRefund({id: this.option.id}).then(res=>{
+				passRefund({id: this.option.id,version:1,confirm:confirm}).then(res=>{
 					uni.hideLoading()
 					if(res.code == 1){
-						if(res.data.error && res.data.error == 'hasUnClearOrder'){
+						if(res.data.error && res.data.error == 'notFirstApply'){
+							that.$util.confirmModal({content:'本单第二次售后，确认要通过？'},() => {
+								that.pass(1)
+							})
+						}else if(res.data.error && res.data.error == 'hasUnClearOrder'){
 							that.needCancelRemind(res.data.clearId)
 						}else{
 							that.$msg('操作成功')