Merge remote-tracking branch 'origin/master'

src/components/index/PageLeft.vue

@@ -42,7 +42,7 @@
                                     <span>{{item.functionName}}</span>
                                 </template>
                                 <el-menu-item-group v-for="(son,ind) in item.systemFunctionlist" :key="ind">
-                                    <el-menu-item :index="son.functionUrl"><span class="circle5px" :style="{backgroundColor:currentIndex==son.functionUrl?'#5D78FF':''}"></span>{{son.functionName}}
+                                    <el-menu-item v-if="$i18n.locale=='zh-CN'?son.functionUrl!=null:son.functionUrl!='/userintegral'&&son.functionUrl!='/empguesslist'" :index="son.functionUrl"><span class="circle5px" :style="{backgroundColor:currentIndex==son.functionUrl?'#5D78FF':''}"></span>{{son.functionName}}
                                     </el-menu-item>
                                 </el-menu-item-group>
                             </el-submenu>

src/views/index/pages/index.vue

 <template>
     <div class="contentWrapper" style="max-width: 1440px;margin: 0 auto;">
-        <div style="position: fixed;right: 5px;top: 70%;z-index:500;cursor: pointer;">
+        <div v-if="$i18n.locale=='zh-CN'" style="position: fixed;right: 5px;top: 70%;z-index:500;cursor: pointer;">
             <p v-if="!isHasSign" @click="getintegralCode" style="margin-bottom: 20px;"><img src="../../../assets/img/indexSignin.png" style="width: 50px;height: 50px;" alt=""></p>
             <p @click="toguesslist"><img src="../../../assets/img/indexguess.png" style="width: 90px;height: 80px;" alt=""></p>
         </div>

src/views/integralpage/guesslist.vue

@@ -66,7 +66,7 @@
                     </el-table-column>
                     <el-table-column label="操作" width="200" align='center'>
                         <template slot-scope="scope">
-                            <el-button v-if="scope.row.guessStatus != 2" type="text" @click="$router.push({path:'/guessDetail',query:{id:scope.row.guessId}})">预览</el-button>
+                            <el-button v-if="scope.row.guessStatus != 2&&scope.row.guessStatus != 0" type="text" @click="$router.push({path:'/guessDetail',query:{id:scope.row.guessId}})">预览</el-button>
                             <el-button v-if="scope.row.guessStatus == 3" type="text" @click="settledguess(scope.row)">结算</el-button>
                             <el-button type="text" @click="viewShow(scope.row)">查看</el-button>
                             <el-button v-if="scope.row.guessStatus != 2" type="text" @click="pullGuess(scope.row)">下架</el-button>

src/views/integralpage/integralconfig.vue

@@ -92,7 +92,9 @@
         mounted() {
             api.getIntegrationSetting().then(response => {
                 if(response.code == 0) {
-                    this.infoData = response.result;
+                    if(response.result){
+                        this.infoData = response.result;
+                    }
                 } else {
                     this.$message.error(response.msg);
                 }