From 5596cc695d444d9ef13661148d6e227f8ed3171e Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:25:37 +0800
Subject: [PATCH] '冲突解决'
---
pages/home/home.vue | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index e53f9b8..0012985 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -3,8 +3,8 @@
<!-- 杞挱鍥� -->
<view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
<!-- 鎴戠殑鐢宠 -->
- <combined-title title="鎴戠殑鐢宠" detailsPath="/pages/my-application/my-application" v-if="$store.state.shenqingMenu"></combined-title>
- <combination-card v-for="(item, index) in shenqingData" index="index" v-if="$store.state.shenqingMenu">
+ <combined-title title="鎴戠殑鐢宠" detailsPath="/pages/my-application/my-application"></combined-title>
+ <combination-card v-for="(item, index) in shenqingData" index="index">
<template v-slot:top>
<view>
<text>{{ item.title }}</text>
@@ -52,7 +52,7 @@
</view>
<view @click="theFormDataClick(item.tableId)" v-if="item.status == 1 || item.status == 2">
<image src="@/static/home/biaodan.png" mode=""></image>
- <view>鐢宠璇︽儏</view>
+ <view>琛ㄥ崟鏁版嵁</view>
</view>
<view @click="apply(item)" v-if="item.status == 3">
<image src="@/static/home/history.png" mode=""></image>
@@ -73,7 +73,7 @@
<image src="@/static/home/biaodan.png" mode=""></image>
<view>琛ㄥ崟鏁版嵁</view>
</view>
-
+
</view> -->
</view>
</template>
@@ -110,10 +110,10 @@
<view class="bottom-container">
<!-- 寰呭姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
+ <!-- <view @click="theFormDataClick">
<image src="@/static/home/jindu.png" mode=""></image>
<view>鐢宠璇︽儏</view>
- </view>
+ </view> -->
<view @click="adopClick(item)">
<image src="@/static/home/tongguo.png" mode=""></image>
<view>閫氳繃</view>
@@ -182,7 +182,7 @@
<view class="bottom-container">
<!-- 宸插姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)" v-if="item.procDefId == 'WAY_BILL:4:87504'">
+ <view @click="theFormDataClick(item.tableId)">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>琛ㄥ崟鏁版嵁</view>
</view>
@@ -324,6 +324,7 @@
// data
shenqingData: [],
daibanData: [],
+ daibanData: [],
yibanData: [],
menuShow: false,
// 鐢宠
@@ -353,18 +354,11 @@
console.log(e);
this.$refs.menuRef.menuClick();
},
- onLoad(){
- console.log('鍔犺浇椤甸潰');
- wx.hideShareMenu({
- menus: ['shareAppMessage', 'shareTimeline']
- })
- },
onShow() {
if (this.menuShow == true) {
this.$refs.menuRef.menuClick();
}
this.init();
-
},
components: {
combinedTitle,
@@ -509,7 +503,7 @@
this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�')
}
})
-
+
},
deleteApplicationModalCancel() {
this.deleteApplicationModalShow = false;
@@ -582,7 +576,7 @@
uni.showToast({
title:res.data,
icon:'success',
- duration:2000
+ duration:2000
});
}
// 鍒濆鍖栫敵璇峰垪琛�
@@ -600,7 +594,7 @@
}
console.log(this.form);
});
-
+
this.modalVisible = true;
},
// 淇敼
@@ -691,9 +685,6 @@
justify-content: center;
align-content: center;
margin-right: vww(10);
- &:nth-last-child(1) {
- margin-right: 0;
- }
view {
display: inline-block;
}
--
Gitblit v1.9.1