Browse Source

update code

zhuliu 1 năm trước cách đây
mục cha
commit
a088930d36

+ 1 - 1
myComponents/product/product.wxml

@@ -27,7 +27,7 @@
         <view wx:if="{{item.concernType == 0 || item.concernType}}" class="icon1 iconfont {{concernType[item.concernType]}}" data-index="{{index}}" catch:tap="cancelFollow"></view>
         <view wx:else class="iconfont myIconguanzhu" data-index="{{index}}" catch:tap="open"></view>
 
-        <myPopover2 wx:if="{{isFollow}}" id="myPopover{{index}}" position="top" show="{{item.showMenu}}">
+        <myPopover2 wx:if="{{isFollow || menu.length>0}}" id="myPopover{{index}}" position="top" show="{{item.showMenu}}">
           <view slot="menu" class="menu">
             <view class="menu_item" wx:for="{{menu}}" wx:for-item="menu" wx:for-index="ind" data-item="{{menu}}" data-index="{{index}}" catch:tap="onClickA">{{menu.label}}</view>
           </view>

+ 0 - 1
pages/form/addProduct/addProduct.js

@@ -47,7 +47,6 @@ Page({
       var form = {
         searchCondition:data.key,
         concernType:data.concernType,
-        monitorPeriod:'7天'
       }
       var file = []
       if(data.filePath){

+ 1 - 1
pages/monitor/monitor.js

@@ -133,7 +133,7 @@ Page({
     this.getMyMonitor()
   },
   //取消监控
-  bindcancelMonitoring(e){
+  cancelMonitoring(e){
     var index = e.detail
     var data = this.data.tableData
     data.splice(index,1)

+ 1 - 1
pages/monitor/monitor.wxml

@@ -8,7 +8,7 @@
   </view>
   <view class="main">
     <my-scroll-view  triggered="{{triggered}}" load="{{load}}" hasMore="{{hasMore}}" bindonRefresh="onRefresh" bindloadMore="loadMore" customStyle="height: calc(100vh - 300rpx)">
-      <myProduct wx:if="{{tableData.length>0}}" tableData="{{tableData}}" menu="{{menu}}"></myProduct>
+      <myProduct wx:if="{{tableData.length>0}}" tableData="{{tableData}}" menu="{{menu}}" bindcancelMonitoring="cancelMonitoring"></myProduct>
       <van-empty wx:else description="暂无数据" />
     </my-scroll-view>
     

+ 0 - 8
pages/searchResults/searchResults.js

@@ -483,14 +483,6 @@ collectPatent(){
   },
  //监控
  control(e){
-  wx.showModal({
-    title: '提示',
-    content: '敬请期待!',
-    complete: (res) => {
-      if (res.cancel) {}
-      if (res.confirm) {}
-    }
-  })
   if(this.data.searchType == 0 ){
     this.toImproveInformation('监控')
     return