Browse Source

Merge commit 'ddb8eb386ad33f5d82caecb0aa461fad44729a0c' into HEAD

gitadmin 2 days ago
parent
commit
c2d765de1a
2 changed files with 4 additions and 7 deletions
  1. 3 3
      src/mobile/priceInquiry/list.vue
  2. 1 4
      src/utils/util.js

+ 3 - 3
src/mobile/priceInquiry/list.vue

@@ -111,9 +111,9 @@
               <h4>原厂编码:<span>{{ record.origCode||'--' }}</span></h4>
               <h4>产品状态:<span>{{ record.stateDictValue }}</span></h4>
               <div style="display: flex;flex-wrap: wrap;">
-                <div style="width:33%">省级价:<span style="color:red" v-if="$hasPermissions('M_priceInquiryList_provincePrice')">{{ toThousands(record.provincePrice) }}</span></div>
-                <div style="width:33%">市级价:<span style="color:red" v-if="$hasPermissions('M_priceInquiryList_cityPrice')">{{ toThousands(record.cityPrice) }}</span></div>
-                <div style="width:33%">特约价:<span style="color:red" v-if="$hasPermissions('M_priceInquiryList_specialPrice')">{{ toThousands(record.specialPrice) }}</span></div>
+                <div style="width:33%" v-if="$hasPermissions('M_priceInquiryList_provincePrice')">省级价:<span style="color:red">{{ toThousands(record.provincePrice) }}</span></div>
+                <div style="width:33%" v-if="$hasPermissions('M_priceInquiryList_cityPrice')">市级价:<span style="color:red">{{ toThousands(record.cityPrice) }}</span></div>
+                <div style="width:33%" v-if="$hasPermissions('M_priceInquiryList_specialPrice')">特约价:<span style="color:red">{{ toThousands(record.specialPrice) }}</span></div>
                 <div style="width:33%">终端价:<span style="color:red" >{{ toThousands(record.terminalPrice) }}</span></div>
                 <div style="width:33%">车主价:<span style="color:red" >{{ toThousands(record.carOwnersPrice) }}</span></div>
               </div>

+ 1 - 4
src/utils/util.js

@@ -64,11 +64,8 @@ export function isMobileDevice() {
     // 方法2:通过屏幕宽度检测(通常移动端宽度小于768px)
     const isSmallScreen = window.innerWidth < 768;
     
-    // 方法3:检测触摸支持
-    const hasTouch = 'ontouchstart' in window || navigator.maxTouchPoints > 0;
-    
     // 综合判断
-    return mobileRegex.test(userAgent) || isSmallScreen || hasTouch;
+    return mobileRegex.test(userAgent) || isSmallScreen;
 }
 
 export function timeFix () {