细节 店内区分 立即邀请

pages/index/index.vue

@@ -316,7 +316,7 @@
 				<view class="diannei">
 					<view class="dianneiTitle">
 						<text>店内现货</text>
-						<view class="lookMore" @click="goJump('/pages/user/vip/goods')">
+						<view class="lookMore" @click="goJump('/pages/user/vip/goods?type=1')">
 							查看更多
 							<u-icon name="arrow-right" color="#909090"></u-icon>
 						</view>
@@ -459,7 +459,7 @@
 			return {
 				isLogin: false,
 				isTop: false,
-				logoImage:'',
+				logoImage: '',
 				// background: {
 				// 	backgroundColor: 'transparent',
 				// },
@@ -719,13 +719,17 @@
 				})
 			},
 			getTypeList() {
-				GoodsApi.typeList().then(res => {
+				GoodsApi.typeList({
+					is_in_store: this.current==0?0:1
+				}).then(res => {
 					if (res.status == 200) {
 						this.tabList = res.data.list;
 						this.catagoryList = res.data.list[0].children
+						if(this.current==0){
 						this.getRankingList(this.tabList[0].category_id)
 						this.getNewGoods(this.tabList[0].category_id)
-						this.getBigList(this.tabList[0].category_id)
+						}
+						this.getBigList(this.current==0?(this.tabList[0].category_id):(this.tabList[this.tabCurrent].category_id))
 					}
 				})
 			},
@@ -831,7 +835,7 @@
 					categoryId: val,
 					is_brand: 0,
 					is_new: 1,
-					order: 1
+					order: 1,
 				}
 				GoodsApi.brandList(param).then(res => {
 					let arr = res.data.data
@@ -860,7 +864,8 @@
 					categoryId: val,
 					is_brand: 1,
 					is_new: 0,
-					order: 1
+					order: 1,
+					is_in_store: this.current==0?0:1
 				}
 				GoodsApi.brandList(param).then(res => {
 						let arr = res.data.data;
@@ -923,6 +928,8 @@
 			},
 			changeHome(val) {
 				this.current = val;
+				this.getTypeList()
+				// this.getBigList(this.tabList[this.tabCurrent].category_id)
 			},
 			getCityInfo() {
 				const that = this
@@ -937,7 +944,7 @@
 			async getStore() {
 				newFunApi.storeData().then(res => {
 						if (res.status == 200) {
-							this.logoImage=res.data.storeInfo.logoImage.preview_url
+							this.logoImage = res.data.storeInfo.logoImage.preview_url
 						}
 					})
 					.finally(() => {})
@@ -2263,4 +2270,4 @@
 	// 	height:10px;
 	// 	width:10px;
 	// }
-</style>
+</style>

pages/invite/index.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="invite-hd">
 			<image :src="$picUrl+'/static/news/invite-bg.png'"></image>
-			<view class="btn"></view>
+			<view class="btn" @click="openPage(3)"></view>
 			<view class="rule" @click="openPage(4)"></view>
 		</view>
 		<view class="invite-bd">
@@ -55,10 +55,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="invite-bd-d">
+			<!-- <view class="invite-bd-d">
 				<image :src="$picUrl+'/static/news/invite-bg4.png'"></image>
 				<view class="p" @click="openPage(3)">立即邀请</view>
-			</view>
+			</view> -->
 		</view>
 		<!--  -->
 		<view class="invite-popup" v-if="isPopup">

pages/news/rules/rulesList.vue

@@ -27,6 +27,7 @@
 		},
 		onLoad(options) {
 			this.itemInfo = JSON.parse(decodeURIComponent(options.itemInfo))
+			console.log(this.itemInfo )
 			this.title = this.itemInfo.name
 			this.list = this.itemInfo.child
 		},

pages/user/vip/goods.vue

@@ -2,7 +2,8 @@
 	<view class="goods">
 		<u-navbar>
 			<view class="slot-wrap">
-				<u-search @click="openPage()" placeholder="iPhone 15" disabled :show-action="false" v-model="keyword"></u-search>
+				<u-search @click="openPage()" placeholder="iPhone 15" disabled :show-action="false" v-model="keyword">
+				</u-search>
 			</view>
 		</u-navbar>
 		<view class="goods-hd">
@@ -28,8 +29,8 @@
 					<view class="item" @click="tabFilter(3,7)" :class="filterIndex==3?'item-on':''">综合</view>
 				</view>
 				<scroll-view scroll-y class="l">
-					<view class="item" v-for="(item,index) in list" v-if="list.length>0" :key="index" @click="goodsDetail(item.goods_id)"
+					<view class="item" v-for="(item,index) in list" v-if="list.length>0" :key="index"
-						:isLoading="isLoading">
+						@click="goodsDetail(item.goods_id)" :isLoading="isLoading">
 						<image :src="item.goods_image"></image>
 						<view class="title">
 							<text>自营</text>{{item.goods_name}}
@@ -69,9 +70,13 @@
 				categoryChildren: [],
 				list: [],
 				swiperList: [],
-				orderSort: 1
+				orderSort: 1,
+				type: 0
 			}
 		},
+		onLoad(op) {
+			this.type = op.type
+		},
 		/**
 		 * 生命周期函数--监听页面显示
 		 */
@@ -94,7 +99,7 @@
 			// 获取分类
 			getCategoryList() {
 				const app = this;
-				Api.category()
+				Api.category({is_in_store:this.type==1?1:0})
 					.then(result => {
 						app.categoryList = result.data.list;
 						app.categoryChildren = result.data.list[0].children;
@@ -111,13 +116,14 @@
 					is_brand: 1,
 					is_new: 0,
 					categoryId: categoryId,
-					order: app.orderSort
+					order: app.orderSort,
+					is_in_store:this.type==1?1:0
 				}
 				Api.brandList(pamars)
 					.then(result => {
 						let arr = result.data.data;
-						if(arr && arr.length > 0){
+						if (arr && arr.length > 0) {
-							arr.map(a=>{
+							arr.map(a => {
 								a.goods_price_min = Number(a.goods_price_min)
 								a.goods_price_max = Number(a.goods_price_max)
 								a.line_price_min = Number(a.line_price_min)
@@ -129,12 +135,12 @@
 					.finally(() => app.isLoading = false)
 			},
 			tabItem(index, item) {
-				console.log(item,'1')
+				console.log(item, '1')
 				this.tabIndex = index;
 				this.getBrandList(item.category_id)
 			},
 			tabItem1(item, index) {
-				console.log(item,'2')
+				console.log(item, '2')
 				this.tabIndex1 = index;
 				let app = this;
 				app.categoryChildren = [];
@@ -183,6 +189,7 @@
 		&-hd {
 			width: 100%;
 			height: 400rpx;
+
 			image {
 				width: 100%;
 				height: 100%;