no message

src/pages/mine/myIssue/list.vue

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <template>
   <!-- #ifdef H5 -->
   <view>
@@ -46,7 +45,13 @@
             </view>
           </view>
           <view class="bottom">
-            <view class="left-location"><text class="iconfont icon-dingwei"></text>{{item.city}} {{item.area}}</view>
+            <view class="left-buyer" v-if="item.status === 4 && item.orderInfo">
+              <image :src="item.orderInfo.buyerUserPic ? (imageUrl + item.orderInfo.buyerUserPic) : require('@/static/common/logo.png')"></image>
+              <view class="name">{{item.orderInfo.buyerUserName}}</view>
+              <view class="text">买到了</view>
+            </view>
+            <view class="left-location" v-else><text class="iconfont icon-dingwei"></text>{{item.city}} {{item.area}}</view>
+            
             <view class="right-btn" @tap.stop>
               <block v-if="item.status === 4 && item.sendStatus === 'NO'">
                 <u-button text="确认发货" shape="circle" @click="openDeliver(item.id)"></u-button>
@@ -68,93 +73,11 @@
   </view>
   <!-- #endif -->
   <!-- #ifndef H5 -->
-  <web-view :src="webViewHref(`/pages/mine/myIssue/list`, pam)"  @message="crossPage.$listener"></web-view>
+  <web-view :src="webViewHref(`/pages/mine/myIssue/list`, pam)"></web-view>
   <!-- #endif -->
 </template>
 
 <script>
-=======
-<template>
-  <!-- #ifdef H5 -->
-  <view>
-    <zj-page-layout
-      :hasFooter="false"
-      :isScroll="true"
-      :refresherTriggered="refresherTriggered"
-      @refresherrefresh="refresherrefresh"
-      @scrolltolower="scrolltolower">
-      <template slot="header">
-        <view class="header-container">
-          <u-tabs
-            :scrollable="false"
-            :list="tabList"
-            :current="tabCurrent"
-            @click="clickTab"
-            lineColor="#01C30B"
-            :activeStyle="{
-              color: '#01C30B'
-            }"
-            :inactiveStyle="{
-              color: '#666666'
-            }"
-            itemStyle="padding-left: 0; padding-right: 0; height: 88rpx;">
-          </u-tabs>
-        </view>
-      </template>
-
-      <view class="common-order-list">
-        <view class="item" v-for="(item, index) in dataList" :key="index" @tap="toDetail(item.id)">
-          <view class="top">
-            <image :src="item.userPic ? (imageUrl + item.userPic) : require('@/static/common/logo.png')"></image>
-            <view class="user">
-              <view class="name">{{item.userName}}</view>
-              <view class="time">{{item.createTime | timeFilter}}发布</view>
-            </view>
-            <view class="status">{{item.status | statusFilter}}</view>
-          </view>
-          <view class="goods">
-            <image :src="imageUrl + item.goodsPicUrl" mode="aspectFill"></image>
-            <view class="main">
-              <view class="name">{{item.title}}<text>×{{item.num}}</text></view>
-              <view class="des">{{item.content}}</view>
-              <view class="price">{{item.amount | priceFilter2}}</view>
-            </view>
-          </view>
-          <view class="bottom">
-            <view class="left-buyer" v-if="item.status === 4 && item.orderInfo">
-              <image :src="item.orderInfo.buyerUserPic ? (imageUrl + item.orderInfo.buyerUserPic) : require('@/static/common/logo.png')"></image>
-              <view class="name">{{item.orderInfo.buyerUserName}}</view>
-              <view class="text">买到了</view>
-            </view>
-            <view class="left-location" v-else><text class="iconfont icon-dingwei"></text>{{item.city}} {{item.area}}</view>
-            
-            <view class="right-btn" @tap.stop>
-              <block v-if="item.status === 4 && item.sendStatus === 'NO'">
-                <u-button text="确认发货" shape="circle" @click="openDeliver(item.id)"></u-button>
-              </block>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <Loading :loadStatus="loadStatus" :dataList="dataList" />
-
-    </zj-page-layout>
-
-    <zj-dialog-deliver
-      ref="deliverDialog"
-      :isShow="isShowDeliverDialog"
-      @close="isShowDeliverDialog = false">
-    </zj-dialog-deliver>
-  </view>
-  <!-- #endif -->
-  <!-- #ifndef H5 -->
-  <web-view :src="webViewHref(`/pages/mine/myIssue/list`, pam)"></web-view>
-  <!-- #endif -->
-</template>
-
-<script>
->>>>>>> 910ae31612a93586d8e4a73a7c09a61cc7dcbfe0
   // #ifdef H5
 	import zjDialogDeliver from '@/components/zj-dialog/zj-dialog-deliver.vue';