From 09485747a640b1b6474270bd96c529dd05ffedde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Wed, 20 Jul 2022 18:24:49 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=85=E4=BE=9B=E6=B5=8B=E8=AF=95]=E9=87=8D?=
 =?UTF-8?q?=E5=86=99navigateTo=E6=96=B9=E6=B3=95=EF=BC=8C=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=B8=AD?=
 =?UTF-8?q?=E8=B6=85=E8=BF=8710=E4=B8=AA=E9=A1=B5=E9=9D=A2=E6=A0=88?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E5=87=BA=E7=8E=B0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 469 +++++++++---------
 components/m-buy/goods.vue                    | 112 ++---
 components/m-goods-list/list.vue              |   8 +-
 components/m-goods-recommend/index.vue        |   2 +-
 main.js                                       |   6 +-
 pages/cart/coupon/couponCenter.vue            |   2 +-
 pages/cart/coupon/myCoupon.vue                |   4 +-
 pages/cart/payment/payOrder.vue               |  16 +-
 pages/mine/address/add.vue                    |   6 +-
 pages/mine/address/address.vue                |   4 +-
 pages/mine/address/addressManage.vue          |   2 +-
 pages/mine/deposit/operation.vue              |   2 +-
 pages/mine/deposit/recharge.vue               |   2 +-
 pages/mine/distribution/home.vue              |   4 +-
 pages/mine/distribution/list.vue              |   2 +-
 pages/mine/msgTips/main.vue                   |   2 +-
 pages/mine/msgTips/packageMsg/index.vue       |   2 +-
 pages/mine/myCollect.vue                      |   4 +-
 pages/mine/myTracks.vue                       |   6 +-
 pages/mine/set/editionIntro.vue               |   2 +-
 .../set/securityCenter/securityCenter.vue     |   2 +-
 pages/mine/set/setUp.vue                      |   2 +-
 pages/navigation/search/searchPage.vue        |   4 +-
 pages/order/afterSales/afterSales.vue         |  10 +-
 pages/order/afterSales/afterSalesSelect.vue   |   2 +-
 pages/order/afterSales/applyDetail.vue        |   4 +-
 pages/order/complain/complainList.vue         |   4 +-
 pages/order/evaluate/myEvaluate.vue           |   4 +-
 pages/order/fillorder.vue                     |   4 +-
 pages/order/myOrder.vue                       |  16 +-
 pages/order/orderDetail.vue                   |  20 +-
 pages/passport/login.vue                      |   6 +-
 pages/product/goods.vue                       |  10 +-
 .../product/evaluation/-evaluation.vue        |   2 +-
 pages/product/product/popup/address.vue       |   4 +-
 pages/product/product/shop/-shop.vue          |   4 +-
 pages/product/shopList.vue                    |   2 +-
 pages/product/shopPage.vue                    |  30 +-
 pages/promotion/bargain/list.vue              |   2 +-
 pages/promotion/bargain/log.vue               |   2 +-
 pages/promotion/joinGroup.vue                 |   2 +-
 pages/promotion/lives.vue                     |   2 +-
 pages/promotion/point/pointList.vue           |   4 +-
 pages/promotion/seckill.vue                   |   2 +-
 pages/tabbar/cart/cartList.vue                |  12 +-
 pages/tabbar/category/category.vue            |   4 +-
 pages/tabbar/home/template/tpl_goods.vue      |   2 +-
 .../home/template/tpl_promotions_detail.vue   |   8 +-
 pages/tabbar/home/template/tpl_search.vue     |   2 +-
 pages/tabbar/home/views.vue                   |  14 +-
 pages/tabbar/screen/fullScreen.vue            |   4 +-
 pages/tabbar/user/my.vue                      |   2 +-
 pages/tabbar/user/similarGoods.vue            |   2 +-
 pages/tabbar/user/utils/tool.vue              |   8 +-
 utils/navigateRoute.js                        |  24 +
 uview-ui/components/u-parse/libs/trees.vue    |   4 +-
 uview-ui/components/u-parse/u-parse.vue       |   4 +-
 uview-ui/components/u-toast/u-toast.vue       |   2 +-
 58 files changed, 472 insertions(+), 421 deletions(-)
 create mode 100644 utils/navigateRoute.js

diff --git a/App.vue b/App.vue
index 42b33aa..6290180 100644
--- a/App.vue
+++ b/App.vue
@@ -1,234 +1,257 @@
-
-
 <script>
-/**
- * vuex管理登录状态，具体可以参考官方登录模板示例
- */
-import { mapMutations } from "vuex";
-import APPUpdate from "@/plugins/APPUpdate";
-import { getClipboardData } from "@/js_sdk/h5-copy/h5-copy.js";
-import config from "@/config/config";
-import storage from "@/utils/storage";
-// 悬浮球
+	/**
+	 * vuex管理登录状态，具体可以参考官方登录模板示例
+	 */
+	import {
+		mapMutations
+	} from "vuex";
+	import APPUpdate from "@/plugins/APPUpdate";
+	import {
+		getClipboardData
+	} from "@/js_sdk/h5-copy/h5-copy.js";
+	import config from "@/config/config";
+	import storage from "@/utils/storage";
 
