update code

miniprogram_npm/@vant/weapp/steps/index.wxml

@@ -12,7 +12,8 @@
     >
       <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
         <view>{{ item.text }}</view>
-        <view class="desc-class">{{ item.desc }}</view>
+        <!-- <view class="desc-class">{{ item.desc }}</view> -->
+        <rich-text nodes="{{item.desc}}"></rich-text>
       </view>
       <view class="van-step__circle-container">
         <block wx:if="{{ index !== active }}">

myComponents/product/product.wxml

@@ -24,7 +24,7 @@
         <view wx:if="{{!isFollow && !item.ifMonitor}}" class="iconfont myIconmonitor" data-index="{{index}}" catch:tap="control"></view>
         <view wx:elif="{{item.ifMonitor && !isFollow}}" class="iconfont myIcona-yijiankong2x" data-index="{{index}}" catch:tap="cancelControl"></view>
 
-        <view wx:if="{{item.concernType == 0 || item.concernType}}" class="icon1 iconfont {{concernType[item.concernType]}}" data-index="{{index}}" catch:tap="cancelFollow"></view>
+        <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 || menu.length>0}}" id="myPopover{{index}}" position="top" show="{{item.showMenu}}">

myComponents/product/product.wxss

@@ -106,3 +106,13 @@
 .menu_item:last-child{
   border-bottom:none;
 }
+
+.myIconanquanbangzhu{
+  font-size: 60rpx;
+}
+.myIconicon-test{
+  font-size: 50rpx;
+}
+.myIcongroup43{
+  
+}

pages/form/addProduct/addProduct.js

@@ -189,6 +189,19 @@ Page({
     validateFields((err, values) => {
       console.log(err)
       if (!err) {
+        if(this.data.funType == '监控'){
+          if(this.data.concernType!=0 && !this.data.concernType){
+            wx.showModal({
+              title: '提示',
+              content: '请选择关注类型',
+              complete: (res) => {
+                if (res.cancel) {}
+                if (res.confirm) {}
+              }
+            })
+            return
+          }
+        }
         var fileGuids = this.data.fileList.map(item=>{
           return item.guid
         })

pages/monitor/monitoringRecord.js

@@ -23,10 +23,9 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    var id = options.id
     this.setData({
-      id:id,
-      productName:productName
+      id:options.id,
+      productName:options.productName
     })
     this.init()
   },
@@ -88,20 +87,14 @@ Page({
         var data2 = []
         res.data.data.forEach(item => {
           var num = item.num
+          var productName = this.data.productName
           var obj =  {
             text: item.createTime,
-            desc: `您监控的${{productName}}有${{num}}件新专利。`,
+            desc: `您监控的<span style="color:red">${productName}</span>有<span style="color:red">${num}</span>件新专利。`,
           }
           data2.push(obj)
         });
-        if(type){
-            var startIndex = (this.data.queryParams.current-1)*this.data.queryParams.size
-            var endIndex = data.length
-            var len = endIndex - startIndex
-            data.splice(startIndex,len,...data2)
-        }else{
-            data = data.concat(data2)
-        }
+        data = data.concat(data2)
         this.setData(
           {
             tableData:data,

pages/monitor/monitoringRecord.wxml

@@ -11,7 +11,7 @@
       <view class="content">
         <van-steps
           steps="{{ tableData }}"
-          active="{{ tableData.length }}"
+          active="{{ tableData.length-1 }}"
           direction="vertical"
           active-color="#ee0a24"
         />

pages/searchResults/searchResults.wxml

@@ -57,7 +57,7 @@
       </view>
 
       <view class="product_icon">
-        <view wx:if="{{product.concernType == 0 || product.concernType}}" class="iconfont {{concernType[product.concernType]}}" style="font-size: 50rpx;" catch:tap="cancelFollow"></view>
+        <view wx:if="{{product.concernType == 0 || product.concernType}}" class="iconfont {{concernType[product.concernType]}}"  catch:tap="cancelFollow"></view>
         <view wx:else class="iconfont myIconguanzhu" bind:tap="open"></view>
 
         <view wx:if="{{!product.ifMonitor}}" class="iconfont myIconmonitor" catch:tap="control"></view>

pages/searchResults/searchResults.wxss

@@ -107,4 +107,14 @@
 .isAdd{
   margin-top: 15rpx;
   font-size: 14px;
+}
+
+.myIconanquanbangzhu{
+  font-size: 60rpx;
+}
+.myIconicon-test{
+  font-size: 50rpx;
+}
+.myIcongroup43{
+  font-size: 50rpx;
 }

utils/request.js

@@ -15,7 +15,7 @@ const config = {
   tabbar:["pages/index/index","pages/hotProduct/hotProduct","pages/mine/mine"]
 };  
 const apiUrl = {  
-  develop: 'http://192.168.2.113:8902', // 开发环境地址  
+  develop: 'http://192.168.2.111:8902', // 开发环境地址  
   trial: 'https://www.xsip.cn/test', // 测试环境地址  
   release: 'https://www.xsip.cn' // 生产环境地址  
 };