Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive…

….com/w-front-end/select_good into version_2.0.0_optimization_mall_update

Merge branch 'version_2.0.0_optimization_mall_update' of http://bj.gitlab.cnlive…
….com/w-front-end/select_good into version_2.0.0_optimization_mall_update
zhiyangdu
2 parents 4337de9b 956fe7bf
Showing 3 changed files with 26 additions and 5 deletions
src/components/showModal/show_modal.less
src/main.js
src/pages/common/common.vue
@@ -5,7 +5,7 @@
         position: fixed;
         top: 0;
         left: 0;
-        z-index: 150;
+        z-index: 1500;
         display: flex;
         flex-direction: column;
         justify-content: center;
@@ -377,10 +377,20 @@ Vue.prototype.http = function(path, data, callback, ext) {
                 }
             },
             err => {
+                
                 /* 加载错误处理 开始 */
+
                 Indicator.close();
-                Toast("请求出错");
+
+                // 判断是断网还是接口出错
+                if (!navigator.onLine) {
+                    Toast("网络异常，请检查网络");
+                } else {
+                    Toast("请求出错");
+                }
+
                 /* 加载错误处理 结束 */
+
             }
         );
     }
@@ -424,10 +434,20 @@ Vue.prototype.http = function(path, data, callback, ext) {
                 }
             },
             err => {
+
                 /* 加载错误处理 开始 */
+
                 Indicator.close();
-                Toast("请求出错");
+
+                // 判断是断网还是接口出错
+                if (!navigator.onLine) {
+                    Toast("网络异常，请检查网络");
+                } else {
+                    Toast("请求出错");
+                }
+
                 /* 加载错误处理 结束 */
+
             }
         );
     }
 <template>
     <div class="common">
+        <!-- 主页面 -->
+        <router-view ref="childCommon"></router-view>
+
         <!-- iOS QQ内 & Android WeChat内无法唤起App，提示用Safari或浏览器打开蒙层 -->
         <mask-layer ref="maskLayer"
             :maskLayers="maskLayers">
@@ -15,8 +18,6 @@
         <show-modal ref="callAppModal"
             :options="callAppModals">
         </show-modal>
-
-        <router-view ref="childCommon"></router-view>
     </div>
 </template>