-export default {
-  data() {
-    return {
-      config,
-    };
-  },
-
-  /**
-   * 监听返回
-   */
-  onBackPress(e) {
-    if (e.from == "backbutton") {
-      let routes = getCurrentPages();
-      let curRoute = routes[routes.length - 1].options;
-      routes.forEach((item) => {
-        if (
-          item.route == "pages/tabbar/cart/cartList" ||
-          item.route.indexOf("pages/product/goods") != -1
-        ) {
-          uni.redirectTo({
-            url: item.route,
-          });
-        }
-      });
-
-      if (curRoute.addId) {
-        uni.reLaunch({
-          url: "/pages/tabbar/cart/cartList",
-        });
-      } else {
-        uni.navigateBack();
-      }
-      return true; //阻止默认返回行为
-    }
-  },
-  methods: {
-    ...mapMutations(["login"]),
-  },
-  onLaunch: function () {
-    // #ifdef APP-PLUS
-    this.checkArguments(); // 检测启动参数
-    APPUpdate();
-
-    // 重点是以下： 一定要监听后台恢复 ！一定要
-    plus.globalEvent.addEventListener("newintent", (e) => {
-      this.checkArguments(); // 检测启动参数
-    });
-    // #endif
-
-    // #ifdef MP-WEIXIN
-    this.applyUpdateWeChat();
-    // #endif
-  },
-
-   onShow() {
-    // #ifndef H5
-      this.getClipboard();
-		// #endif
-    // #ifdef APP-PLUS
-  
-    if (storage.getShow()) {
-      if(uni.getSystemInfoSync().platform == 'ios'){
-      this.$u.route("/pages/tabbar/screen/fullScreen");
-
-      }
-    }
-    // #endif
-  },
-  methods: {
-    /**
-     * 微信小程序版本提交更新版本 解决缓存问题
-     */
-    applyUpdateWeChat() {
-      const updateManager = uni.getUpdateManager();
-
-      updateManager.onCheckForUpdate(function (res) {
-        // 请求完新版本信息的回调
-      });
-
-      updateManager.onUpdateReady(function (res) {
-        uni.showModal({
-          title: "更新提示",
-          content: "发现新版本，是否重启应用？",
-          success(res) {
-            if (res.confirm) {
-              // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
-              updateManager.applyUpdate();
-            }
-          },
-        });
-      });
-      updateManager.onUpdateFailed(function (res) {
-        // 新的版本下载失败
-      });
-    },
-
-    //  TODO 开屏广告 后续优化添加
-    launch() {
-      try {
-        // 获取本地存储中launchFlag标识 开屏广告
-        const value = uni.getStorageSync("launchFlag");
-        if (!value) {
-          // this.$u.route("/pages/index/agreement");
-        } else {
-          //app启动时打开启动广告页
-          var w = plus.webview.open(
-            "/hybrid/html/advertise/advertise.html",
-            "本地地址",
-            {
-              top: 0,
-              bottom: 0,
-              zindex: 999,
-            },
-            "fade-in",
-            500
-          );
-          //设置定时器，4s后关闭启动广告页
-          setTimeout(function () {
-            plus.webview.close(w);
-            APPUpdate();
-          }, 3000);
-        }
-      } catch (e) {
-        // error
-        uni.setStorage({
-          key: "launchFlag",
-          data: true,
-          success: function () {
-            console.log("error时存储launchFlag");
-          },
-        });
-      }
-    },
-
-    /**
-     * 获取粘贴板数据
-     */
-    async getClipboard() {
-      let res = await getClipboardData();
 	
-      /**
-       * 解析粘贴板数据
-       */
-		
-      if (res.indexOf(config.shareLink) != -1 && (res!= this.$store.state.shareLink)) {
-        this.$store.state.shareLink = res
-        uni.showModal({
-          title: "提示",
-          content: "检测到一个分享链接是否跳转？",
-          confirmText: "跳转",
-          success: function (callback) {
-            if (callback.confirm) {
-              const path = res.split(config.shareLink)[1];
-              if (path.indexOf("tabbar") != -1) {
-                uni.switchTab({
-                  url: path,
-                });
-              } else {
-                uni.navigateTo({
-                  url: path,
-                });
-              }
-            }
-          },
-        });
-      }
-    },
+	
+	/**
+	 * 路由监听并删除路由
+	 * https://developers.weixin.qq.com/miniprogram/dev/api/route/wx.navigateTo.html
+	 * */
+	// #ifdef MP-WEIXIN
+	wx.onAppRoute((res) => {
+		const pages = getCurrentPages();
+		console.log("pages:" + pages.length,pages);
+		if (pages.length > 3) {
+			delete getCurrentPages()[2]
+		}
+		console.log('路由监听', {
+			res
+		})
+	})
+	// #endif
 
-    /**
-     * h5中打开app获取跳转app的链接并跳转
-     */
-    checkArguments() {
-      // #ifdef APP-PLUS
-      setTimeout(() => {
-        const args = plus.runtime.arguments;
-        if (args) {
-          const argsStr = decodeURIComponent(args);
-          const path = argsStr.split("//")[1];
-          if (path.indexOf("tabbar") != -1) {
-            uni.switchTab({
-              url: `/${path}`,
-            });
-          } else {
-            uni.navigateTo({
-              url: `/${path}`,
-            });
-          }
-        }
-      });
-      // #endif
-    },
-  },
-};
+	export default {
+		data() {
+			return {
+				config,
+			};
+		},
+
+
+		/**
+		 * 监听返回
+		 */
+		onBackPress(e) {
+			if (e.from == "backbutton") {
+				let routes = getCurrentPages();
+				let curRoute = routes[routes.length - 1].options;
+				routes.forEach((item) => {
+					if (
+						item.route == "pages/tabbar/cart/cartList" ||
+						item.route.indexOf("pages/product/goods") != -1
+					) {
+						uni.redirectTo({
+							url: item.route,
+						});
+					}
+				});
+
+				if (curRoute.addId) {
+					uni.reLaunch({
+						url: "/pages/tabbar/cart/cartList",
+					});
+				} else {
+					uni.navigateBack();
+				}
+				return true; //阻止默认返回行为
+			}
+		},
+		methods: {
+			...mapMutations(["login"]),
+		},
+		onLaunch: function() {
+			// #ifdef APP-PLUS
+			this.checkArguments(); // 检测启动参数
+			APPUpdate();
+
+			// 重点是以下： 一定要监听后台恢复 ！一定要
+			plus.globalEvent.addEventListener("newintent", (e) => {
+				this.checkArguments(); // 检测启动参数
+			});
+			// #endif
+
+			// #ifdef MP-WEIXIN
+			this.applyUpdateWeChat();
+			// #endif
+		},
+
+		onShow() {
+			// #ifndef H5
+			this.getClipboard();
+			// #endif
+			// #ifdef APP-PLUS
+
+			if (storage.getShow()) {
+				if (uni.getSystemInfoSync().platform == 'ios') {
+					this.$u.route("/pages/tabbar/screen/fullScreen");
+
+				}
+			}
+			// #endif
+		},
+		methods: {
+			/**
+			 * 微信小程序版本提交更新版本 解决缓存问题
+			 */
+			applyUpdateWeChat() {
+				const updateManager = uni.getUpdateManager();
+
+				updateManager.onCheckForUpdate(function(res) {
+					// 请求完新版本信息的回调
+				});
+
+				updateManager.onUpdateReady(function(res) {
+					uni.showModal({
+						title: "更新提示",
+						content: "发现新版本，是否重启应用？",
+						success(res) {
+							if (res.confirm) {
+								// 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+								updateManager.applyUpdate();
+							}
+						},
+					});
+				});
+				updateManager.onUpdateFailed(function(res) {
+					// 新的版本下载失败
+				});
+			},
+
+			//  TODO 开屏广告 后续优化添加
+			launch() {
+				try {
+					// 获取本地存储中launchFlag标识 开屏广告
+					const value = uni.getStorageSync("launchFlag");
+					if (!value) {
+						// this.$u.route("/pages/index/agreement");
+					} else {
+						//app启动时打开启动广告页
+						var w = plus.webview.open(
+							"/hybrid/html/advertise/advertise.html",
+							"本地地址", {
+								top: 0,
+								bottom: 0,
+								zindex: 999,
+							},
+							"fade-in",
+							500
+						);
+						//设置定时器，4s后关闭启动广告页
+						setTimeout(function() {
+							plus.webview.close(w);
+							APPUpdate();
+						}, 3000);
+					}
+				} catch (e) {
+					// error
+					uni.setStorage({
+						key: "launchFlag",
+						data: true,
+						success: function() {
+							console.log("error时存储launchFlag");
+						},
+					});
+				}
+			},
+
+			/**
+			 * 获取粘贴板数据
+			 */
+			async getClipboard() {
+				let res = await getClipboardData();
+
+				/**
+				 * 解析粘贴板数据
+				 */
+
+				if (res.indexOf(config.shareLink) != -1 && (res != this.$store.state.shareLink)) {
+					this.$store.state.shareLink = res
+					uni.showModal({
+						title: "提示",
+						content: "检测到一个分享链接是否跳转？",
+						confirmText: "跳转",
+						success: function(callback) {
+							if (callback.confirm) {
+								const path = res.split(config.shareLink)[1];
+								if (path.indexOf("tabbar") != -1) {
+									uni.switchTab({
+										url: path,
+									});
+								} else {
+									this.$navigateTo({
+										url: path,
+									});
+								}
+							}
+						},
+					});
+				}
+			},
+
+			/**
+			 * h5中打开app获取跳转app的链接并跳转
+			 */
+			checkArguments() {
+				// #ifdef APP-PLUS
+				setTimeout(() => {
+					const args = plus.runtime.arguments;
+					if (args) {
+						const argsStr = decodeURIComponent(args);
+						const path = argsStr.split("//")[1];
+						if (path.indexOf("tabbar") != -1) {
+							uni.switchTab({
+								url: `/${path}`,
+							});
+						} else {
+							this.$navigateTo({
+								url: `/${path}`,
+							});
+						}
+					}
+				});
+				// #endif
+			},
+		},
+	};
 </script>
 
 <style lang="scss">
-@import "uview-ui/index.scss";
+	@import "uview-ui/index.scss";
 
-// -------适配底部安全区  苹果x系列刘海屏
+	// -------适配底部安全区  苹果x系列刘海屏
 
