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

pages/handlecase/component/list.vue

@@ -53,6 +53,9 @@
 			<button class="btnItem" type="primary" size="mini" @tap="isAssignrbitrators">是否指派仲裁员</button>
 			<button class="btnItem" type="primary" size="mini" @tap="chooseMethod">选择仲裁方式</button> -->
 		</view>
+		<view class="btn" v-if="sysType == 1">
+			<button class="btnItem" type="primary" size="mini" @tap="caseCrossExamin">案件质证</button>
+		</view>
 	</view>
 </template>
 
@@ -128,6 +131,12 @@
 					this.clickPay(9)
 				}
 			},
+			// 案件质证
+			caseCrossExamin(){
+				uni.navigateTo({
+					url:`/pages/handlecase/component/uploadEvidence?id=${this.defalutVal.id}`
+				})
+			},
 			// 案件详情以及操作
 			caseDetail() {
 				uni.navigateTo({

pages/handlecase/index.vue

@@ -186,19 +186,21 @@
 				obj = {
 					pageNum: this.pageNum,
 					pageSize: this.pageSize,
+					caseFlowId:this.caseFlowId
 				}
 			}
 			this.getList(obj)
 			this.getButtonList()
 		},
-		// onLoad() {
-		// 	let obj = {
-		// 		pageNum: this.pageNum,
-		// 		pageSize: this.pageSize,
-		// 		caseStatus:4
-		// 	}
-		// 	this.getList(obj)
-		// }
+		onLoad(data) {
+			this.caseFlowId = data.caseFlowId
+			// let obj = {
+			// 	pageNum: this.pageNum,
+			// 	pageSize: this.pageSize,
+			// 	caseStatus:4
+			// }
+			// this.getList(obj)
+		}
 
 	}
 </script>

pages/index.vue

@@ -4,7 +4,7 @@
 		<uni-section title="我的代办事项" type="line" padding></uni-section>
 	</view>
 	<view class="homeMain" v-if="sysType == 2">
-		<view class="cardList" @tap="handlingCases()" v-for="item in homePageList" :key="item.caseFlowId">
+		<view class="cardList" @tap="handlingCases(item.caseFlowId)" v-for="item in homePageList" :key="item.caseFlowId">
 		    <view class="badge">{{item.caseCount}}</view>
 		    <view class="cardMain">
 		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
@@ -13,12 +13,14 @@
 		      <view class="imgTitle">{{item.caseStatusName}}</view>
 		    </view>    
 		</view>
+		<view class="emptyBox" style="margin: 0 auto;" v-if="homePageList.length == 0">
+			<luanqing-empty :show="true" textColor="#000"></luanqing-empty>
+		</view>
 	</view>
 	<view class="homeMain" v-if="sysType == 1">
-		<view class="cardList" @tap="refereeCase()">
+<!-- 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApply}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待立案申请</view>
@@ -27,7 +29,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyCheck}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待立案审查</view>
@@ -36,7 +37,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyPay}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待缴费</view>
@@ -45,16 +45,22 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyPayCheck}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待缴费确认</view>
 		    </view>    
-		</view>
+		</view> -->
 		<view class="cardList" @tap="refereeCase()">
+		    <view class="badge">{{dataCount.caseApplyEvidence}}</view>
+		    <view class="cardMain">
+		    </view>
+		    <view class="cardMain">
+		      <view class="imgTitle">待案件质证</view>
+		    </view>    
+		</view>
+<!-- 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyGroupCheck}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待组庭审核</view>
@@ -63,7 +69,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyGroupConfirm}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待组庭确定</view>
@@ -72,7 +77,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyArbitrateWay}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待审核仲裁方式</view>
@@ -81,7 +85,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{ dataCount.updateOnlineHearDate}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待确认开庭时间</view>
@@ -90,7 +93,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyGroupOnline}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待开庭审理</view>
@@ -99,7 +101,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyGroupOffline}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待书面审理</view>
@@ -108,7 +109,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyAwardCheck}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待核验仲裁文书</view>
@@ -117,7 +117,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.arbitratorApplyAwardConfirm }}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待仲裁员核验仲裁文书</view>
@@ -126,7 +125,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyAwardConfirm}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待审核仲裁文书</view>
@@ -135,7 +133,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyAwardSign}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待仲裁文书签名</view>
@@ -144,7 +141,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyAwardSeal}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待仲裁文书用印</view>
@@ -153,7 +149,6 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyAwardSend}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待仲裁文书送达</view>
@@ -162,19 +157,22 @@
 		<view class="cardList" @tap="refereeCase()">
 		    <view class="badge">{{dataCount.caseApplyStored}}</view>
 		    <view class="cardMain">
-		      <!-- <img class="iconImg" src="@/assets/images/daishencha.png" alt=""> -->
 		    </view>
 		    <view class="cardMain">
 		      <view class="imgTitle">待案件归档</view>
 		    </view>    
