Merge branch 'master' of http://git.2weisou.com/liumin/NewZkgj

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "数智工牌",
+    "name" : "去房智控管家",
     "appid" : "__UNI__7A1611D",
     "description" : "去房智控管家",
     "versionName" : "1.1.0",
@@ -91,7 +91,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxe044603515ff2cb5",
+        "appid" : "wx8f883dca5ecc5510",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

pages/center/Piabodata/requireminingAnalysis.vue

@@ -331,10 +331,10 @@
 						this.ringChartData = { series: [
               {
                 data: [
-									{"name":"30%以下","value":res.a},
-									{"name":"30%～50%","value":res.b},
+									{"name":"30%及以下","value":res.a},
+									{"name":"31%～50%","value":res.b},
 									{"name":"51%～70%","value":res.c},
-									{"name":"70%以上","value":res.d},
+									{"name":"71%及以上","value":res.d},
 								]
               }
             ]}

pages/center/consumer/index.vue

@@ -646,44 +646,44 @@ export default {
       ],
       wajueList: [
         {
-          label: "30%以下",
+          label: "31%及以下",
           value: 1,
           isShow: false,
         },
         {
-          label: "30%~50%",
+          label: "31%~50%",
           value: 2,
           isShow: false,
         },
         {
-          label: "50%~70%",
+          label: "51%~70%",
           value: 3,
           isShow: false,
         },
         {
-          label: "70%以上",
+          label: "71%及以上",
           value: 4,
           isShow: false,
         },
       ],
       xiaojiangList: [
         {
-          label: "30%以下",
+          label: "30%及以下",
           value: 1,
           isShow: false,
         },
         {
-          label: "30%~50%",
+          label: "31%~50%",
           value: 2,
           isShow: false,
         },
         {
-          label: "50%~70%",
+          label: "51%~70%",
           value: 3,
           isShow: false,
         },
         {
-          label: "70%以上",
+          label: "71%及以上",
           value: 4,
           isShow: false,
         },

pages/center/records/index.vue

@@ -364,38 +364,38 @@
 				],
 				wajueList:[
 					{
-					label: '30%以下',
+					label: '30%及以下',
 					value: 1,
 					isShow: false,
 				}, {
-					label: '30%~50%',
+					label: '31%~50%',
 					value: 2,
 					isShow: false,
 				}, {
-					label: '50%~70%',
+					label: '51%~70%',
 					value: 3,
 					isShow: false,
 				}, {
-					label: '70%以上',
+					label: '71%及以上',
 					value: 4,
 					isShow: false,
 					}
 				],
 				xiaojiangList:[
 					{
-					label: '30%以下',
+					label: '30%及以下',
 					value: 1,
 					isShow: false,
 				}, {
-					label: '30%~50%',
+					label: '31%~50%',
 					value: 2,
 					isShow: false,
 				}, {
-					label: '50%~70%',
+					label: '51%~70%',
 					value: 3,
 					isShow: false,
 				}, {
-					label: '70%以上',
+					label: '71%及以上',
 					value: 4,
 					isShow: false,
 					}