-// #ifdef MP-WEIXIN
-.mp-iphonex-bottom {
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-  box-sizing: content-box;
-  height: auto !important;
-  padding-top: 10rpx;
-}
-// #endif
+	// #ifdef MP-WEIXIN
+	.mp-iphonex-bottom {
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		box-sizing: content-box;
+		height: auto !important;
+		padding-top: 10rpx;
+	}
 
-body {
-  background-color: $bg-color;
-}
-/************************ */
-.w200 {
-  width: 200rpx !important;
-}
-.flex1 {
-  flex: 1; //必须父级设置flex
-}
+	// #endif
+
+	body {
+		background-color: $bg-color;
+	}
+
+	/************************ */
+	.w200 {
+		width: 200rpx !important;
+	}
+
+	.flex1 {
+		flex: 1; //必须父级设置flex
+	}
 </style>
diff --git a/components/m-buy/goods.vue b/components/m-buy/goods.vue
index 60724a3..e73204f 100644
--- a/components/m-buy/goods.vue
+++ b/components/m-buy/goods.vue
@@ -46,20 +46,20 @@
 									    formatPrice(item.price)[0]
 									  }}</span>
 										.{{ formatPrice(item.price)[1] }}
-									</span>
-									<span class='wholesale-item'>
-										{{item.num}}{{goodsDetail.goodsUnit}}
+									</span>
+									<span class='wholesale-item'>
+										{{item.num}}{{goodsDetail.goodsUnit}}
 									</span>
 								</div>
-							</div>
-							<div class="goods-price" v-else>
-								<span>
-									￥
-									<span class="goods-price-bigshow">{{
-							    formatPrice(goodsDetail.price)[0]
-							  }}</span>
-									.{{ formatPrice(goodsDetail.price)[1] }}
-								</span>
+							</div>
+							<div class="goods-price" v-else>
+								<span>
+									￥
+									<span class="goods-price-bigshow">{{
+							    formatPrice(goodsDetail.price)[0]
+							  }}</span>
+									.{{ formatPrice(goodsDetail.price)[1] }}
+								</span>
 							</div>
 						</view>
 						<view class="goods-check-skus">
@@ -68,12 +68,12 @@
 								{{ selectName }}
 								<span>，{{ num }}个</span>
 							</span>
-						</view>
-						<view class="goods-check-skus">
-							库存
-							<span class="goods-check-skus-name">
-								<span>{{ goodsDetail.quantity }}</span>
-							</span>
+						</view>
+						<view class="goods-check-skus">
+							库存
+							<span class="goods-check-skus-name">
+								<span>{{ goodsDetail.quantity }}</span>
+							</span>
 						</view>
 					</view>
 				</view>
@@ -101,7 +101,7 @@
 					<!-- 数量 -->
 					<view class="goods-skus-number">
 						<view class="view-class-title">数量</view>
-						
+						
 						<u-input style='text-align: right;' v-model="num" type="number"  />
 					</view>
 				</scroll-view>
@@ -133,14 +133,14 @@
 				formatList: [],
 				currentSelceted: [],
 				skuList: "",
-				isClose: false, //是否可以点击遮罩关闭
+				isClose: false, //是否可以点击遮罩关闭
 				
 			};
 		},
-		props: {
-			wholesaleList:{
-				type: null,
-				default: false,
+		props: {
+			wholesaleList:{
+				type: null,
+				default: false,
 			},
 			buyMask: {
 				type: Boolean,
@@ -170,23 +170,23 @@
 				default: "",
 				type: null,
 			},
-		},
-		computed: {
-			wholesalePrice(key){
-				return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.price }) :[]
-			},
-			wholesaleNum(key){
-				return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.num }) :[]
-			}
 		},
