'冲突解决'

zhangxiaoxu123

2022-07-28 5596cc695d444d9ef13661148d6e227f8ed3171e

 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>
@@ -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,
@@ -691,12 +685,6 @@
            justify-content: center;
            align-content: center;
            margin-right: vww(10);
<<<<<<< Updated upstream
            &:nth-last-child(1) {
               margin-right: 0;
            }
=======
>>>>>>> Stashed changes
            view {
               display: inline-block;
            }