-		</view>
+		</view> -->
 	</view>
   </view>
 </template>
 
 <script>
-	import {todoCount,toDoCountReferee} from '@/api/homePage/index.js'
+	import {todoCount,toDoCountReferee} from '@/api/homePage/index.js'
+	import LuanqingEmpty from "@/components/luanqing-empty.vue"
   export default {
+	components: {
+		'luanqing-empty': LuanqingEmpty,
+	},
 	data(){
 		return {
 			homePageList:[],
@@ -187,6 +185,7 @@
 			if(this.sysType==2){
 				todoCount().then(res =>{
 					this.homePageList = res.data.toDoCountList
+					console.log(res)
 				})
 			}else if(this.sysType==1){
 				toDoCountReferee().then(res =>{
@@ -195,9 +194,9 @@
 			}
 		},
 		// 调解跳转
-		handlingCases(){
+		handlingCases(caseFlowId){
 			uni.navigateTo({
-				url:'../pages/handlecase/index'
+				url:`../pages/handlecase/index?caseFlowId=${caseFlowId}`
 			})
 		},
 		// 仲裁跳转
@@ -206,11 +205,14 @@
 				url:'../pages/handlecase/index'
 			})
 		}
+	},
+	onShow() {
+		this.getHomePage()
 	},
     onLoad: function() {
 		this.sysType = uni.getStorageSync('sysType');
 		console.log(this.sysType)
-		this.getHomePage()
+		
     }
   }
 </script>

pages/login.vue

@@ -6,7 +6,7 @@
 			<text class="title">仲裁平台</text>
 		</view>
 		<view class="logo-content align-center justify-center flex" v-if="logSyste==2">
-			<image style="width: 100rpx;height: 100rpx;" :src="globalConfig.appInfo.logo" mode="widthFix">
+			<image style="width: 100rpx;height: 100rpx;" src="../static/refree.png" mode="widthFix">
 			</image>
 			<text class="title">调解平台</text>
 		</view>

pages/mine/setting/index.vue

@@ -7,7 +7,7 @@
           <view>修改密码</view>
         </view>
       </view>
-      <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
+     <!-- <view class="list-cell list-cell-arrow" @click="handleToUpgrade">
         <view class="menu-item-box">
           <view class="iconfont icon-refresh menu-icon"></view>
           <view>检查更新</view>
@@ -18,7 +18,7 @@
           <view class="iconfont icon-clean menu-icon"></view>
           <view>清理缓存</view>
         </view>
-      </view>
+      </view> -->
     </view>
     <view class="cu-list menu">
       <view class="cu-item item-box">

pages/work/index.vue

@@ -28,28 +28,29 @@
 				<uni-grid-item>
 					<view class="grid-item-box" @tap="changeGrid(0)">
 						<uni-icons type="calendar-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">待办案件</text>
+						<text class="text" v-if="sysType == 1">待办案件</text>
+						<text class="text" v-if="sysType == 2">我的申请</text>
 					</view>
 				</uni-grid-item>
-				<uni-grid-item v-if="sysType == 2">
+				<uni-grid-item v-if="sysType == 2 && checkPermi(['caseManagement:list:add'])">
 					<view class="grid-item-box" @tap="changeGrid(1)">
 						<uni-icons type="staff-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">调解申请</text>
+						<text class="text">立案申请</text>
 					</view>
 				</uni-grid-item>
-<!-- 				<uni-grid-item>
+				<!-- <uni-grid-item v-if="sysType == 2">
 					<view class="grid-item-box" @tap="changeGrid(2)">
 						<uni-icons type="color" size="30" color="#327DD7"></uni-icons>
-						<text class="text">代理立案</text>
+						<text class="text">线上调解</text>
 					</view>
 				</uni-grid-item>
-				<uni-grid-item>
+				<uni-grid-item v-if="sysType == 2">
 					<view class="grid-item-box" @tap="changeGrid(3)">
-						<uni-icons type="settings-filled" size="30" color="#327DD7"></uni-icons>
-						<text class="text">代理案件进展</text>
+						<uni-icons type="compose" size="30" color="#327DD7"></uni-icons>
+						<text class="text">我的申请</text>
 					</view>
-				</uni-grid-item>
-				<uni-grid-item>
+				</uni-grid-item> -->
+				<!-- <uni-grid-item>
 					<view class="grid-item-box" @tap="changeGrid(4)">
 						<uni-icons type="heart-filled" size="30" color="#327DD7"></uni-icons>
 						<text class="text">证据交换</text>
@@ -58,7 +59,8 @@
 				<uni-grid-item>
 					<view class="grid-item-box" @tap="changeGrid(5)">
 						<uni-icons type="bars" size="30" color="#327DD7"></uni-icons>
-						<text class="text">视频审理</text>
+						<text class="text" v-if="sysType == 1">视频审理</text>
+						<text class="text" v-if="sysType == 2">线上调解</text>
 					</view>
 				</uni-grid-item>
 				<!-- <uni-grid-item>