Merge branch 'release' into 'jd_dev'

Release最新代码合并入jd_dev20241104

See merge request !35

.env.staging

@@ -4,5 +4,6 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = 'https://api.jd.qipx.top'
 
+VUE_APP_HOME_API = 'https://api.jd.qipx.top'

src/views/jiedao/profile/orderdetail.vue

@@ -396,7 +396,7 @@ export default {
 
         var country = that.address.find(item=>item.id == that.order.consigneeVO.country)||''
         if(country){
-          if(that.$lang.locale=='zh'){
+          if(that.$i18n.locale=='zh'){
             orderAdderss = country.titleZh
           }else{
             orderAdderss = country.titleEn
@@ -404,7 +404,7 @@ export default {
           if(that.order.consigneeVO.province){
             var province = country.children.find(item=>item.id == that.order.consigneeVO.province)||''
             if(province){
-              if(that.$lang.locale=='zh'){
+              if(that.$i18n.locale=='zh'){
                 orderAdderss += province.titleZh
               }else{
                 orderAdderss += province.titleEn
@@ -412,7 +412,7 @@ export default {
               if(that.order.consigneeVO.city){
                 var city = province.children.find(item=>item.id == that.order.consigneeVO.city)||''
                 if(city){
-                  if(that.$lang.locale=='zh'){
+                  if(that.$i18n.locale=='zh'){
                     orderAdderss += city.titleZh
                   }else{
                     orderAdderss += city.titleEn