修改首页功能

bundle/pages/shop_search/shop_search.vue

@@ -40,7 +40,7 @@
     </view>
 </template>
 <script>
-import { mapGetters } from 'vuex'
+import { mapActions, mapGetters } from 'vuex'
 import { getGoodsList } from '@/api/store'
 import MescrollMixin from '@/components/mescroll-uni/mescroll-mixins.js'
 
@@ -107,7 +107,8 @@ export default {
                 is_recommend: this.is_recommend == 1 ? 1 : '',
                 sort_by_price: priceSort,
                 sort_by_sales: saleSort,
-                keyword
+                keyword,
+                city_id: (this.cityInfo && this.cityInfo.id) || 0,
             }).then(({ data }) => {
                 let curPageData = data.lists
                 let curPageLen = curPageData.length
@@ -119,7 +120,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['sysInfo']),
+        ...mapGetters(['sysInfo', 'cityInfo']),
         navHeight() {
             return this.sysInfo.navHeight + 'px'
         }

bundle/pages/user_spread/user_spread.vue

@@ -262,12 +262,9 @@
             	isScanEntry: false
 			};
 		},
-		onLoad() {
+		onLoad(options) {
 			this.isScanEntry = false
-			console.log("🚀 ~ this.$Route.query:", this.$Route.query)
 			if (this.$Route.query && this.$Route.query.scene) {
-				console.log("🚀 ~ this.$Route.query:", this.$Route.query.scene)
-
 				const query = this.parseScanQuery(this.$Route.query.scene)
 				console.log("🚀 ~ query:", query)
 				if (query.type == 1 || query.type == '1') {
@@ -276,13 +273,16 @@
 				}
 			}
 
+			if (options && (options.type == 1 || options.type == '1')) {
+				this.isScanEntry = true
+			}
+
 			// 获取上级及个人信息
 			this.getSuperiorInfoFun()
 			// 判断是否是分销会员
 			this.veryfiyDistributeFun()
 		},
 
-
 		methods: {
 			parseScanQuery(scene) {
 				if (!scene || typeof scene !== 'string') return {}