update code

api/search.js

@@ -9,8 +9,12 @@ module.exports={
 	getPatentVectors:(data)=>{
     return request.post('/xiaoshi-weixinback/patent/getPatentVectors',data,true,{'content-type': 'application/x-www-form-urlencoded'})
   },
-  //根据关键词获取列表(图片用于排序)接口
+  //根据申请号获取图片
 	getPictureByNo:(data)=>{
 		return request.post('/xiaoshi-weixinback/patent/getPictureByNo',data)
-	}
+  },
+  //根据专利号获取专利详情
+	selectPatentInfoByPatentNo:(data)=>{
+		return request.post('/xiaoshi-weixinback/patent/selectPatentInfoByPatentNo',data)
+	},
  }

app.js

@@ -2,11 +2,11 @@
 const api = require('./api/index')
 App({
   onLaunch() {
+    wx.setStorageSync('showDialog', true)
     // 展示本地存储能力
     const logs = wx.getStorageSync('logs') || []
     logs.unshift(Date.now())
     wx.setStorageSync('logs', logs)
-
     //获取顶部navBar的信息
     const that = this;
     // 获取系统信息
@@ -34,6 +34,7 @@ App({
     windowHeight:0,
     windowWidth:0,
     phone:'0755-82839168',
+    localImagePath:'',//发布是'.',本地开发是''
     imghttp:'https://www.xsip.cn/fileManager/downloadFile?fileId='
     // imghttp:'http://192.168.1.16:8801/fileManager/downloadFile?fileId='
   },

app.json

@@ -19,7 +19,9 @@
     "pages/selectedPatents/selectedPatents",
     "pages/memberCenter/memberCenter",
     "pages/form/addProduct/addProduct",
-    "pages/collectPatent/collectPatent"
+    "pages/collectPatent/collectPatent",
+    "pages/personalInformation/personalInformation",
+    "pages/patentDetails/patentDetails"
   ],
   "tabBar": {
     "list": [

myComponents/card/card.js

@@ -34,6 +34,9 @@ Component({
       if(this.properties.menu.length == 0){
         return false
       }
+      var dom = this.selectComponent('#myPopover')
+      dom.showMenu()
+      return
       console.log(e)
       console.log(this.data.popover)
       // 获取按钮元素的坐标信息
@@ -55,6 +58,7 @@ Component({
 
     // 响应popover组件中的子元素点击事件
     onClickA: function (e) {
+      console.log(e)
       const item = e.currentTarget.dataset.item
       item.data = this.properties.data
       item.index = this.properties.index
@@ -63,7 +67,10 @@ Component({
       //   icon: 'none'
       // });
       // 调用自定义组件 popover 中的 onHide 方法
-      this.data.popover.onHide();
+      // this.data.popover.onHide();
+      console.log(item)
+      var dom = this.selectComponent('#myPopover')
+      dom.showMenu()
       this.triggerEvent('value',item)
     }
   },

myComponents/card/card.json

@@ -4,6 +4,7 @@
     "van-icon": "/miniprogram_npm/@vant/weapp/icon/index",
     "wux-popover":"/miniprogram_npm/wux-weapp/popover/index",
     "myPopover":"/myComponents/popover/popover",
-    "myPopover-item":"/myComponents/popover/popover-item"
+    "myPopover-item":"/myComponents/popover/popover-item",
+    "myPopover2":"/myComponents/popover2/popover"
   }
 }

myComponents/card/card.wxml

@@ -1,8 +1,8 @@
 <!--myComponents/card/card.wxml-->
 <view class="myCard">
-  <myPopover id='popover' wx:if="{{menu.length>0}}">
-    <myPopover-item wx:for="{{menu}}" data-item="{{item}}" wx:if="{{(item.type && data.ticketProgress==item.type) || !item.type}}" bindtap='onClickA' hasline>{{item.label}}</myPopover-item>
-  </myPopover>
+  <!-- <myPopover id='popover' wx:if="{{menu.length>0}}">
+    <view class="menu_item" wx:for="{{menu}}" data-item="{{item}}" bind:tap='onClickA' wx:if="{{(item.type && data.ticketProgress==item.type) || !item.type}}"  hasline>{{item.label}}</view>
+  </myPopover> -->
   <view class="head">
     <view class="head_left">
       <slot name="head_left"></slot>
@@ -12,7 +12,13 @@
         <slot name="head_right"></slot>
       </view>
       <view class="eidt" wx:if="{{edit}}" >
-        <van-icon name="ellipsis" id='button' bindtap='onTap'/>
+        <myPopover2 id="myPopover" >
+          <view slot="menu" class="menu">
+            <view class="menu_item" wx:for="{{menu}}" data-item="{{item}}" bind:tap='onClickA' wx:if="{{(item.type && data.ticketProgress==item.type) || !item.type}}"  hasline>{{item.label}}</view>
+          </view>
+          <van-icon name="ellipsis" id='button' bindtap='onTap'/>
+        </myPopover2>
+        
       </view>
     </view>
   </view>

myComponents/card/card.wxss

@@ -39,4 +39,15 @@
   width: 10px;
   height: 10px;
 }
-
+.menu{
+  width: 100px;
+}
+.menu_item{
+  font-size: 16px;
+  text-align: center;
+  padding: 5px 0;
+  border-bottom: 1px solid #f2f2f2;
+}
+.menu_item:last-child{
+  border-bottom:none;
+}

myComponents/formItem/formItem.js

@@ -23,9 +23,17 @@ Component({
       type:String,
       value:''
     },
+    customStyle:{
+      type:String,
+      value:''
+    },
     required:{
       type:Boolean,
       value:false
+    },
+    border:{
+      type:Boolean,
+      value:true
     }
   },
 

myComponents/formItem/formItem.wxml

@@ -1,13 +1,13 @@
 <!--myComponents/formItem/formItem.wxml-->
-<view class="{{customClass}} myFormItem">
-	<view class="left" id="label" style="width: {{labelWidth?labelWidth:200}}rpx;text-align: {{labelPosition}};">
+<view class="{{customClass}} myFormItem" style="{{customStyle}}">
+	<view class="left" id="label" style="width: {{labelWidth?labelWidth:200}}rpx;text-align: {{labelPosition}};{{border?'':'border:none'}}">
 		<view class="left_label">
       <view wx:if="{{required}}" class="required"></view>
       <slot name="label"></slot>
     </view>
     <text class="left_text {{required?'required':''}}">{{label}}</text>
 	</view>
-	<view class="right">
+	<view class="right" style="{{border?'':'border:none'}}">
 		<slot></slot>
 	</view>
 </view>

myComponents/formItem/formItem.wxss

@@ -1,9 +1,10 @@
 /* myComponents/formItem/formItem.wxss */
 @import "./form.wxss";
 page{
-	--padding:15rpx;
+	
 }
 .myFormItem{
+  --padding:15rpx;
 	width:100%;
 	min-height: 50rpx;
 	line-height: 50rpx;

myComponents/myInput/myInput.js

@@ -10,12 +10,15 @@ Component({
   properties: {
     value:{
       type:String,
-      value:''
-    },
-    placeholder:{
-      type:String,
-      value:'请输入'
+      value:'',
+      observer:function(val){
+        this.changeContent(val)
+      }
     },
+    // placeholder:{
+    //   type:String,
+    //   value:'请输入'
+    // },
     showEdit:{
       type:Boolean,
       value:true
@@ -35,14 +38,46 @@ Component({
    * 页面的初始数据
    */
   data: {
+    searchType:[
+      {
+        label:'按产品查',
+        value:'key',
+        placeholder:'请输入产品相关关键词'
+      },
+      {
+        label:'按公司查',
+        value:'companyName',
+        placeholder:'请输入公司名称'
+      }
+    ],
+    field:'key',
+    lastField:'',
+    placeholder:'请输入产品相关关键词',
     content:'',
     show:false,
     fileList:[]
   },
 methods:{
+  changeSearchType(e){
+    // var field = e.detail
+    var lastField = this.data.field
+    var {field} = e.currentTarget.dataset
+    var obj = this.data.searchType.find(item=>{
+      return item.value == field
+    })
+    this.setData(
+      {
+        field:field,
+        lastField:lastField,
+        placeholder:obj.placeholder
+      }
+    )
+    this.triggerEvent('changeSearchType',field)
+  },
   changeInput(e){
     const value = e.detail.value;
-    this.triggerEvent("input", value);
+    this.changeContent(value)
+    this.triggerEvent("input", value,this.data.field);
   },
   inputBlur(e){
     const value = e.detail.value;
@@ -50,7 +85,7 @@ methods:{
       return false
     }
     this.changeContent(value)
-    this.triggerEvent("change", value);
+    this.triggerEvent("change", value,this.data.field);
   },
   changeContent(value){
     this.setData(
@@ -78,18 +113,28 @@ methods:{
         return false
       }
       var params = {
-        key:this.data.content
+        // key:this.data.content
       }
+      params[this.data.field] = this.data.content
       if(this.data.fileList && this.data.fileList.length>0){
         params.filePath = this.data.fileList[0].url
       }
       var product = JSON.stringify(params)
+      console.log(product)
       wx.navigateTo({
         url: '/pages/searchResults/searchResults?type=0&product='+encodeURIComponent(product),
       })
     }
     // console.log(e,this.properties.value)
-    this.triggerEvent('search',1)
+    var data = {
+      value:this.data.content,
+      field:this.data.field,
+      lastField:this.data.lastField,
+    }
+    if(this.data.fileList && this.data.fileList.length>0){
+      data.filePath = this.data.fileList[0].url
+    }
+    this.triggerEvent('search',data)
   },
   //图片上传
   beforeUpload(e){

myComponents/myInput/myInput.json

@@ -3,6 +3,8 @@
   "usingComponents": {
     "wux-upload":"/miniprogram_npm/wux-weapp/upload",
     "my-form-item":"/myComponents/formItem/formItem",
-    "wux-textarea":"/miniprogram_npm/wux-weapp/textarea"
+    "wux-textarea":"/miniprogram_npm/wux-weapp/textarea",
+    "van-radio": "/miniprogram_npm/@vant/weapp/radio/index",
+    "van-radio-group": "/miniprogram_npm/@vant/weapp/radio-group/index"
   }
 }

myComponents/myInput/myInput.wxml

@@ -1,4 +1,12 @@
 <!--myComponents/myInput/myInput.wxml-->
+<view class="searchType">
+  <!-- <van-radio-group value="{{ field }}" bind:change="changeSearchType">
+    <view class="radio_group">
+      <van-radio wx:for="{{searchType}}" wx:key="index" name="{{item.value}}">{{item.label}}</van-radio>
+    </view>
+  </van-radio-group> -->
+  <view wx:for="{{searchType}}" class="searchType_item {{item.value == field?'checked':''}}"  wx:key="index" data-field="{{item.value}}" bind:tap="changeSearchType">{{item.label}}</view>
+</view>
 <view class="myInput">
   <view class="left">
     <view class="input_type">

myComponents/myInput/myInput.wxss

@@ -85,3 +85,37 @@ page{
   margin: auto;
 }
 
+.searchType{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 5px;
+}
+.searchType_item{
+  /* width: 58px; */
+  border-radius: 10rpx;
+  background-color: #a4adb3;
+  padding: 4px 15px;
+  margin: 0 5px;
+  text-align: center;
+  color: #ffffff;
+}
+
+.checked{
+  background-color: var(--themeColor);
+  position: relative;
+}
+.checked::before {
+  position: absolute;
+  display: inline-block;
+  width: 0;
+  height: 0px;
+  content: '';
+  border-style: solid;
+  border-width: 4px;
+  border-color: var(--themeColor) var(--themeColor) transparent transparent;
+  box-shadow: 2px -2px 2px #ddd;
+  top:calc(100% - 6px);
+  right: 50%;
+  transform: rotate(135deg);
+}

myComponents/navBar/navBar.js

@@ -60,8 +60,8 @@ Component({
       wx.switchTab({
           url: "/pages/index/index"
       });
-  }
-
+  },
+ 
+  },
  
-  }
 })

myComponents/navBar/navBar.wxml

@@ -18,7 +18,10 @@
 				<view class="base-box" 
                      style="height:{{menuHeight}}px;width:{{menuWidth}}px" wx:else></view>
                 <!-- 中间文字部分，可设置字体颜色 -->
-				<view class="title" style="color:{{color}}">{{title}}</view>
+				<view class="title" style="color:{{color}}">
+        <image class="image" src="/static/image/logo-3.png" mode="aspectFit"/>
+        {{title}}
+        </view>
                 <!-- 右边部分，占据小程序系统胶囊位置 -->
 				<view class="base-box" style="height:{{menuHeight}}px;width:{{menuWidth}}px"></view>
 			</view>

myComponents/navBar/navBar.wxss

@@ -43,6 +43,12 @@
   white-space: nowrap; /* 防止文本换行 */  
   overflow: hidden; /* 隐藏超出容器的文本 */  
   text-overflow: ellipsis; /* 显示省略号来表示文本被截断 */ 
+  display: flex;
+  align-items: center;
+}
+.image{
+  width: 40px;
+  margin-right: 4px;
 }
 .nav-bar-buttom {
   height: 10rpx;

pages/collectPatent/collectPatent.js

@@ -10,7 +10,7 @@ Page({
   data: {
     imgHttp:app.globalData.imghttp,
     loading:false,
-    scrollTop: 0,
+    scrolltop: 20,
     tableData:[],
     queryParams:{
       size:10,
@@ -111,7 +111,7 @@ Page({
     api.selectCollectPatent(params).then(res=>{
       if(res.code == 200){
         var len1 = this.data.tableData.length
-        var len = len1>0?len1-1: 0
+        var len = len1>0?len1: 0
         
         this.setData(
           {
@@ -146,6 +146,13 @@ Page({
       }
     })
   },
+  //查看专利详情
+  checkPatentDetail(e){
+    var {patentno} = e.currentTarget.dataset
+    wx.navigateTo({
+      url: '/pages/patentDetails/patentDetails?patentNo='+patentno,
+    })
+  },
   //加载更多
   loadMore(){
     var current = this.data.queryParams.current

pages/collectPatent/collectPatent.wxml

@@ -6,7 +6,7 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <view class="collectPatent">
   <view class="head">
@@ -16,7 +16,7 @@
     <block wx:for="{{tableData}}" wx:key="index">
         <myCard edit="{{false}}">
           <view slot="head_left">
-            <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：{{item.appNo}}
+            <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：<text class="link" data-patentNo="{{item.patentNo}}" catch:tap="checkPatentDetail">{{item.patentNo}} </text>
           </view>
           <!-- <view slot="head_right">
             <van-checkbox-group value="{{ patentNoList }}" data-item="{{item}}" data-index="{{index}}" data-appNo="{{item.appNo}}"  bind:change="changePatentNoList">
@@ -34,7 +34,12 @@
             </block>
           </swiper>
           <view wx:if="{{item.rightHolder && item.rightHolder.length>0}}">
-            专利权人：{{item.rightHolder[0]}}
+            专利权人：
+            <!-- {{item.rightHolder[0]}} -->
+            <text wx:for="{{item.rightHolder}}" wx:for-item="rightHolder" wx:for-index="ind" wx:key="ind">
+              <text>{{rightHolder}}</text>
+              <text wx:if="{{ind != item.rightHolder.length-1}}">、</text>
+            </text>
           </view>
           </view>
         </myCard>
@@ -42,7 +47,7 @@
     <view class="loadData" wx:if="{{total && tableData.length>0}}">
       <view wx:if="{{total>tableData.length}}" bind:tap="loadMore">加载更多</view>
       <wux-spin wux-class="spin" size="small" wx:elif="{{loading}}"/>
-      <view wx:elif="{{total>10}}">没有更多了</view>
+      <view wx:else>没有更多了</view>
     </view>
   </scroll-view>
   <van-empty wx:else description="暂无数据" />

pages/form/addProduct/addProduct.js

@@ -228,7 +228,7 @@ Page({
               showDialog:false,
               followType:null,
             })
-
+            prepage.collectPatent()
             wx.navigateBack()
           }
         })

pages/hotProduct/hotProduct.js

@@ -16,7 +16,7 @@ Page({
     },
     total:25,
     loading:false,
-    scrollTop: 0,
+    scrolltop: 20,
   },
 
   /**

pages/hotProduct/hotProduct.wxml

@@ -4,7 +4,7 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <view class="hotProduct">
   <view class="search">

pages/index/index.js

@@ -1,10 +1,11 @@
 const api = require("../../api/index.js")
-
+const app = getApp()
 // index.js
 const defaultAvatarUrl = 'https://mmbiz.qpic.cn/mmbiz/icTdbqWNOwNRna42FI242Lcia07jQodd2FJGIYQfG0LAJGFxM4FbnQP6yfMxBgJ0F3YRqJCJ1aPAK2dQagdusBZg/0'
 
 Page({
   data: {
+    phone:app.globalData.phone,
     motto: 'Hello World',
     userInfo: {
       avatarUrl: defaultAvatarUrl,
@@ -39,7 +40,8 @@ Page({
         color:'#000a7b',
         page:'/pages/form/application/application'
       }
-    ]
+    ],
+    visible1:false
   },
   bindViewTap() {
     wx.navigateTo({
@@ -56,9 +58,27 @@ Page({
   //  api.search().then(res=>{
   //    console.log(res)
   //  })
-   
+   var a = wx.getStorageSync('showDialog')
+   this.setData(
+     {
+      visible1:a
+     }
+   )
+  },
+  onClose1(){
+    this.setData(
+      {
+       visible1:false
+      }
+    )
+    wx.setStorageSync('showDialog', false)
+  },
+
+  makePhoneCall(){
+    wx.makePhoneCall({
+      phoneNumber: this.data.phone
+    })
   },
-  
   //修改输入的关键词
   changeKeyword(e){
     this.setData(

pages/index/index.json

@@ -2,6 +2,8 @@
   "navigationBarTitleText":"",
   "usingComponents":{
     "form-item":"/myComponents/formItem/formItem",
-    "tabBar":"/myComponents/tabBar/tabBar"
+    "tabBar":"/myComponents/tabBar/tabBar",
+    "van-notice-bar": "/miniprogram_npm/@vant/weapp/notice-bar/index",
+    "wux-landscape": "/miniprogram_npm/wux-weapp/landscape/index"
   }
 }

pages/index/index.wxml

@@ -1,6 +1,30 @@
 <!--index.wxml-->
 <van-notify id="van-notify" />
-<scroll-view class="scrollarea" scroll-y type="list">
+<wux-landscape visible="{{ visible1 }}" bind:close="onClose1">
+  <view class="landscape_content">  
+    <view class="landscape_content_head">小世电商专利助手</view>
+    <view class="landscape_content_body">
+      <view class="landscape_content_body_item">小世电商专利助手小程序旨在为跨境电商提供一站式的知识产权专业服务</view>
+      <view class="landscape_content_body_item2">  
+        <view>主要提供：</view>
+        <view>1.爆款产品专利库</view>
+        <view>2.上架产品的专利侵权风险排查</view>
+        <view>3.产品下架意见分析</view>
+        <view>4.专利侵权行为投诉</view>
+        <view>5.协助维权</view>
+        <view>6.专利申请的相关服务</view>
+      </view>
+      <view class="landscape_content_body_item">以协助跨境电商的商家打好知识产权这把出海“保护伞”，避开知产雷区，为自己的品牌保驾护航，提高企业竞争力。</view>
+    </view>
+  </view>
+</wux-landscape>
+<van-notice-bar
+  left-icon="volume-o"
+  mode="link"
+  custom-class="notice-bar"
+  text="小世电商专利助手小程序旨在为跨境电商提供一站式的知识产权专业服务，主要提供爆款产品专利库、上架产品的专利侵权风险排查、产品下架意见分析、专利侵权行为投诉、协助维权、专利申请的相关服务，以协助跨境电商的商家打好知识产权这把出海“保护伞”，避开知产雷区，为自己的品牌保驾护航，提高企业竞争力。"
+/>
+<view class="scrollarea" scroll-y type="list">
   <view class="">
     <view class="content">
       <view class="img">
@@ -17,5 +41,9 @@
       </block>
     </view>
   </view>
- 
-</scroll-view>
+ <view class="foot">
+ <view>软件服务提供商：小世 </view>
+ <view>知识产权服务提供商：深圳威世博</view>
+     
+ </view>
+</view>

pages/index/index.wxss

@@ -6,7 +6,9 @@ page {
 }
 .scrollarea {
   flex: 1;
-  overflow-y: hidden;
+  /* overflow-y: hidden; */
+  padding-top: 40px;
+  height: 100vh;
 }
 .content{
   width: 85%;
@@ -36,4 +38,48 @@ page {
 .result_content{
   height: 50rpx;
   color: black;
+}
+
+.notice-bar{
+  height: 30px !important;
+  position: fixed !important;
+  top: 0 !important;
+  width: 100%;
+  z-index: 999;
+}
+
+.foot{
+  font-size: 14px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 30px;
+  color: #a7a5a5;
+}
+
+
+.landscape_content{
+  border-radius: 15rpx;
+  border: 2px solid var(--themeColor);
+  background-color: white;
+}
+.landscape_content_head{
+  border-bottom: 1px solid var(--themeColor);
+  padding: 5px;
+  color: var(--themeColor);
+  text-align: left;
+  font-weight: bold;
+}
+.landscape_content_body{
+  padding: 5px;
+  font-weight: bold;
+  text-align: left;
+  font-size: 15px;
+  color: black;
+}
+.landscape_content_body_item{
+  text-indent: 2em;
+}
+.landscape_content_body_item2{
+  padding: 0 2em;
 }

pages/memberCenter/memberCenter.js

@@ -1,28 +1,31 @@
 // pages/memberCenter/memberCenter.js
 const api = require('../../api/index')
 const pay = require('../../utils/pay')
+const app = getApp()
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+    localImagePath:app.globalData.localImagePath,
+    imgHttp:app.globalData.imghttp,
     userinfo:{},
     equity:[
       {
-        icon:'/static/svg/会员下载.svg',
+        icon:'/static/svg/down.png',
         label:'权益一'
       },
       {
-        icon:'/static/svg/会员权益 (1).svg',
+        icon:'/static/svg/会员权益 (1).png',
         label:'权益二'
       },
       {
-        icon:'/static/svg/会员权益.svg',
+        icon:'/static/svg/会员权益.png',
         label:'权益三'
       },
       {
-        icon:'/static/svg/会员级别处理.svg',
+        icon:'/static/svg/会员级别处理.png',
         label:'权益四'
       },
     ],
@@ -230,6 +233,9 @@ Page({
           }
         )
         this.getUserinfo()
+        var pages = getCurrentPages()
+        var currentPage = pages[pages.length - 2]
+        currentPage.getUserinfo()
       }
     }).catch(error=>{
 

pages/memberCenter/memberCenter.wxml

@@ -6,7 +6,7 @@
   <view class="content">
     <view class="userinfo">
       <view class="left">
-        <wux-avatar size="large" wx:if="{{userinfo.fileGuid}}" src="imgHttp{{userinfo.fileGuid}}"></wux-avatar>
+        <wux-avatar size="large" wx:if="{{userinfo.fileGuid}}" src="{{imgHttp}}{{userinfo.fileGuid}}"></wux-avatar>
       <wux-avatar size="large" wx:else src="/static/image/unlogin.jpeg"></wux-avatar>
         <view class="message">
           <view class="name">{{userinfo.name || userinfo.phoneNum}}</view>
@@ -18,12 +18,12 @@
     <view class="equity">
       <view class="equity_item" wx:for="{{equity}}" wx:key="index">
         <!-- <view class="equity_item_icon iconfont {{item.icon}}"></view> -->
-        <view class="equity_item_icon backGroundImage" style="background-image: url('{{item.icon}}')"></view>
+        <view class="equity_item_icon backGroundImage" style="background-image: url('{{localImagePath}}{{item.icon}}')"></view>
         <view class="equity_item_lable">{{item.label}}</view>
       </view>
     </view>
     <view class="grades">
-      <view  wx:for="{{grades}}" wx:key="index" class="grades_item backGroundImage {{choseVip.vipUuid == item.vipUuid?'checked':''}}" style="background-image: url('{{item.background_icon}}');background-color: {{item.background_color}};" data-item="{{item}}" bind:tap="chooseVip">
+      <view  wx:for="{{grades}}" wx:key="index" class="grades_item backGroundImage {{choseVip.vipUuid == item.vipUuid?'checked':''}}" style="background-image: url('{{localImagePath}}{{item.background_icon}}');background-color: {{item.background_color}};" data-item="{{item}}" bind:tap="chooseVip">
         <view class="grades_item_label">{{item.grade}}</view>
         <view class="money">￥<text class="money_value">{{item.money}}</text>/年</view>
       </view>

pages/mine/mine.js

@@ -48,10 +48,11 @@ Page({
     imgHttp:app.globalData.imghttp,
     show:false,
     actions: [
-      // {
-      //   name: '编辑信息',
-      //   page:''
-      // },
+      {
+        name: '编辑信息',
+        page:'/pages/personalInformation/personalInformation',
+        method:'editInformation'
+      },
       {
         name: '退出登录',
         page:'',
@@ -144,7 +145,14 @@ Page({
   onSelect(event) {
     console.log(event.detail);
     var btn = event.detail
-    this[btn.method]()
+    this[btn.method](btn)
+  },
+  //编辑个人信息
+  editInformation(btn){
+    var page = btn.page
+    wx.navigateTo({
+      url: page,
+    })
   },
   //退出登录
   logout(){

pages/mine/mine.wxml

@@ -9,7 +9,7 @@
 <view class="mine">
   <view class="head flex" wx:if="{{isLogin}}">
     <view class="flex">
-      <wux-avatar size="large" wx:if="{{userinfo.fileGuid}}" src="imgHttp{{userinfo.fileGuid}}" bind:tap="editMessage"></wux-avatar>
+      <wux-avatar size="large" wx:if="{{userinfo.fileGuid}}" src="{{imgHttp}}{{userinfo.fileGuid}}" bind:tap="editMessage"></wux-avatar>
       <wux-avatar size="large" wx:else src="/static/image/unlogin.jpeg" bind:tap="editMessage"></wux-avatar>
       <view class="message">
         <view class="name">{{userinfo.name || userinfo.phoneNum}}</view>

pages/monitor/monitor.js

@@ -13,7 +13,7 @@ Page({
       size:10
     },
     total:0,
-    scrollTop: 0,
+    scrolltop: 20,
   },
 
   /**

pages/monitor/monitor.wxml

@@ -5,7 +5,7 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <view class="monitor">
   <view class="head">

pages/myFollow/myFollow.js

@@ -41,7 +41,7 @@ Page({
       },
     ],
     checked:[],
-    scrollTop: 0,
+    scrolltop: 20,
   },
 
   /**

pages/myFollow/myFollow.wxml

@@ -5,7 +5,7 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <view class="myFollow">
   <view class="head">

pages/myWork/myWork.js

@@ -16,7 +16,7 @@ Page({
     total:0,
     loading:false,
     imgHttp:app.globalData.imghttp,
-    scrollTop: 0,
+    scrolltop: 20,
     ticketTypeFiled:{
       '1':'ticketFillInVO',
       '2':'ticketRightsProtectionVO',
@@ -120,7 +120,7 @@ Page({
       urls:imgs,
     })
   },
-  //获取检索记录
+  //获取工单记录
   getMyWork(){
     wx.showLoading({
       title: '加载中',
@@ -158,7 +158,7 @@ Page({
   payMoney(data,index){
     console.log(data)
     var params = {
-      goodType:0,
+      goodType:2,
       goodUuid:data.num
     }
     wx.showLoading({

pages/myWork/myWork.wxml

@@ -6,7 +6,7 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <view class="myWork">
   <view class="head">

pages/patentDetails/patentDetails.js

@@ -0,0 +1,242 @@
+// pages/patentDetails/patentDetails.js
+const api = require('../../api/index')
+const app = getApp()
+import {$wuxGallery} from '../../miniprogram_npm/wux-weapp/index'
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    imgHttp:app.globalData.imghttp,
+    labelPosition:'left',
+    labelWidth:250,
+    customStyle:" --padding:5rpx;font-weight:bold",
+    patentNo:'',
+    patent:{},
+    isSame:false
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.setData(
+      {
+        patentNo:options.patentNo
+      }
+    )
+    this.selectPatentInfoByPatentNo()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 页面功能
+   */
+   //查看图片
+   previewImage(e) {
+    console.log(e)
+    var { current,imglist } = e.currentTarget.dataset
+    var imgs = []
+    for(var i =0;i<imglist.length;i++){
+      imgs.push(this.data.imgHttp + imglist[i].guid)
+    }
+    current = this.data.imgHttp + current
+    $wuxGallery().show({
+      current,
+      urls: imgs.map((n) => ({ image: n, remark: n })),
+      indicatorDots: true,
+      indicatorColor: '#fff',
+      indicatorActiveColor: '#04BE02',
+      showDelete:false
+    })
+  },
+  //获取专利详情
+  selectPatentInfoByPatentNo(){
+    if(!this.data.patentNo){
+      return false
+    }
+    var params = {
+      patentNo:this.data.patentNo
+    }
+    api.selectPatentInfoByPatentNo(params).then(res=>{
+      if(res.code == 200){
+        var isSame = false
+        if(JSON.stringify(res.data.applicant) == JSON.stringify(res.data.rightHolder)){
+          isSame = true
+        }
+        var classification = []
+        if(res.data.ipc){
+          for(var i = 0;i<res.data.ipc.length;i++){
+            var item = res.data.ipc[i]
+            var arr = Object.keys(item)
+            classification.push(item[arr[arr.length-1]]) 
+          }
+          res.data.classification = classification.join('，')
+        }
+        if(res.data.abstractStr && res.data.abstractStr.length>0){
+          var abstractStr = res.data.abstractStr[0].text_content
+          if(abstractStr){
+            
+            var arr = [
+              "a",
+              "abbr",
+              "address",
+              "article",
+              "aside",
+              "b",
+              "bdi",
+              "bdodir",
+              "big",
+              "blockquote",
+              "br",
+              "caption",
+              "center",
+              "cite",
+              "code",
+              "col",
+              "colgroup",
+              "dd",
+              "del",
+              "div",
+              "dl",
+              "dt",
+              "em",
+              "fieldset",
+              "font",
+              "footer",
+              "h1",
+              "h2",
+              "h3",
+              "h4",
+              "h5",
+              "h6",
+              "header",
+              "hr",
+              "i",
+              "img",
+              "ins",
+              "label",
+              "legend",
+              "li",
+              "mark",
+              "nav",
+              "ol",
+              "p",
+              "pre",
+              "q",
+              "rt",
+              "ruby",
+              "s",
+              "section",
+              "small",
+              "span",
+              "strong",
+              "sub",
+              "sup",
+              "table",
+              "tbody",
+              "td",
+              "tfoot",
+              "th",
+              "thead",
+              "tr",
+              "tt",
+              "u",
+              "ul"
+          ]
+            var str = ''
+            for(var i = 0;i<arr.length;i++){
+              var item = arr[i]
+              if(str){
+                 str = str + '|' + item + '|\/' + item
+              }else{
+                str = str + item + '|\/' + item
+              }
+            }
+            var regx = new RegExp(`<(?!(${str})).*?>`,'g')
+            abstractStr = abstractStr.replace(regx,'')  
+            res.data.abstractStr[0].text_content = abstractStr
+          }
+        }
+       
+        this.setData(
+          {
+            patent:res.data,
+            isSame:isSame
+          }
+        )
+        var appNo = res.data.appNo
+        if(appNo){
+          this.getPictureByNo(appNo)
+        }
+      }
+    })
+  },
+  //根据专利号获取相关图片
+  getPictureByNo(appNo){
+    var params = {
+      appNo:appNo
+    }
+    api.getPictureByNo(params).then(res=>{
+      if(res.code == 200){
+        this.setData(
+          {
+            ["patent.imageList"]:res.data
+          }
+        )
+      }
+    })
+  },
+
+
+
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/patentDetails/patentDetails.json

@@ -0,0 +1,7 @@
+{
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "wux-divider": "/miniprogram_npm/wux-weapp/divider/index",
+    "my-form-item": "/myComponents/formItem/formItem"
+  }
+}

pages/patentDetails/patentDetails.wxml

@@ -0,0 +1,87 @@
+<!--pages/patentDetails/patentDetails.wxml-->
+<navBar></navBar>
+<wux-gallery id="wux-gallery" />
+<van-notify id="van-notify" />
+<view class="patentDetail">
+  <view class="patentNo">
+    <view>{{patent.patentNo}}</view>
+  </view>
+  <view class="title">
+    标题：{{patent.title[0].text_content}}
+  </view>
+  <block wx:if="{{patent.appDate || patent.grantDate || patent.publicDate}}">
+    <wux-divider wux-class="line" position="left" text="日期" />
+    <view class="form">
+      <my-form-item wx:if="{{patent.appDate}}" label="申请日：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.appDate}}</view>
+      </my-form-item>
+      <my-form-item wx:if="{{patent.grantDate || patent.publicDate}}" label="公开/授权日：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.grantDate || patent.publicDate}}</view>
+      </my-form-item>
+    </view>
+  </block>
+ 
+  <wux-divider wux-class="line" position="left" text="号码" />
+  <view>
+    <my-form-item wx:if="{{patent.appNo}}" label="申请号：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.appNo}}</view>
+      </my-form-item>
+      <my-form-item wx:if="{{patent.grantNo || patent.publicNo}}" label="公开/授权号：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.grantNo || patent.publicNo}}</view>
+      </my-form-item>
+      <my-form-item wx:if="{{patent.classification}}" label="分类号：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.classification}}</view>
+      </my-form-item>
+  </view>
+ 
+  <wux-divider wux-class="line" position="left" text="申请（权利）人/设计人" />
+  <view>
+    <view >
+      <my-form-item label="申请（权利）人：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="350" labelPosition="{{labelPosition}}">
+        <view class="form_item" wx:if="{{isSame}}">{{patent.rightHolder}}</view>
+        <view class="form_item" wx:elif="{{patent.rightHolder&&patent.rightHolder.length>0}}">{{patent.rightHolder}}</view>
+        <view class="form_item" wx:else>{{patent.applicant}}</view>
+      </my-form-item>
+    </view>
+    <!-- <view wx:else>
+      <my-form-item label="申请人：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.applicant}}</view>
+      </my-form-item>
+      <my-form-item label="权利人：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.rightHolder}}</view>
+      </my-form-item>
+    </view> -->
+    <my-form-item wx:if="{{patent.inventor && patent.inventor.length>0}}" label="设计人：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{isSame?350:labelWidth}}" labelPosition="{{labelPosition}}">
+        <view class="form_item">{{patent.inventor}}</view>
+      </my-form-item>
+  </view>
+  
+  <block wx:if="{{(patent.agency && patent.agency.length>0) ||(patent.agent && patent.agent.length>0) }}">
+     <wux-divider wux-class="line" position="left" text="代理人" />
+      <view>
+        <my-form-item wx:if="{{patent.agency && patent.agency.length>0}}" label="代理机构：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+          <view class="form_item">{{patent.agency}}</view>
+        </my-form-item>
+        <my-form-item wx:if="{{patent.agent && patent.agent.length>0}}" label="代理人：" border="{{false}}" customStyle="{{customStyle}}" labelWidth="{{labelWidth}}" labelPosition="{{labelPosition}}">
+          <view class="form_item">{{patent.agent}}</view>
+        </my-form-item>
+      </view>
+  </block>
+   
+    <block wx:if="{{patent.abstractStr && patent.abstractStr.length>0}}">
+      <wux-divider wux-class="line" position="left" text="简要说明" />
+      <view class="form_item">
+        <rich-text nodes="{{patent.abstractStr[0].text_content}}"></rich-text>
+      </view>
+    </block>
+    
+
+    <wux-divider wux-class="line" position="left" text="附图" />
+    <swiper indicator-dots="{{true}}"  autoplay="{{false}}" interval="{{2000}}" duration="{{500}}">
+      <block wx:if="{{patent.imageList && patent.imageList.length>0}}" wx:for="{{patent.imageList}}" wx:for-item="img" wx:key="index">
+        <swiper-item>
+          <view style="background-image: url('{{imgHttp+img.guid}}')" class="slide-image" data-current="{{patent}}" data-imgList="{{patent.imageList}}" bind:tap="previewImage"></view>  
+        </swiper-item>
+      </block>
+    </swiper>
+</view>

pages/patentDetails/patentDetails.wxss

@@ -0,0 +1,42 @@
+/* pages/patentDetails/patentDetails.wxss */
+.line{
+  border-top: 2rpx solid var(--themeColor) !important;
+  color: var(--themeColor) !important;
+  font-weight: bold !important;
+  font-size: 15px !important;
+}
+.swiper{
+  height: 200rpx;
+}
+.slide-image {  
+  width: 100%;  
+  height: 100%;  
+  background-size:contain; /* 图片覆盖整个容器，可能部分图片不可见 */  
+  background-position: center; /* 图片居中显示 */  
+  background-repeat: no-repeat; /* 图片不重复 */  
+}
+.patentDetail{
+  padding: 10px 25rpx;
+}
+.patentNo{
+  border-radius: 10rpx;
+  background-color: var(--themeColor);
+  width: fit-content;
+  padding: 8px;
+  margin-left: 10px;
+  color: #ffffff;
+}
+.title{
+  margin-top: 10px;
+  margin-left: 10px;
+  font-weight: bold;
+}
+.form_item{
+  padding:0 10rpx;
+  font-size: 14px;
+  font-weight: normal;
+  color: var(--themeColor);
+  /* width: fit-content;
+  border-radius: 10rpx;
+  border: 1px solid var(--themeColor); */
+}

pages/personalInformation/editMessage.js

@@ -0,0 +1,66 @@
+// pages/personalInformation/editMessage.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/personalInformation/editMessage.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/personalInformation/editMessage.wxml

@@ -0,0 +1,2 @@
+<!--pages/personalInformation/editMessage.wxml-->
+<text>pages/personalInformation/editMessage.wxml</text>

pages/personalInformation/editMessage.wxss

@@ -0,0 +1 @@
+/* pages/personalInformation/editMessage.wxss */

pages/personalInformation/personalInformation.js

@@ -0,0 +1,189 @@
+// pages/personalInformation/personalInformation.js
+const api = require('../../api/index')
+const app = getApp()
+const upload = require('../../utils/upload')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    userinfo:{},
+    imgHttp:app.globalData.imghttp,
+    show:false,
+    fieldMessage:{}
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    this.getUserinfo()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 页面功能
+   */
+  //获取用户信息
+  getUserinfo(){
+    api.selectPerson({},false).then(res=>{
+      if(res.code == 200){
+        this.setData(
+          {
+            userinfo:res.data
+          }
+        )
+      }
+    })
+  },
+  //更新用户信息
+  editMessage(field,value){
+    var params = {}
+    params[field] = value
+    api.editPerson(params).then(res=>{
+      if(res.code == 200){
+        this.setData(
+          {
+            ["userinfo."+field]:value
+          }
+        )
+        this.onClose()
+        var pages = getCurrentPages()
+        var currentPage = pages[pages.length - 2]
+        currentPage.setData(
+          {
+            ["userinfo."+field]:value
+          }
+        )
+      }
+    })
+  },
+  //获取用户信息
+  getUserInfo(e){
+    console.log(e)
+    var url = e.detail.avatarUrl
+    this.setData(
+      {
+        ["userinfo.avatarUrl"]:url
+      }
+    )
+    upload.upload(url).then(res=>{
+      if(res.code == 200){
+        this.editMessage('fileGuid',res.data[0])
+      }
+    })
+    
+  },
+  //栏位值修改
+  fieldEdit(e){
+    console.log(e)
+    var {field,label} = e.currentTarget.dataset
+    var value = this.data.userinfo[field] || ''
+    this.setData(
+      {
+        fieldMessage:{
+          field:field,
+          label:label,
+          value:value
+        },
+        show:true
+      }
+    )
+  },
+  //关闭
+  onClose(){
+    this.setData(
+      {
+        show:false,
+        fieldMessage:{},
+      }
+    )
+  },
+  //清空输入框
+  clearInput(e){
+    this.setData(
+      {
+        ["fieldMessage.value"]:''
+      }
+    )
+  },
+  //获取输入框的值
+  changeInput(e){
+    var value = e.detail.value
+    this.setData(
+      {
+        ["fieldMessage.value"]:value
+      }
+    )
+  },
+  //保存
+  saveMessage(){
+    var field = this.data.fieldMessage.field
+    var value = this.data.fieldMessage.value
+    this.editMessage(field,value)
+  },
+  //退出登录
+  logout(){
+    api.logout().then(res=>{
+      if(res.code == 200){
+        this.setData(
+          {
+            isLogin:false
+          }
+        )
+        wx.setStorageSync('token', '')
+        wx.navigateBack()
+      }
+    })
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/personalInformation/personalInformation.json

@@ -0,0 +1,13 @@
+{
+  "navigationStyle": "custom",
+  "usingComponents": {
+    "navBar": "/myComponents/navBar/navBar",
+    "wux-divider": "/miniprogram_npm/wux-weapp/divider/index",
+    "wux-avatar":"/miniprogram_npm/wux-weapp/avatar/index",
+    "wux-cell-group": "/miniprogram_npm/wux-weapp/cell-group/index",
+    "wux-cell": "/miniprogram_npm/wux-weapp/cell/index",
+    "van-popup": "/miniprogram_npm/@vant/weapp/popup/index",
+    "wux-field":"/miniprogram_npm/wux-weapp/field/index",
+    "wux-input":"/miniprogram_npm/wux-weapp/input/index"
+  }
+}

pages/personalInformation/personalInformation.wxml

@@ -0,0 +1,76 @@
+<!--pages/personalInformation/personalInformation.wxml-->
+<navBar></navBar>
+<van-popup
+  show="{{ show }}"
+  closeable
+  position="bottom"
+  custom-style="height: auto;margin-bottom:20px"
+  bind:close="onClose"
+>
+  <view class="popup">
+    <view class="popup_head">修改{{fieldMessage.label}}</view>
+    <view class="popup_content">
+        <wux-input label="{{fieldMessage.label}}" value="{{fieldMessage.value}}" placeholder="请输入" catch:change="changeInput"/>
+    </view>
+    <view class="popup_btn" catch:tap="saveMessage">保存</view>
+  </view>
+</van-popup>
+<view class="information">
+  <view class="head">
+    编辑个人信息
+  </view>
+  <wux-divider wux-class="line" show-text="{{ false }}" />
+  <view>
+      <wux-cell
+        wux-class="wuxCell"
+        title="头像"
+        is-link
+        open-type="chooseAvatar"
+        bindchooseavatar="getUserInfo"
+      >
+        <view slot="footer">
+          <wux-avatar size="large" wx:if="{{userinfo.fileGuid}}" src="{{imgHttp}}{{userinfo.fileGuid}}"></wux-avatar>
+          <wux-avatar size="large" wx:elif="{{userinfo.avatarUrl}}" src="{{userinfo.avatarUrl}}"></wux-avatar>
+          <wux-avatar size="large" wx:else src="/static/image/unlogin.jpeg"></wux-avatar>
+        </view>
+      </wux-cell>
+      <wux-cell wux-class="wuxCell" title="用户名" is-link data-field="name" data-label="用户名"
+        bind:click="fieldEdit">
+        <view slot="footer">{{userinfo.name}}</view>
+      </wux-cell>
+      <!-- <wux-cell
+        wux-class="wuxCell"
+        title="性别"
+        is-link
+        open-type="getUserInfo"
+        bind:getuserinfo="onGotUserInfo"
+      ></wux-cell> -->
+      <wux-cell
+        wux-class="wuxCell"
+        title="电话"
+        is-link
+      >
+        <view slot="footer">{{userinfo.phoneNum}}</view>
+      </wux-cell>
+      <wux-cell
+        wux-class="wuxCell"
+        title="邮箱"
+        is-link
+        data-field="email"
+        data-label="邮箱"
+        bind:click="fieldEdit"
+      >
+        <view slot="footer">{{userinfo.email}}</view>
+      </wux-cell>
+      <!-- <wux-cell
+        wux-class="wuxCell"
+        title="地区"
+        is-link
+        open-type="getPhoneNumber"
+        bind:getphonenumber="onGotPhoneNumber"
+      ></wux-cell> -->
+  </view>
+  <view class="foot">
+    <view class="btn" bind:tap="logout">退出登录</view>
+  </view>
+</view>

pages/personalInformation/personalInformation.wxss

@@ -0,0 +1,54 @@
+/* pages/personalInformation/personalInformation.wxss */
+.information{
+  padding: 10rpx 25rpx;
+}
+.head{
+  text-align: center;
+  padding: 10px;
+  color: var(--themeColor);
+}
+.wuxCell{
+  padding:30rpx 15rpx !important;
+  color: var(--themeColor) !important;
+  border-bottom: 1px solid var(--themeColor);
+  font-weight: bolder;
+}
+.foot{
+  margin-top: 40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
+.btn{
+  width: auto;
+  border-radius: 10rpx;
+  color: #ffffff;
+  background-color: var(--themeColor);
+  padding: 8px 20px;
+}
+.line{
+  border-top: 2rpx solid var(--themeColor) !important;
+  margin: 0 !important;
+}
+.popup{
+  height: 100%;
+  padding: 0 25rpx;
+}
+.popup_head{
+  text-align: center;
+  padding: 12px 0;
+}
+.popup_content{
+  background-color: rgb(207, 202, 202);
+  padding: 10px;
+  border-radius: 10rpx;
+  margin-top: 20rpx;
+}
+.popup_btn{
+  margin-top: 25rpx;
+  border-radius: 50px;
+  background-color: var(--themeColor);
+  color:#ffffff;
+  text-align: center;
+  padding: 8px 0;
+}

pages/riskAssessment/riskAssessment.js

@@ -9,7 +9,7 @@ Page({
   data: {
     tableData:[],
     keyword:'',
-    scrollTop: 0,
+    scrolltop: 20,
   },
 
   /**

pages/riskAssessment/riskAssessment.wxml

@@ -5,15 +5,15 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <scroll-view class="appscrollarea" scroll-y >
 <view class="padding_50 content">
-  <view class="head">
+  <!-- <view class="head">
     <view class="img">
       <image class="img" src="/static/image/logo-3.png" mode=""/>
     </view>
-  </view>
+  </view> -->
   <view class="search">
     <myInput value="{{keyword}}" placeholder="请输入产品相关关键词" bindchange="changeKeyword" bindsearch="search" bindclickInnerIcon="clickInnerIcon"></myInput>
   </view>

pages/searchRecords/searchRecords.js

@@ -16,7 +16,7 @@ Page({
     total:0,
     loading:false,
     imgHttp:app.globalData.imghttp,
-    scrollTop: 0,
+    scrolltop: 20,
     menu:[
       {
         label:'删除',
@@ -106,7 +106,23 @@ Page({
       if(res.code == 200){
         console.log(res)
         var data = this.data.tableData
-        data = data.concat(res.data.data)
+        for(var i =0;i<res.data.data.length;i++){
+          var item = res.data.data[i]
+          if(item.searchCondition){
+            try {  
+                var obj = JSON.parse(item.searchCondition)
+                if(obj){
+                  var arr = Object.values(obj)
+                  item.searchCondition = arr.join('；')
+                }
+            } catch (e) {  
+              
+            }
+            
+          }
+          data.push(item)
+        }
+        // data = data.concat(res.data.data)
         this.setData(
           {
             tableData:data,

pages/searchRecords/searchRecords.wxml

@@ -5,7 +5,7 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <view class="searchRecords">
   <view class="head">
@@ -16,7 +16,7 @@
       <myCard edit="{{false}}" menu="{{menu}}" data="{{item}}" index="{{index}}" bindvalue='clickMenu'>
         <view slot="head_left" class="head_left">
           <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  
-          <wux-ellipsis class="head_left_title" wx:if="{{item.productId}}" direction="end" content="{{ item.searchCondition }}"/>
+          <wux-ellipsis class="head_left_title" wx:if="{{item.productId}}" direction="end" content="{{ item.productName }}"/>
         </view>
         <view slot="head_right">
           {{item.searchTime}}
@@ -34,8 +34,8 @@
           </swiper-item>
         </swiper>
         </view>
-        <view wx:if="{{!item.productId}}">
-          <wux-ellipsis direction="end" content="{{ item.searchCondition }}"/>
+        <view wx:if="{{ item.searchCondition }}">
+          <wux-ellipsis direction="end" content="检索内容：{{ item.searchCondition }}"/>
         </view>
       </myCard>
     </block>

pages/searchResults/searchResults.js

@@ -20,23 +20,26 @@ Page({
     loading:false,
     tableData:[],
     keyword:'',
-    scrollTop: 0,
+    scrolltop: 60,
     searchType:1,//检索类型1是爆款产品0是手动检索
     product:{},//产品信息
     patentNoList:[],
     patentList:[],
     buttons:[
       {
-        label: '提交工单',
-        method:'check'
+        label: '人工服务',
+        method:'check',
+        icon:'/static/image/工单.png'
       },
       {
         label: '一键导出',
-        method:'export'
+        method:'export',
+        icon:'/static/image/导出.png'
       },
       {
         label:'人工客服',
-        method:'makePhoneCall'
+        method:'makePhoneCall',
+        icon:'/static/image/人工客服.png'
       }
     ],
     concernType:{
@@ -53,10 +56,12 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
+    var data = JSON.parse(decodeURIComponent(options.product))
     this.setData(
       {
         searchType:options.type,
-        product:JSON.parse(decodeURIComponent(options.product))
+        product:data,
+        keyword:data.key
       }
     )
     console.log(this.data.product)
@@ -90,7 +95,8 @@ Page({
         queryParams:params,
         total:0,
         tableData:[],
-        patentNoList:[]
+        patentNoList:[],
+        patentList:[],
       }
     )
     this.getPatentVectors()
@@ -104,6 +110,7 @@ Page({
     console.log('onRefresh')
     this.init()
   },
+ 
   //查看图片
   previewImage(e) {
     console.log(e)
@@ -134,13 +141,37 @@ Page({
       }
     )
   },
-  //点击输入框内部图标
-  clickInnerIcon(e){
-    // console.log(e)
-  },
+ //切换检索类型
+ changeSearchType(e){
+   console.log(e)
+   var field = e.detail
+   var str = this.data.product[field] || ''
+   this.setData(
+     {
+       keyword:str
+     }
+   )
+ },
   //点击搜索按钮
   search(e){
-    // console.log(e)
+    console.log(e)
+    var {value,field,lastField,filePath} = e.detail
+    if(lastField){
+      this.setData(
+        {
+          ["product."+lastField]:''
+        }
+      )
+    }
+    this.setData(
+      {
+        ["product."+field]:value,
+        ["product.filePath"]:filePath,
+        ifAddSearchRecord:true,
+        concernType:null
+      }
+    )
+    this.init()
   },
 
   //查询产品相关专利
@@ -154,9 +185,10 @@ Page({
     if(this.data.searchType == 1){
       params.productId = this.data.product.id
     }else{
-      params.key = this.data.product.key
       params.description = this.data.product.description
     }
+    params.key = this.data.product.key
+    params.companyName = this.data.product.companyName
     var vectorDTO = JSON.stringify(params)
     var url = 'getPatentVectors'
     var data = {
@@ -172,7 +204,7 @@ Page({
       if(res.code == 200){
         console.log(res)
         var len1 = this.data.tableData.length
-        var len = len1>0?len1-1: 0
+        var len = len1>0?len1: 0
         
         this.setData(
           {
@@ -217,16 +249,23 @@ Page({
     )
     this.getPatentVectors()
   },
+  //查看专利详情
+  checkPatentDetail(e){
+    var {patentno} = e.currentTarget.dataset
+    wx.navigateTo({
+      url: '/pages/patentDetails/patentDetails?patentNo='+patentno,
+    })
+  },
   //选择专利
   changePatentNoList(event) {
     console.log(event)
-    var {item,appNo} = event.currentTarget.dataset
+    var {item,patentno} = event.currentTarget.dataset
     var data = event.detail
     var patent = this.data.patentList
-    var index = data.indexOf(appNo)
-    if(index != -1){
+    var index = data.indexOf(patentno)
+    if(index == -1){
       var index1 = patent.findIndex(item=>{
-        return item.appNo == appNo
+        return item.patentno == patentno
       })
       patent.splice(index1,1)
     }else{
@@ -281,6 +320,7 @@ Page({
       }
     )
   },
+  //关注类型
   attention(e){
     var {type} = e.currentTarget.dataset
     this.setData(
@@ -349,28 +389,31 @@ Page({
         })
         that.closeDialog()
         // console.log(that.data.isAdd,this.data.patentNoList)
-        if(that.data.isAdd ){
-          that.setData(
-            {
-              idAdd:false
-            }
-          )
-          if(that.data.patentNoList && that.data.patentNoList.length>0){
-            var params1 = {
-              productId:that.data.product.id,
-              patentNos:that.data.patentNoList
-            }
-            api.collectPatent(params1).then(res=>{
-              if(res.code == 200){
-                
-              }
-            })
-          }
-        }
+        this.collectPatent()
       }
     })
   },
-
+//收藏专利
+collectPatent(){
+  if(that.data.isAdd ){
+    that.setData(
+      {
+        idAdd:false
+      }
+    )
+    if(that.data.patentNoList && that.data.patentNoList.length>0){
+      var params1 = {
+        productId:that.data.product.id,
+        patentNos:that.data.patentNoList
+      }
+      api.collectPatent(params1).then(res=>{
+        if(res.code == 200){
+          
+        }
+      })
+    }
+  }
+},
   //取消关注
   cancelFollow(e){
     if(!this.data.product.id){

pages/searchResults/searchResults.wxml

@@ -44,15 +44,15 @@
   id="wux-refresher"
   bind:pulling="onPulling"
   bind:refresh="onRefresh"
-  scrollTop="{{scrollTop}}"
+  distance="60"
 >
 <scroll-view scroll-y class="searchResults">
   <view class="head">
-    <view class="img">
+    <!-- <view class="img">
       <image class="img" src="/static/image/logo-3.png" mode=""/>
-    </view>
+    </view> -->
     <view>
-      <myInput value="{{keyword}}" placeholder="请输入产品相关关键词" bindchange="changeKeyword" bindsearch="search" bindclickInnerIcon="clickInnerIcon"></myInput>
+      <myInput value="{{keyword}}" ownner="{{false}}" placeholder="请输入产品相关关键词" bindinput="changeKeyword" bindchangeSearchType="changeSearchType" bindsearch="search"></myInput>
     </view>
   </view>
   <view class="product">
@@ -84,13 +84,14 @@
           <!-- <view class="slide-image" style="background-image: url('{{product.filePath}}')"></view> -->
         </swiper-item>
         <swiper-item wx:else>
+        
           <image  class="slide-image" src="/static/image/empty.gif" mode="aspectFit"/>
           <!-- <view class="slide-image" style="background-image: url('/static/image/empty.gif')"></view> -->
         </swiper-item>
       </swiper>
     </view>
-    <view class="product_text" wx:if="{{product.key}}">
-        检索内容：{{product.key}}
+    <view class="product_text" wx:if="{{product.key || product.companyName}}">
+        检索内容：{{product.key}}<text wx:if="{{product.key && product.companyName}}">，</text>{{product.companyName}}
       </view>
   </view>
   <van-divider customStyle=" border-color: #6b6b6b;" dashed />
@@ -108,11 +109,11 @@
       <block wx:for="{{tableData}}" wx:key="index">
         <myCard edit="{{false}}">
           <view slot="head_left">
-            <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：{{item.appNo}}
+            <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：<text class="link" data-patentNo="{{item.patentNo}}" catch:tap="checkPatentDetail">{{item.patentNo}} </text>
           </view>
           <view slot="head_right">
-            <van-checkbox-group value="{{ patentNoList }}" data-item="{{item}}" data-index="{{index}}" data-appNo="{{item.appNo}}"  bind:change="changePatentNoList">
-              <van-checkbox name="{{item.appNo}}"></van-checkbox>
+            <van-checkbox-group value="{{ patentNoList }}" data-item="{{item}}" data-index="{{index}}" data-patentNo="{{item.patentNo}}"  bind:change="changePatentNoList">
+              <van-checkbox name="{{item.patentNo}}"></van-checkbox>
             </van-checkbox-group>
           </view>
           <view>
@@ -126,7 +127,11 @@
             </block>
           </swiper>
           <view wx:if="{{item.rightHolder && item.rightHolder.length>0}}">
-            专利权人：{{item.rightHolder[0].name}}
+            专利权人：
+            <text wx:for="{{item.rightHolder}}" wx:for-item="rightHolder" wx:for-index="ind" wx:key="ind">
+              <text>{{rightHolder.name}}</text>
+              <text wx:if="{{ind != item.rightHolder.length-1}}">、</text>
+            </text>
           </view>
           </view>
         </myCard>
@@ -134,7 +139,7 @@
       <view class="loadData" wx:if="{{total && tableData.length>0}}">
         <view wx:if="{{total>tableData.length}}" bind:tap="loadMore">加载更多</view>
         <wux-spin wux-class="spin" size="small" wx:elif="{{loading}}"/>
-        <view wx:elif="{{total>10}}">没有更多了</view>
+        <view wx:else>没有更多了</view>
       </view>
     </view>
     <van-empty wx:else description="暂无数据" />

pages/searchResults/searchResults.wxss

@@ -17,8 +17,8 @@
   padding: 0 30rpx;
 }
 .head{
-  display: flex;
-  align-items: center;
+  /* display: flex;
+  align-items: center; */
 }
 .img{
   width: 140rpx;

pages/selectedPatents/selectedPatents.js

@@ -47,7 +47,13 @@ Page({
 
   },
 
-
+ //查看专利详情
+ checkPatentDetail(e){
+  var {patentno} = e.currentTarget.dataset
+  wx.navigateTo({
+    url: '/pages/patentDetails/patentDetails?patentNo='+patentno,
+  })
+},
    //查看图片
    previewImage(e) {
     console.log(e)

pages/selectedPatents/selectedPatents.wxml

@@ -14,11 +14,11 @@
     <view class="content_item">
      <myCard edit="{{false}}">
           <view slot="head_left">
-            <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：{{item.appNo}}
+            <van-tag round color="#3f395c">{{index+ 1}}</van-tag>  专利号：<text class="link" data-patentNo="{{item.patentNo}}" catch:tap="checkPatentDetail">{{item.patentNo}} </text>
           </view>
           <view slot="head_right">
-            <van-checkbox-group value="{{ patentNoList }}" data-item="{{item}}" data-index="{{index}}" data-appNo="{{item.appNo}}"  bind:change="changePatentNoList">
-              <van-checkbox name="{{item.appNo}}"></van-checkbox>
+            <van-checkbox-group value="{{ patentNoList }}" data-item="{{item}}" data-index="{{index}}" data-patentNo="{{item.patentNo}}"  bind:change="changePatentNoList">
+              <van-checkbox name="{{item.patentNo}}"></van-checkbox>
             </van-checkbox-group>
           </view>
           <view>
@@ -32,7 +32,12 @@
             </block>
           </swiper>
           <view wx:if="{{item.rightHolder && item.rightHolder.length>0}}">
-            专利权人：{{item.rightHolder[0].name}}
+            专利权人：
+            <text wx:for="{{item.rightHolder}}" wx:for-item="rightHolder" wx:for-index="ind" wx:key="ind">
+              <text>{{rightHolder.name}}</text>
+              <text wx:if="{{ind != item.rightHolder.length-1}}">、</text>
+            </text>
+            <!-- {{item.rightHolder[0].name}} -->
           </view>
           </view>
         </myCard>

utils/request.js

@@ -3,7 +3,7 @@ import Notify from '../miniprogram_npm/@vant/weapp/notify/notify';
 import { $startWuxRefresher, $stopWuxRefresher,$stopWuxLoader} from '../miniprogram_npm/wux-weapp/index';
 // 配置项  
 const config = {  
-  // baseURL: 'http://192.168.1.2:8901', // 基础URL  
+  // baseURL: 'http://192.168.1.18:8901', // 基础URL  
   baseURL: 'https://www.xsip.cn', // 基础URL  
   timeout: 30000, // 超时时间（单位ms）  
   header: {  
@@ -41,7 +41,9 @@ function request(url, method = 'GET', data = {}, header = {},isLogin=true) {
       header: {  
         ...config.header,  
         ...header,  
-        "Cookie": wx.getStorageSync('token')
+        "Authorization": wx.getStorageSync('token')
+        // "Cookie": wx.getStorageSync('token')
+
       },  
       timeout: config.timeout,  
       success: function(res){  
@@ -66,7 +68,8 @@ function request(url, method = 'GET', data = {}, header = {},isLogin=true) {
               wx.setStorageSync('token', '')
               break;
             default:
-              obj.message = '请求失败'
+              // obj.message = '请求失败'
+              obj.message = res.data.message
               // Notify({ type: 'danger', message: '请求失败',top:'90' });
              
           }
@@ -96,7 +99,7 @@ function request(url, method = 'GET', data = {}, header = {},isLogin=true) {
         //   icon: 'error',
         //   duration: 2000
         // })
-        obj.message = '请求失败'
+        obj.message = '请求超时'
         // Notify({ type: 'danger', message: '请求失败',top:'90' });
         Notify(obj)
         reject(error);  
@@ -118,7 +121,7 @@ function upload(url="/fileManager/uploadNormalFile", path = '', header = {},form
       header: {  
         ...config.header,  
         ...header,  
-        "Cookie": wx.getStorageSync('token')
+        "Authorization": wx.getStorageSync('token')
       },  
       timeout: config.timeout,  
       success: function(res){ 
@@ -143,7 +146,8 @@ function upload(url="/fileManager/uploadNormalFile", path = '', header = {},form
               wx.setStorageSync('token', '')
               break;
             default:
-              obj.message = '请求失败'
+              // obj.message = '请求失败'
+              obj.message = res.data.message
               // Notify({ type: 'danger', message: '请求失败',top:'90' });
              
           }
@@ -173,7 +177,7 @@ function upload(url="/fileManager/uploadNormalFile", path = '', header = {},form
         //   icon: 'error',
         //   duration: 2000
         // })
-        obj.message = '请求失败'
+        obj.message = '请求超时'
         // Notify({ type: 'danger', message: '请求失败',top:'90' });
         Notify(obj)
         reject(error);  

utils/upload.js

@@ -40,7 +40,7 @@ function upload(url="/fileManager/uploadNormalFile", path = '', header = {},form
       header: {  
         ...config.header,  
         ...header,  
-        "Cookie": wx.getStorageSync('token')
+        "Authorization": wx.getStorageSync('token')
       },  
       timeout: config.timeout,  
       success: function(res){  
@@ -65,7 +65,8 @@ function upload(url="/fileManager/uploadNormalFile", path = '', header = {},form
               wx.setStorageSync('token', '')
               break;
             default:
-              obj.message = '请求失败'
+              // obj.message = '请求失败'
+              obj.message = res.data.message
               // Notify({ type: 'danger', message: '请求失败',top:'90' });
              
           }
@@ -95,7 +96,7 @@ function upload(url="/fileManager/uploadNormalFile", path = '', header = {},form
         //   icon: 'error',
         //   duration: 2000
         // })
-        obj.message = '请求失败'
+        obj.message = '请求超时'
         // Notify({ type: 'danger', message: '请求失败',top:'90' });
         Notify(obj)
         reject(error);