Почетна Преглед Помоћ
Регистрација Пријавите се
xingjinxing
/
realtorEasier-webSite
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

feat：提交修改

jinx пре 4 година
родитељ
43ef6b67cc
комит
d25c57fa63
22 измењених фајлова са 167 додато и 162 уклоњено
Подељен поглед Покажи статистику Diff
  1. 3 2
      mobile/.eslintrc.js
  2. 2 2
      pc/build/webpack.base.conf.js
  3. 5 5
      pc/index.html
  4. 5 5
      pc/main.html
  5. 3 3
      pc/src/App.vue
  6. 1 1
      pc/src/assets/font/iconfont.json
  7. BIN
      pc/src/assets/images/home/logo.png
  8. 8 6
      pc/src/config/mall.js
  9. 5 6
      pc/src/page/cases/index.vue
  10. 1 1
      pc/src/page/chat/index.vue
  11. 70 67
      pc/src/page/layout/header/index.vue
  12. 1 1
      pc/src/page/layout/header/istyle.scss
  13. 3 2
      pc/src/page/layout/shop.vue
  14. 10 11
      pc/src/page/layout/shopHeader/index.vue
  15. 5 4
      pc/src/page/manage/index.vue
  16. 5 1
      pc/src/page/manage/style.scss
  17. 2 1
      pc/src/page/manage/temp/device.vue
  18. 3 3
      pc/src/page/manage/temp/information.vue
  19. 10 9
      pc/src/page/manage/temp/scene.vue
  20. 12 15
      pc/src/router/index.js
  21. 9 13
      pc/src/store/language/cn/manage.js
  22. 4 4
      pc/src/store/language/index.js

+ 3 - 2
mobile/.eslintrc.js
Прегледај датотеку 

@@ -11,7 +11,7 @@ module.exports = {
 
   extends: [
 
     // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
 
     // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
 
-    'plugin:vue/essential', 
+    'plugin:vue/essential',
 
     // https://github.com/standard/standard/blob/master/docs/RULES-en.md
 
     'standard'
 
   ],
 
@@ -24,6 +24,7 @@ module.exports = {
 
     // allow async-await
 
     'generator-star-spacing': 'off',
 
     // allow debugger during development
 
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
 
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
 
+
 
   }
 
 }

+ 2 - 2
pc/build/webpack.base.conf.js
Прегледај датотеку 