-		watch: {
-			num(val){
-				if(val){
-					if(val > this.goodsDetail.quantity){
-						console.log(val)
-						this.val = this.goodsDetail.quantity
-					}
-				}
+		computed: {
+			wholesalePrice(key){
+				return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.price }) :[]
+			},
+			wholesaleNum(key){
+				return this.wholesaleList.length ? this.wholesaleList.map(item=>{ return item.num }) :[]
+			}
+		},
+		watch: {
+			num(val){
+				if(val){
+					if(val > this.goodsDetail.quantity){
+						console.log(val)
+						this.val = this.goodsDetail.quantity
+					}
+				}
 			},
 			buyType: {
 				handler(val) {
@@ -263,7 +263,7 @@
 			buy(data) {
 				API_trade.addToCart(data).then((res) => {
 					if (res.data.success) {
-						uni.navigateTo({
+						this.$navigateTo({
 							url: `/pages/order/fillorder?way=${
               data.cartType
             }&addr=${""}&parentOrder=${encodeURIComponent(
@@ -314,7 +314,7 @@
 
 					API_trade.addToCart(data).then((res) => {
 						if (res.data.code == 200) {
-							uni.navigateTo({
+							this.$navigateTo({
 								url: `/pages/order/fillorder?way=${data.cartType}&addr=${
                 this.addr.id || ""
               }&parentOrder=${encodeURIComponent(JSON.stringify(this.parentOrder))}`,
@@ -399,9 +399,9 @@
 </script>
 <style lang="scss" scoped>
 	@import "./popup.scss";
-	.price-row{
-		text-align: center;
-		
+	.price-row{
+		text-align: center;
+		
 	}
 	.buy {
 		background-image: linear-gradient(135deg, #ffba0d, #ffc30d 69%, #ffcf0d);
@@ -422,8 +422,8 @@
 
 	.goods-skus-number {
 		justify-content: space-between;
-		display: flex;
-		text-align: right
+		display: flex;
+		text-align: right
 	}
 
 	/deep/ .uni-scroll-view {
@@ -468,13 +468,13 @@
 				border-radius: 30rpx;
 			}
 		}
-	}
-	.wholesale-item{
-		color: #999 !important;
-		font-size: 24rpx;
-		margin:0 20rpx;
-		display: flex;
-		justify-content: center;
+	}
+	.wholesale-item{
+		color: #999 !important;
+		font-size: 24rpx;
+		margin:0 20rpx;
+		display: flex;
+		justify-content: center;
 	}
 
 	.goods-header {
@@ -494,7 +494,7 @@
 
 	.goods-price {
 		color: $price-color;
-		line-height: 80rpx;
+		line-height: 80rpx;
 		margin-right: 20rpx;
 		>* {
 			color: $price-color;
@@ -536,4 +536,4 @@
 			color: #333;
 		}
 	}
-</style>
+</style>
diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue
index 18b4a53..dfc6e89 100644
--- a/components/m-goods-list/list.vue
+++ b/components/m-goods-list/list.vue
@@ -151,7 +151,7 @@
 					for (let i of Array.from(keyword)) {
 						unicodes += this.unicode(i) + "|"
 					}
-					const rule = '(' + unicodes + ')'
+					const rule = '(' + unicodes + ')'
 					const reg = new RegExp(rule, 'gi');
 					return str ? str.replace(reg, matchValue =>
 						`<span style="color:${this.lightColor}">${matchValue}</span>`
@@ -198,13 +198,13 @@
 			},
 			// 跳转到商品详情
 			navigateToDetailPage(item) {
-				uni.navigateTo({
+				this.$navigateTo({
 					url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
 				});
 			},
 			// 跳转地址
 			navigateToStoreDetailPage(item) {
-				uni.navigateTo({
+				this.$navigateTo({
 					url: `/pages/product/shopPage?id=${item.content.storeId}`,
 				});
 			},
@@ -341,4 +341,4 @@
 		}
 
 	}
-</style>
+</style>
diff --git a/components/m-goods-recommend/index.vue b/components/m-goods-recommend/index.vue
index 8f60967..dc19323 100644
--- a/components/m-goods-recommend/index.vue
+++ b/components/m-goods-recommend/index.vue
@@ -62,7 +62,7 @@ export default {
       this.goodsList.push(...goodsList.data.result.content);
     },
     handleClick(item) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
       });
     },
diff --git a/main.js b/main.js
index e02f774..37296c1 100644
--- a/main.js
+++ b/main.js
@@ -3,7 +3,7 @@ import App from "./App";
 import * as filters from "./utils/filters.js"; // global filter
 import uView from "uview-ui";
 import store from "./store";
-
+import {navigateTo} from '@/utils/navigateRoute.js'
 
 /**
  * 仅在h5中显示唤醒app功能
@@ -27,6 +27,10 @@ Object.keys(filters).forEach((key) => {
 
 // 引入Vuex
 Vue.prototype.$store = store;
+
+
+// // 引入Vuex
+Vue.prototype.$navigateTo = navigateTo;
 Vue.use(uView);
 Vue.config.productionTip = false;
 
diff --git a/pages/cart/coupon/couponCenter.vue b/pages/cart/coupon/couponCenter.vue
index e8806ad..5c8e818 100644
--- a/pages/cart/coupon/couponCenter.vue
+++ b/pages/cart/coupon/couponCenter.vue
@@ -145,7 +145,7 @@
 			},
 		},
 		onNavigationBarButtonTap(e) {
-			uni.navigateTo({
+			this.$navigateTo({
 				url: "/pages/cart/coupon/couponIntro",
 			});
 		},
diff --git a/pages/cart/coupon/myCoupon.vue b/pages/cart/coupon/myCoupon.vue
index ac59a4a..1d63237 100644
--- a/pages/cart/coupon/myCoupon.vue
+++ b/pages/cart/coupon/myCoupon.vue
@@ -189,7 +189,7 @@ export default {
      */
     useItNow(item) {
       if (item.storeId && item.storeId!='0') {
-        uni.navigateTo({
+        this.$navigateTo({
           url: `/pages/product/shopPage?id=${item.storeId}`,
         });
       } else {
@@ -203,7 +203,7 @@ export default {
      * 优惠券详情
      */
     couponDetail(item) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/cart/coupon/couponDetail?item=" +
           encodeURIComponent(JSON.stringify(item)),
diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue
index f5b092c..179422b 100644
--- a/pages/cart/payment/payOrder.vue
+++ b/pages/cart/payment/payOrder.vue
@@ -120,7 +120,7 @@
 			 * 支付成功后跳转
 			 */
 			callback(paymentMethod){
-				uni.navigateTo({
+				this.$navigateTo({
 					url: "/pages/cart/payment/success?paymentMethod=" +
 					paymentMethod +
 					"&payPrice=" +
@@ -138,7 +138,7 @@
 				if (this.routerVal.recharge_sn) {
 					// 判断当前是否是充值
 					this.sn = this.routerVal.recharge_sn;
-					this.orderType = "RECHARGE";
+					this.orderType = "RECHARGE";
 					
 				} else if (this.routerVal.trade_sn) {
 					this.sn = this.routerVal.trade_sn;
@@ -178,12 +178,12 @@
 					
 						this.payList = res.data.result.support.filter((item) => {
 							return item != "ALIPAY";
-						});
-						// 充值的话仅保留微信支付
-						if(this.orderType == "RECHARGE"){
-							this.payList = res.data.result.support.filter((item) => {
-								return item == "WECHAT";
-							});
+						});
+						// 充值的话仅保留微信支付
+						if(this.orderType == "RECHARGE"){
+							this.payList = res.data.result.support.filter((item) => {
+								return item == "WECHAT";
+							});
 						}
 						
 					}
diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue
index 7cf807f..08bac21 100644
--- a/pages/mine/address/add.vue
+++ b/pages/mine/address/add.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="add-address">
     <div class="uForm">
-      <u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
+      <u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
 				<!-- #ifndef H5 -->
         <view class="selectAddress" @click="clickUniMap">
           选择收货地址
-        </view>
+        </view>
 				<!-- #endif -->
         <u-form-item class="border" label="收货人" label-width="130" prop="name">
           <u-input v-model="form.name" clearable placeholder="请输入收货人姓名" />
@@ -162,7 +162,7 @@ export default {
             delete this.form.updateTime;
             editAddress(this.form).then((res) => {
               if (res.data.success) {
-                uni.navigateTo({
+                this.$navigateTo({
                   url: `/${beforePage.route}`,
                 });
               }
diff --git a/pages/mine/address/address.vue b/pages/mine/address/address.vue
index e025746..22b4feb 100644
--- a/pages/mine/address/address.vue
+++ b/pages/mine/address/address.vue
@@ -129,7 +129,7 @@ export default {
     //新建。编辑地址
     addAddress(id) {
       if (id) {
-        uni.navigateTo({
+        this.$navigateTo({
           url:
             "/pages/mine/address/add?id=" +
             id +
@@ -138,7 +138,7 @@ export default {
             "&type=order",
         });
       } else {
-        uni.navigateTo({
+        this.$navigateTo({
           url:
             "/pages/mine/address/add?way=" + this.routerVal.way + "&type=order",
         });
diff --git a/pages/mine/address/addressManage.vue b/pages/mine/address/addressManage.vue
index 2934f43..0d70500 100644
--- a/pages/mine/address/addressManage.vue
+++ b/pages/mine/address/addressManage.vue
@@ -145,7 +145,7 @@ export default {
     },
     //新建。编辑地址
     addAddress(id) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/mine/address/add${id ? "?id=" + id : ""}`,
       });
     },
diff --git a/pages/mine/deposit/operation.vue b/pages/mine/deposit/operation.vue
index e9c8dff..8832a3b 100644
--- a/pages/mine/deposit/operation.vue
+++ b/pages/mine/deposit/operation.vue
@@ -50,7 +50,7 @@ export default {
      * 跳转
      */
     navgition(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
diff --git a/pages/mine/deposit/recharge.vue b/pages/mine/deposit/recharge.vue
index c9272d5..0d16c8e 100644
--- a/pages/mine/deposit/recharge.vue
+++ b/pages/mine/deposit/recharge.vue
@@ -38,7 +38,7 @@ export default {
        
         let res = await recharge({ price: this.price });
         if (res.data.success) {
-          uni.navigateTo({
+          this.$navigateTo({
             url: `/pages/cart/payment/payOrder?orderType=RECHARGE&recharge_sn=${res.data.result.rechargeSn}`,
           });
         }
diff --git a/pages/mine/distribution/home.vue b/pages/mine/distribution/home.vue
index 7dda626..e2029a9 100644
--- a/pages/mine/distribution/home.vue
+++ b/pages/mine/distribution/home.vue
@@ -58,12 +58,12 @@ export default {
   },
   methods: {
     handleClick(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
     queryGoods(src) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/mine/distribution/${src}`,
       });
     },
diff --git a/pages/mine/distribution/list.vue b/pages/mine/distribution/list.vue
index 989daf3..852f523 100644
--- a/pages/mine/distribution/list.vue
+++ b/pages/mine/distribution/list.vue
@@ -221,7 +221,7 @@ export default {
      * 查看图片
      */
     handleNavgationGoods(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${val.skuId}&goodsId=${val.goodsId}`,
       });
     },
diff --git a/pages/mine/msgTips/main.vue b/pages/mine/msgTips/main.vue
index eb383da..6ceed10 100644
--- a/pages/mine/msgTips/main.vue
+++ b/pages/mine/msgTips/main.vue
@@ -56,7 +56,7 @@
 		methods: {
 			...mapMutations(["logout"]),
 			navigateTo(url) {
-				uni.navigateTo({
+				this.$navigateTo({
 					url
 				});
 			},
diff --git a/pages/mine/msgTips/packageMsg/index.vue b/pages/mine/msgTips/packageMsg/index.vue
index 619cf4e..aa2df11 100644
--- a/pages/mine/msgTips/packageMsg/index.vue
+++ b/pages/mine/msgTips/packageMsg/index.vue
@@ -45,7 +45,7 @@ export default {
   },
   methods: {
     goDetail(sn,logi_id,ship_no){
-		uni.navigateTo({
+		this.$navigateTo({
 			url:'/pages/msgTips/packagemsg/logisticsDetail?order_sn=' + sn +'&logi_id='+logi_id+'&ship_no='+ship_no,
 		})
 	},
diff --git a/pages/mine/myCollect.vue b/pages/mine/myCollect.vue
index 18ee619..e39c4e8 100644
--- a/pages/mine/myCollect.vue
+++ b/pages/mine/myCollect.vue
@@ -174,7 +174,7 @@
 			 */
 			goGoodsDetail(val) {
 				//商品详情
-				uni.navigateTo({
+				this.$navigateTo({
 					url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId,
 				});
 			},
@@ -184,7 +184,7 @@
 			 */
 			goStoreMainPage(id) {
 				//店铺主页
-				uni.navigateTo({
+				this.$navigateTo({
 					url: "/pages/product/shopPage?id=" + id,
 				});
 			},
diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index 4768c70..c6119f1 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -84,7 +84,7 @@
 			 * 导航到店铺
 			 */
 			navgaiteToStore(val) {
-				uni.navigateTo({
+				this.$navigateTo({
 					url: "/pages/product/shopPage?id=" + val.storeId,
 				});
 			},
@@ -100,7 +100,7 @@
 			 * 跳转详情
 			 */
 			navgaiteToDetail(item) {
-				uni.navigateTo({
+				this.$navigateTo({
 					url: "/pages/product/goods?id=" + item.id + "&goodsId=" + item.goodsId,
 				});
 			},
@@ -256,4 +256,4 @@
 		display: -webkit-flex;
 		display: flex;
 	}
-</style>
+</style>
diff --git a/pages/mine/set/editionIntro.vue b/pages/mine/set/editionIntro.vue
index 8109206..98dd74a 100644
--- a/pages/mine/set/editionIntro.vue
+++ b/pages/mine/set/editionIntro.vue
@@ -88,7 +88,7 @@ export default {
     },
 
     navigateTo(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
diff --git a/pages/mine/set/securityCenter/securityCenter.vue b/pages/mine/set/securityCenter/securityCenter.vue
index 64c07f4..956a0f1 100644
--- a/pages/mine/set/securityCenter/securityCenter.vue
+++ b/pages/mine/set/securityCenter/securityCenter.vue
@@ -16,7 +16,7 @@ export default {
 
   methods: {
     navigateTo(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: url,
       });
     },
diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue
index 176cd23..61be1db 100644
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -49,7 +49,7 @@ export default {
       if (url == "/pages/set/securityCenter/securityCenter") {
         url += `?mobile=${this.userInfo.mobile}`;
       }
-      uni.navigateTo({
+      this.$navigateTo({
         url: url,
       });
     },
diff --git a/pages/navigation/search/searchPage.vue b/pages/navigation/search/searchPage.vue
index 1d9fbf0..7b76ac6 100644
--- a/pages/navigation/search/searchPage.vue
+++ b/pages/navigation/search/searchPage.vue
@@ -488,13 +488,13 @@ export default {
     },
     // 跳转到商品详情
     navigateToDetailPage(item) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${item.content.id}&goodsId=${item.content.goodsId}`,
       });
     },
     // 跳转地址
     navigateToStoreDetailPage(item) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/shopPage?id=${item.content.storeId}`,
       });
     },
diff --git a/pages/order/afterSales/afterSales.vue b/pages/order/afterSales/afterSales.vue
index 15b41c4..b9bbb36 100644
--- a/pages/order/afterSales/afterSales.vue
+++ b/pages/order/afterSales/afterSales.vue
@@ -351,7 +351,7 @@ export default {
      * 售后详情
      */
     afterDetails(order) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "./applyDetail?sn=" + order.sn,
       });
     },
@@ -394,7 +394,7 @@ export default {
         ...sku,
       };
       storage.setAfterSaleData(data);
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/order/afterSales/afterSalesSelect?sn=${sn}`,
       });
     },
@@ -410,7 +410,7 @@ export default {
       };
 
       storage.setAfterSaleData(data);
-      uni.navigateTo({
+      this.$navigateTo({
         url: `./afterSalesDetailExpress?serviceSn=${order.sn}`,
       });
     },
@@ -421,13 +421,13 @@ export default {
     onDetail(goods, sku) {
       // 售后申请
       if (this.current == 0) {
-        uni.navigateTo({
+        this.$navigateTo({
           url: `/pages/product/goods?id=${sku.skuId}&goodsId=${
             sku.goodsId || sku.goodsId
           }`,
         });
       } else {
-        uni.navigateTo({
+        this.$navigateTo({
           url: `/pages/product/goods?id=${goods.skuId}&goodsId=${
             goods.goodsId || goods.goodsId
           }`,
diff --git a/pages/order/afterSales/afterSalesSelect.vue b/pages/order/afterSales/afterSalesSelect.vue
index d298151..fb8e3fc 100644
--- a/pages/order/afterSales/afterSalesSelect.vue
+++ b/pages/order/afterSales/afterSalesSelect.vue
@@ -94,7 +94,7 @@ export default {
      * 跳转到商品信息
      */
     navigateToGoodsDetail(id) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${id}&goodsId=${goodsId}`,
       });
     },
diff --git a/pages/order/afterSales/applyDetail.vue b/pages/order/afterSales/applyDetail.vue
index c8564d9..54fce3a 100644
--- a/pages/order/afterSales/applyDetail.vue
+++ b/pages/order/afterSales/applyDetail.vue
@@ -381,7 +381,7 @@ export default {
      * 访问商品详情
      */
     navgiateToGoodsDetail(item) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
       });
     },
@@ -390,7 +390,7 @@ export default {
      * 进度
      */
     onProgress() {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `./applyProgress?sn=${
           this.serviceDetail.sn
         }&createTime=${encodeURIComponent(this.serviceDetail.createTime)}
diff --git a/pages/order/complain/complainList.vue b/pages/order/complain/complainList.vue
index ccdec07..45777d9 100644
--- a/pages/order/complain/complainList.vue
+++ b/pages/order/complain/complainList.vue
@@ -86,7 +86,7 @@ export default {
   methods: {
     // 点击跳转到商品
     handleToGoods(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/product/goods?id=" + val.skuId + "&goodsId=" + val.goodsId,
       });
     },
@@ -120,7 +120,7 @@ export default {
      * 查看详情
      */
     handleInfo(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "./complainInfo?id=" + val.id,
       });
     },
diff --git a/pages/order/evaluate/myEvaluate.vue b/pages/order/evaluate/myEvaluate.vue
index 35dc244..99c5798 100644
--- a/pages/order/evaluate/myEvaluate.vue
+++ b/pages/order/evaluate/myEvaluate.vue
@@ -219,7 +219,7 @@ export default {
      */
     talkCommont(sku) {
       console.log(sku);
-      uni.navigateTo({
+      this.$navigateTo({
         url: `./releaseEvaluate?sn=${sku.sn}&sku=${encodeURIComponent(
           JSON.stringify(sku)
         )}`,
@@ -270,7 +270,7 @@ export default {
      * 评价详情
      */
     onDetail(comment) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "./evaluateDetail?comment=" +
           encodeURIComponent(JSON.stringify(comment)),
diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue
index e0c03a8..71aa936 100644
--- a/pages/order/fillorder.vue
+++ b/pages/order/fillorder.vue
@@ -481,7 +481,7 @@ export default {
 
     // 跳转到店铺
     navigateToStore(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/product/shopPage?id=" + val.storeId,
       });
     },
@@ -555,7 +555,7 @@ export default {
      * 跳转
      */
     navigateTo(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index 0683258..45ac708 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -340,7 +340,7 @@ export default {
      * 替换onLoad下代码即可
      */
     let status = Number(options.status);
-    this.status = status;
+    this.status = status;
 		
     this.tabCurrentIndex = status;
     // if (status == 0) {
@@ -364,14 +364,14 @@ export default {
   methods: {
     // 售后
     applyService(order) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`,
       });
     },
 
     // 店铺详情
     navigateToStore(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/product/shopPage?id=" + val.storeId,
       });
     },
@@ -423,7 +423,7 @@ export default {
         }).pay();
         // #endif
         // #ifndef MP-WEIXIN
-        uni.navigateTo({
+        this.$navigateTo({
           url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
         });
         // #endif
@@ -522,7 +522,7 @@ export default {
      * 跳转到订单详情
      */
     navigateToOrderDetail(sn) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "./orderDetail?sn=" + sn,
       });
     },
@@ -588,7 +588,7 @@ export default {
      * 评价商品
      */
     onComment(sn) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "./evaluate/myEvaluate",
       });
     },
@@ -599,7 +599,7 @@ export default {
     reBuy(order) {
       console.log(order);
       return;
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId,
       });
@@ -609,7 +609,7 @@ export default {
      * 查看物流
      */
     navigateToLogistics(order) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/mine/msgTips/packageMsg/logisticsDetail?order_sn=" + order.sn,
       });
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index 4014a7e..d1b2e88 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -277,7 +277,7 @@ export default {
   },
   methods: {
     tostore(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/product/shopPage?id=" + val.storeId,
       });
     },
@@ -294,7 +294,7 @@ export default {
     },
     // #TODO 这块需要写一下 目前没有拼团的详细信息
     ByUserMessage(order) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/cart/payment/shareOrderGoods?sn=" +
           order.sn +
@@ -318,12 +318,12 @@ export default {
       });
     },
     onReceipt(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/order/invoice/invoiceDetail?id=" + val.id,
       });
     },
     gotoGoodsDetail(sku) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${sku.skuId}&goodsId=${sku.goodsId}`,
       });
     },
@@ -363,7 +363,7 @@ export default {
      * 投诉
      */
     complaint(sku) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/order/complain/complain?sn=" +
           this.sn +
@@ -373,7 +373,7 @@ export default {
     },
     //售后按钮
     onAfterSales(sn, sku) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `./afterSales/afterSalesSelect?sn=${sn}&sku=${encodeURIComponent(
           JSON.stringify(sku)
         )}`,
@@ -382,7 +382,7 @@ export default {
     // 去支付
     toPay(val) {
       val.sn
-        ? uni.navigateTo({
+        ? this.$navigateTo({
             url: "/pages/cart/payment/payOrder?order_sn=" + val.sn,
           })
         : false;
@@ -459,12 +459,12 @@ export default {
     },
     //评价商品
     onComment(sn) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "./evaluate/myEvaluate",
       });
     }, //查看物流
     onLogistics(order) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/mine/msgTips/packageMsg/logisticsDetail?logi_id=" +
           order.logi_id +
@@ -480,7 +480,7 @@ export default {
       this.reason = reason;
     },
     reBuy(order) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/product/goods?id=" + order.id + "&goodsId=" + order.goodsId,
       });
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index 227da4e..b2e2d5d 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -545,7 +545,7 @@ export default {
              if (user.data.result.mobile) {
                 whetherNavigate();
               } else {
-                uni.navigateTo({
+                this.$navigateTo({
                   url: "/pages/passport/bindUserPhone",
                 });
               }
@@ -639,13 +639,13 @@ export default {
     },
     // 跳转
     navigateToPrivacy(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/mine/help/tips?type=" + val,
       });
       console.log(val)
     },
     navigateToPrivacys(val){
-      uni.navigateTo({
+      this.$navigateTo({
         url:"/pages/mine/help/tips?type="+ val,
       })
     },
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 1cf8b5c..9477d6f 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -718,13 +718,13 @@ export default {
     linkMsgDetail() {
       // lili 基础客服
 	
-	  uni.navigateTo({
+	  this.$navigateTo({
 		url: `/pages/tabbar/home/web-view?IM=${this.storeDetail.storeId}`,
 	  });
 		
 		// udesk 代码  
 		// if (this.storeDetail.merchantEuid) {
-		//   uni.navigateTo({
+		//   this.$navigateTo({
 		//     url: `/pages/tabbar/home/web-view?src=${this.IM}`,
 		//   });
 		// }
@@ -744,7 +744,7 @@ export default {
         //   sign: this.storeDetail.yzfSign,
         //   mpSign: this.storeDetail.yzfMpSign,
         // };
-        // uni.navigateTo({
+        // this.$navigateTo({
         //   url:
         //     "/pages/product/customerservice/index?params=" +
         //     encodeURIComponent(JSON.stringify(params)),
@@ -752,7 +752,7 @@ export default {
         // // #endif
         // // #ifndef MP-WEIXIN
         // const sign = this.storeDetail.yzfSign;
-        // uni.navigateTo({
+        // this.$navigateTo({
         //   url:
         //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
         //     sign,
@@ -916,7 +916,7 @@ export default {
      * 跳转到店铺页面
      */
     navigateToStore(store_id) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/shopPage?id=` + store_id,
       });
     },
diff --git a/pages/product/product/evaluation/-evaluation.vue b/pages/product/product/evaluation/-evaluation.vue
index 27ad2fd..e19c39b 100644
--- a/pages/product/product/evaluation/-evaluation.vue
+++ b/pages/product/product/evaluation/-evaluation.vue
@@ -94,7 +94,7 @@ export default {
       );
     },
     toComment(id, grade) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/comment?id=${id}&grade=${grade}`,
       });
     },
diff --git a/pages/product/product/popup/address.vue b/pages/product/product/popup/address.vue
index 50ce0b9..a2a4829 100644
--- a/pages/product/product/popup/address.vue
+++ b/pages/product/product/popup/address.vue
@@ -54,7 +54,7 @@ export default {
       this.getShippingAddress()
     }
     else{
-      uni.navigateTo({
+      this.$navigateTo({
          url: 'pages/passport/login'
       });
     }
@@ -71,7 +71,7 @@ export default {
 
     getpicker() {
       // this.$refs.cityPicker.show();
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/mine/address/add",
       });
       this.closeAddress();
diff --git a/pages/product/product/shop/-shop.vue b/pages/product/product/shop/-shop.vue
index 3220628..2ab359c 100644
--- a/pages/product/product/shop/-shop.vue
+++ b/pages/product/product/shop/-shop.vue
@@ -57,13 +57,13 @@ export default {
     },
     // 点击商品
     clickGoods(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${val.content.id}&goodsId=${val.content.goodsId}`,
       });
     },
 
     tostorePage(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "../product/shopPage?id=" + val.storeId,
       });
     },
