Merge branch 'dev' of xiongzhu/raex_front into master

src/main.js

@@ -93,6 +93,9 @@ if (query.inviteCode) {
 if (query.review === 'true' || query.review === true) {
     store.commit('setReview', true);
 }
+if (query.reviewPay === 'true' || query.reviewPay === true) {
+    store.commit('setReviewPay', true);
+}
 const style = document.documentElement.style;
 style.setProperty('--safe-top', 'env(safe-area-inset-top)');
 style.setProperty('--safe-bottom', 'env(safe-area-inset-bottom)');

src/store/index.js

@@ -9,6 +9,7 @@ export default createStore({
         couponInfo: null,
         invitor: null,
         review: false,
+        reviewPay: false,
         from: '',
         inviteCode: '',
         loginBackUrl: '',
@@ -38,6 +39,9 @@ export default createStore({
         setReview(state, review) {
             state.review = review;
         },
+        setReviewPay(state, reviewPay) {
+            state.reviewPay = reviewPay;
+        },
         setFrom(state, from) {
             state.from = from;
         },

src/views/Discover.vue

@@ -17,13 +17,17 @@
             </swiper-slide>
         </swiper>
 
-        <van-grid :border="false" :column-num="$store.state.review ? 4 : 5">
+        <van-grid :border="false" :column-num="$store.state.review || $store.state.reviewPay ? 4 : 5">
             <van-grid-item text="精选推荐" :to="{ path: '/productList' }">
                 <template v-slot:icon>
                     <img class="grid-img" src="@assets/info_icon_jingxuanxilie.png" />
                 </template>
             </van-grid-item>
-            <van-grid-item text="二手市场" :to="{ path: '/productList', query: { source: 'TRANSFER' } }">
+            <van-grid-item
+                text="二手市场"
+                v-if="!$store.state.reviewPay"
+                :to="{ path: '/productList', query: { source: 'TRANSFER' } }"
+            >
                 <template v-slot:icon>
                     <img class="grid-img" src="@assets/info_icon_ershoushichang.png" />
                 </template>