合并

pages/NursingNew/component/leftcontent/serveswipe.vue

@@ -212,7 +212,7 @@
 					{{ zdxzdex==1?`转单执行`:`协助执行` }}
 				</view>
 			</view>
-			<scroll-view scroll-y="true" class="photowall-other" scroll-with-animation enable-flex v-if="zdxzdex>0">
+			<scroll-view scroll-y class="photowall-other" scroll-with-animation enable-flex v-if="zdxzdex>0">
 				<view class="photowall-other">
 					<view class="bottom-title" v-for="(v,k) in zdxzarr" :key='k' @click="zdwu(v,k)"
 						:style="v.flag?{borderColor: `rgba(1, 125, 233, 0.3)`}:''">

pages/watch/api/lunpan.js

@@ -20,7 +20,6 @@ export const queryPadPageList = (params) => {
 }
 
 export const getPermissionList = (params) => {
-	// console.log("kankan入参",params)
 	return request({
 		url: `${uni.getStorageSync('serverUrl')}/api/employeesInfo/getPermissionList`,
 		method: 'get',