diff --git a/pages/product/shopList.vue b/pages/product/shopList.vue
index c91daa8..8ba4ecc 100644
--- a/pages/product/shopList.vue
+++ b/pages/product/shopList.vue
@@ -74,7 +74,7 @@ export default {
   },
   methods: {
     handleClickStore(val){
-      uni.navigateTo({
+      this.$navigateTo({
          url: `/pages/product/shopPage?id=${val.id}`
       });
     },
diff --git a/pages/product/shopPage.vue b/pages/product/shopPage.vue
index dc57cf3..f7b018b 100644
--- a/pages/product/shopPage.vue
+++ b/pages/product/shopPage.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <u-navbar :border-bottom="false">
+    <u-navbar :border-bottom="false">
 			<u-search v-model="keyword" @custom='search' :show-action="true" action-text="搜索" :animation="true" @search="search" @click="search" placeholder="请输入搜索"></u-search>
     </u-navbar>
     <div class="wrapper">
@@ -58,7 +58,7 @@
     <!-- menu -->
 
     <!-- 商品 -->
-    <div class="contant" v-if="current == 0">
+    <div class="contant" v-if="current == 0">
 		
       <u-empty style='margin-top:100rpx' v-if="goodsList.length == 0" class="empty" text='暂无商品信息'></u-empty>
 			<goodsTemplate v-else :res="goodsList" :storeName="false" />
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
+import { getStoreBaseInfo, getStoreCategory } from "@/api/store.js";
 import goodsTemplate from '@/components/m-goods-list/list'
 import {
   receiveCoupons,
@@ -119,7 +119,7 @@ export default {
     current(val) {
       val == 0 ? ()=>{ this.goodsList = []; this.getGoodsData()} : this.getCategoryData();
     },
-  },
+  },
 	components:{goodsTemplate},
 
   /**
@@ -152,7 +152,7 @@ export default {
 
   methods: {
     getStoreLicencePhoto() {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/licencePhoto?id=${this.storeId}`,
       });
     },
@@ -190,7 +190,7 @@ export default {
       //   sign: this.storeInfo.yzfSign,
       //   mpSign: this.storeInfo.yzfMpSign,
       // };
-      // uni.navigateTo({
+      // this.$navigateTo({
       //   url:
       //     "/pages/product/customerservice/index?params=" +
       //     encodeURIComponent(JSON.stringify(params)),
@@ -198,15 +198,15 @@ export default {
       // // #endif
       // // #ifndef MP-WEIXIN
       // const sign = this.storeInfo.yzfSign;
-      // uni.navigateTo({
+      // this.$navigateTo({
       //   url:
       //     "/pages/tabbar/home/web-view?src=https://yzf.qq.com/xv/web/static/chat/index.html?sign=" +
       //     sign,
       // });
-      // // #endif
-			
-			uni.navigateTo({
-			   url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
+      // // #endif
+			
+			this.$navigateTo({
+			   url: `/pages/tabbar/home/web-view?IM=${this.storeId}`,
 			 });
     },
 
@@ -227,7 +227,7 @@ export default {
 
     /**商品分类中商品集合 */
     getCategoryGoodsList(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/shopPageGoods?title=${val.labelName}&id=${val.id}&storeId=${this.storeId}`,
       });
     },
@@ -235,9 +235,9 @@ export default {
     /**
      * 搜索
      */
-    search() {
+    search() {
 			console.log("点击")
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/navigation/search/searchPage?storeId=${this.storeId}&keyword=${this.keyword}`,
       });
     },
@@ -261,7 +261,7 @@ export default {
     async getGoodsData() {
       let res = await getGoodsList(this.goodsParams);
       if (res.data.success) {
-        this.goodsList.push(...res.data.result.content);
+        this.goodsList.push(...res.data.result.content);
 				console.log(this.goodsList)
       }
     },
diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue
index f86c416..162d771 100644
--- a/pages/promotion/bargain/list.vue
+++ b/pages/promotion/bargain/list.vue
@@ -74,7 +74,7 @@ export default {
 
     // 跳转到砍价详情
     navigateToBargainDetail(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/promotion/bargain/detail?id=${val.id}`,
       });
     },
diff --git a/pages/promotion/bargain/log.vue b/pages/promotion/bargain/log.vue
index 9a811bd..8bb1b16 100644
--- a/pages/promotion/bargain/log.vue
+++ b/pages/promotion/bargain/log.vue
@@ -67,7 +67,7 @@ export default {
     },
     // 跳转到砍价详情
     navigateToBargainDetail(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/promotion/bargain/detail?id=${val.kanjiaActivityGoodsId}`,
       });
     },
diff --git a/pages/promotion/joinGroup.vue b/pages/promotion/joinGroup.vue
index 7b953d4..47aad92 100644
--- a/pages/promotion/joinGroup.vue
+++ b/pages/promotion/joinGroup.vue
@@ -113,7 +113,7 @@ export default {
     },
 
     toHref(goods) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${goods.skuId}&goodsId=${goods.goodsId}`,
       });
     },
diff --git a/pages/promotion/lives.vue b/pages/promotion/lives.vue
index bd0a728..eeedaad 100644
--- a/pages/promotion/lives.vue
+++ b/pages/promotion/lives.vue
@@ -229,7 +229,7 @@ export default {
       let customParams = encodeURIComponent(
         JSON.stringify({ path: "pages/index/index", pid: 1 })
       ); // 开发者在直播间页面路径上携带自定义参数，后续可以在分享卡片链接和跳转至商详页时获取，详见【获取自定义参数】、【直播间到商详页面携带参数】章节（上限600个字符，超过部分会被截断）
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=" +
           roomId +
diff --git a/pages/promotion/point/pointList.vue b/pages/promotion/point/pointList.vue
index 59187b1..c34799a 100644
--- a/pages/promotion/point/pointList.vue
+++ b/pages/promotion/point/pointList.vue
@@ -137,14 +137,14 @@ export default {
   methods: {
     // 跳转
     navigateTo(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
 
     toGoods(item) {
       //跳转详情
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/promotion/point/detail?id=${item.id}`,
       });
     },
