Merge remote-tracking branch 'origin/dev4.0' into dev4.0

src/jfw/modules/app/src/web/templates/big-member/page_forecast_list.html

@@ -190,7 +190,7 @@
                         <div @click="goDetail(item)">
                             <p class="custom-title">预测采购内容</p>
                             <a href="javascript:;" class="custom-info">
-                                <span v-for="keys in item.results">${keys.keys.join('、')}</span>
+                                <span v-for="keys in item.results">${keys.keys ? keys.keys.join('、') : ''}</span>
                             </a>
                         </div>
                     </van-step>
@@ -214,7 +214,7 @@
             </div>
         </div>
     </div>
-</div>  
+</div>
 
 <!--S-必定需要预加载的资源-->
 <link rel="preload" as="script" href=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.min.js />
@@ -264,7 +264,7 @@
             } else {
                 this.getList()
             }
-            
+
         },
         mounted() {
             sessionStorage.removeItem('forecast_keys')