Merge branch 'wlogin'

pages/shop/GoodsCon/index.vue

@@ -266,6 +266,7 @@ export default {
     console.log(url);
     if (url && url.productId) {
       this.id = url.productId;
+      
     } else {
       this.id = this._route.query.id;
     }
@@ -339,12 +340,12 @@ export default {
     //产品详情接口；
     productCon: function() {
       let that = this;
-      let form = {};
+      let from = {};
       if (this.$deviceType == "app") {
-        form.form = "app";
+        from.from = "app";
       }
       uni.showLoading({ title: "加载中", mask: true });
-      getProductDetail(that.id, form)
+      getProductDetail(that.id, from)
         .then(res => {
           that.$set(that, "storeInfo", res.data.storeInfo);
           // 给 attr 赋值，将请求回来的规格赋值给 attr

pages/shop/GoodsEvaluate/index.vue

@@ -196,12 +196,22 @@
 							icon: "success",
 							duration: 2000
 						});
-						this.$yrouter.push({
-							path: "/pages/order/OrderDetails/index",
-							query: {
-								id: this.orderCon.orderId
-							}
-						});
+						
+						// ? 回跳到上一页
+						this.$yrouter.back()
+						
+						// ? 默认跳转到详情页
+						// this.$yrouter.push({
+						// 	path: "/pages/order/OrderDetails/index",
+						// 	query: {
+						// 		id: this.orderCon.orderId
+						// 	}
+						// });
+						
+						// ? 可选重定向到详情页，这时左上角会有一个返回首页的图标
+						// this.$yrouter.reLaunch({
+						// 	path: "/pages/home/index",
+						// });
 					})
 					.catch(err => {
 						uni.showToast({