diff --git a/pages/promotion/seckill.vue b/pages/promotion/seckill.vue
index 0dc1c10..075d9ff 100644
--- a/pages/promotion/seckill.vue
+++ b/pages/promotion/seckill.vue
@@ -151,7 +151,7 @@ export default {
       ) {
         return;
       } else {
-        uni.navigateTo({
+        this.$navigateTo({
           url: `/pages/product/goods?id=${item.skuId}&goodsId=${item.goodsId}`,
         });
       }
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index c4b234f..097c700 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -111,8 +111,8 @@
                 预估到手价 ￥<span>{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[0]}}</span>
                 <span>.{{ formatPrice(skuItem.priceDetailDTO.flowPrice)[1] }} </span>
               </div>
-							<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
-								{{skuItem.errorMessage}}
+							<div style='margin-left: 20rpx;' v-if="!skuItem.checked && skuItem.errorMessage">
+								{{skuItem.errorMessage}}
 							</div>
             </view>
           </view>
@@ -343,7 +343,7 @@ export default {
      * 跳转到店铺
      */
     navigateToStore(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/product/shopPage?id=" + val.storeId,
       });
     },
@@ -352,7 +352,7 @@ export default {
      * 跳转到优惠券
      */
     navigateToConpon(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/cart/coupon/couponCenter?storeId=" + val.storeId,
       });
     },
