修改erp弹窗返回

pages/erp/index.vue

@@ -36,7 +36,7 @@
 		</view>
 		<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
 			:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='立即开通'
-			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService"></u-modal>
+			title='您尚未开通ERP业务' showCancelButton='false' :content="content" @confirm="goOpenService" @cancel="cancelClick"></u-modal>
 	</view>
 </template>
 <script>
@@ -187,6 +187,9 @@
 			})
 		},
 		methods: {
+			cancelClick(){
+				uni.navigateBack(-1)
+			},
 			getCompWarehouse() {},
 			goOpenService() {
 				if (!this.hasLogin) {

pages/task/audit/warehouse_approval.vue

@@ -55,8 +55,8 @@
 		</view>
 		<u-toast ref="uToast" />
 		<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='reject' type="error" class="btn1">驳回</u-button>
-			<u-button  @click='audit' type="success" class="btn2">通过</u-button>
+			<u-button  @click='reject' type="error" class="btn1" hover-class='none'>驳回</u-button>
+			<u-button  @click='audit' type="success" class="btn2" hover-class='none'>通过</u-button>
 		</view>
 	</view>
 </template>

pages/task/my_task.vue

@@ -47,7 +47,7 @@
 				PageCur: "task",
 				taskInfo: [],
 				pages: 1, //页数
-				limit: 50, //每次取条目数
+				limit: 10, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
 				isSole: false,