Merge branch 'master' of http://www.sysuimars.cn:3000/feiniao/feiniao-pc-vue

.gitignore

@@ -23,3 +23,4 @@ cloudbaserc.json
 *.njsproj
 *.sln
 *.sw?
+yarn.lock

package.json

@@ -16,9 +16,6 @@
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@element-plus/icons-vue": "^2.0.6",
     "@fortawesome/fontawesome-svg-core": "^6.3.0",
-    "@iconify/iconify": "^3.1.0",
-    "@iconify/json": "^2.2.42",
-    "@iconify/vue": "^4.1.0",
     "@liveqing/liveplayer-v3": "^3.7.35",
     "@turf/turf": "^7.2.0",
     "@vueuse/core": "^8.7.5",
@@ -65,7 +62,6 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.18.2",
-    "@iconify/json": "^2.2.42",
     "@vue/babel-plugin-jsx": "^1.1.1",
     "@vue/cli-plugin-babel": "^5.0.6",
     "@vue/cli-plugin-eslint": "^5.0.6",

src/api/modules/farm.js

@@ -146,7 +146,7 @@ module.exports = {
         type: "get",
         mockCondition: (p)=>{
             // return p.farmId === 90888 || p.farmId === 26196 || p.farmId === 766 || p.farmId === 80865;
-            return p.farmId === 26196 || p.farmId === 91702;
+            return p.farmId === 91702;
         },mockFun:function(p){
             return new Promise((resolve, reject) => {
                 if(p.farmId === 26196){

src/components/fnHeader.vue

@@ -109,6 +109,7 @@ const getGardenList = () => {
         userId: userInfo.userId,
         show3dFarm: true,
         location: "113.746646,22.970229",
+        vip:1
     };
     console.log('userInfo', userInfo);
     if(userInfo.userName === "游客"){

src/views/home/components/homePage.vue

@@ -11,7 +11,7 @@
         <div class="base-wrap">
           <div class="base-item" v-for="(item, index) in baseData.labels" :key="index">
             <div class="label">{{ item }}风险</div>
-            <div class="value">{{ baseData.valueMaxList[index].toFixed(0) }}<span>%</span></div>
+            <div class="value">{{ Number(baseData.valueMaxList[index]) >= 95 ? 95 : baseData.valueMaxList[index].toFixed(0) }}<span>%</span></div>
           </div>
         </div>
         <!-- <one-line-chart class="line-chart" :yData="lineYdata" :minData="minData"></one-line-chart> -->