Merge branch 'dev/1.0.36_zsy' of jianyu/web into feature/v1.0.36

apps/bigmember_pc/index.html

@@ -24,7 +24,6 @@
       <link ignore href='https://jybx2-webtest.jydev.jianyu360.com/css/pc.css?v=6302' rel="stylesheet"/>
       <link ignore href='https://jybx2-webtest.jydev.jianyu360.com/pccss/public-nav-1200.css?v=6302' rel="stylesheet" type="text/css"/>
 
-      <script src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
       <link ignore rel="stylesheet" href="https://at.alicdn.com/t/c/font_624651_o2us2uwpt6b.css">
     <% } %>
 
@@ -33,6 +32,7 @@
       <link rel="stylesheet" href="<%= cdn.css[i] %>" />
       <% } %>
       <!-- 使用CDN的JS文件 -->
+      <script ignore src=//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js></script>
       <% for (var i in cdn && cdn.js) { %>
       <script type="text/javascript" src="<%= cdn.js[i] %>"></script>
       <% } %>

apps/bigmember_pc/src/utils/common.js

@@ -18,8 +18,8 @@ Vue.prototype.$showLoginDialog = function () {
   try {
     openLoginDig && openLoginDig(...arguments)
   } catch (error) {
-    location.href = '/notin/page?close_goBack=1'
     console.log(error)
+    location.href = '/notin/page?close_goBack=1'
   }
 }
 

apps/bigmember_pc/src/views/search/bidding/model/base.js

@@ -71,6 +71,8 @@ export default function () {
   // 本地调试，可改为工作台内isInApp = ref(true)，  isInWeb = ref(false) 提交记得改回！
   const isInApp = ref(InContainer.inApp)
   const isInWeb = ref(InContainer.inWeb)
+  console.log(8888888)
+  console.log(isInWeb)
 
   // 是否是渠道商
   const cooperateCode = ref(false)

apps/bigmember_pc/vite.config.js

@@ -21,7 +21,7 @@ const baseCDN = {
   js: [
     'https://cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js',
     'https://cdn-common.jianyu360.com/cdn/lib/v-charts/1.19.0/index.min.js',
-    'https://cdn-common.jianyu360.com/cdn/lib/jquery/3.5.1/jquery.min.js',
+    // 'https://cdn-common.jianyu360.com/cdn/lib/jquery/3.5.1/jquery.min.js', // 标签上需要添加ignore
     'https://res.wx.qq.com/open/js/jweixin-1.6.0.js'
   ]
 }