@@ -38,7 +38,7 @@ module.exports = {
 
     extensions: ['.js', '.vue', '.json'],
 
     alias: {
 
       'vue$': 'vue/dist/vue.esm.js',
 
-      '@': resolve('src'),
 
+      '@': resolve('src')
 
     }
 
   },
 
   module: {
 
@@ -60,7 +60,7 @@ module.exports = {
 
         options: {
 
           limit: 10000,
 
           name: utils.assetsPath('v2/images/[path][name].[ext]'),
 
-          publicPath: isProd ?  'https://4dscene.4dage.com/new4dkk/' : ''
 
+          publicPath: isProd ? 'https://4dscene.4dage.com/new4dkk/' : ''
 
         }
 
       },
 
       {

+ 5 - 5
pc/index.html
Прегледај датотеку 

@@ -11,12 +11,12 @@
 
     <meta name="browsermode" content="application">
 
     <meta name="full-screen" content="yes">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <meta name="description" content="世界上首款消费级3D相机—四维看看（4DKanKan）。技术核心三要素：易操作；自动化；高精度。主要应用领域为数字文博、数字地产、数字电商、数字餐饮、数字家居等。">
 
-    <link rel="shortcut icon" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico">
 
-    <link rel="icon" type="image/png" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon192.png" sizes="192x192">
 
+    <meta name="description" content="">
 
+    <!-- <link rel="shortcut icon" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico"> -->
 
+    <!-- <link rel="icon" type="image/png" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon192.png" sizes="192x192"> -->
 
     <link rel="stylesheet" href="//at.alicdn.com/t/font_941679_7vwx5e680s5.css">
 
-    <link rel="apple-touch-icon" sizes="180x180" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon180.png">
 
-    <title>四维看看</title>
 
+    <!-- <link rel="apple-touch-icon" sizes="180x180" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon180.png"> -->
 
+    <title>Realtor Easier</title>
 
     <script>
 
       var _hmt = _hmt || [];
 
       (function() {

+ 5 - 5
pc/main.html
Прегледај датотеку 

@@ -11,11 +11,11 @@
 
     <meta name="browsermode" content="application">
 
     <meta name="full-screen" content="yes">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-    <meta name="description" content="世界上首款消费级3D相机—四维看看（4DKanKan）。技术核心三要素：易操作；自动化；高精度。主要应用领域为数字文博、数字地产、数字电商、数字餐饮、数字家居等。">
 
-    <link rel="shortcut icon" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico">
 
-    <link rel="icon" type="image/png" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon192.png" sizes="192x192">
 
-    <link rel="apple-touch-icon" sizes="180x180" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon180.png">
 
-    <title>四维看看</title>
 
+    <meta name="description" content="">
 
+    <!-- <link rel="shortcut icon" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon.ico"> -->
 
+    <!-- <link rel="icon" type="image/png" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon192.png" sizes="192x192">
 
+    <link rel="apple-touch-icon" sizes="180x180" href="//4dkk.4dage.com/FDKKIMG/icon/kankan_icon180.png"> -->
 
+    <title>Realtor Easier</title>
 
 </head>
 
 <body>
 
   <script>

+ 3 - 3
pc/src/App.vue
Прегледај датотеку 

@@ -1,5 +1,6 @@
 
 <template>
 
-  <div id="app" :style="{transform:scale!==1 && gre150? `scale(${scale})`:'none','paddingTop':deviceLogin?'0px':'80px'}">
 
+  <!-- <div id="app" :style="{transform:scale!==1 && gre150? `scale(${scale})`:'none','paddingTop':deviceLogin?'0px':'80px'}"> -->
 
+  <div id="app">
 
     <router-view />
 
   </div>
 
 </template>
 
@@ -140,7 +141,7 @@ export default {
 
 <style lang="scss">
 
 
 #app {
 
-  padding-top: 80px;
 
+  // padding-top: 80px;
 
   width: 100%;
 
   transform-origin: left top;
 
   min-width: 1316px;
 
@@ -153,7 +154,6 @@ export default {
 
   top: 0;
 
   width: 100%;
 
   z-index: 999;
 
-
 
 }
 
 
 .hidden-nav{

+ 1 - 1
pc/src/assets/font/iconfont.json
Прегледај датотеку 

@@ -1,6 +1,6 @@
 
 {
 
   "id": "941679",
 
-  "name": "四维看看官网",
 
+  "name": "Realtor Easier",
 
   "font_family": "iconfont",
 
   "css_prefix_text": "icon-",
 
   "description": "",

BIN
pc/src/assets/images/home/logo.png
Прегледај датотеку


+ 8 - 6
pc/src/config/mall.js
Прегледај датотеку 

@@ -1,6 +1,9 @@
 
-import { i18n } from '@/lang'
 
-function formatNum(num){
 
-  return (num.toFixed(0) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,');
 
+import {
 
+  i18n
 
+} from '@/lang'
 
+
 
+function formatNum (num) {
 
+  return (num.toFixed(0) + '').replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
 
 }
 
 
 let cameraName = {
 
@@ -46,17 +49,16 @@ const goodsMap = {
 
   7: {
 
     name: i18n.t('mall.jiaojia'),
 
     img: `${window.$app.$cdn}images/zhijia.png`,
 
-    detail:  [`${i18n.t('mall.jiaojia')}(${i18n.t('mall.zhijiaColor')})`],
 
+    detail: [`${i18n.t('mall.jiaojia')}(${i18n.t('mall.zhijiaColor')})`],
 
     price: zhijiaPrice,
 
     skuSn: 'U15604134406280073'
 
   }
 
 }
 
 
-
 
 export default {
 
   formatNum,
 
   price,
 
   zhijiaPrice,
 
   showPrice: formatNum(price),
 
   goodsMap
 
-}
 
+}

+ 5 - 6
pc/src/page/cases/index.vue
Прегледај датотеку 

@@ -23,7 +23,7 @@
 
         <div  class="card_active card" :style="{'animation-delay': i*0.1 + 's'}">
 
           <card :data="item" ></card>
 
         </div>
 
-        
+
 
       </h-col>
 
     </h-row>
 
   </div>
 
@@ -76,7 +76,7 @@ const types = [
 
   {
 
     id: 0,
 
     name: i18n.t('kankanSpace.typeOther')
 
-  },
 
+  }
 
 ]
 
 
 const sub_types = [
 
@@ -94,10 +94,9 @@ const sub_types = [
 
     icon: 'case_new',
 
     name: i18n.t('kankanSpace.new'),
 
     id: 2
 
-  },
 
+  }
 
 ]
 
 
-
 
 export default {
 
   // import引入的组件需要注入到对象中才能使用
 
   components: {
 
@@ -126,7 +125,7 @@ export default {
 
   computed: {
 
     ...mapState({
 
       langCases: state => state.language.home.cases,
 
-      language: state => state.language.current,
 
+      language: state => state.language.current
 
     })
 
   },
 
   // 监控data中的数据变化
 
@@ -277,7 +276,7 @@ export default {
 
     width: 256px;
 
     padding-left: 20px;
 
   }
 
-  
+
 
 }
 
 .paging {
 
   // border-left: #e5e5e5 1px solid;

+ 1 - 1
pc/src/page/chat/index.vue
Прегледај датотеку 

@@ -1,5 +1,5 @@
 
 <template>
 
-  <div class="chat-layout">
 
+  <div class="chat-layout" v-if="false">
 
     <div class="hover-btn" @click="showAside=!showAside">
 
       <vcenter>
 
         <img :class="{'img-active':!showAside}" src="@/assets/images/home/chat-logo.png" alt="">

+ 70 - 67
pc/src/page/layout/header/index.vue
Прегледај датотеку 

@@ -2,13 +2,13 @@
 
   <div class="header-layout" :class="language === 'zh' ? '' : 'isInternational'">
 
     <div class="container clear">
 
       <div class="logo-layout">
 
-        <router-link :to="{name: 'home'}" class="logo">
 
+        <!-- <router-link :to="{name: 'home'}" class="log1o"> -->
 
           <vcenter>
 
-            <img :src="language === 'en' ? `https://4dscene.oss-cn-shenzhen.aliyuncs.com/new4dkk/v2/img/%E7%BB%84%203802.png` : require('@/assets/images/home/logo-cn.png')" alt>
 
+            <img :src=" require('@/assets/images/home/logo.png')" alt>
 
           </vcenter>
 
-        </router-link>
 
+        <!-- </router-link> -->
 
       </div>
 
-      <div class="menu">
 
+      <!-- <div class="menu">
 
         <div
 
           class="list"
 
           ref="list"
 
@@ -39,11 +39,11 @@
 
                 <li v-for="item in languageList" :key="item.name" :style="{'background-image': `url(${item.img})`}" @click="changeLanguage(item.value)">{{ item.name }}</li>
 
               </ul>
 
             </a>
 
-          </div>
 
+          </div> -->
 
           <!-- <span class="language en" :class="{'is-active': language === 'en'}" @click="changeLanguage('en')">EN</span>
 
           <span class="language" :class="{'is-active': language !== 'en'}" @click="changeLanguage('zh')">中</span> -->
 
-        </div>
 
-        <div class="loginAndRegis"  v-if="!isLogin"><span @click="$router.push('/login/login')">{{$t('login.login')}}</span>|<span @click="$router.push('/login/register')">{{$t('login.register')}}</span></div>
 
+        <!-- </div> -->
 
+        <!-- <div class="loginAndRegis"  v-if="!isLogin"><span @click="$router.push('/login/login')">{{$t('login.login')}}</span>|<span @click="$router.push('/login/register')">{{$t('login.register')}}</span></div>
 
         <div v-else class="user-w">
 
           <div class="user avatar" v-if="info.head"  :style="{'background-image': `url(${info.head})`}" @click="$router.push('/information')"></div>
 
           <div class="list">
 
@@ -58,7 +58,7 @@
 
         <div class="cart" @click="handleCartClick" v-if="isLogin">
 
           <h-icon type="xingouwuche" class="icon" />
 
           <span v-if="cartCount">{{cartCount}}</span>
 
-        </div>
 
+        </div> -->
 
       </div>
 
     </div>
 
   </div>
 
@@ -96,65 +96,68 @@ export default {
 
             }
 
           ]
 
         },
 
-        {text: this.$t('header.solutions'), items: [
 
-          {
 
-            text: this.$t('header.solutionsHouse'),
 
-            link: '/conductHouse'
 
-          },
 
-          {
 
-            text: this.$t('header.solutionsExi'),
 
-            link: '/conductExhibition'
 
-          },
 
-          {
 
-            text: this.$t('header.solutionsSubject'),
 
-            link: '/conductSubject'
 
-          },
 
-          {
 
-            text: this.$t('header.solutionsShop'),
 
-            link: '/conductShop'
 
-          },
 
-          {
 
-            text: this.$t('header.solutionsSec'),
 
-            link: '/conductSecury'
 
-          },
 
-        ]},
 
-        {text: this.$t('header.kankan_space'), 
-        link: '/cases/全部'
 
+        {text: this.$t('header.solutions'),
 
+          items: [
 
+            {
 
+              text: this.$t('header.solutionsHouse'),
 
+              link: '/conductHouse'
 
+            },
 
+            {
 
+              text: this.$t('header.solutionsExi'),
 
+              link: '/conductExhibition'
 
+            },
 
+            {
 
+              text: this.$t('header.solutionsSubject'),
 
+              link: '/conductSubject'
 
+            },
 
+            {
 
+              text: this.$t('header.solutionsShop'),
 
+              link: '/conductShop'
 
+            },
 
+            {
 
+              text: this.$t('header.solutionsSec'),
 
+              link: '/conductSecury'
 
+            }
 
+          ]},
 
+        {text: this.$t('header.kankan_space'),
 
+          link: '/cases/全部'
 
         },
 
-        {text: this.$t('header.core_tech'),  link: '/location'},
 
-        {text: this.$t('header.service'),  items: [
 
-          {
 
-            text: this.$t('header.serviceApp'),
 
-            link: '/service/app/pro'
 
-          },
 
-          {
 
-            text: this.$t('header.serviceUse'),
 
-            link: '/service/use/pro'
 
-          },
 
-          {
 
-            text: this.$t('header.serviceBaoxiu'),
 
-            link: '/service/clause/pro'
 
-          },
 
-          {
 
-            text: this.$t('header.serviceVideo'),
 
-            link: '/service/mVideo/all'
 
-          }
 
-        ]},
 
-        {text: this.$t('header.about'),  items: [
 
-          {
 
-            text: this.$t('header.aboutCompany'),
 
-            link: '/about'
 
-          },
 
-          {
 
-            text: this.$t('header.aboutNews'),
 
-            link: '/news'
 
-          },
 
-          {
 
-            text: this.$t('header.aboutAgent'),
 
-            link: '/distributor'
 
-          },
 
-          
-        ]}
 
+        {text: this.$t('header.core_tech'), link: '/location'},
 
+        {text: this.$t('header.service'),
 
+          items: [
 
+            {
 
+              text: this.$t('header.serviceApp'),
 
+              link: '/service/app/pro'
 
+            },
 
+            {
 
+              text: this.$t('header.serviceUse'),
 
+              link: '/service/use/pro'
 
+            },
 
+            {
 
+              text: this.$t('header.serviceBaoxiu'),
 
+              link: '/service/clause/pro'
 
+            },
 
+            {
 
+              text: this.$t('header.serviceVideo'),
 
+              link: '/service/mVideo/all'
 
+            }
 
+          ]},
 
+        {text: this.$t('header.about'),
 
+          items: [
 
+            {
 
+              text: this.$t('header.aboutCompany'),
 
+              link: '/about'
 
+            },
 
+            {
 
+              text: this.$t('header.aboutNews'),
 
+              link: '/news'
 
+            },
 
+            {
 
+              text: this.$t('header.aboutAgent'),
 
+              link: '/distributor'
 
+            }
 
+
 
+          ]}
 
       ]
 
     }
 
   },
 
@@ -235,7 +238,7 @@ export default {
 
   components: { vcenter },
 
   watch: {
 
     language (newVal) {
 
-      document.title = newVal === 'en' ? '4DKanKan' : '四维看看'
 
+      // document.title = newVal === 'en' ? '4DKanKan' : '四维看看'
 
     }
 
   }
 
 }

+ 1 - 1
pc/src/page/layout/header/istyle.scss
Прегледај датотеку 

@@ -1,7 +1,7 @@
 
 .header-layout {
 
   $mc: .5s cubic-bezier(.77, 0, .175, 1);
 
   $ts: all $mc;
 
-  background-color: #fff;
 
+  background-color: #000;
 
   color: #fff;
 
   justify-content: space-between;
 
   color: #202020;

+ 3 - 2
pc/src/page/layout/shop.vue
Прегледај датотеку 

@@ -7,7 +7,7 @@
 
     <div class="mask" :class="{active: showMask}" :style="{zIndex: maskZIndex}"></div>
 
     <ichat />
 
     <router-view />
 
-    <ifooter v-if="$route.name!=='about'" />
 
+    <!-- <ifooter v-if="$route.name!=='about'" /> -->
 
   </div>
 
 </template>
 
 
@@ -85,7 +85,8 @@ export default {
 
     (async () => {
 
       let res = await this.$store.dispatch('checkToken')
 
       if (localStorage.currentName === 'manage' && res) {
 
-        this.$router.push({name: 'home'})
 
+        // this.$router.push({name: 'home'})
 
+        this.$router.push('/login/login')
 
       }
 
     })()

+ 10 - 11
pc/src/page/layout/shopHeader/index.vue
Прегледај датотеку 

@@ -2,13 +2,13 @@
 
   <div class="header-layout">
 
     <div class="container clear">
 
       <div class="logo-layout">
 
-        <router-link :to="{name: 'home'}" class="logo">
 
+        <!-- <router-link :to="{name: 'home'}" class="logo"> -->
 
           <vcenter>
 
-            <img :src="language === 'en' ? `https://4dscene.oss-cn-shenzhen.aliyuncs.com/new4dkk/v2/img/%E7%BB%84%203802.png` : require('@/assets/images/home/logo-cn.png')" alt>
 
+            <img :src=" require('@/assets/images/home/logo.png')" alt>
 
           </vcenter>
 
-        </router-link>
 
+        <!-- </router-link> -->
 
       </div>
 
-      <div class="menu">
 
+      <!-- <div class="menu">
 
         <div
 
           class="list"
 
           ref="list"
 
@@ -26,7 +26,7 @@
 
               </li>
 
             </ul>
 
           </a>
 
-          
+
 
         </div>
 
       </div>
 
       <div class="ctrl">
 
@@ -58,7 +58,7 @@
 
           <h-icon type="xingouwuche" class="icon" />
 
           <span v-if="cartCount">{{cartCount}}</span>
 
         </div>
 
-      </div>
 
+      </div> -->
 
     </div>
 
   </div>
 
 </template>
 
@@ -84,7 +84,7 @@ export default {
 
       navs: [
 
         { text: this.$t('header.mallPro'), link: '/mall/kankanPro' },
 
         { text: this.$t('header.mallPeijian'), link: '/mall/zhijia' },
 
-        { text: this.$t('header.addService'), link: '/mall/cloudCapacity' },
 
+        { text: this.$t('header.addService'), link: '/mall/cloudCapacity' }
 
         // { text: this.$t('header.solutions'), items: [
 
         //   {
 
         //     text: this.$t('header.solutionsHouse'),
 
@@ -177,7 +177,7 @@ export default {
 
   components: { vcenter },
 
   watch: {
 
     language (newVal) {
 
-      document.title = newVal === 'en' ? '4DKanKan' : '四维看看'
 
+      // document.title = newVal === 'en' ? '4DKanKan' : '四维看看'
 
     }
 
   }
 
 }
 
@@ -213,7 +213,7 @@ export default {
 
 .header-layout {
 
   $mc: .5s cubic-bezier(.77, 0, .175, 1);
 
   $ts: all $mc;
 
-  background-color: #fff;
 
+  background-color: #000;
 
   color: #fff;
 
   justify-content: space-between;
 
   color: #202020;
 
@@ -281,7 +281,6 @@ export default {
 
       }
 
     }
 
 
-    
   }
 
   .list {
 
       justify-content: space-between;
 
@@ -411,7 +410,7 @@ export default {
 
   transition: all linear 0.5s;
 
   padding-top: 6px;
 
   white-space: nowrap;
 
-  
+
 
   background: #fff;
 
   &::before {
 
     position: absolute;

+ 5 - 4
pc/src/page/manage/index.vue
Прегледај датотеку 

@@ -23,7 +23,7 @@
 
               </div>
 
             </div>
 
           </div>
 
-          <div class="open-btn" :style="{backgroundColor:'#1fe4dc'}" @click="toastKR(detail.userId)">{{langMain.btnType.buy[detail.spaceId?'xufei':'name']}}</div>
 
+          <!-- <div class="open-btn" :style="{backgroundColor:'#1fe4dc'}" @click="toastKR(detail.userId)">{{langMain.btnType.buy[detail.spaceId?'xufei':'name']}}</div> -->
 
       </div>
 
     </div>
 
     <div class="manage-body ">
 
@@ -106,9 +106,10 @@ export default {
 
         case 'logout':
 
           this.$toast.showConfirm('warn', this.language === 'en' ? 'Are you sure to log out?' : '确定要退出登录吗？', async () => {
 
             await this.$store.dispatch('logout')
 
-            this.$router.push({
 
-              name: 'home'
 
-            })
 
+            // this.$router.push({
 
+            //   name: 'login'
 
+            // })
 
+            this.$router.push('/login/login')
 
           })
 
           break

+ 5 - 1
pc/src/page/manage/style.scss
Прегледај датотеку 

@@ -1,7 +1,11 @@
 
 .manage-layout{
 
+  
   $font-color:#2d2d2d;
 
   $theme-color:#1fe4dc;
 
   position: relative;
 
+  width: 100vw;
 
+  height: 100vh;
 
+  background: #f4f4f6;
 
   .manage-bg{
 
     background: url(https://4dscene.4dage.com/new4dkk/images/person-bg.png) no-repeat top center;
 
     background-size: cover;
 
@@ -139,7 +143,7 @@
 
   }
 
   .manage-body{
 
     min-height: 676px;
 
-    padding: 80px 0;
 
+    padding: 100px 0;
 
     background-color: #f4f4f6;
 
     .container {
 
       display: flex;

+ 2 - 1
pc/src/page/manage/temp/device.vue
Прегледај датотеку 

@@ -150,7 +150,8 @@ export default {
 
       tabActive: 4,
 
       currentPage: 1,
 
       total: 0,
 
-      isImgType: isImgType,
 
+      // isImgType: isImgType,
 
+      isImgType: true,
 
       searchKey: '',
 
       pageSize: 8,
 
       isWide: window.innerWidth > 1300,

+ 3 - 3
pc/src/page/manage/temp/information.vue
Прегледај датотеку 

@@ -63,7 +63,7 @@
 
       </div>
 
     </edit>
 
 
-    <edit
 
+    <!-- <edit
 
       :name="langAccount.address"
 
       @clickOper="handleOper('addressStatus')"
 
       :oper="addressStatus?langAccount.edit:langAccount.show"
 
@@ -99,7 +99,7 @@
 
         </div>
 
         <div class="btn parmary" @click="uAddress">{{langAccount.save}}</div>
 
       </div>
 
-    </edit>
 
+    </edit> -->
 
   </div>
 
 </template>
 
 
@@ -451,7 +451,7 @@ export default {
 
   $info-width: 120px;
 
 
   width: 90%;
 
-  padding-bottom: 100px;
 
+  // padding-bottom: 100px;
 
   input {
 
     appearance: none;
 
     line-height: 36px;

+ 10 - 9
pc/src/page/manage/temp/scene.vue
Прегледај датотеку 

@@ -37,7 +37,7 @@
 
             type="text"
 
             :placeholder="langScenes.placeholder.searchID"
 
           />
 
-          
+
 
           <!-- <i class="iconfont icon-sousuo" @click="gotoSearch(searchKey)"></i> -->
 
         </div>
 
         <div class="search-btn" @click="gotoSearch(searchKey)">{{ $t('manage.sceneAdmin.search')}}</div>
 
@@ -241,7 +241,7 @@ export default {
 
       startTime: '',
 
       endTime: '',
 
       weekdays: ['一', '二', '三', '四', '五', '六', '日'],
 
-      months: ['1月', '2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月']
 
+      months: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
 
     }
 
   },
 
   watch: {
 
@@ -316,7 +316,7 @@ export default {
 
     }
 
     if (this.language !== 'zh') {
 
       this.weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
 
-      this.months = ['January', 'February', 'March', 'April','May', 'June', 'July', 'August','September', 'October', 'November', 'December']
 
+      this.months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']
 
     }
 
   },
 
   methods: {
 
@@ -445,8 +445,10 @@ export default {
 
             break
 
         }
 
       }
 
-
 
       url = pStr ? url.replace(page, pStr) : url
 
+      // 预留代码 为了跳转根域名
 
+      let queryParams = url.split('.html')[1]
 
+      console.log(window.location.origin + '/' + pStr + '.html' + queryParams)
 
 
       window.open(url.replace('http://', 'https://') + (this.language === 'en' ? '&lang=en' : ''), '_blank')
 
     },
 
@@ -512,11 +514,10 @@ export default {
 
         searchKey: this.searchKey.trim(),
 
         cameraType,
 
         startTime: new Date(this.startTime).getTime(),
 
-        endTime: new Date(this.endTime).getTime() + 86400000,
 
+        endTime: new Date(this.endTime).getTime() + 86400000
 
       }
 
       if (this.tabActive === 2) {
 
         await this.$store.dispatch('getCooperationScene', params)
 
-        
       } else {
 
         cameraId
 
           ? await this.$store.dispatch('getScanScene', params)
 
@@ -565,7 +566,7 @@ export default {
 
     isAfter (date) {
 
       const endDate = new Date(this.endTime)
 
       return date > endDate
 
-    },
 
+    }
 
   }
 
 }
 
 </script>
 
@@ -628,7 +629,7 @@ $font-color: #2d2d2d;
 
           margin-left: 10px;
 
         }
 
       }
 
-      
+
 
       .main-list{
 
         display: inline-block;
 
         margin-left: 20px;
 
@@ -1157,4 +1158,4 @@ $font-color: #2d2d2d;
 
     }
 
   }
 
 }
 
-</style>
 
+</style>

+ 12 - 15
pc/src/router/index.js
Прегледај датотеку 

@@ -114,29 +114,29 @@ let router = new Router({
 
         {
 
           path: 'kankanPro',
 
           name: 'mallHome',
 
-          component: resolve => require(['@/page/mall/kankanPro'], resolve),
 
+          component: resolve => require(['@/page/mall/kankanPro'], resolve)
 
         },
 
         {
 
           path: 'zhijia',
 
-          component: resolve => require(['@/page/mall/zhijia'], resolve),
 
+          component: resolve => require(['@/page/mall/zhijia'], resolve)
 
         },
 
         {
 
           path: 'cart',
 
-          component: resolve => require(['@/page/mall/cart'], resolve),
 
+          component: resolve => require(['@/page/mall/cart'], resolve)
 
         },
 
         {
 
           path: 'confirm',
 
-          component: resolve => require(['@/page/mall/confirm'], resolve),
 
+          component: resolve => require(['@/page/mall/confirm'], resolve)
 
         },
 
         {
 
           path: 'pay',
 
           name: 'pay',
 
-          component: resolve => require(['@/page/mall/pay'], resolve),
 
+          component: resolve => require(['@/page/mall/pay'], resolve)
 
         },
 
         {
 
           path: 'cloudCapacity',
 
           name: 'cloudCapacity',
 
-          component: resolve => require(['@/page/mall/cloudCapacity'], resolve),
 
+          component: resolve => require(['@/page/mall/cloudCapacity'], resolve)
 
         },
 
         {
 
           path: '/',
 
@@ -160,7 +160,7 @@ let router = new Router({
 
               path: '/order',
 
               component: resolve => require(['@/page/manage/temp/order'], resolve),
 
               meta: {requireAuth: true}
 
-    
+
 
             },
 
             {
 
               name: 'consumption',
 
@@ -191,7 +191,7 @@ let router = new Router({
 
           path: '/introtow/:id',
 
           name: 'introtow',
 
           component: resolve => require(['@/page/introtow'], resolve)
 
-        },
 
+        }
 
       ]
 
     },
 
     {
 
@@ -239,7 +239,7 @@ let router = new Router({
 
     //   name: 'binocular',
 
     //   component: resolve => require(['@/page/binocular'], resolve)
 
     // },
 
-    
+
 
     {
 
       path: '/eight',
 
       name: 'eight',
 
@@ -285,8 +285,7 @@ let router = new Router({
 
     //   name: 'introduce',
 
     //   component: resolve => require(['@/page/introduce'], resolve)
 
     // },
 
-    
-    
+
 
     {
 
       path: '/service/down',
 
       name: 'service_down',
 
@@ -326,7 +325,7 @@ router.beforeEach((to, from, next) => {
 
   let token = store.state.user.token
 
   if (to.path == '/dev') {
 
     import('./../components/dev').then(dev => {
 
-        dev.configuration()
 
+      dev.configuration()
 
     })
 
     return
 
   }
 
@@ -335,9 +334,7 @@ router.beforeEach((to, from, next) => {
 
     if (token) {
 
       next()
 
     } else {
 
-      next({
 
-        name: 'home'
 
-      })
 
+      next()
 
     }
 
   } else {
 
     localStorage.currentName = ''

+ 9 - 13
pc/src/store/language/cn/manage.js
Прегледај датотеку 

@@ -19,7 +19,7 @@ export default{
 
   information: {
 
     nameArr: {
 
       information: '账号信息',
 
-      scene: '场景管理',
 
+      scene: '我的场景',
 
       order: '我的订单',
 
       device: '我的相机',
 
       consumption: '消费记录',
 
@@ -33,28 +33,24 @@ export default{
 
           name: '账号信息',
 
           to: {name: 'information'}
 
         }, {
 
-          name: '场景管理',
 
+          name: '我的场景',
 
           to: {name: 'scene'}
 
         }, {
 
           name: '我的相机',
 
           to: {name: 'device'}
 
         }, {
 
-          name: '我的订单',
 
-          to: {name: 'order'}
 
-        }, {
 
-          name: '消费记录',
 
-          to: {name: 'consumption'}
 
-        }]
 
-      },
 
-      {
 
-        name: 'security',
 
-        items: [{
 
           name: '修改密码',
 
-          to: {name: 'change'}
 
+          to: {
 
+            name: 'change'
 
+          }
 
         }, {
 
           name: '退出登录',
 
           to: 'logout'
 
         }]
 
+      },
 
+      {
 
+        name: 'security',
 
+        items: []
 
       }
 
     ],
 
     deviceSettings: [

+ 4 - 4
pc/src/store/language/index.js
Прегледај датотеку 

@@ -17,13 +17,13 @@ if (!current) {
 
   current = window.navigator.language || window.navigator.userLanguage || null
 
   console.log('自动获取浏览器语言:' + current)
 
   if (current && !/^zh/.test(current)) {
 
-      current = 'en'
 
-  }else{
 
+    current = 'en'
 
+  } else {
 
     current = 'zh'
 
   }
 
 }
 
 
-document.title = current === 'en' ? '4DKanKan' : '四维看看'
 
+// document.title = current === 'en' ? '4DKanKan' : '四维看看'
 
 let languageMap = {
 
   zh: cn,
 
   en: en,
 
@@ -45,7 +45,7 @@ export default {
 
         name: 'English',
 
         img: require('@/assets/images/home/USA@2x.jpg'),
 
         value: 'en'
 
-      },
 
+      }
 
       // {
 
       //   name: 'Français',
 
       //   img: require('@/assets/images/home/France@2x.jpg'),