feat：更新

pc/build/webpack.base.conf.js

@@ -60,7 +60,7 @@ module.exports = {
         options: {
           limit: 10000,
           name: utils.assetsPath('v2/images/[path][name].[ext]'),
-          publicPath: isProd ? 'https://testusaoss.4dkankan.com/new4dkk/' : ''
+          publicPath: isProd ? '/oss/new4dkk/' : ''
         }
       },
       {

pc/build/webpack.dev.conf.js

@@ -47,9 +47,9 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     },
     proxy: {
       '/api': {
-        // target: 'https://test.4dkankan.com',
+        target: 'https://test.4dkankan.com',
         // target: 'https://testusa.4dkankan.com',
-        target: 'https://falconvisual.brokersbus.com',
+        // target: 'https://falconvisual.brokersbus.com',
         // target: 'http://192.168.0.50:8080',
         changeOrigin: true
       },

pc/index.html

@@ -12,11 +12,11 @@
     <meta name="full-screen" content="yes">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
-    <link rel="shortcut icon" href="./static/img/favicon.ico">
+    <!-- <link rel="shortcut icon" href="./static/img/favicon.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>Falcon Visual相机管理后台</title>
+    <title>宝略科技VR相机管理后台</title>
     <script>
       var _hmt = _hmt || [];
       (function() {

pc/src/assets/style/public.scss

@@ -316,15 +316,15 @@ body{
 .check_active{
   &::before{
     content: '';
-    background: #1fe4dc;
-    border: #1fe4dc 1px solid;
+    background: rgb(250, 205, 145);
+    border: rgb(250, 205, 145) 1px solid;
   }
   &::after{
     left: -17px;
     top: 50%;
     position: absolute;
     display: table;
-    border: 2px solid #000;
+    border: 2px solid #fff;
     border-top: 0;
     border-left: 0;
     transform: rotate(45deg) translate(-50%, -50%);

pc/src/components/compare/index.vue

@@ -170,7 +170,7 @@ export default {
   .overlap .l-move::before {
     width: 40px;
     z-index: 15;
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/border-linear.png) left top no-repeat;
+    background: url(/oss/new4dkk/images/border-linear.png) left top no-repeat;
   }
   /* .overlap .r-move::before {
     width: 0;
@@ -184,7 +184,7 @@ export default {
     top: 0;
     width: 40px;
     z-index: 15;
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/border-linear-r.png) right top no-repeat;
+    background: url(/oss/new4dkk/images/border-linear-r.png) right top no-repeat;
   }
 
   .c-video{

pc/src/components/dev/components/News.vue

@@ -102,7 +102,7 @@ export default {
         loadNews () {
             let urlMap = {
                 zh: '@/../common/data/news.json',
-                en: 'https://testusaoss.4dkankan.com/new4dkk/news-en.json'
+                en: '/oss/new4dkk/news-en.json'
             }
             http.get(`../dev/news/${this.curr}`).then(res => {
                 console.log(res)

pc/src/components/tablePaging/index.vue

@@ -123,13 +123,13 @@ export default {
     height: 20px;
     margin-right: 22px;
     cursor: pointer;
-    background-image: url(https://testusaoss.4dkankan.com/new4dkk/images/btn_leftArrow_normal.png);
-    background-image: image-set(url(https://testusaoss.4dkankan.com/new4dkk/images/btn_leftArrow_normal.png) 1x);
+    background-image: url(/oss/new4dkk/images/btn_leftArrow_normal.png);
+    background-image: image-set(url(/oss/new4dkk/images/btn_leftArrow_normal.png) 1x);
     background-repeat: no-repeat;
     background-position: 0 2px;
     // &:hover{
-    // background-image: url(https://testusaoss.4dkankan.com/new4dkk/images/btn_leftArrow_hover.png);
-    // background-image: image-set(url(https://testusaoss.4dkankan.com/new4dkk/images/btn_leftArrow_hover.png) 1x);
+    // background-image: url(/oss/new4dkk/images/btn_leftArrow_hover.png);
+    // background-image: image-set(url(/oss/new4dkk/images/btn_leftArrow_hover.png) 1x);
     // }
   }
   .page-current{
@@ -159,8 +159,8 @@ export default {
     height: 20px;
     margin-left: 22px;
     cursor: pointer;
-    background-image: url(https://testusaoss.4dkankan.com/new4dkk/images/btn_rightArrow_normal.png);
-    background-image: image-set(url(https://testusaoss.4dkankan.com/new4dkk/images/btn_rightArrow_normal.png) 1x);
+    background-image: url(/oss/new4dkk/images/btn_rightArrow_normal.png);
+    background-image: image-set(url(/oss/new4dkk/images/btn_rightArrow_normal.png) 1x);
     background-repeat: no-repeat;
     background-position: 0 2px;
   }

pc/src/components/toast/capacityRecharge.vue

@@ -53,7 +53,7 @@
               @click="paytype='alipay'"
               v-if="!capacitycountry"
             >
-              <img :src="`${$cdn}images/ali-pay.png`" class="t-icon" alt />
+              <!-- <img :src="`${$cdn}images/ali-pay.png`" class="t-icon" alt /> -->
               <span>{{langauge==='en'?'Alipay':'支付宝'}}</span>
               <img :src="`${$cdn}images/tag-icon.png`" class="t-click" alt />
             </div>
@@ -63,7 +63,7 @@
               @click="paytype='wechatPay'"
               v-if="!capacitycountry"
             >
-              <img :src="`${$cdn}images/wechat-pay.png`" class="t-icon" alt />
+              <!-- <img :src="`${$cdn}images/wechat-pay.png`" class="t-icon" alt /> -->
               <span>{{langauge==='en'?'Wechat':'微信支付'}}</span>
               <img :src="`${$cdn}images/tag-icon.png`" class="t-click" alt />
             </div>

pc/src/components/toast/extendtoast.vue

@@ -4,7 +4,7 @@
 
 <script>
 import Toast from './index.vue'
-let baseUrl = process.env.IS_INTERNATIONAL ? '/' : 'https://testusaoss.4dkankan.com/new4dkk/'
+let baseUrl = process.env.IS_INTERNATIONAL ? '/' : '/oss/new4dkk/'
 
 let imgs = {
   success: baseUrl + 'images/icon/success.png',

pc/src/components/toast/index.vue

@@ -31,13 +31,13 @@
         </div>
         <div class="t-line"></div>
         <div class="detail">
-          <img :src="img" alt>
+          <!-- <img :src="img" alt> -->
           <span v-html="message"></span>
         </div>
         <div class="t-line"></div>
         <div class="bottom" v-if="toastType==='comfirm'">
           <span class="btn primary" @click="emitCallback">{{diycomfirm||comfirmtxt}}</span>
-          <span @click="visible=false,cancal()" class="btn cancel">{{lang==='en'?'Cancel':'取消'}}</span>
+          <!-- <span @click="visible=false,cancal()" class="btn cancel">{{lang==='en'?'Cancel':'取消'}}</span> -->
         </div>
         <div class="bottom mid-bottom" v-else>
           <span class="btn primary" @click="emitCallback">{{diycomfirm||comfirmtxt}}</span>

pc/src/components/toast/pointRecharge.vue

@@ -36,7 +36,7 @@
               @click="paytype='alipay'"
               v-if="langauge!=='en'"
             >
-              <img :src="`${$cdn}images/ali-pay.png`" class="t-icon" alt />
+              <!-- <img :src="`${$cdn}images/ali-pay.png`" class="t-icon" alt /> -->
               <span>支付宝</span>
               <img :src="`${$cdn}images/tag-icon.png`" class="t-click" alt />
             </div>
@@ -46,7 +46,7 @@
               @click="paytype='wechatPay'"
               v-if="langauge!=='en'"
             >
-              <img :src="`${$cdn}images/wechat-pay.png`" class="t-icon" alt />
+              <!-- <img :src="`${$cdn}images/wechat-pay.png`" class="t-icon" alt /> -->
               <span>微信支付</span>
               <img :src="`${$cdn}images/tag-icon.png`" class="t-click" alt />
             </div>

pc/src/components/toast/style.scss

@@ -1,4 +1,4 @@
-$theme-color: #1fe4dc;
+$theme-color: rgb(250, 205, 145);
 $font-color: #2d2d2d;
 $anima-time:0.2s;
 $anima-delay:0.15s;
@@ -23,8 +23,8 @@ $border-color: #e7e7e7;
 .check_active{
   &::before{
     content: '';
-    background: #1fe4dc;
-    border: #1fe4dc 1px solid;
+    background: rgb(250, 205, 145);
+    border: rgb(250, 205, 145) 1px solid;
   }
   &::after{
     left: -17px;
@@ -45,7 +45,7 @@ $border-color: #e7e7e7;
 
 .btn {
   width: 88px;
-  color: #2d2d2d;
+  color: #222;
   display: inline-block;
   font-size: 14px;
   text-align: center;
@@ -57,6 +57,8 @@ $border-color: #e7e7e7;
 }
 .primary {
   background: $theme-color;
+  display: block;
+  margin:0 auto;
 }
 .cancel {
   background: #e6e6e6;
@@ -580,7 +582,7 @@ $border-color: #e7e7e7;
     }
     .bottom {
       padding: 0 36px;
-      float: right;
+      // float: right;
     }
     .mid-bottom {
       float: none;

pc/src/components/toast/toast.js

@@ -1,6 +1,6 @@
 import ToastComponent from './index.vue'
 const Toast = {}
-let baseUrl = 'https://testusaoss.4dkankan.com/new4dkk/'
+let baseUrl = '/oss/new4dkk/'
 // 注册Toast
 Toast.install = function (Vue) {
   // 生成一个Vue的子类

pc/src/lang/zh/modules/manage.js

@@ -18,7 +18,7 @@ module.exports = {
     search: '查询'
   },
   deviceAdmin: {
-    addDevice: '新增相机',
+    addDevice: '新增',
     collaborative: '协作',
     unbind: '解绑',
     snCode: 'S/N',
@@ -29,4 +29,4 @@ module.exports = {
     sceneCount: '拍摄场景数量',
     lastTime: '最后拍摄时间'
   }
-}
+}

pc/src/main.js

@@ -8,7 +8,7 @@ import { i18n } from './lang'
 import './register-components'
 // import axios from './util/http.js'
 // import router from './router'
-Vue.prototype.$cdn = process.env.IS_INTERNATIONAL ? 'https://testusaoss.4dkankan.com/new4dkk/' : 'https://testusaoss.4dkankan.com/new4dkk/'
+Vue.prototype.$cdn = process.env.IS_INTERNATIONAL ? '/oss/new4dkk/' : '/oss/new4dkk/'
 
 Vue.use(vuex)
 Vue.use(Toast)

pc/src/page/about/mstyle.scss

@@ -57,7 +57,7 @@
       }
       h3::before {
         content: "";
-        background: url(https://testusaoss.4dkankan.com/new4dkk/images/cicle.png) center no-repeat;
+        background: url(/oss/new4dkk/images/cicle.png) center no-repeat;
         z-index: 1000;
         display: inline-block;
         width: 12px;

pc/src/page/about/style.scss

@@ -154,7 +154,7 @@ $txt_delay: 0.2s;
         }
         h3::before {
           content: "";
-          background: url(https://testusaoss.4dkankan.com/new4dkk/images/cicle.png) center no-repeat;
+          background: url(/oss/new4dkk/images/cicle.png) center no-repeat;
           z-index: 1000;
           display: inline-block;
           width: 18px;

pc/src/page/binocular/style.scss

@@ -9,7 +9,7 @@ $txt_delay: 0.2s;
 }
 .product-layout {
   overflow: hidden;
-  // background: url("https://testusaoss.4dkankan.com/new4dkk/images/background.jpg") top -135px center no-repeat;
+  // background: url("/oss/new4dkk/images/background.jpg") top -135px center no-repeat;
 }
 
 .btns{
@@ -202,12 +202,12 @@ $txt_delay: 0.2s;
         font-weight: 600;
       }
       .apple {
-        background: url("https://testusaoss.4dkankan.com/new4dkk/images/apple.png")
+        background: url("/oss/new4dkk/images/apple.png")
           #4d4d4d left 30px center no-repeat;
         background-size: 32px auto;
       }
       .android {
-        background: url("https://testusaoss.4dkankan.com/new4dkk/images/android.png")
+        background: url("/oss/new4dkk/images/android.png")
           #2fd36a left 30px center no-repeat;
         background-size: 32px auto;
       }
@@ -245,7 +245,7 @@ $txt_delay: 0.2s;
   overflow: hidden;
   position: relative;
   padding: 150px 0 30px;
-  background: url("https://testusaoss.4dkankan.com/new4dkk/images/linear_bg.png")
+  background: url("/oss/new4dkk/images/linear_bg.png")
     #010101 top center no-repeat;
   background-size: 100% auto;
   // background:linear-gradient(
@@ -291,7 +291,7 @@ $txt_delay: 0.2s;
     align-items: center;
     margin: 23px auto 60px;
     height: 700px;
-    background: url("https://testusaoss.4dkankan.com/new4dkk/images/fk_wangge.png")
+    background: url("/oss/new4dkk/images/fk_wangge.png")
       left -400px top no-repeat;
     background-size: 100%;
 
@@ -520,7 +520,7 @@ $txt_delay: 0.2s;
       width: 75vw;
       margin: -20px auto 0;
       height: 42vw;
-      background-image: url("https://testusaoss.4dkankan.com/new4dkk/images/boomImg.png");
+      background-image: url("/oss/new4dkk/images/boomImg.png");
       background-repeat: no-repeat;
       background-position: 0% 0px;
       background-size: cover;
@@ -631,7 +631,7 @@ $txt_delay: 0.2s;
     margin-top: 60px;
     .button {
       padding: 0 98px;
-      // background: url('https://testusaoss.4dkankan.com/new4dkk/images/product_icon_arrow.png') #1fe4dc center left 30% no-repeat;
+      // background: url('/oss/new4dkk/images/product_icon_arrow.png') #1fe4dc center left 30% no-repeat;
       margin-left: 8px;
     }
   }

pc/src/page/capacity/index.vue

@@ -54,7 +54,7 @@ export default {
 
 <style lang="scss" scoped>
 .capatity-layout{
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/person-bg.png) #eee no-repeat top center;
+    background: url(/oss/new4dkk/images/person-bg.png) #eee no-repeat top center;
     background-size: 100% 400px;
     .capatity-con{
       width: 1100px;

pc/src/page/eight/style.scss

@@ -208,11 +208,11 @@ $num_time: 0.6s;
         font-weight: 600;
       }
       .apple{
-        background: url(https://testusaoss.4dkankan.com/new4dkk/images/apple.png) #4d4d4d left 30px center no-repeat;
+        background: url(/oss/new4dkk/images/apple.png) #4d4d4d left 30px center no-repeat;
         background-size: 32px auto;
       }
       .android{
-        background: url(https://testusaoss.4dkankan.com/new4dkk/images/android.png) #2fd36a left 30px center no-repeat;
+        background: url(/oss/new4dkk/images/android.png) #2fd36a left 30px center no-repeat;
         background-size: 32px auto;
       }
     }
@@ -335,7 +335,7 @@ $num_time: 0.6s;
         width: 57.5vw;
         height: 20vw;
         margin-left: 280px;
-        background-image: url(https://testusaoss.4dkankan.com/new4dkk/images/xinpian.png);
+        background-image: url(/oss/new4dkk/images/xinpian.png);
         background-repeat: no-repeat;
         background-position: 0% 0px;
         background-size: cover;
@@ -407,7 +407,7 @@ $num_time: 0.6s;
 
 .plate05{
   padding: 155px 0 0;
-  background: url(https://testusaoss.4dkankan.com/new4dkk/images/lin-bg.png) #060606 top center no-repeat;
+  background: url(/oss/new4dkk/images/lin-bg.png) #060606 top center no-repeat;
   background-size: 100% auto;
   // .num-lighting{
   //   height: 0;
@@ -511,13 +511,13 @@ $num_time: 0.6s;
     .qxd-4{
       margin-top: 40px;
       padding: 144px 0 172px;
-      background: url(https://testusaoss.4dkankan.com/new4dkk/images/battery-bg.png) top center no-repeat;
+      background: url(/oss/new4dkk/images/battery-bg.png) top center no-repeat;
       .qxd-4-battery{
         margin: 0 auto;
         width: 679px;
         height: 131px;
         position: relative;
-        background: url(https://testusaoss.4dkankan.com/new4dkk/images/battery-right.png) top center no-repeat;
+        background: url(/oss/new4dkk/images/battery-right.png) top center no-repeat;
         .b-l{
           $skew_num:25deg;
           $position:23px;
@@ -576,7 +576,7 @@ $num_time: 0.6s;
         .lighting{
           width: 80px;
           height: 130px;
-          background-image: url(https://testusaoss.4dkankan.com/new4dkk/images/lighting.png);
+          background-image: url(/oss/new4dkk/images/lighting.png);
           background-repeat: no-repeat;
           background-position: 0% 0px;
           background-size: cover;
@@ -624,7 +624,7 @@ $num_time: 0.6s;
       width: 75vw;
       margin: 0 auto;
       height: 42vw;
-      background-image: url("https://testusaoss.4dkankan.com/new4dkk/images/boomImg8-1.png");
+      background-image: url("/oss/new4dkk/images/boomImg8-1.png");
       background-repeat: no-repeat;
       background-position: 0% 0px;
       background-size: cover;

pc/src/page/home/style.scss

@@ -243,7 +243,7 @@
           padding-right: 30px;
           padding-top: 10px;
           display: inline-block;
-          background: url(https://testusaoss.4dkankan.com/new4dkk/images/index_icon_record_arrow.png) no-repeat top right;
+          background: url(/oss/new4dkk/images/index_icon_record_arrow.png) no-repeat top right;
         }
 
         p {

pc/src/page/introduce/style.scss

@@ -41,7 +41,7 @@
   }
 
   .introduce-bg{
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/person-bg.png) no-repeat top center;
+    background: url(/oss/new4dkk/images/person-bg.png) no-repeat top center;
     background-size: cover;
     .introduce-con{
       padding: 30px 0;

pc/src/page/introtow/style.scss

@@ -3,7 +3,7 @@
   $theme-color:#1fe4dc;
 
   .introduce-bg{
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/person-bg.png) no-repeat top center;
+    background: url(/oss/new4dkk/images/person-bg.png) no-repeat top center;
     background-size: cover;
     .introduce-con{
       padding: 30px 0;

pc/src/page/layout/aside/index.vue

@@ -5,9 +5,9 @@
       <div>
         <div class="clause-img" ref="clause">
           <div ref="clauseImg">
-            <img :src="cluseType==='cart'?`${$cdn}images/cluse-long1v2.jpg`:`${$cdn}images/${language==='en'?'cluse-long-en':'cluse-long'}.jpg`" alt>
-            <img v-if="cluseType!=='cart'&&language==='en'" :src="`${$cdn}images/cluse-long-en1.jpg`" alt>
-            <img v-if="cluseType!=='cart'&&language==='en'" :src="`${$cdn}images/cluse-long-en2.jpg`" alt>
+            <!-- <img :src="cluseType==='cart'?`${$cdn}images/cluse-long1v2.jpg`:`${$cdn}images/${language==='en'?'cluse-long-en':'cluse-long'}.jpg`" alt> -->
+            <!-- <img v-if="cluseType!=='cart'&&language==='en'" :src="`${$cdn}images/cluse-long-en1.jpg`" alt> -->
+            <!-- <img v-if="cluseType!=='cart'&&language==='en'" :src="`${$cdn}images/cluse-long-en2.jpg`" alt> -->
           </div>
         </div>
         <p>{{languagelAside.xieyi}}</p>

pc/src/page/layout/aside/temp/ctemp/detail.scss

@@ -352,7 +352,7 @@ input {
           border: 1px solid #e7e7e7;
         }
         .fobid{
-          cursor: url(https://testusaoss.4dkankan.com/new4dkk/images/forbid.png),auto;
+          cursor: url(/oss/new4dkk/images/forbid.png),auto;
           color: #ccc;
           background-color: #f7f8fa;
           border-color: #e6e7eb;

pc/src/page/layout/aside/temp/ctemp/list.vue

@@ -357,7 +357,7 @@ $border-color: #e7e7e7;
             border: 1px solid #e7e7e7;
           }
           .fobid {
-            cursor: url(https://testusaoss.4dkankan.com/new4dkk/images/forbid.png), auto;
+            cursor: url(/oss/new4dkk/images/forbid.png), auto;
             color: #ccc;
             background-color: #f7f8fa;
             border-color: #e6e7eb;
@@ -467,7 +467,7 @@ $border-color: #e7e7e7;
           border: 1px solid #e7e7e7;
         }
         .fobid{
-          cursor: url(https://testusaoss.4dkankan.com/new4dkk/images/forbid.png),auto;
+          cursor: url(/oss/new4dkk/images/forbid.png),auto;
           color: #ccc;
           background-color: #f7f8fa;
           border-color: #e6e7eb;

pc/src/page/layout/header/style.scss

@@ -62,7 +62,7 @@
     $ts: all .7s cubic-bezier(.77,0,.175,1);
     justify-content: space-between;
 
-    background-color: $bgcolor;
+
     display: flex;
 
     .logo .icon-logo_b {

pc/src/page/layout/shopHeader/index.vue

@@ -3,10 +3,11 @@
     <div class="container clear">
       <div class="logo-layout">
         <!-- <router-link :to="{name: 'home'}" class="logo"> -->
-          <vcenter>
-            <!-- <img src="https://testusaoss.4dkankan.com/new4dkk/images/logo.png" alt> -->
-            <img src="https://testusaoss.4dkankan.com/new4dkk/images/logo.svg" alt>
-          </vcenter>
+          <!-- <vcenter> -->
+            <!-- <img src="/oss/new4dkk/images/logo.png" alt> -->
+            <img src="/oss/new4dkk/images/logo-bl.png" alt>
+            <h1>宝略科技VR相机管理后台</h1>
+          <!-- </vcenter> -->
         <!-- </router-link> -->
       </div>
       <!-- <div class="menu">
@@ -214,7 +215,8 @@ export default {
 .header-layout {
   $mc: .5s cubic-bezier(.77, 0, .175, 1);
   $ts: all $mc;
-  background-color: #fff;
+    background: rgb(250, 205, 145);
+
   color: #fff;
   justify-content: space-between;
   color: #202020;
@@ -247,6 +249,9 @@ export default {
     margin-right: 52px;
     float: left;
     height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
     .logo {
       position: relative;
       width: 150px;
@@ -255,8 +260,9 @@ export default {
       color: #fff;
     }
     img{
-      width: 230px;
-      height: 38px;
+      width: 40px;
+      height: 40px;
+      margin-right: 10px;
     }
   }
 

pc/src/page/login/components/login.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="login-box">
-    <div class="login-tabs">
+    <!-- <div class="login-tabs">
       <div class="login-tab" :class="{'is-active': !type || type === 'codeLogin'}" @click="toOtherLogin('')">{{$t('login.userLogin')}}</div><div class="login-tab" :class="{'is-active': type==='camera'}" @click="toOtherLogin('camera')">{{$t('login.cameraLogin')}}</div>
-    </div>
+    </div> -->
     <div class="account-login" v-if="!type">
       <!-- <input type="text" v-if="!isInternational" oninput="value=value.replace(/[^\d]/g,'')" maxlength="11" class="input" :placeholder="isInternational? $t('login.emailPlaceholder') : $t('login.phonePlaceholder')" v-model="form.phone"> -->
       <!-- <input type="text" v-else class="input" :placeholder="isInternational? $t('login.emailPlaceholder') : $t('login.phonePlaceholder')" v-model="form.phone"> -->
@@ -17,10 +17,10 @@
       </div>
       <div class="checkbox"><input type="checkbox" v-model="rememberMe" id="rember" /><label for="rember">{{$t('login.rememberPassword')}}</label></div>
       <div class="login-btn"  @click="login" >{{$t('login.login')}}</div>
-      <div class="others">
+      <!-- <div class="others">
         <a class="other-actions" @click="$router.push('/login/forget')">{{ $t('login.forgetPassword') }}<span class="line" @click.stop=""></span></a>
         <a class="other-actions" @click="$router.push(isInternational ? '/login/register?type=email' : '/login/register')">{{ $t('login.registerAccount') }}</a>
-      </div>
+      </div> -->
     </div>
     <cameraLogin v-if="type === 'camera'" />
     <codeLogin v-if="type === 'codeLogin'" />
@@ -121,7 +121,7 @@ export default {
         const from = this.$route.query.from
 
         // this.$router.push('/information')
-        this.$router.push('/scene')
+        this.$router.push('/device')
       } catch (err) {
 
       }
@@ -155,7 +155,7 @@ export default {
   margin-bottom: 38px;
   cursor: pointer;
   &.is-active {
-    border-bottom: 2px solid #1FE4DC;
+    border-bottom: 2px solid #facd91;
     padding-bottom: 9px;
   }
 }
@@ -199,13 +199,14 @@ export default {
 }
 .login-btn {
   margin: 36px 0 18px;
-  background: #1FE4DC;
+  background: #facd91;
   width: 100%;
   text-align: center;
   line-height: 60px;
   font-weight: 600;
   border-radius: 3px;
   cursor: pointer;
+  color: #222;
 }
 .others {
   text-align: center;

pc/src/page/login/index.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="login-page">
+    <div class="logo-msg">
+      <div class="login-logo"><img src="/oss/new4dkk/images/logo-bl.png" alt=""></div>
+      <h1>宝略科技VR相机管理后台</h1>
+    </div>
     <div class="login-container">
       <LoginBox v-if="page === 'login'" />
       <registerBox v-else-if="page === 'register'" />
@@ -8,7 +12,7 @@
     <cluseUser />
     <div class="ctrl">
       <!-- <div class="shop-btn" @click="$router.push({name: 'mallHome'})">{{ $i18n.t('header.online_shop')}}</div> -->
-      <div class="language-w">
+      <!-- <div class="language-w">
         <div class="list">
           <a class="header-item" :class="{'is-hover': showLangList}" @touchstart="showLangList = !showLangList">
             <p class="guoqi" :style="{'background-image': `url(${languageObj.img})`}">{{ languageObj.name }}</p>
@@ -17,9 +21,7 @@
             </ul>
           </a>
         </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> -->
       <!-- <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>
@@ -37,7 +39,7 @@
           <span v-if="cartCount">{{cartCount}}</span>
         </div> -->
 
-    <div class="copyright">Copyright ©  2021 Falcon Visual.All rights reserved.</div>
+    <!-- <div class="copyright">Copyright ©  2021 Falcon Visual.All rights reserved.</div> -->
     </div>
   </div>
 </template>
@@ -101,14 +103,31 @@ export default {
   width: 100%;
   // height: calc(100vh - 80px);
   height: 100vh;
-  background: url(~@/assets/images/refactor/login/login-bg.jpg) no-repeat center
-    center;
+  // background: url(~@/assets/images/refactor/login/login-bg.jpg) no-repeat center
+  //   center;
+  background: #facd91;
+  .logo-msg{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+        position: absolute;
+    left: 20%;
+    top: 50%;
+    transform: translateY(-50%);
+
+    .login-logo{
+      img{
+        width: 100px;
+        height: 100px;
+      }
+    }
+  }
   .login-container {
     position: absolute;
-    left: 50%;
+    left: 45%;
     top: 50%;
-    transform: translate(-50%, -50%);
-    transform: translate(-50%, calc(-50% + 40px));
+      transform: translateY(-50%);
+    // transform: translate(-50%, calc(-50% + 40px));
     box-shadow: 0px 2px 6px rgba(0, 0, 0, 0.4);
     background-color: #fff;
   }

pc/src/page/mall/confirm/index.vue

@@ -73,7 +73,7 @@
       <div>
         <div class="clause-img" ref="clause">
           <div ref="clauseImg">
-            <img :src="`${$cdn}images/cluse-long1v2.jpg`" alt>
+            <!-- <img :src="`${$cdn}images/cluse-long1v2.jpg`" alt> -->
           </div>
         </div>
         <p> </p>
@@ -344,7 +344,7 @@ export default {
     margin-left: 176px;
     padding-top: 53px;
     font-size: 14px;
-    
+
     .right-item {
       margin-bottom: 30px;
       line-height: 1;
@@ -428,4 +428,4 @@ export default {
     .cart-clause{
       width: calc(100vw - 730px);
     }
-</style>
+</style>

pc/src/page/manage/style.scss

@@ -7,7 +7,7 @@
   height: 100vh;
   background: #f4f4f6;
   .manage-bg{
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/person-bg.png) no-repeat top center;
+    background: url(/oss/new4dkk/images/person-bg.png) no-repeat top center;
     background-size: cover;
     .manage-con{
       padding: 30px 0;
@@ -154,6 +154,8 @@
       border-right: 1px solid #e7e7e7;
       padding-top: 30px;
       min-height: 550px;
+ 
+      padding-right: 20px;
       .list-items{
         font-size: 16px;
         display: inline-block;
@@ -162,8 +164,8 @@
         li{
           width: 100%;
           line-height: 36px;
-          text-align: right;
-          padding-right: 110px;
+          text-align: center;
+          // padding-right: 50px;
           &.is-en {
             padding-right: 50px;
           }
@@ -172,26 +174,29 @@
             display: inline-block;
             position: relative;
             vertical-align: middle;
-            padding-left: 12px;
-            &::before{
-              position: absolute;
-              top: 50%;
-              left: 0;
-              display: inline-block;
-              transform: translateY(-50%);
-              content: '';
-              width: 6px;
-              height: 6px;
-              vertical-align: middle;
-              border-radius: 50%;
-              border: 1px solid #000;
-            }
+            // padding-left: 12px;
+            padding: 0 20px;
+            display: block;
+            // &::before{
+            //   position: absolute;
+            //   top: 50%;
+            //   left: 0;
+            //   display: inline-block;
+            //   transform: translateY(-50%);
+            //   content: '';
+            //   width: 6px;
+            //   height: 6px;
+            //   vertical-align: middle;
+            //   border-radius: 50%;
+            //   border: 1px solid #000;
+            // }
           }
           .active{
-            &::before{
-              background-color: #1fe4dc;
-              border: 1px solid #1fe4dc;
-            }
+            background: rgb(250, 205, 145);
+            // &::before{
+            //   background-color: #1fe4dc;
+            //   border: 1px solid #1fe4dc;
+            // }
           }
           .logout-span{
             &::before{

pc/src/page/manage/temp/consumption.vue

@@ -47,7 +47,7 @@
       </vcenter>
     </div>
     <div class="scene-nothing" v-else>
-      <img :src="`${$cdn}images/nothing.png`" >
+      <!-- <img :src="`${$cdn}images/nothing.png`" > -->
       <div>{{langSpending.norecord}}</div>
     </div>
   </div>

pc/src/page/manage/temp/device.vue

@@ -1,25 +1,25 @@
 <template>
   <div class="device-layout">
     <div class="d-header">
-      <ul class="tab-list">
+      <!-- <ul class="tab-list">
         <li @click="tabActive = item.id" :class="{active:tabActive === item.id}" v-for="(item,i) in langDevices.tabList" :key="i">
           {{item.name}}({{i===0?allTotal:xiezuoNum}})
         </li>
-      </ul>
+      </ul> -->
       <div class="rig-con">
         <div class="btns" v-if="tabActive===4&&!isImgType">
-          <span class="button"  @click="addDevice"><i class="iconfont icon-jiahao"></i>{{$t('manage.deviceAdmin.addDevice')}}</span>
-          <span class="button" @click="multCop">{{$t('manage.deviceAdmin.collaborative')}}</span>
+          <span class="button" @click="addDevice"><i class="iconfont icon-jiahao"></i>{{$t('manage.deviceAdmin.addDevice')}}</span>
+          <!-- <span class="button" @click="multCop">{{$t('manage.deviceAdmin.collaborative')}}</span> -->
           <span class="button default" @click="multDel">{{langDevices.unbind}}</span>
         </div>
-        <div class="tab-search" :style="{marginRight:isWide?'0':'149px'}">
+        <!-- <div class="tab-search" :style="{marginRight:isWide?'0':'149px'}">
           <input v-model="searchKey" @keyup.enter="getList(searchKey)" type="text" :placeholder="langDevices.placeholder.searchID">
           <i class="iconfont icon-sousuo" @click="getList(searchKey)"></i>
-        </div>
-        <div class="main-list" v-if="tabActive===4">
+        </div> -->
+        <!-- <div class="main-list" v-if="tabActive===4">
           <i @click="changeType(true)" class="iconfont icon-main_grid" :title="langDevices.pictle" :class="{active:isImgType}"></i>
           <i @click="changeType(false)" class="iconfont icon-main_list" :title="langDevices.listtle" :class="{active:!isImgType}"></i>
-        </div>
+        </div> -->
       </div>
     </div>
 
@@ -35,7 +35,7 @@
           </div>
         </div>
 
-        <template v-if="!loading" >
+        <template v-if="!loading">
           <div class="d-item item" :style="{padding:language==='en'?'10px 16px':'10px 24px 10px 30px'}" v-for="(item,i) in mydevice.list" :key="i">
             <template v-if="tabActive===4">
               <div v-if="item.isExpire&&(item.usedSpace<=item.totalSpace)" class="tag expire">{{langDevices.jijiang}}</div>
@@ -76,10 +76,10 @@
                 <p class="d-id">ID: {{item.childName}}</p>
                 <p class="p-sub">剩余点数：{{item.balance}}</p>
                 <div class="d-edit" :class="{'dtow-edit':tabActive!==4}">
-                <router-link class="primary" :to="{name:'introtow',params:{id:item.childName}}"><span>{{langDevices.recharge}}</span></router-link>
-                <div>
+                  <router-link class="primary" :to="{name:'introtow',params:{id:item.childName}}"><span>{{langDevices.recharge}}</span></router-link>
+                  <div>
                     <span @click="unbind(item)">{{langDevices.unbind}}</span>
-                </div>
+                  </div>
                 </div>
               </template>
             </div>
@@ -90,7 +90,7 @@
         </template>
       </div>
 
-      <tableList v-else @selection-change="data=>{selectedArr=data}" :header='tabHeader' :showLine='true' :selection='true' :data='mydevice.list' class="table-list" >
+      <tableList v-else @selection-change="data=>{selectedArr=data}" :header='tabHeader' :showLine='true' :selection='true' :data='mydevice.list' class="table-list">
         <div slot-scope="{data}" slot="header">
           {{language==='en'?data.en:data.name}}
         </div>
@@ -99,7 +99,7 @@
             <span class="table-btn">
               <router-link class="edit" target="_blank" :to="{name:'introduce',params:{id:item.childName}}">{{langDevices.capacity}}</router-link>
             </span>
-            <span class="edit table-btn" @click="handleCooperation(item)" v-if="item.status !== 0" >{{$t('manage.deviceAdmin.collaborative')}}</span>
+            <span class="edit table-btn" @click="handleCooperation(item)" v-if="item.status !== 0">{{$t('manage.deviceAdmin.collaborative')}}</span>
 
           </template>
           <span v-else-if="type==='qingkuang'">{{item.usedSpaceStr}} / {{item.totalSpaceStr}}</span>
@@ -110,7 +110,7 @@
     </template>
 
     <div class="scene-nothing" v-if="!total && !isImgType">
-      <img :src="`${$cdn}images/nothing.png`" />
+      <!-- <img :src="`${$cdn}images/nothing.png`" /> -->
       <div>{{langDevices.norecord}}</div>
     </div>
 
@@ -124,21 +124,23 @@
 import { mapState } from 'vuex'
 import Paging from '@/components/Paging'
 import tableList from '@/components/table'
-import {device} from './idevice'
+import { device } from './idevice'
 
 export default {
-  components: {Paging, tableList},
+  components: { Paging, tableList },
   data () {
     let tabList = [
       {
         name: '四维看看Pro',
         id: 4
-      }, {
+      },
+      {
         name: '四维看看Lite',
         id: 0
       }
     ]
-    let isImgType = localStorage.getItem('isImgTypeForDevice') === '' ? true : (localStorage.getItem('isImgTypeForDevice') === 'true')
+    // let isImgType = localStorage.getItem('isImgTypeForDevice') === '' ? true : (localStorage.getItem('isImgTypeForDevice') === 'true')
+    let isImgType = false
 
     return {
       tabHeader: device,
@@ -151,7 +153,7 @@ export default {
       currentPage: 1,
       total: 0,
       // isImgType: isImgType,
-      isImgType: true,
+      isImgType: false,
       searchKey: '',
       pageSize: 8,
       isWide: window.innerWidth > 1300,
@@ -160,17 +162,20 @@ export default {
   },
   computed: {
     ...mapState({
-      language: state => state.language.current,
-      token: state => state.user.token,
-      langToast: state => state.language.home.toast,
-      langDevices: state => state.language.home.manage.myDevices,
-      mydevice: state => {
+      language: (state) => state.language.current,
+      token: (state) => state.user.token,
+      langToast: (state) => state.language.home.toast,
+      langDevices: (state) => state.language.home.manage.myDevices,
+      mydevice: (state) => {
         let type = Object.prototype.toString.call(state.user.mydevice)
         if (type === '[object Object]') {
           return state.user.mydevice
         }
-        let condition = state.user.mydevice && state.user.mydevice !== 'null' && type !== '[object Array]'
-        return (condition ? JSON.parse(state.user.mydevice) : {})
+        let condition =
+          state.user.mydevice &&
+          state.user.mydevice !== 'null' &&
+          type !== '[object Array]'
+        return condition ? JSON.parse(state.user.mydevice) : {}
       }
     })
   },
@@ -180,7 +185,7 @@ export default {
     },
     tabActive (newVal) {
       this.loading = true
-      this.currentPage === 1 ? this.getList() : this.currentPage = 1
+      this.currentPage === 1 ? this.getList() : (this.currentPage = 1)
     }
   },
   mounted () {
@@ -196,27 +201,37 @@ export default {
     checkSelect () {
       let pass = this.selectedArr.length <= 0
       if (pass) {
-        return this.$toast.show('warn', `${this.language === 'en' ? 'Please select at least one.' : '请至少勾选一项'}`)
+        return this.$toast.show(
+          'warn',
+          `${
+            this.language === 'en'
+              ? 'Please select at least one.'
+              : '请至少勾选一项'
+          }`
+        )
       }
       return true
     },
     multCop () {
       if (this.checkSelect()) {
-        let ids = this.selectedArr.map(item => {
+        let ids = this.selectedArr.map((item) => {
           return item.id
         })
 
-        this.$toast.showCooperation({
-          ids: ids.join(','),
-          type: 'device'
-        }, () => {
-          this.getList()
-        })
+        this.$toast.showCooperation(
+          {
+            ids: ids.join(','),
+            type: 'device'
+          },
+          () => {
+            this.getList()
+          }
+        )
       }
     },
     multDel () {
       if (this.checkSelect()) {
-        let ids = this.selectedArr.map(item => {
+        let ids = this.selectedArr.map((item) => {
           return item.id
         })
 
@@ -240,16 +255,19 @@ export default {
       this.xiezuoNum = res.data.data.total
     },
     async handleCooperation (item) {
-      this.$toast.showCooperation({
-        num: item.id,
-        cooName: item.cooperationUserName,
-        type: 'device',
-        getListData: {
-          cameraId: item.id
+      this.$toast.showCooperation(
+        {
+          num: item.id,
+          cooName: item.cooperationUserName,
+          type: 'device',
+          getListData: {
+            cameraId: item.id
+          }
+        },
+        () => {
+          this.getList()
         }
-      }, () => {
-        this.getList()
-      })
+      )
     },
     gotoScene (item) {
       this.$router.push({
@@ -286,8 +304,7 @@ export default {
     },
     async unbind (item, multi = false) {
       this.$toast.showConfirm('warn', this.langToast['26'], async () => {
-        let params = {
-        }
+        let params = {}
         multi ? (params['ids'] = item) : (params['cameraId'] = item.id)
         let res = await this.$http({
           method: 'post',
@@ -327,9 +344,15 @@ export default {
       await this.$store.dispatch('getUserDevice', params)
 
       if (!this.mydevice.total && searchKey) {
-        return this.$toast.show('warn', this.language === 'en' ? 'No corresponding device found.' : '没有找到对应的设备', () => {
-          this.getList()
-        })
+        return this.$toast.show(
+          'warn',
+          this.language === 'en'
+            ? 'No corresponding device found.'
+            : '没有找到对应的设备',
+          () => {
+            this.getList()
+          }
+        )
       }
       this.pageSize = this.mydevice.pageSize
       this.total = this.mydevice.total || 0
@@ -348,16 +371,16 @@ export default {
 $theme-color: #1fe4dc;
 $font-color: #2d2d2d;
 
-.device-layout{
+.device-layout {
   margin: 30px 0 30px 0;
   // width: 995px;
   color: $font-color;
-  .d-header{
+  .d-header {
     margin-left: 40px;
     height: 30px;
-    .tab-list{
+    .tab-list {
       display: inline-block;
-      li{
+      li {
         display: inline-block;
         margin-right: 40px;
         cursor: pointer;
@@ -367,20 +390,21 @@ $font-color: #2d2d2d;
           margin-right: 0;
         }
       }
-      .active{
+      .active {
         color: $theme-color;
         border-bottom: 1px solid $theme-color;
       }
     }
 
-    .rig-con{
+    .rig-con {
       margin-right: 40px;
-      float: right;
+      float: left;
       display: flex;
       align-items: center;
-      .btns{
+      height: 30px;
+      .btns {
         margin-right: 20px;
-        .button{
+        .button {
           line-height: 30px;
           height: 30px;
           min-width: 80px;
@@ -388,36 +412,37 @@ $font-color: #2d2d2d;
           text-align: center;
           vertical-align: middle;
           font-size: 14px;
-          color: #202020;
+          color: #000;
           margin-left: 10px;
+          background: rgb(250, 205, 145);
           cursor: pointer;
           &:first-child {
             margin-left: 0;
           }
-          .iconfont{
+          .iconfont {
             font-size: 14px;
             margin-right: 4px;
           }
         }
-        .default{
-          background: #E4E4E4;
+        .default {
+          background: rgb(250, 205, 145);
         }
       }
-      .tab-search{
+      .tab-search {
         float: right;
         position: relative;
         width: 230px;
         padding-left: 10px;
         border: 1px solid #ccc;
         display: flex;
-        .iconfont{
+        .iconfont {
           width: 28px;
           height: 28px;
           padding: 6px;
           cursor: pointer;
           background: #e4e4e4;
         }
-        input{
+        input {
           width: 100%;
           font-size: 14px;
           appearance: none;
@@ -426,25 +451,24 @@ $font-color: #2d2d2d;
           border: 0;
         }
       }
-      .main-list{
+      .main-list {
         display: inline-block;
         margin-left: 35px;
-        .iconfont{
+        .iconfont {
           cursor: pointer;
           font-size: 20px;
           margin-left: 5px;
         }
-        .active{
-          color: #1fe4dc;
+        .active {
+          color: rgb(250, 205, 145);
         }
       }
     }
-
   }
-  .d-con{
+  .d-con {
     margin-left: 40px;
     display: inline-block;
-    .item{
+    .item {
       display: inline-block;
       box-shadow: 0 4px 4px rgba($color: #000000, $alpha: 0.1);
       position: relative;
@@ -452,44 +476,44 @@ $font-color: #2d2d2d;
       height: 180px;
       margin: 36px 36px 0 0;
     }
-    .edit-item{
+    .edit-item {
       cursor: pointer;
       vertical-align: top;
-      .plus-con{
+      .plus-con {
         position: absolute;
         text-align: center;
-        transform: translate(-50%,-50%);
+        transform: translate(-50%, -50%);
         top: 50%;
         left: 50%;
-        .iconplus{
+        .iconplus {
           position: relative;
           width: 50px;
           height: 50px;
           margin: 0 auto;
-          span{
+          span {
             position: absolute;
-            transform: translate(-50%,-50%);
+            transform: translate(-50%, -50%);
             top: 50%;
             left: 50%;
             display: inline-block;
             width: 50px;
             height: 6px;
             background: $font-color;
-            &:last-child{
-              transform: translate(-50%,-50%) rotate(90deg)
+            &:last-child {
+              transform: translate(-50%, -50%) rotate(90deg);
             }
           }
         }
-        p{
+        p {
           margin-top: 28px;
           font-weight: bold;
         }
       }
     }
-    .d-item{
+    .d-item {
       padding: 10px 24px 10px 30px;
       position: relative;
-      .tag{
+      .tag {
         position: absolute;
         top: 0;
         left: 0;
@@ -502,18 +526,18 @@ $font-color: #2d2d2d;
         color: #fff;
         padding: 0 10px;
       }
-      .expire{
+      .expire {
         background: #fed228;
       }
-      .full{
+      .full {
         background: #f90217;
       }
-      .i-left{
+      .i-left {
         display: inline-block;
         vertical-align: top;
         width: 145px;
         margin-top: 25px;
-        .d-id{
+        .d-id {
           font-size: 14px;
           font-weight: bold;
           margin-bottom: 5px;
@@ -522,26 +546,26 @@ $font-color: #2d2d2d;
           overflow: hidden;
           white-space: nowrap;
         }
-        .capacity{
+        .capacity {
           margin: 5px 0;
-          .c-line{
+          .c-line {
             width: 100%;
             height: 10px;
             background-color: #ccc;
-            .active{
-              background-color:$theme-color;
+            .active {
+              background-color: $theme-color;
               height: 100%;
             }
           }
         }
-        .p-sub{
+        .p-sub {
           color: #969696;
           font-size: 14px;
           text-overflow: ellipsis;
           overflow: hidden;
           white-space: nowrap;
           position: relative;
-          img{
+          img {
             position: absolute;
             left: 0;
             top: 50%;
@@ -550,14 +574,14 @@ $font-color: #2d2d2d;
             height: 22px;
             vertical-align: middle;
           }
-
         }
-        .d-edit{
+        .d-edit {
           margin-top: 10px;
           font-size: 14px;
           position: absolute;
           bottom: 22px;
-          div,a {
+          div,
+          a {
             display: inline-block;
             background: #fff;
             color: #000;
@@ -573,20 +597,20 @@ $font-color: #2d2d2d;
             box-sizing: border-box;
             cursor: pointer;
             position: relative;
-            span{
+            span {
               position: absolute;
               top: 50%;
               left: 50%;
-              transform: translate(-50%,-50%);
+              transform: translate(-50%, -50%);
               width: 100%;
             }
           }
-          .primary{
+          .primary {
             background: #1fe4dc;
             border: 1px solid #1fe4dc;
           }
         }
-        .oper-con{
+        .oper-con {
           flex: 1;
           .oper {
             width: 26px;
@@ -596,16 +620,16 @@ $font-color: #2d2d2d;
             line-height: 30px;
             height: 30px;
             font-size: 14px;
-            &:hover{
-              >ul{
+            &:hover {
+              > ul {
                 display: block;
               }
             }
-            >div {
+            > div {
               text-align: right;
               display: inline-block;
               width: 100%;
-              .spot{
+              .spot {
                 width: 4px;
                 height: 4px;
                 display: inline-block;
@@ -613,8 +637,9 @@ $font-color: #2d2d2d;
                 border-radius: 50%;
                 position: relative;
                 margin-right: 10px;
-                &::after,&::before{
-                  content: '';
+                &::after,
+                &::before {
+                  content: "";
                   position: absolute;
                   width: 4px;
                   height: 4px;
@@ -625,78 +650,78 @@ $font-color: #2d2d2d;
                   top: 50%;
                   transform: translateY(-50%);
                 }
-                &::before{
+                &::before {
                   right: -8px;
                   left: unset;
                 }
               }
             }
 
-            >ul{
+            > ul {
               display: none;
               position: absolute;
               top: 30px;
               z-index: 9;
               left: 0;
-              background: #F7F7F7;
+              background: #f7f7f7;
               min-width: 90px;
-              box-shadow:0px 1px 6px rgba(0,0,0,0.16);
-              >li{
+              box-shadow: 0px 1px 6px rgba(0, 0, 0, 0.16);
+              > li {
                 text-align: left;
                 width: 100%;
                 line-height: 2.5;
                 padding: 0 10px;
                 color: #202020;
-                &:hover{
-                  background-color: #EBEBEB;
+                &:hover {
+                  background-color: #ebebeb;
                 }
               }
             }
-            .b_default{
-                display: inline-block;
-                background: #fff;
-                color: #000;
-                border: 1px solid #777;
-                border-radius: 2px;
-                font-size: 12px;
-                width: 52px;
-                height: 22px;
-                line-height: 22px;
-                text-align: center;
-                vertical-align: middle;
-                margin-left: 4px;
-                -webkit-box-sizing: border-box;
-                box-sizing: border-box;
-                cursor: pointer;
-                position: relative;
-                >span{
-                  position: absolute;
-                  top: 50%;
-                  left: 50%;
-                  -webkit-transform: translate(-50%,-50%);
-                  transform: translate(-50%,-50%);
-                  width: 100%;
-                }
+            .b_default {
+              display: inline-block;
+              background: #fff;
+              color: #000;
+              border: 1px solid #777;
+              border-radius: 2px;
+              font-size: 12px;
+              width: 52px;
+              height: 22px;
+              line-height: 22px;
+              text-align: center;
+              vertical-align: middle;
+              margin-left: 4px;
+              -webkit-box-sizing: border-box;
+              box-sizing: border-box;
+              cursor: pointer;
+              position: relative;
+              > span {
+                position: absolute;
+                top: 50%;
+                left: 50%;
+                -webkit-transform: translate(-50%, -50%);
+                transform: translate(-50%, -50%);
+                width: 100%;
+              }
             }
           }
         }
-        .dtow-edit{
+        .dtow-edit {
           bottom: 40px;
         }
       }
-      .i-right{
+      .i-right {
         vertical-align: top;
         float: right;
         height: 100%;
         position: relative;
-        img{
-          height:150px;
+        img {
+          height: 150px;
           cursor: pointer;
         }
       }
     }
   }
-  .table-list{
+  .table-list {
     width: calc(100% - 80px);
     margin: 30px auto;
     font-size: 14px;
@@ -707,14 +732,14 @@ $font-color: #2d2d2d;
       }
     }
   }
-  .scene-nothing{
+  .scene-nothing {
     padding: 42px 0 150px 0;
     text-align: center;
-    img{
+    img {
       padding-bottom: 22px;
       text-align: center;
     }
-    div{
+    div {
       font-size: 16px;
       color: #969696;
       text-align: center;
@@ -722,7 +747,7 @@ $font-color: #2d2d2d;
       margin: 0 auto;
     }
   }
-   .paging {
+  .paging {
     // border-left: #e5e5e5 1px solid;
     height: 100%;
     margin: 40px 0;
@@ -789,11 +814,11 @@ $font-color: #2d2d2d;
     width: 75%;
   }
 }
-@media screen and (max-width: 1700px){
+@media screen and (max-width: 1700px) {
   .device-layout {
     width: 95%;
-    .d-con{
-      .item{
+    .d-con {
+      .item {
         width: 280px;
         margin: 36px 36px 0 0;
       }
@@ -801,40 +826,39 @@ $font-color: #2d2d2d;
   }
 }
 
-@media screen and (max-width: 1400px){
-   .device-layout {
+@media screen and (max-width: 1400px) {
+  .device-layout {
     width: 98%;
-    .d-header{
-      .tab-search{
-        margin-right: 60px!important;
+    .d-header {
+      .tab-search {
+        margin-right: 60px !important;
       }
     }
-    .d-con{
-      .item{
+    .d-con {
+      .item {
         width: 265px;
         margin: 20px 20px 0 0;
-        padding: 10px 16px!important;
+        padding: 10px 16px !important;
       }
     }
   }
 }
 
-@media screen and (max-width: 1300px){
-   .device-layout {
+@media screen and (max-width: 1300px) {
+  .device-layout {
     width: 100%;
-    .d-header{
-      .tab-search{
-        margin-right: 20px!important;
+    .d-header {
+      .tab-search {
+        margin-right: 20px !important;
       }
     }
-    .d-con{
-      .item{
+    .d-con {
+      .item {
         width: 235px;
         margin: 10px 11px 0 0;
-        padding: 10px 13px!important;
+        padding: 10px 13px !important;
       }
     }
   }
 }
-
 </style>

pc/src/page/manage/temp/idevice.js

@@ -35,13 +35,14 @@ let device = [
     en: i18n.t('manage.deviceAdmin.lastTime'),
     name: i18n.t('manage.deviceAdmin.lastTime'),
     width: 180
-  }, {
-    key: 'detail',
-    name: i18n.t('common.handle'),
-    en: i18n.t('common.handle'),
-    canclick: true,
-    width: 120,
   }
+  // {
+  //   key: 'detail',
+  //   name: i18n.t('common.handle'),
+  //   en: i18n.t('common.handle'),
+  //   canclick: true,
+  //   width: 120,
+  // }
 ]
 
 export {

pc/src/page/manage/temp/order.vue

@@ -74,7 +74,7 @@
       </div>
     </div>
     <div class="scene-nothing" v-else>
-      <img :src="`${$cdn}images/nothing.png`" alt>
+      <!-- <img :src="`${$cdn}images/nothing.png`" alt> -->
       <div>{{langOrders.norecord}}</div>
     </div>
     <div class="paging" v-if="total">

pc/src/page/manage/temp/scene.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="scene-layout">
     <div class="d-header">
-        <ul class="tab-list" v-if="!deviceLogin">
+        <!-- <ul class="tab-list" v-if="!deviceLogin">
           <li @click="tabActive = item.id" :class="{active:tabActive === item.id}" v-for="(item,i) in tabList" :key="i">
             {{item.name}}({{i===0?allTotal:xiezuoNum}})
           </li>
@@ -11,20 +11,20 @@
           <li class="active" v-for="(item,i) in [tabList[0]]" :key="i">
             {{item.name}}({{allTotal}})
           </li>
-        </ul>
+        </ul> -->
       <div class="rig-con">
         <div class="btns" v-if="tabActive===1&&!isImgType">
-          <span  v-if="!deviceLogin" class="button" @click="handleSenceCopy()">{{ langScenes.share.copy }}</span>
-          <span  v-if="!deviceLogin" class="button" @click="multCop">{{ $t('manage.sceneAdmin.collaborative') }}</span>
+          <!-- <span  v-if="!deviceLogin" class="button" @click="handleSenceCopy()">{{ langScenes.share.copy }}</span> -->
+          <!-- <span  v-if="!deviceLogin" class="button" @click="multCop">{{ $t('manage.sceneAdmin.collaborative') }}</span> -->
           <span class="button default" @click="multDel">{{ $t('common.delete') }}</span>
         </div>
-        <div class="main-list">
+        <!-- <div class="main-list">
           <i @click="changeType(true)" class="iconfont icon-main_grid" :title="langScenes.pictle" :class="{active:isImgType}"></i>
           <i @click="changeType(false)" class="iconfont icon-main_list" :title="langScenes.listtle" :class="{active:!isImgType}"></i>
-        </div>
+        </div> -->
       </div>
 
-      <div class="search-w">
+      <!-- <div class="search-w">
         <div class="date-w">
           <span class="label">{{ $t('manage.sceneAdmin.createTime') }}</span>
           <vueDate showClear v-model="startTime" :placeholder="$t('manage.sceneAdmin.startTime')" :isDateDisabled="isAfter" :weekdays="weekdays" :months="months"></vueDate>
@@ -39,18 +39,17 @@
             :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>
-      </div>
+      </div> -->
     </div>
 
   <template v-if="total">
      <ul v-if="isImgType" ref="ulMenu">
       <template>
         <li v-for="(item,index) in myscene.list" :key="index">
-          <div @click="((item.status === 1||item.status===-2)&&item.payStatus !== -2) && goto(item.webSite)" class="a-tap">
-            <div class="share-btn" v-if="((item.status === 1||item.status===-2)&&item.payStatus !== -2)" @click.stop="handleShare(item)"></div>
+          <div @click="((item.status === 1||item.status===-2)&&item.payStatus !== -2) && goto(item)" class="a-tap">
+            <!-- <div class="share-btn" v-if="((item.status === 1||item.status===-2)&&item.payStatus !== -2)" @click.stop="handleShare(item)"></div> -->
             <div class="cooperation" v-if="item.cooperationUserName&&!deviceLogin"><i class="iconfont icon-case_teamwork"></i><span>{{langScenes.user}}: {{item.cooperationUserName}}</span></div>
             <div class="card-img" :style="{backgroundImage: `url(${getSceneImg(item)})`}"></div>
             <div class="loading-hover" v-if="item.status === 0">
@@ -75,8 +74,8 @@
                 </div>
                 <ul :style="{minWidth: language==='en'?'150px': '90px'}">
                   <li v-if="item.status === 1||item.status===-2 && item.payStatus !== -2" @click="gotoEdit(item)">{{langScenes.edit}}</li>
-                  <li @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin && item.payStatus !== -2">{{langScenes.fenpei}}</li>
-                  <li @click="handleSenceCopy(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin && item.payStatus !== -2">{{langScenes.share.copy}}</li>
+                  <!-- <li @click="handleCooperation(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin && item.payStatus !== -2">{{langScenes.fenpei}}</li> -->
+                  <!-- <li @click="handleSenceCopy(item)" v-if="(item.status === 1||item.status===-2)&&!deviceLogin && item.payStatus !== -2">{{langScenes.share.copy}}</li> -->
                   <li v-if="item.status !== 0" @click="del(item)">{{langScenes.delete}}</li>
                 </ul>
               </template>
@@ -115,7 +114,7 @@
           <span class="edit table-btn delete-btn" v-if="item.status !== 0 && item.status !== 1&&item.status !== -2 || item.payStatus === -2" @click="deleteOneScene(item)">{{ $t('common.delete') }}</span>
         </template>
         <div style="position:relative;" v-else-if="type === 'image'" >
-          <div :title="item.name" @click="((item.status === 1||item.status===-2)&&item.payStatus !== -2) && goto(item.webSite)" style="height:40px;" class="card-img" :style="{backgroundImage: `url(${getSceneImg(item)})`, cursor: item.status !== 1 && item.status!==-2 ? 'initial' : 'pointer'}"></div>
+          <div :title="item.name" @click="((item.status === 1||item.status===-2)&&item.payStatus !== -2) && goto(item)" style="height:40px;" class="card-img" :style="{backgroundImage: `url(${getSceneImg(item)})`, cursor: item.status !== 1 && item.status!==-2 ? 'initial' : 'pointer'}"></div>
           <div class="loading-hover" v-if="item.status === 0 || item.payStatus === -2">
             <div class="loading-icon" style="width:100%">
               <p style="margin-top:0;font-size:12px;">{{item.payStatus === -2 ? $t('manage.sceneAdmin.archived') : langScenes.share.calcule}}</p>
@@ -130,7 +129,7 @@
   </template>
 
     <div class="scene-nothing" v-else>
-      <img :src="`${$cdn}images/nothing.png`" />
+      <!-- <img :src="`${$cdn}images/nothing.png`" /> -->
       <div>{{langScenes.noScenes}}</div>
     </div>
 
@@ -195,21 +194,22 @@ export default {
   components: { Paging, tableList, vueDate },
   data () {
     let imgs = [
-      {
-        img: this.$cdn + 'images/s-wechat.png',
-        id: 0
-      },
-      {
-        img: this.$cdn + 'images/s-weibo.png',
-        id: 1
-      },
-      {
-        img: this.$cdn + 'images/s-qq.png',
-        id: 2
-      }
+      // {
+      //   img: this.$cdn + 'images/s-wechat.png',
+      //   id: 0
+      // },
+      // {
+      //   img: this.$cdn + 'images/s-weibo.png',
+      //   id: 1
+      // },
+      // {
+      //   img: this.$cdn + 'images/s-qq.png',
+      //   id: 2
+      // }
     ]
 
-    let isImgType = localStorage.getItem('isImgType') === '' ? true : (localStorage.getItem('isImgType') === 'true')
+    // let isImgType = localStorage.getItem('isImgType') === '' ? true : (localStorage.getItem('isImgType') === 'true')
+    let isImgType = true
     return {
       tabHeader: scene,
       xiezuoNum: 0,
@@ -449,9 +449,14 @@ export default {
       this.item = item
       this.showShare = true
     },
-    goto (url) {
-      let temp = url.replace('show.html', 'showPC.html')
-      window.open(temp.replace('http://', 'https://') + (this.language === 'en' ? '&lang=en' : ''), '_blank')
+    goto (item) {
+      // let temp = url.replace('show.html', 'showPC.html')
+      // window.open(temp + (this.language === 'en' ? '&lang=en' : ''), '_blank')
+
+      let origin = window.location.origin
+      let url = origin + '/spc.html?m=' + item.num
+      console.log(url)
+      window.open(url + (this.language === 'en' ? '&lang=en' : ''), '_blank')
     },
     getSceneImg (item) {
       switch (item.status) {
@@ -463,31 +468,33 @@ export default {
       }
     },
     gotoEdit (item) {
-      let url = item.webSite
-      let page = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.html'))
-      let pStr = 'edit'
-      if (item.buildType) {
-        switch (item.buildType.toLowerCase()) {
-          case 'v1':
-            pStr = 'edit'
-            break
-          case 'v2':
-            pStr = 'editProPC'
-            break
-          case 'v3':
-            pStr = 'epc'
-            break
-          default:
-            pStr = 'edit'
-            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')
+      // let url = item.webSite
+      // let page = url.substring(url.lastIndexOf('/') + 1, url.lastIndexOf('.html'))
+      // let pStr = 'edit'
+      // if (item.buildType) {
+      //   switch (item.buildType.toLowerCase()) {
+      //     case 'v1':
+      //       pStr = 'edit'
+      //       break
+      //     case 'v2':
+      //       pStr = 'editProPC'
+      //       break
+      //     case 'v3':
+      //       pStr = 'epc'
+      //       break
+      //     default:
+      //       pStr = 'edit'
+      //       break
+      //   }
+      // }
+      // url = pStr ? url.replace(page, pStr) : url
+      // // 预留代码 为了跳转根域名
+      // let queryParams = url.split('.html')[1]
+      // console.log(window.location.origin + '/' + pStr + '.html' + queryParams)
+      let origin = window.location.origin
+      let url = origin + '/epc.html?m=' + item.num
+      console.log(url)
+      window.open(url + (this.language === 'en' ? '&lang=en' : ''), '_blank')
     },
     async del (item, multi = false) {
       this.$toast.showConfirm('warn', this.langScenes.delwarn, async () => {
@@ -609,16 +616,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-$theme-color: #1fe4dc;
+$theme-color: rgb(250, 205, 145);
 $font-color: #2d2d2d;
 
 .huifu{
   position: absolute;
   bottom: 10px;
   right: 10px;
-  color: #1fe4dc;
+  color: rgb(250, 205, 145);
   display: inline-block;
-  border-bottom: 1px solid #1fe4dc;
+  border-bottom: 1px solid rgb(250, 205, 145);
   padding-bottom: 2px;
   cursor: pointer;
 }
@@ -648,6 +655,7 @@ $font-color: #2d2d2d;
       float: right;
       display: flex;
       align-items: center;
+      height: 30px;
       .btns{
         margin-right: 20px;
         .button{
@@ -662,8 +670,9 @@ $font-color: #2d2d2d;
           cursor: pointer;
         }
         .default{
-          background: #E4E4E4;
+          background: rgb(250, 205, 145);
           margin-left: 10px;
+          color: #fff;
         }
       }
 
@@ -676,7 +685,7 @@ $font-color: #2d2d2d;
           margin-left: 5px;
         }
         .active{
-          color: #1fe4dc;
+          color: rgb(250, 205, 145);
         }
       }
     }
@@ -747,7 +756,7 @@ $font-color: #2d2d2d;
         top: 10px;
         width: 35px;
         height: 35px;
-        background-image: url(https://testusaoss.4dkankan.com/new4dkk/images/share-btn.png);
+        background-image: url(/oss/new4dkk/images/share-btn.png);
         background-color: rgba(0, 0, 0, 0.3);
         background-position: center;
         background-repeat: no-repeat;
@@ -1188,7 +1197,7 @@ $font-color: #2d2d2d;
     .search-btn {
       padding: 0 20px;
       line-height: 28px;
-      background: #1fe4dc;
+      background: rgb(250, 205, 145);
       margin-left: 15px;
       cursor: pointer;
       // font-weight: bold;

pc/src/page/purchasetow/style.scss

@@ -26,7 +26,7 @@
 }
 
 .plate01{
-  background: url(https://testusaoss.4dkankan.com/new4dkk/images/purchase_bg.png) #f8f9fc top center no-repeat;
+  background: url(/oss/new4dkk/images/purchase_bg.png) #f8f9fc top center no-repeat;
   padding: 0 0 100px;
   .main-detail{
     padding-top: 80px;

pc/src/page/purchasezhijia/style.scss

@@ -26,7 +26,7 @@
 }
 
 .plate01{
-  background: url(https://testusaoss.4dkankan.com/new4dkk/images/purchase_bg.png) #f8f9fc top center no-repeat;
+  background: url(/oss/new4dkk/images/purchase_bg.png) #f8f9fc top center no-repeat;
   padding: 0 0 100px;
   .main-detail{
     padding-top: 20px;

pc/src/page/service/temp/app.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="app-download">
-    
+
     <div class="container">
       <div class="common-title">{{$t('service.app')}}</div>
       <div class="logo">
         <img :src="`${$cdn}images/app-logo.png`"  alt srcset>
       </div>
       <div class="info">
-        <img :src=" language==='en'?`https://testusaoss.4dkankan.com/new4dkk/images/pro-logo-en.png`:`https://testusaoss.4dkankan.com/new4dkk/images/pro-logo.png`" alt srcset>
+        <img :src=" language==='en'?`/oss/new4dkk/images/pro-logo-en.png`:`/oss/new4dkk/images/pro-logo.png`" alt srcset>
         <h2></h2>
         <p>{{ $t('service.appDownload.downloadTip')}}</p>
         <div class="download-w">
@@ -113,7 +113,6 @@ export default {
           background-color: #7fc651;
         }
 
-        
       }
 
       .button {
@@ -152,7 +151,7 @@ export default {
       width: 122px;
       margin: 20px auto 0;
       display: block;
-      
+
     }
     .icon {
       color: #909090;

pc/src/page/zhijia/style.scss

@@ -92,7 +92,7 @@
   }
   .plate02 {
     position: relative;
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/zhijia-bg2.png) top
+    background: url(/oss/new4dkk/images/zhijia-bg2.png) top
       center #1e1e21 no-repeat;
     background-size: 100% 100%;
     padding: 140px 0 155px;

pc/src/store/language/cn/manage.js

@@ -2,7 +2,7 @@
 // let vue = new Vue()
 // let baseUrl = vue.$cdn
 
-export default{
+export default {
   main: {
     btnType: {
       buy: {
@@ -18,53 +18,63 @@ export default{
   },
   information: {
     nameArr: {
-      information: '账号信息',
-      scene: '我的场景',
-      order: '我的订单',
-      device: '我的相机',
-      consumption: '消费记录',
-      change: '修改密码',
+      // information: '账号信息',
+      device: '设备管理',
+
+      scene: '场景管理',
+      // order: '我的订单',
+      // consumption: '消费记录',
+      // change: '修改密码',
       logout: '退出登录'
     },
-    settings: [
-      {
-        name: 'info',
-        items: [{
-          name: '账号信息',
-          to: {name: 'information'}
-        }, {
-          name: '我的场景',
-          to: {name: 'scene'}
-        }, {
-          name: '我的相机',
-          to: {name: 'device'}
-        }, {
-          name: '修改密码',
+    settings: [{
+      name: 'info',
+      items: [
+        //   {
+        //   name: '账号信息',
+        //   to: {name: 'information'}
+        // },
+        {
+          name: '设备管理',
           to: {
-            name: 'change'
+            name: 'device'
           }
-        }, {
-          name: '退出登录',
-          to: 'logout'
-        }]
-      },
-      {
-        name: 'security',
-        items: []
-      }
-    ],
-    deviceSettings: [
-      {
-        name: 'security',
-        items: [{
+        },
+        {
           name: '场景管理',
-          to: {name: 'scene'}
-        }, {
+          to: {
+            name: 'scene'
+          }
+        },
+        //   {
+        //   name: '修改密码',
+        //   to: {
+        //     name: 'change'
+        //   }
+        // },
+        {
           name: '退出登录',
           to: 'logout'
-        }]
-      }
-    ]
+        }
+      ]
+    },
+    {
+      name: 'security',
+      items: []
+    }
+    ],
+    deviceSettings: [{
+      name: 'security',
+      items: [{
+        name: '场景管理',
+        to: {
+          name: 'scene'
+        }
+      }, {
+        name: '退出登录',
+        to: 'logout'
+      }]
+    }]
   },
   account: {
     info: '账号信息',
@@ -118,15 +128,13 @@ export default{
       0: '其他',
       3: '电商'
     },
-    tabList: [
-      {
-        name: '我的场景',
-        id: 1
-      }, {
-        name: '协作场景',
-        id: 2
-      }
-    ],
+    tabList: [{
+      name: '我的场景',
+      id: 1
+    }, {
+      name: '协作场景',
+      id: 2
+    }],
     noScenes: '暂无任何场景。',
     placeholder: {
       searchID: '搜索场景'
@@ -193,11 +201,10 @@ export default{
   },
   myDevices: {
     add: '新增相机',
-    tabList: [
-      {
-        name: 'Falcon Visual',
-        id: 4
-      }
+    tabList: [{
+      name: 'Falcon Visual',
+      id: 4
+    }
       //  {
       //   name: '四维看看Lite',
       //   id: 0
@@ -224,15 +231,13 @@ export default{
     norecord: '暂无任何记录'
   },
   Spending: {
-    tabList: [
-      {
-        name: '扩容记录'
-      }, {
-        name: '充值记录'
-      }, {
-        name: '增值发票'
-      }
-    ],
+    tabList: [{
+      name: '扩容记录'
+    }, {
+      name: '充值记录'
+    }, {
+      name: '增值发票'
+    }],
     norecord: '暂无任何记录',
     placeholder: {
       searchID: '搜索设备S/N'