Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/cats/cats.vue

@@ -168,7 +168,7 @@ export default {
 				url: '/api/AppletGoods/GetProductCategoryTreeList',
 				data: {
 					RootId:this.cat_id,
-					UserPageType:UserPageType
+					CategoryPageType:UserPageType
 				}
 			},
 			res => {

pages/goods/goods.vue

@@ -676,7 +676,7 @@ export default {
           data: {
             RecommendType: 1,
 			GoodsId:this.id,
-			UserPageType:UserPageType
+			GoodsPageType:UserPageType
           },
         },
         (res) => {

pages/goods/list.vue

@@ -83,7 +83,7 @@
 					GoodsType: 0,
 					CategoryIds: '',
 					OrderBy: 0,
-					UserPageType:0
+					GoodsPageType:0
 				},
 				newsortType: 1,
 			};
@@ -162,7 +162,7 @@
 				this.isover = false;
 				this.loading = true;
 				this.showLoading = this.msg.pageIndex != 1;
-				this.msg.UserPageType = uni.getStorageSync("mall_UserInfo").UserPageType;
+				this.msg.GoodsPageType = uni.getStorageSync("mall_UserInfo").UserPageType;
 				this.request2({
 						url: '/api/AppletGoods/GetAppletGoodsPageListForZY',
 						data: this.msg

pages/search/search.vue

@@ -260,7 +260,7 @@ export default {
 			GoodsType:0,
 			CategoryIds:'',
 			OrderBy:1,
-			UserPageType:UserPageType
+			GoodsPageType:UserPageType
           },
         },
         (res) => {