Merge remote-tracking branch 'origin/jd_dev' into jd_dev

src/pages/levite/levite.vue

@@ -33,10 +33,13 @@
 						if(that.$lang.locale=='zh'){
 							that.title = res.data.titleZh
 							that.leviteInfo = res.data.contentZh
-						}else{
+						}else if(that.$lang.locale=='en'){
 							that.title = res.data.titleEn
 							that.leviteInfo = res.data.contentEn
-						}
+						} else {
+              that.title = res.data.titleFr
+              that.leviteInfo = res.data.contentFr
+            }
 					}
 				})
 			},
@@ -51,6 +54,6 @@
 }
 .text{
 	overflow: auto;
-	
+
 }
 </style>

src/pages/login/login.vue

@@ -249,8 +249,10 @@ export default {
         if (res.code == 0 && res.data) {
           if (that.$lang.locale == 'zh') {
             that.leviteInfo = res.data.contentZh
-          } else {
+          } else if (that.$lang.locale == 'en') {
             that.leviteInfo = res.data.contentEn
+          } else {
+            that.leviteInfo = res.data.contentFr
           }
         }
       })