商品绑定楼盘筛选，首页导航跳转，加入拼团订单修复~

package.json

@@ -58,9 +58,9 @@
     "@vue/cli-service": "^3.9.2",
     "babel-plugin-import": "^1.12.0",
     "cross-env": "^6.0.0",
-    "node-sass": "^6.0.1",
+    "node-sass": "^4.0.0",
     "postcss-comment": "^2.0.0",
-    "sass-loader": "^10.1.0",
+    "sass-loader": "^7.1.0",
     "vue-template-compiler": "^2.6.10"
   },
   "browserslist": [

src/core/request.js

@@ -43,7 +43,14 @@ const request = async function (args) {
     let platform_storage = Vue.prototype.$storage.getStorageSync('platform');
     platform_storage = platform_storage === 'wxapp_wechat' ? 'wechat' : platform_storage;
     header['X-App-Platform'] = (args.header && args.header['X-App-Platform']) ? args.header['X-App-Platform'] : `${siteInfo.platform}`;
-    // #endif
+    // #endif 
+	
+	/* 添加estate_id的接口 */
+	let goodsByEstate=['api/default/goods-list']
+	if(goodsByEstate.includes(args.url.split('r=')[1])){
+		args.data.estate_id=Vue.prototype.$store.state.user.selectedProperties.id
+	}
+
     const [error, response] = await uni.request({
         url: args.url,
         method: args.method || 'get',

src/pages/index/hxj_index_component.vue

@@ -110,12 +110,12 @@
 			</view>
 			<scroll-view scroll-x="true">
 				<view class="main-left w">
-					<view class="item" v-for="(item,index) in homePages[8].data.navs" :key="index">
+					<view class="item" v-for="(item,index) in homePages[8].data.navs" :key="index" @click="goPage(item.link_url)">
 						<image class="borradu_20"
 							:src="item.icon_url"
 							mode=""></image>
 						<view class="title_2" style="margin-top: 35rpx;">{{item.name}}</view>
-						<view class="desc_2">独到品味的代表备份</view>
+						<!-- <view class="desc_2">独到品味的代表备份</view> -->
 					</view>
 				</view>
 			</scroll-view>

src/plugins/pt/components/app-group-avatar-short.vue

@@ -106,6 +106,7 @@
             url: String,
             status: String,
             goodsId: String,
+			mch_id:[String,Number],
 			one_goods_id: Number,
 			is_join: String,
             detail: Object,
@@ -145,6 +146,7 @@
                     data: {
                         id: this.goodsId,
                         group_id: this.detail.group_id,
+						mch_id:this.mch_id
                     }
                 }).then(response => {
                     uni.hideLoading();

src/plugins/pt/components/app-participant.vue

@@ -52,7 +52,7 @@
 								</view>
 							</view>
 							<view class="app-go" :style="{'background-color': theme.background}">
-								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item-1].id}`">
+								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item-1].id}&mch_id=${mch_id}`">
 									去参团
 								</app-jump-button>
 							</view>
@@ -76,7 +76,7 @@
 								</view>
 							</view>
 							<view class="app-go" :style="{'background-color': theme.background}">
-								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item-1].id}`">
+								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item-1].id}&mch_id=${mch_id}`">
 									去参团
 								</app-jump-button>
 							</view>
@@ -102,7 +102,7 @@
 								</view>
 							</view>
 							<view class="app-go" :style="{'background-color': theme.background}">
-								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item].id}`">
+								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item].id}&mch_id=${mch_id}`">
 									去参团
 								</app-jump-button>
 							</view>
@@ -126,7 +126,7 @@
 								</view>
 							</view>
 							<view class="app-go" :style="{'background-color': theme.background}">
-								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item].id}`">
+								<app-jump-button form :url="`/plugins/pt/detail/detail?id=${list[item].id}&mch_id=${mch_id}`">
 									去参团
 								</app-jump-button>
 							</view>
@@ -162,7 +162,8 @@
                     return [];
 	            }
             },
-			theme: Object
+			theme: Object,
+			mch_id:[String,Number]
 	    },
 
 		methods: {

src/plugins/pt/detail/detail.vue

@@ -22,6 +22,7 @@
                         :group_users="detail.group_users"
                         :status="detail.status"
                         :goodsId="detail.goods_id"
+						:mch_id="mch_id"
 						:one_goods_id="detail.one_goods_id"
                         :is_join="detail.is_join"
                         :detail="detail"
@@ -71,12 +72,14 @@
                 url: '',
                 list: [],
                 id: null,
+				mch_id:0,
                 poster_config: this.$api.pt.poster_config,
                 poster_generate: this.$api.pt.poster_generate,
             }
 	    },
 	    onLoad(options) { this.$commonLoad.onload(options);
 			this.id = options.id;
+			this.mch_id = options.mch_id;
             this.request(options.id);
 	    },
         onShow() {

src/plugins/pt/goods/goods.vue

@@ -87,7 +87,7 @@
                 :shipping="detail.goods_marketing.shipping"
                 :pickup="detail.goods_marketing.pickup"
             ></bd-kb>
-            <app-participant :theme="getTheme" :pintuan_list="pintuan_list"></app-participant>
+            <app-participant :theme="getTheme" :pintuan_list="pintuan_list" :mch_id="mch_id"></app-participant>
             <bd-comments :goods-id="detail.id"></bd-comments>
             <bd-detail :detail="detail.detail"></bd-detail>
             <app-related-suggestion-product :theme="getTheme" sign="pintuan" :list="list"></app-related-suggestion-product>
@@ -409,7 +409,7 @@
             },
             goJoin(id) {
                 uni.navigateTo({
-                    url: `/plugins/pt/detail/detail?id=${id}`
+                    url: `/plugins/pt/detail/detail?id=${id}&mch_id=${this.mch_id}`
                 })
             },
             // 获取商品详情