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

src/views/Mine.vue

@@ -171,6 +171,15 @@
                 <span>立即邀请</span>
             </div>
         </div> -->
+
+        <div class="riceBanner" @click="$router.push('/rice')">
+            <img src="@/assets/riceBanner.png" alt="" />
+            <div class="rice-content">
+                <div class="text">快来种植你的绿洲水稻！</div>
+                <div class="rice-btn">去种植</div>
+            </div>
+        </div>
+
         <div class="menus">
             <div class="menus_list">
                 <!-- <div class="menus_list_con" @click="$router.push('/domainname')" v-if="!$store.state.review">
@@ -1502,4 +1511,44 @@ export default {
         background: #ff4f50;
     }
 }
+
+.riceBanner {
+    margin: 16px 16px 0;
+    position: relative;
+    img {
+        width: 100%;
+        display: block;
+    }
+
+    .rice-content {
+        position: absolute;
+        left: 21.8vw;
+        right: 0;
+        top: 0;
+        bottom: 0;
+        .flex();
+        justify-content: space-between;
+
+        .text {
+            font-size: 13px;
+            font-family: AlimamaShuHeiTi;
+            color: #ffffff;
+            line-height: 24px;
+            text-shadow: 0px 0px 10px #1d1909;
+        }
+
+        .rice-btn {
+            width: 60px;
+            height: 24px;
+            background: linear-gradient(263deg, #ffd936 0%, #fffb4a 100%);
+            border-radius: 12px;
+            font-size: 12px;
+            font-weight: bold;
+            color: #352900;
+            line-height: 24px;
+            margin-right: 12px;
+            text-align: center;
+        }
+    }
+}
 </style>

src/views/product/Detail.vue

@@ -1013,11 +1013,13 @@ export default {
                     if (res) {
                         this.blindBoxItems = res.content;
                     }
-                    setTimeout(() => {
-                        this.$refs.sale.getMarketData().then(num => {
-                            this.totalSales = num;
-                        });
-                    }, 100);
+                    if (this.info.type !== 'DOMAIN') {
+                        setTimeout(() => {
+                            this.$refs.sale.getMarketData().then(num => {
+                                this.totalSales = num;
+                            });
+                        }, 100);
+                    }
                 })
                 .catch(e => {
                     this.$toast.clear();
@@ -2210,6 +2212,26 @@ export default {
     }
 }
 
+.no-btn {
+    color: @text3;
+    background-color: #303133;
+    border-width: 0;
+
+    .appoint {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+
+        span {
+            font-size: @font2;
+
+            &:last-child {
+                font-size: @font1;
+            }
+        }
+    }
+}
+
 .add_to_cart_btn {
     height: 56px;
     position: fixed;