1

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/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>消安相机管理平台</title>
     <script>
       var _hmt = _hmt || [];
       (function() {

pc/src/assets/style/public.scss

@@ -1,6 +1,6 @@
 $battery-start:52%;
 $battery-end:32%;
-$theme-color:#1fe4dc;
+$theme-color:#169bd5;
 
 @font-face {
   font-family: 'OSP-DIN';
@@ -316,15 +316,15 @@ body{
 .check_active{
   &::before{
     content: '';
-    background: #1fe4dc;
-    border: #1fe4dc 1px solid;
+    background: #169bd5;
+    border: #169bd5 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/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,13 +1,14 @@
-$theme-color: #1fe4dc;
+$theme-color: rgba(22, 155, 213, 1);
 $font-color: #2d2d2d;
 $anima-time:0.2s;
 $anima-delay:0.15s;
 $border-color: #e7e7e7;
 
-.fdcheck{
+.fdcheck {
   position: relative;
   cursor: pointer;
-  &::before{
+
+  &::before {
     content: '';
     border: #CCCCCC 1px solid;
     width: 14px;
@@ -20,18 +21,19 @@ $border-color: #e7e7e7;
   }
 }
 
-.check_active{
-  &::before{
+.check_active {
+  &::before {
     content: '';
-    background: #1fe4dc;
-    border: #1fe4dc 1px solid;
+    background: #169bd5;
+    border: #169bd5 1px solid;
   }
-  &::after{
+
+  &::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%);
@@ -55,13 +57,20 @@ $border-color: #e7e7e7;
   line-height: 34px;
   cursor: pointer;
 }
+
 .primary {
-  background: $theme-color;
+  background: rgba(22, 155, 213, 1);
+  margin: 0 auto;
+  display: block;
+  color: #fff;
 }
+
 .cancel {
   background: #e6e6e6;
   margin-left: 10px;
+  display: none;
 }
+
 .toast-layout {
   display: none;
   position: fixed;
@@ -71,9 +80,10 @@ $border-color: #e7e7e7;
   height: 100%;
   overflow: hidden;
   margin: 0;
-  opacity:0;
+  opacity: 0;
   z-index: 88888888;
   transition: all $anima-time linear;
+
   .loading {
     svg {
       position: absolute;
@@ -88,6 +98,7 @@ $border-color: #e7e7e7;
       animation-iteration-count: infinite;
     }
   }
+
   .toast-con {
     position: absolute;
     padding: 20px 0;
@@ -97,16 +108,19 @@ $border-color: #e7e7e7;
     background: #fff;
     border-radius: 6px;
     box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
+
     .t-line {
       width: 100%;
       background: #e4e4e4;
       height: 1px;
       margin: 20px 0;
     }
+
     .iconfont {
       cursor: pointer;
     }
-    .t-header{
+
+    .t-header {
       display: flex;
       justify-content: space-between;
       align-items: center;
@@ -115,10 +129,12 @@ $border-color: #e7e7e7;
       height: 54px;
       padding: 0 30px;
     }
+
     .pay-con {
       background: #fff;
       padding: 24px 30px;
       max-width: 95%;
+
       .capacity,
       .device,
       .mid,
@@ -126,35 +142,43 @@ $border-color: #e7e7e7;
       .amount {
         display: flex;
         padding-bottom: 32px;
+
         .attr {
           font-size: 14px;
           color: $font-color;
         }
+
         .attren {
           min-width: 140px;
         }
+
         .val {
           display: flex;
           align-items: center;
           margin-left: 20px;
-          .time{
+
+          .time {
             color: #f9082a;
             font-size: 14px;
 
           }
-          .a-price{
+
+          .a-price {
             color: #ff0000;
             font-size: 32px;
-            span{
+
+            span {
               font-size: 16px;
               font-weight: bold;
             }
           }
-          .dec{
+
+          .dec {
             color: #2d2d2d;
             font-size: 12px;
             margin-top: 10px;
           }
+
           .tag {
             height: 100%;
             font-size: 0;
@@ -164,6 +188,7 @@ $border-color: #e7e7e7;
             border: 1px solid #e7e7e7;
             position: relative;
             cursor: pointer;
+
             .year {
               min-width: 82px;
               height: 48px;
@@ -175,6 +200,7 @@ $border-color: #e7e7e7;
               font-size: 14px;
               flex-shrink: 0;
             }
+
             .price {
               background: #fff;
               height: 48px;
@@ -184,11 +210,13 @@ $border-color: #e7e7e7;
               font-size: 18px;
               color: #ff0000;
               text-align: center;
+
               .per {
                 font-size: 12px;
                 color: #777777;
               }
             }
+
             img {
               position: absolute;
               bottom: 0;
@@ -196,11 +224,13 @@ $border-color: #e7e7e7;
               width: 14px;
             }
           }
-          .tag-renew{
+
+          .tag-renew {
             width: 140px;
             box-sizing: border-box;
             height: 40px;
-            .tag-item{
+
+            .tag-item {
               width: 100%;
               background: #f4f4f9;
               color: #2d2d2d;
@@ -213,10 +243,12 @@ $border-color: #e7e7e7;
               display: inline-block;
               vertical-align: middle;
             }
-            img{
+
+            img {
               display: none;
             }
-            .iconfont{
+
+            .iconfont {
               color: #777;
               vertical-align: middle;
               font-size: 30px;
@@ -224,16 +256,20 @@ $border-color: #e7e7e7;
               margin-right: 13px;
             }
           }
+
           .tag-active {
             border: 1px solid $theme-color;
             box-sizing: border-box;
-            img{
+
+            img {
               display: inline-block;
             }
           }
         }
+
         .body {
           margin-left: 20px;
+
           .pay-tag {
             cursor: pointer;
             border: 1px solid #e7e7e7;
@@ -242,18 +278,22 @@ $border-color: #e7e7e7;
             height: 36px;
             margin-bottom: 20px;
             position: relative;
-            &:last-of-type{
+
+            &:last-of-type {
               margin-bottom: 0;
             }
+
             span {
               margin-left: 36px;
               display: inline-block;
               text-align: center;
               padding-left: 60px;
             }
+
             img {
               position: absolute;
             }
+
             .t-icon {
               width: 36px;
               height: 35px;
@@ -261,17 +301,21 @@ $border-color: #e7e7e7;
               left: 0;
               border-right: 1px solid #e7e7e7;
             }
+
             .t-click {
               right: 0;
               bottom: 0;
               display: none;
             }
           }
-          .paypal-con{
+
+          .paypal-con {
             position: relative;
-            .form-con{
+
+            .form-con {
               opacity: 0;
-              input[type='text']{
+
+              input[type='text'] {
                 width: 1px;
                 height: 1px;
                 position: absolute;
@@ -279,73 +323,86 @@ $border-color: #e7e7e7;
                 left: 0;
                 opacity: 0;
               }
-               input[type='submit']{
-                 width: 100%;
-                 position: absolute;
-                 top: 0;
-                 left: 0;
-                 height: 100%;
-                 opacity: 0;
-               }
+
+              input[type='submit'] {
+                width: 100%;
+                position: absolute;
+                top: 0;
+                left: 0;
+                height: 100%;
+                opacity: 0;
+              }
             }
           }
+
           .tag-active {
             border: 1px solid $theme-color;
+
             span {
               color: #000;
             }
+
             .t-icon {
               border-right: 1px solid $theme-color;
             }
+
             .t-click {
               display: inline-block;
             }
           }
         }
       }
-      .amount{
-        .val{
+
+      .amount {
+        .val {
           display: block;
           position: relative;
           top: -16px;
-          .price-img{
+
+          .price-img {
             width: 180px;
-            box-shadow: 0 0 10px rgba(0,0,0,0.2);
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
             margin: 18px 0 12px;
           }
-          .scanicon{
+
+          .scanicon {
             position: absolute;
             left: 210px;
             width: 200px;
             top: 30px;
             height: auto;
           }
-          .dec{
+
+          .dec {
             text-align: center;
           }
         }
       }
     }
-    .binding-con{
+
+    .binding-con {
       position: relative;
       height: 295px;
       border-top: 1px solid #e4e4e4;
       border-bottom: 1px solid #e4e4e4;
-      .binding-body{
+
+      .binding-body {
         position: absolute;
         top: 32px;
         left: 50%;
         transform: translateX(-50%);
         width: 420px;
 
-        .toclient{
+        .toclient {
           color: #202020;
           margin-bottom: 24px;
           font-size: 14px;
         }
-        .b-input{
+
+        .b-input {
           width: 100%;
-          input{
+
+          input {
             width: 100%;
             color: #969696;
             height: 40px;
@@ -354,63 +411,76 @@ $border-color: #e7e7e7;
             font-size: 14px;
             border: solid 1px #e7e7e7;
           }
-          .notbing{
+
+          .notbing {
             border: 1px solid #ff0000;
           }
         }
-        .bind-error{
+
+        .bind-error {
           color: #ff0000;
           font-size: 14px;
           text-align: center;
           height: 30px;
           margin-top: 5px;
         }
-        p{
+
+        p {
           color: $font-color;
           font-size: 14px;
           line-height: 2;
         }
       }
-      .cooperation{
-        top: 0!important;
+
+      .cooperation {
+        top: 0 !important;
         width: 670px;
-        .toclient{
+
+        .toclient {
           margin-top: 15px;
           margin-bottom: 7px;
           display: flex;
           justify-content: space-between;
         }
-        .auth-list{
+
+        .auth-list {
           display: flex;
           flex-wrap: wrap;
           margin-left: 20px;
-          >li{
+
+          >li {
             margin-bottom: 10px;
             width: 25%;
           }
         }
       }
-      .binding-success{
+
+      .binding-success {
         position: absolute;
         top: 50%;
         left: 50%;
         transform: translate(-50%, -50%);
         width: 420px;
         text-align: center;
-        img{
+
+        img {
           width: 64px;
         }
-        p{
+
+        p {
           font-size: 16px;
-          &:first-of-type{
+
+          &:first-of-type {
             margin-bottom: 10px;
           }
         }
       }
     }
-    .bind-btn{
+
+    .bind-btn {
       text-align: center;
-      span{
+
+      span {
         display: inline-block;
         margin: 18px auto;
         background: $theme-color;
@@ -420,36 +490,44 @@ $border-color: #e7e7e7;
         line-height: 34px;
         font-size: 14px;
         cursor: pointer;
+        color: #fff;
       }
     }
-    .coo-btn{
+
+    .coo-btn {
       text-align: right;
       padding-right: 30px;
-      >span{
+
+      >span {
         text-align: center;
       }
-      .default{
+
+      .default {
         background-color: #E6E6E6;
       }
     }
-    .invoice-con{
+
+    .invoice-con {
       background: #fff;
       padding: 30px;
+
       input {
         appearance: none;
         line-height: 36px;
         height: 36px;
         border: solid 1px $border-color;
         padding-left: 10px;
+
         &:focus {
           border: solid 1px $theme-color;
         }
       }
-      
+
       .btn {
         text-align: center;
         cursor: pointer;
       }
+
       .parmary {
         background-color: $theme-color;
         width: 126px;
@@ -457,6 +535,7 @@ $border-color: #e7e7e7;
         line-height: 36px;
         margin-top: 20px;
       }
+
       .choose {
         background-color: #ddd;
         color: #fff;
@@ -466,6 +545,7 @@ $border-color: #e7e7e7;
         font-size: 12px;
         margin: 12px 0 20px;
       }
+
       .edit-invoice {
         .select-con {
           div {
@@ -479,6 +559,7 @@ $border-color: #e7e7e7;
             color: #a0a0a0;
             padding: 0 10px;
             display: inline-block;
+
             img {
               display: none;
               position: absolute;
@@ -486,14 +567,17 @@ $border-color: #e7e7e7;
               right: 0;
             }
           }
+
           .tag-active {
             border: solid 1px $theme-color;
             color: #000;
+
             img {
               display: inline-block;
             }
           }
         }
+
         .input-con {
           input {
             width: 316px;
@@ -503,32 +587,40 @@ $border-color: #e7e7e7;
           }
         }
       }
-      .open-edu{
+
+      .open-edu {
         margin-bottom: 10px;
-        span{
+
+        span {
           font-size: 14px;
           margin-left: 10px;
         }
       }
     }
-    .show-invoice{
+
+    .show-invoice {
       background: #fff;
       padding: 30px;
-      .invoice-p,.address-p{
-        p{
+
+      .invoice-p,
+      .address-p {
+        p {
           font-size: 14px;
           color: #969696;
           margin-bottom: 8px;
-          &:first-of-type{
+
+          &:first-of-type {
             margin-bottom: 10px;
             color: $font-color;
           }
         }
       }
-      .address-p{
+
+      .address-p {
         margin-top: 20px;
       }
     }
+
     .edit-address {
       .input-con {
         input {
@@ -538,38 +630,47 @@ $border-color: #e7e7e7;
           margin: 10px 25px 10px 0;
         }
       }
+
       .address-input {
         input {
           width: 660px;
         }
       }
     }
+
     .t-line {
       width: 100%;
       background: #e4e4e4;
       height: 1px;
       margin: 20px 0;
     }
+
     .top {
       padding: 0 36px;
       display: flex;
       justify-content: space-between;
       align-items: center;
       color: #969696;
+
       span {
         font-size: 16px;
       }
+
       .iconfont {
         cursor: pointer;
       }
     }
+
     .detail {
       padding: 0 36px;
+
       img {
         width: 30px;
         display: inline-block;
         vertical-align: middle;
+        display: none;
       }
+
       span {
         margin-left: 10px;
         font-size: 16px;
@@ -578,28 +679,34 @@ $border-color: #e7e7e7;
         vertical-align: middle;
       }
     }
+
     .bottom {
       padding: 0 36px;
-      float: right;
+      float: none !important;
     }
+
     .mid-bottom {
       float: none;
       text-align: center;
     }
   }
-  .recharge-con,.bind-con{
+
+  .recharge-con,
+  .bind-con {
     padding: 0;
     border-radius: 4px;
     overflow: hidden;
     top: 50%;
   }
-  .bind-con{
-    .t-header{
+
+  .bind-con {
+    .t-header {
       background: #fff;
     }
   }
 }
-.toast-active{
-  display: block!important;
-  opacity: 1!important;
-}
+
+.toast-active {
+  display: block !important;
+  opacity: 1 !important;
+}

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/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/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-xa.png" alt>
+            <h1>消安相机管理平台</h1>
+          <!-- </vcenter> -->
         <!-- </router-link> -->
       </div>
       <!-- <div class="menu">
@@ -245,8 +246,11 @@ export default {
     text-align: center;
     text-align: left;
     margin-right: 52px;
-    float: left;
+    // float: left;
     height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     .logo {
       position: relative;
       width: 150px;
@@ -255,8 +259,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'" />
@@ -155,7 +155,7 @@ export default {
   margin-bottom: 38px;
   cursor: pointer;
   &.is-active {
-    border-bottom: 2px solid #1FE4DC;
+    border-bottom: 2px solid rgba(22, 155, 213, 1);
     padding-bottom: 9px;
   }
 }
@@ -199,13 +199,14 @@ export default {
 }
 .login-btn {
   margin: 36px 0 18px;
-  background: #1FE4DC;
+  background: rgba(22, 155, 213, 1);
   width: 100%;
   text-align: center;
   line-height: 60px;
   font-weight: 600;
   border-radius: 3px;
   cursor: pointer;
+  color: #fff;
 }
 .others {
   text-align: center;

pc/src/page/login/index.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="login-page">
+      <h1 class="login-title">消安相机管理平台</h1>
+
     <div class="login-container">
       <LoginBox v-if="page === 'login'" />
       <registerBox v-else-if="page === 'register'" />
@@ -8,7 +10,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,27 +19,9 @@
             </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 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">
-            <a class="header-item" @click="$router.push('/information')">
-              <ul class="child-list">
-                <li @click="$router.push('/information')">{{ homeLang.headers.myaccount }}</li>
-                <li @click.stop="handleLogout">{{ homeLang.headers.logout }}</li>
-              </ul>
-            </a>
-          </div>
-        </div> -->
-      <!-- <div class="cart" @click="handleCartClick" v-if="isLogin">
-          <h-icon type="xingouwuche" class="icon" />
-          <span v-if="cartCount">{{cartCount}}</span>
-        </div> -->
+      </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,8 +85,18 @@ 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: #169bd5;
+  .login-title{
+        position: absolute;
+    left: 50%;
+    top: 20%;
+    transform: translateX(-50%);
+    color: #fff;
+    font-size: 28px;
+
+  }
   .login-container {
     position: absolute;
     left: 50%;

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;
@@ -163,7 +163,7 @@
           width: 100%;
           line-height: 36px;
           text-align: right;
-          padding-right: 110px;
+          padding-right: 50px;
           &.is-en {
             padding-right: 50px;
           }
@@ -189,8 +189,8 @@
           }
           .active{
             &::before{
-              background-color: #1fe4dc;
-              border: 1px solid #1fe4dc;
+              background-color: rgba(22, 155, 213, 1);
+              border: 1px solid rgba(22, 155, 213, 1);
             }
           }
           .logout-span{

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">
+        <!-- <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 default" @click="multDel">{{langDevices.unbind}}</span>
-        </div>
-        <div class="tab-search" :style="{marginRight:isWide?'0':'149px'}">
+        </div> -->
+        <!-- <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>
 
@@ -57,20 +57,18 @@
                 <p class="p-sub">{{langDevices.expire}}{{item.spaceEndStr||'--'}}</p>
                 <p class="p-sub" :title="item.cooperationUserName" v-if="item.cooperationUserName">{{langDevices.xiezuo}}{{item.cooperationUserName||'--'}}</p>
 
-                <div class="oper-con">
+                <!-- <div class="oper-con">
                   <div class="oper">
                     <div>
                       <span class="spot"></span>
                     </div>
                     <ul :style="{minWidth: language==='en'?'150px': '90px'}">
-                      <!-- <li @click="$router.push({name:'introduce',params:{id:item.childName}})">
-                        {{langDevices.capacity}}
-                      </li> -->
+
                       <li @click="unbind(item)">{{langDevices.unbind}}</li>
                       <li v-if="item.status !== 0" @click="handleCooperation(item)">{{langDevices.fenpei}}</li>
                     </ul>
                   </div>
-                </div>
+                </div> -->
               </template>
               <template v-else>
                 <p class="d-id">ID: {{item.childName}}</p>
@@ -110,7 +108,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>
 
@@ -275,7 +273,7 @@ export default {
       let color = ''
       switch (true) {
         case temp < point:
-          color = '#1fe4dc'
+          color = 'rgba(22, 155, 213, 1)'
           break
 
         default:
@@ -345,7 +343,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-$theme-color: #1fe4dc;
+$theme-color: rgba(22, 155, 213, 1);
 $font-color: #2d2d2d;
 
 .device-layout{
@@ -435,7 +433,7 @@ $font-color: #2d2d2d;
           margin-left: 5px;
         }
         .active{
-          color: #1fe4dc;
+          color: rgba(22, 155, 213, 1);
         }
       }
     }
@@ -582,8 +580,8 @@ $font-color: #2d2d2d;
             }
           }
           .primary{
-            background: #1fe4dc;
-            border: 1px solid #1fe4dc;
+            background: rgba(22, 155, 213, 1);
+            border: 1px solid rgba(22, 155, 213, 1);
           }
         }
         .oper-con{
@@ -713,13 +711,14 @@ $font-color: #2d2d2d;
     img{
       padding-bottom: 22px;
       text-align: center;
+      opacity: 0;
     }
     div{
       font-size: 16px;
       color: #969696;
       text-align: center;
       width: 230px;
-      margin: 0 auto;
+      margin: 50px auto;
     }
   }
    .paging {

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

@@ -7,7 +7,7 @@
         <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">

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

@@ -18,40 +18,44 @@ export default{
   },
   information: {
     nameArr: {
-      information: '账号信息',
-      scene: '我的场景',
-      order: '我的订单',
-      device: '我的相机',
-      consumption: '消费记录',
-      change: '修改密码',
+      // information: '账号信息',
+      scene: '拍摄场景',
+      // order: '我的订单',
+      device: '相机管理',
+      // consumption: '消费记录',
+      // change: '修改密码',
       logout: '退出登录'
     },
     settings: [
       {
         name: 'info',
-        items: [{
-          name: '账号信息',
-          to: {name: 'information'}
-        }, {
-          name: '我的场景',
-          to: {name: 'scene'}
-        }, {
-          name: '我的相机',
-          to: {name: 'device'}
-        }, {
-          name: '修改密码',
-          to: {
-            name: 'change'
-          }
-        }, {
-          name: '退出登录',
-          to: 'logout'
-        }]
-      },
-      {
-        name: 'security',
-        items: []
+        items: [
+          // {
+          //   name: '账号信息',
+          //   to: {name: 'information'}
+          // },
+          {
+            name: '拍摄场景',
+            to: {name: 'scene'}
+          }, {
+            name: '相机管理',
+            to: {name: 'device'}
+          },
+          // {
+          //   name: '修改密码',
+          //   to: {
+          //     name: 'change'
+          //   }
+          // },
+          {
+            name: '退出登录',
+            to: 'logout'
+          }]
       }
+      // {
+      //   name: 'security',
+      //   items: []
+      // }
     ],
     deviceSettings: [
       {