@@ -361,7 +361,7 @@ export default {
      * 跳转到商品
      */
     navigateToGoods(val) {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/product/goods?id=" +
           val.goodsSku.id +
@@ -437,7 +437,7 @@ export default {
      * 跳转
      */
     navigateTo(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
diff --git a/pages/tabbar/category/category.vue b/pages/tabbar/category/category.vue
index 4c7feeb..2eb7f92 100644
--- a/pages/tabbar/category/category.vue
+++ b/pages/tabbar/category/category.vue
@@ -57,7 +57,7 @@ export default {
      * 查询
      */
     search() {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/navigation/search/searchPage",
       });
     },
@@ -90,7 +90,7 @@ export default {
     },
 
     navigateToList(sid, tid) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/navigation/search/searchPage?category=${tid}`,
       });
     },
diff --git a/pages/tabbar/home/template/tpl_goods.vue b/pages/tabbar/home/template/tpl_goods.vue
index c511558..57e6acc 100644
--- a/pages/tabbar/home/template/tpl_goods.vue
+++ b/pages/tabbar/home/template/tpl_goods.vue
@@ -57,7 +57,7 @@ export default {
   mounted() {},
   methods: {
     handleClick(item) {
-      uni.navigateTo({
+      this.$navigateTo({
         url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
       });
     },
diff --git a/pages/tabbar/home/template/tpl_promotions_detail.vue b/pages/tabbar/home/template/tpl_promotions_detail.vue
index 0939658..3008aa7 100644
--- a/pages/tabbar/home/template/tpl_promotions_detail.vue
+++ b/pages/tabbar/home/template/tpl_promotions_detail.vue
@@ -145,22 +145,22 @@ export default {
     goToDetail(type) {
       switch(type) {
         case "SECKILL":
-          uni.navigateTo({
+          this.$navigateTo({
             url: `/pages/promotion/seckill`,
           });
           break;
         case "PINTUAN":
-          uni.navigateTo({
+          this.$navigateTo({
             url: `/pages/promotion/joinGroup`,
           });
           break;
         case "LIVE":
-          uni.navigateTo({
+          this.$navigateTo({
             url: `/pages/promotion/lives`,
           });
           break;
         case "KANJIA":
-          uni.navigateTo({
+          this.$navigateTo({
             url: `/pages/promotion/bargain/list`,
           });
           break;
diff --git a/pages/tabbar/home/template/tpl_search.vue b/pages/tabbar/home/template/tpl_search.vue
index 2bbc598..ac3bcd6 100644
--- a/pages/tabbar/home/template/tpl_search.vue
+++ b/pages/tabbar/home/template/tpl_search.vue
@@ -12,7 +12,7 @@ export default {
   props: ["res"],
   methods: {
     handleSearch() {
-      uni.navigateTo({
+      this.$navigateTo({
         url: "/pages/navigation/search/searchPage",
       });
     },
diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue
index 4001ee8..e919e0e 100644
--- a/pages/tabbar/home/views.vue
+++ b/pages/tabbar/home/views.vue
@@ -127,10 +127,10 @@ export default {
           this.pageData = JSON.parse(res.data.result.pageData);
         }
       });
-    },
-		// 是否有网络链接
-		isConnected(val){
-			val ? this.init() : ''
+    },
+		// 是否有网络链接
+		isConnected(val){
+			val ? this.init() : ''
 		},
 
     /**
@@ -149,18 +149,18 @@ export default {
           // WX_CODE 为小程序码
           if (res.scanType == "WX_CODE") {
             console.log(res);
-            uni.navigateTo({
+            this.$navigateTo({
               url: `/${res.path}`,
             });
           } else {
             config.scanAuthNavigation.forEach((src) => {
               if (res.result.indexOf(src) != -1) {
-                uni.navigateTo({
+                this.$navigateTo({
                   url: `/${res.result.substring(src.length)}`,
                 });
               } else {
                 setTimeout(() => {
-                  uni.navigateTo({
+                  this.$navigateTo({
                     url: "/pages/tabbar/home/web-view?src=" + path,
                   });
                 }, 100);
diff --git a/pages/tabbar/screen/fullScreen.vue b/pages/tabbar/screen/fullScreen.vue
index f089fa2..0aeda05 100644
--- a/pages/tabbar/screen/fullScreen.vue
+++ b/pages/tabbar/screen/fullScreen.vue
@@ -45,14 +45,14 @@ export default {
   //   },
   methods: {
     gotoLink() {
-      uni.navigateTo({
+      this.$navigateTo({
         //点击跳转到浏览器
         url:
           "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371992704333905920",
       });
     },
     gotoB() {
-      uni.navigateTo({
+      this.$navigateTo({
         url:
           "/pages/tabbar/home/web-view?src=https://pc-b2b2c.pickmall.cn/article/detail?id=1371779927900160000",
       });
diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue
index ce2cb3f..4553e1d 100644
--- a/pages/tabbar/user/my.vue
+++ b/pages/tabbar/user/my.vue
@@ -122,7 +122,7 @@ export default {
      * navigator标签现在默认没有转场动画，所以用view
      */
     navigateTo(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
diff --git a/pages/tabbar/user/similarGoods.vue b/pages/tabbar/user/similarGoods.vue
index b182475..da7ff9c 100644
--- a/pages/tabbar/user/similarGoods.vue
+++ b/pages/tabbar/user/similarGoods.vue
@@ -73,7 +73,7 @@
 				})
 			},
 			goDetail(item) {
-				uni.navigateTo({
+				this.$navigateTo({
 					url: '/pages/product/goods?id=' + item.content.id + "&goodsId=" +item.content.goodsId
 				})
 			},
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 1e93b1b..f29e323 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -69,7 +69,7 @@ import { distribution } from "@/api/goods";
 export default {
   methods: {
     navigateTo(url) {
-      uni.navigateTo({
+      this.$navigateTo({
         url,
       });
     },
@@ -78,11 +78,11 @@ export default {
         if (res.data.result) {
           let type = res.data.result.distributionStatus;
           if (type == "PASS") {
-            uni.navigateTo({
+            this.$navigateTo({
               url: "/pages/mine/distribution/home",
             });
           } else if (type == "REFUSE") {
-            uni.navigateTo({
+            this.$navigateTo({
               url: "/pages/mine/distribution/auth",
             });
           } else if (type == "RETREAT") {
@@ -106,7 +106,7 @@ export default {
           });
         } else {
           // 没有资格申请 先去实名认证
-          uni.navigateTo({
+          this.$navigateTo({
             url: "/pages/mine/distribution/auth",
           });
         }
diff --git a/utils/navigateRoute.js b/utils/navigateRoute.js
new file mode 100644
index 0000000..71df628
--- /dev/null
+++ b/utils/navigateRoute.js
@@ -0,0 +1,24 @@
+export function navigateTo({url}) {
+  // #ifdef MP-WEIXIN
+  //判断当前页面栈的长度
+  if (getCurrentPages().length >= 8) {
+    //超过八层的时候跳转销毁当前页面，十层的时候手机应该会很卡;
+    uni.redirectTo({
+      url: url,
+      success: function (res) {},
+      fail: function (res) {},
+      complete: function (res) {},
+    });
+  } else {
+    uni.navigateTo({
+      url: url,
+    });
+  }
+  //   #endif
+
+  //   #ifndef MP-WEIXIN
+  uni.navigateTo({
+    url: url,
+  });
+  // #endif
+}
diff --git a/uview-ui/components/u-parse/libs/trees.vue b/uview-ui/components/u-parse/libs/trees.vue
index 0d6bac4..a216649 100644
--- a/uview-ui/components/u-parse/libs/trees.vue
+++ b/uview-ui/components/u-parse/libs/trees.vue
@@ -215,7 +215,7 @@
 				if (jump) {
 					// #ifdef MP
 					if (attrs['app-id']) {
-						return uni.navigateToMiniProgram({
+						return this.$navigateToMiniProgram({
 							appId: attrs['app-id'],
 							path: attrs.path
 						})
@@ -241,7 +241,7 @@
 							})
 							// #endif
 						} else
-							uni.navigateTo({
+							this.$navigateTo({
 								url: attrs.href,
 								fail() {
 									uni.switchTab({
diff --git a/uview-ui/components/u-parse/u-parse.vue b/uview-ui/components/u-parse/u-parse.vue
index ec70d7c..815a038 100644
--- a/uview-ui/components/u-parse/u-parse.vue
+++ b/uview-ui/components/u-parse/u-parse.vue
@@ -331,7 +331,7 @@
 							} else if (href.indexOf('http') == 0 || href.indexOf('//') == 0)
 								return true;
 							else
-								uni.navigateTo({
+								this.$navigateTo({
 									url: href
 								})
 						}
@@ -578,7 +578,7 @@
 							} else if (href.includes('://'))
 								plus.runtime.openWeb(href);
 							else
-								uni.navigateTo({
+								this.$navigateTo({
 									url: href
 								})
 						}
diff --git a/uview-ui/components/u-toast/u-toast.vue b/uview-ui/components/u-toast/u-toast.vue
index 6aad463..72ebd4a 100644
--- a/uview-ui/components/u-toast/u-toast.vue
+++ b/uview-ui/components/u-toast/u-toast.vue
@@ -114,7 +114,7 @@
 							url: this.config.url
 						});
 					} else {
-						uni.navigateTo({
+						this.$navigateTo({
 							url: this.config.url
 						});
 					}