Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/components/rice/Task.vue

@@ -18,14 +18,15 @@
                             taskInfo.isSignedIn ? '已完成' : '签到'
                         }}</van-button>
                     </div>
-                    <div class="box-item" @click="share">
+                    <div class="box-item">
                         <img src="@assets/icon_yaoqing.png" alt="" />
                         <div class="box-info">
                             <div class="text1">邀请互动({{ taskInfo.isInvited ? 1 : 0 }}/1)</div>
 
                             <div class="text2">邀请好友完成互动后领1点电量</div>
                         </div>
-                        <van-button type="primary" round>邀请</van-button>
+                        <van-button class="not" v-if="taskInfo.isInvited" type="primary" round>已完成</van-button>
+                        <van-button v-else type="primary" round @click="share">邀请</van-button>
                     </div>
                     <div class="box-item">
                         <img src="@assets/icon_jifen.png" alt="" />

src/views/Mine.vue

@@ -172,7 +172,7 @@
             </div>
         </div> -->
 
-        <div class="riceBanner" @click="$router.push('/rice')">
+        <div class="riceBanner" v-if="showRice" @click="$router.push('/rice')">
             <img src="@/assets/riceBanner.png" alt="" />
             <div class="rice-content">
                 <div class="text">快来种植你的绿洲水稻！</div>
@@ -419,7 +419,8 @@ export default {
             turnPrivacy: false,
             turnOffPrivacy: false,
             light: null,
-            showGPT: false
+            showGPT: false,
+            showRice: false
         };
     },
     components: { Level, Post, TuanRank },
@@ -446,8 +447,9 @@ export default {
                     this.$toast(e.error);
                 });
         }
-        this.$http.get('/sysConfig/get/chatGPT_show').then(res => {
-            this.showGPT = res.value === true || res.value === '1';
+        this.$http.get('/sysConfig/get/chatGPT_show,rice_show').then(res => {
+            this.showGPT = res.chatGPT_show.value === true || res.chatGPT_show.value === '1';
+            this.showRice = res.rice_show.value == true || res.rice_show.value === '1';
         });
     },
     methods: {