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/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

@@ -57,94 +57,94 @@
     </layout>
 </template>
 <script>
-import http from "@/util/http";
-import Layout from "./Layout";
+import http from '@/util/http'
+import Layout from './Layout'
 import { deepExtend } from '@/util/tools'
 // import { EnNews } from '@/../../common/data/newsData'
 export default {
-    components: {
-        Layout
+  components: {
+    Layout
+  },
+  data () {
+    return {
+      lang: null,
+      curr: 'zh',
+      News: []
+    }
+  },
+  computed: {
+    langs () {
+      return 'zh#中文,en#英文'.split(',').map(item => {
+        let keypair = item.split('#')
+        return { name: keypair[0], text: keypair[1] }
+      })
+    }
+  },
+  created () {
+    this.loadNews()
+  },
+  methods: {
+    isChildren (key, value) {
+      return key !== '__name' && typeof value === 'string'
     },
-    data() {
-        return {
-            lang: null,
-            curr: "zh",
-            News: []
-        };
+    isModule (value) {
+      return typeof value !== 'string'
     },
-    computed: {
-        langs() {
-            return 'zh#中文,en#英文'.split(",").map(item => {
-                let keypair = item.split("#");
-                return { name: keypair[0], text: keypair[1] };
-            });
+    onValueChange (e, p, m, c) {
+      const value = e.target.value.trim()
+      if (value) {
+        if (!c) {
+          p[m] = value
+        } else {
         }
+      }
     },
-    created() {
-        this.loadNews()
+    loadNews () {
+      let urlMap = {
+        zh: '@/../common/data/news.json',
+        en: '/oss/new4dkk/news-en.json'
+      }
+      http.get(`../dev/news/${this.curr}`).then(res => {
+        console.log(res)
+        this.News = res.data.data
+      })
     },
-    methods: {
-        isChildren(key, value) {
-            return key !== "__name" && typeof value === "string";
-        },
-        isModule(value) {
-            return typeof value !== "string";
-        },
-        onValueChange(e, p, m, c) {
-            const value = e.target.value.trim();
-            if (value) {
-                if (!c) {
-                    p[m] = value;
-                } else {
-                }
-            }
-        },
-        loadNews () {
-            let urlMap = {
-                zh: '@/../common/data/news.json',
-                en: 'https://testusaoss.4dkankan.com/new4dkk/news-en.json'
-            }
-            http.get(`../dev/news/${this.curr}`).then(res => {
-                console.log(res)
-                this.News = res.data.data
-            })
-        },
-        onSave() {
-            this.News.sort((a, b) => a.sort - b.sort)
-            
-            http.post(`../dev/news/update`, { data: this.News.filter(item => item.title), lang: this.curr})
-            .then(response => {
-                if (response.data.ok) {
-                    this.$alert('保存成功', {
-                        icon: 'success'
-                    });
-                } else {
-                    this.$alert('保存失败');
-                }
-            })
-            .catch(err => {
-                this.$alert('保存失败');
-            });
-        },
-        handleImgChange (index, e) {
-            const file = e.target.files[0]
-            let formdata = new FormData()
-            formdata.append('file', file)
-            http.post(`../node-upload/uploadfile`, formdata)
-            .then(res => {
-                const url = res.data.data.url
-                this.News[index].img = url
+    onSave () {
+      this.News.sort((a, b) => a.sort - b.sort)
+
+      http.post(`../dev/news/update`, { data: this.News.filter(item => item.title), lang: this.curr})
+        .then(response => {
+          if (response.data.ok) {
+            this.$alert('保存成功', {
+              icon: 'success'
             })
-            .catch(err => {
-                console.error(err)
-                this.$alert('图片上传失败')
-            });
-        },
-        onCreate () {
-            this.News.unshift({})
-        }
+          } else {
+            this.$alert('保存失败')
+          }
+        })
+        .catch(err => {
+          this.$alert('保存失败')
+        })
+    },
+    handleImgChange (index, e) {
+      const file = e.target.files[0]
+      let formdata = new FormData()
+      formdata.append('file', file)
+      http.post(`../node-upload/uploadfile`, formdata)
+        .then(res => {
+          const url = res.data.data.url
+          this.News[index].img = url
+        })
+        .catch(err => {
+          console.error(err)
+          this.$alert('图片上传失败')
+        })
+    },
+    onCreate () {
+      this.News.unshift({})
     }
-};
+  }
+}
 </script>
 <style lang="less" scoped>
 select {
@@ -154,7 +154,7 @@ select {
 .menus {
     .module {
         margin-left: 15px;
-        
+
     }
     li {
       margin-bottom: 10px;
@@ -167,4 +167,4 @@ select {
             margin-top: 5px;
         }
 }
-</style>
+</style>

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

@@ -40,11 +40,11 @@
                 <i style="font-size:12px">{{country[capacitycountry]}} </i>{{capacitycountry===1?activeItem.dollarPrice:activeItem.price}}
                 <span class="per"> / {{activeItem.description&&(langauge==='en'?ani[JSON.parse(activeItem.description)['期限单位']]:JSON.parse(activeItem.description)['期限单位'])}}</span>
               </span>
-              <img :src="`${$cdn}images/tag-icon.png`" />
+              <!-- <img :src="`${$cdn}images/tag-icon.png`" /> -->
             </div>
           </div>
         </div>
-        <div class="mid">
+        <!-- <div class="mid">
           <div class="attr" :class="`attr${langauge}`">{{langauge==='en'?'Payment method: ':'支付方式：'}}</div>
           <div class="body">
             <div
@@ -87,7 +87,7 @@
               </form>
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="validity">
           <div class="attr" :class="`attr${langauge}`">{{langauge==='en'?'Storage Expiry: ':'容量期限：'}}</div>
           <div class="val" style="display:block">

pc/src/components/toast/capacityRenew.vue

@@ -23,11 +23,11 @@
                 <i style="font-size:12px">{{country[capacitycountry]}} </i>{{capacitycountry===1?activeItem.dollarPrice:activeItem.price}}
                 <span class="per"> / {{activeItem.description&&(langauge==='en'?ani[JSON.parse(activeItem.description)['期限单位']]:JSON.parse(activeItem.description)['期限单位'])}}</span>
               </span>
-              <img :src="`${$cdn}images/tag-icon.png`" />
+              <!-- <img :src="`${$cdn}images/tag-icon.png`" /> -->
             </div>
           </div>
         </div>
-        <div class="mid">
+        <!-- <div class="mid">
           <div class="attr">{{langauge==='en'?'Payment method: ':'支付方式：'}}</div>
           <div class="body">
             <div
@@ -70,7 +70,7 @@
               </form>
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="validity">
           <div class="attr">{{langauge==='en'?'Storage Expiry: ':'容量期限：'}}</div>
           <div class="val">

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

@@ -23,11 +23,11 @@
                 <i style="font-size:12px">￥</i>{{activeItem.price}}
                 <span class="per">元</span>
               </span>
-              <img :src="`${$cdn}images/tag-icon.png`" alt />
+              <!-- <img :src="`${$cdn}images/tag-icon.png`" alt /> -->
             </div>
           </div>
         </div>
-        <div class="mid">
+        <!-- <div class="mid">
           <div class="attr">支付方式：</div>
           <div class="body">
             <div
@@ -70,7 +70,7 @@
               </form>
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="amount"  v-if="paytype !== 'paypal'">
           <div class="attr">应付金额：</div>
           <div class="val">

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

@@ -1,7 +1,7 @@
 <template>
 <div class="login-layout">
   <div class="mask" :style="{maxHeight: openClause ? '100%' : '0'}">
-    <div  class="user-clause" :class="{'cart-clause':cluseType==='cart'}">
+    <!-- <div  class="user-clause" :class="{'cart-clause':cluseType==='cart'}">
       <div>
         <div class="clause-img" ref="clause">
           <div ref="clauseImg">
@@ -16,7 +16,7 @@
           <span :class="{primary:allreadyRead}" @click="agree">{{languagelAside.comfirm}}</span>
         </div>
       </div>
-    </div>
+    </div> -->
   </div>
   <component :is="login && notEmit ? 'cart' : 'login'" :cp="cp" :active='active'></component>
 </div>

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

@@ -4,8 +4,8 @@
       <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>
+            <!-- <img src="/oss/new4dkk/images/logo.png" alt> -->
+            <img src="/oss/new4dkk/images/logo-cn.png" alt>
           </vcenter>
         <!-- </router-link> -->
       </div>
@@ -255,8 +255,8 @@ export default {
       color: #fff;
     }
     img{
-      width: 230px;
-      height: 38px;
+      width: 149px;
+      height: 50px;
     }
   }
 

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'" />

pc/src/page/login/index.vue

@@ -7,8 +7,7 @@
     </div>
     <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 +16,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>

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

@@ -70,7 +70,7 @@
                 <div class="ali-pay"></div>
                 <div class="wechat-pay"></div>
               </div>
-              
+
               <div class="actions-w fr">
                 <div class="btn" @click="$router.push('/mall/kankanPro')">{{ $t('mall.continueBuy') }}</div>
                 <div class="btn submit-btn" @click="toConfirm">{{ $t('mall.nowJieSuan') }}</div>
@@ -120,8 +120,8 @@ export default {
           list = state.user.cart
         } else {
           list = state.user.cart && state.user.cart !== 'null'
-          ? JSON.parse(state.user.cart)
-          : []
+            ? JSON.parse(state.user.cart)
+            : []
         }
         list.forEach(item => {
           item.isSelect = true
@@ -134,7 +134,7 @@ export default {
     },
     totalPrice () {
       if (this.cart.length === 1) {
-        return this.cart[0].goodsCount *  this.cart[0].price
+        return this.cart[0].goodsCount * this.cart[0].price
       }
       return this.cart.reduce((total, item) => total + (this.selectedGoods.indexOf(item.goodsId) > -1 ? item.goodsCount * item.price : 0), 0)
     }
@@ -152,7 +152,6 @@ export default {
         this.$store.dispatch('reduceCart', params)
         this.selectedGoods = this.selectedGoods.filter(id => id != item.goodsId)
       })
-      
     },
     input (e) {
     },
@@ -190,8 +189,7 @@ export default {
     changeSelect (item) {
       if (this.selectedGoods.indexOf(item.goodsId) > -1) {
         this.selectedGoods = this.selectedGoods.filter(goodsId => goodsId !== item.goodsId)
-      } else 
-      this.selectedGoods.push(item.goodsId)
+      } else { this.selectedGoods.push(item.goodsId) }
     },
     changeAllSelect () {
       if (this.selectedGoods.length !== this.cart.length) {
@@ -203,7 +201,6 @@ export default {
       } else {
         this.selectedGoods = []
       }
-      
     },
     toConfirm () {
       if (this.selectedGoods.length === 0) {
@@ -328,7 +325,7 @@ export default {
       color: #fff;
       font-size: 14px;
       &.is-active {
-        
+
         background: #1FE4DC;
         border-color: #1FE4DC;
       }
@@ -342,7 +339,7 @@ export default {
     display: flex;
     align-items: center;
     font-size: 14px;
-    
+
     .img-w {
       width: 90px;
       text-align: center;
@@ -466,14 +463,14 @@ export default {
   &>div {
     width: 79px;
     height: 28px;
-    background: url(~@/assets/images/refactor/mall/ali-pay.png) no-repeat center center;
+    // background: url(~@/assets/images/refactor/mall/ali-pay.png) no-repeat center center;
     background-size: 79px auto;
     margin-right: 28px;
   }
   .wechat-pay {
     width: 84.87px;
-    background: url(~@/assets/images/refactor/mall/wechat-pay.png) no-repeat center center;
+    // background: url(~@/assets/images/refactor/mall/wechat-pay.png) no-repeat center center;
     background-size: 84.87px auto;
   }
 }
-</style>
+</style>

pc/src/page/manage/style.scss

@@ -1,227 +1,229 @@
-.manage-layout{
-  
-  $font-color:#2d2d2d;
-  $theme-color:#1fe4dc;
-  position: relative;
-  width: 100vw;
-  height: 100vh;
-  background: #f4f4f6;
-  .manage-bg{
-    background: url(https://testusaoss.4dkankan.com/new4dkk/images/person-bg.png) no-repeat top center;
-    background-size: cover;
-    .manage-con{
-      padding: 30px 0;
-      width: 50%;
-      margin: 0 auto;
-      .info{
-        color: #cfcfcf;
-        width: 730px;
-        display: block;
-        position: relative;
-        .card-img{
-          font-size: 0;
-          display: inline-block;
-          cursor: pointer;
-          background-position: center;
-          background-size: auto 100%;
-        }
-        .avatar{
-          width: 64px;
-          height: 64px;
-          flex-shrink: 0;
-          margin-right: 14px;
-          background-repeat: no-repeat;
-          background-size: cover;
-        }
-        .member{
-          display:flex;
-          flex-direction: column;
-          justify-content: space-between;
-          height: 64px;
-          padding: 2px 0;
-          p{
-            line-height: 1;
-            color: #cfcfcf;
-            font-size: 16px;
-            &:first-child{
-              font-size: 28px;
-              color: #fff;
-            }
-            .child-name{
-              display: inline-block;
-              position: relative;
-              cursor: pointer;
-              min-width: 120px;
-              ul{
-                background-color: #fff;
-                position: absolute;
-                width: calc(100% + 32px);
-                top: 22px;
-                left: -5px;
-                color: #969696;
-                max-height: 0;
-                overflow: hidden;
-                transition:all 0.3s ease;
-                li{
-                  line-height: 28px;
-                  padding: 0 5px;
-                  &:hover{
-                    background: $theme-color;
-                    color: #2d2d2d;
-                  }
+.manage-layout {
+    $font-color: #2d2d2d;
+    $theme-color: #1fe4dc;
+    position: relative;
+    width: 100vw;
+    height: 100vh;
+    background: #f4f4f6;
+    .manage-bg {
+        background: url(/oss/new4dkk/images/person-bg.png) no-repeat top center;
+        background-size: cover;
+        .manage-con {
+            padding: 30px 0;
+            width: 50%;
+            margin: 0 auto;
+            .info {
+                color: #cfcfcf;
+                width: 730px;
+                display: block;
+                position: relative;
+                .card-img {
+                    font-size: 0;
+                    display: inline-block;
+                    cursor: pointer;
+                    background-position: center;
+                    background-size: auto 100%;
+                }
+                .avatar {
+                    width: 64px;
+                    height: 64px;
+                    flex-shrink: 0;
+                    margin-right: 14px;
+                    background-repeat: no-repeat;
+                    background-size: cover;
+                }
+                .member {
+                    display: flex;
+                    flex-direction: column;
+                    justify-content: space-between;
+                    height: 64px;
+                    padding: 2px 0;
+                    p {
+                        line-height: 1;
+                        color: #cfcfcf;
+                        font-size: 16px;
+                        &:first-child {
+                            font-size: 28px;
+                            color: #fff;
+                        }
+                        .child-name {
+                            display: inline-block;
+                            position: relative;
+                            cursor: pointer;
+                            min-width: 120px;
+                            ul {
+                                background-color: #fff;
+                                position: absolute;
+                                width: calc(100% + 32px);
+                                top: 22px;
+                                left: -5px;
+                                color: #969696;
+                                max-height: 0;
+                                overflow: hidden;
+                                transition: all 0.3s ease;
+                                li {
+                                    line-height: 28px;
+                                    padding: 0 5px;
+                                    &:hover {
+                                        background: $theme-color;
+                                        color: #2d2d2d;
+                                    }
+                                }
+                            }
+                        }
+                        .tab-active {
+                            ul {
+                                max-height: 120px;
+                                overflow: auto;
+                            }
+                        }
+                        .sanjiao {
+                            display: inline-block;
+                            position: relative;
+                            &::before {
+                                content: '';
+                                border: 8px solid transparent;
+                                border-top-color: #cfcfcf;
+                                border-left-width: 5px;
+                                border-right-width: 5px;
+                                position: absolute;
+                                right: -20px;
+                                top: 4px;
+                                z-index: 1;
+                            }
+                        }
+                    }
                 }
-              }
             }
-            .tab-active{
-              ul{
-                max-height: 120px;
-                overflow: auto;
-              }
+            .open-btn {
+                color: #010101;
+                line-height: 40px;
+                height: 40px;
+                margin-top: 20px;
+                width: 170px;
+                font-size: 16px;
+                text-align: center;
+                background-color: #1fe4dc;
+                cursor: pointer;
             }
-            .sanjiao{
-              display: inline-block;
-              position: relative;
-              &::before{
-                content: '';
-                border: 8px solid transparent;
-                border-top-color: #cfcfcf;
-                border-left-width: 5px;
-                border-right-width: 5px;
-                position: absolute;
-                right: -20px;
-                top: 4px;
-                z-index: 1;
-              }
+            .deviceLogin {
+                display: block;
+            }
+            .capacity {
+                margin-top: 10px;
+                width: 680px;
+                .c-line {
+                    width: 100%;
+                    margin: 15px 0;
+                    height: 8px;
+                    background-color: #ccc;
+                    .active {
+                        background-color: $theme-color;
+                        height: 100%;
+                    }
+                }
+                .c-dec {
+                    font-size: 16px;
+                    color: #cfcfcf;
+                }
+                .c-detail {
+                    color: #fff;
+                    display: flex;
+                    justify-content: space-between;
+                    span {
+                        font-size: 14px;
+                        color: #cfcfcf;
+                    }
+                }
             }
-          }
-          
-        }
-        
-      }
-      .open-btn{
-        color: #010101;
-        line-height: 40px;
-        height: 40px;
-        margin-top: 20px;
-        width: 170px;
-        font-size: 16px;
-        text-align: center;
-        background-color: #1fe4dc;
-        cursor: pointer;
-      }
-      .deviceLogin{
-        display: block;
-      }
-      .capacity{
-        margin-top: 10px;
-        width: 680px;
-        .c-line{
-          width: 100%;
-          margin: 15px 0;
-          height: 8px;
-          background-color: #ccc;
-          .active{
-            background-color: $theme-color;
-            height: 100%;
-          }
         }
-        .c-dec{
-          font-size: 16px;
-          color: #cfcfcf;
+    }
+    .manage-body {
+        min-height: 676px;
+        padding: 100px 0;
+        background-color: #f4f4f6;
+        .container {
+            display: flex;
         }
-        .c-detail{
-          color: #fff;
-          display: flex;
-          justify-content: space-between;
-          span{
-            font-size: 14px;
-            color: #cfcfcf;
-          }
+        .mc-left {
+            flex-shrink: 0;
+            border-right: 1px solid #e7e7e7;
+            // padding-top: 30px;
+            min-height: 550px;
+            padding: 0 20px 0 0;
+            .list-items {
+                font-size: 16px;
+                display: inline-block;
+                margin-bottom: 50px;
+                width: 100%;
+                background: #fff;
+                padding-top: 20px;
+                li {
+                    // width: 100%;
+                    width: 180px;
+                    text-align: center;
+                    line-height: 40px;
+                    text-align: right;
+                    // padding-right: 110px;
+                    &.is-en {
+                        padding-right: 50px;
+                    }
+                    span {
+                        cursor: pointer;
+                        display: inline-block;
+                        position: relative;
+                        vertical-align: middle;
+                        width: 100%;
+                        text-align: center;
+                        // 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;
+                        // }
+                    }
+                    .active {
+                        // &::before{
+                        //   background-color: #1fe4dc;
+                        //   border: 1px solid #1fe4dc;
+                        // }
+                        background: #f2f2f2;
+                    }
+                    .logout-span {
+                        &::before {
+                            display: none;
+                        }
+                    }
+                }
+            }
         }
-      }
-    }
-  }
-  .manage-body{
-    min-height: 676px;
-    padding: 100px 0;
-    background-color: #f4f4f6;
-    .container {
-      display: flex;
-    }
-    .mc-left{
-      flex-shrink: 0;
-      
-      border-right: 1px solid #e7e7e7;
-      padding-top: 30px;
-      min-height: 550px;
-      .list-items{
-        font-size: 16px;
-        display: inline-block;
-        margin-bottom: 50px;
-        width: 100%;
-        li{
-          width: 100%;
-          line-height: 36px;
-          text-align: right;
-          padding-right: 110px;
-          &.is-en {
-            padding-right: 50px;
-          }
-          span{
-            cursor: pointer;
-            display: inline-block;
+        .mc-right {
+            width: 100%;
+            background: #fff;
             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;
+            .mc-title {
+                margin-left: 40px;
+                margin-top: 34px;
+                font-size: 28px;
+                color: #2d2d2d;
+                font-weight: bold;
             }
-          }
-          .active{
-            &::before{
-              background-color: #1fe4dc;
-              border: 1px solid #1fe4dc;
-            }
-          }
-          .logout-span{
-            &::before{
-              display: none;
-            }
-          }
         }
-        
-      }
-    }
-    .mc-right{
-      width: 100%;
-      background: #fff;
-      position: relative;
-      .mc-title{
-        margin-left: 40px;
-        margin-top: 34px;
-        font-size: 28px;
-        color: #2d2d2d;
-        font-weight: bold;
-      }
     }
-  }
 }
 
-
 @media screen and (min-width: 2000px) {
-  .manage-layout {
-    .manage-body{
-      min-height: 80vh;
+    .manage-layout {
+        .manage-body {
+            min-height: 80vh;
+        }
     }
-  }
 }

pc/src/page/pay/index.vue

@@ -8,7 +8,7 @@
       </div>
       <div class="h-right">{{languagePay.name}}{{info.userName}}</div>
     </div>
-    <div class="pay-con">
+    <!-- <div class="pay-con">
       <div class="pay-left">
         <div class="mid">
           <div class="attr">{{languagePay.method}}</div>
@@ -24,7 +24,7 @@
               <img :src="`${$cdn}images/tag-icon.png`" class="t-click" alt>
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="bottom">
           <div class="attr">{{languagePay.amount}}</div>
           <div class="price-detail">

pc/src/page/payrecharge/index.vue

@@ -23,11 +23,11 @@
                 <i style="font-size:12px">￥</i>{{item.price}}
                 <span class="per" v-if="item.each">{{item.each}}元/月</span>
               </span>
-              <img v-if="privilege===item.privilege" :src="`${$cdn}images/tag-icon.png`" alt />
+              <!-- <img v-if="privilege===item.privilege" :src="`${$cdn}images/tag-icon.png`" alt /> -->
             </div>
           </div>
         </div>
-        <div class="mid">
+        <!-- <div class="mid">
           <div class="attr">支付方式:</div>
           <div class="body">
             <div
@@ -49,7 +49,7 @@
               <img :src="`${$cdn}images/tag-icon.png`" class="t-click" alt />
             </div>
           </div>
-        </div>
+        </div> -->
         <div class="bottom" v-if="paytype !== 'paypal'">
           <div class="attr">应付金额:</div>
           <div class="price-detail">

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: {
@@ -26,45 +26,50 @@ export default{
       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: []
-      }
+    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: []
+      // }
     ],
-    deviceSettings: [
-      {
-        name: 'security',
-        items: [{
-          name: '场景管理',
-          to: {name: 'scene'}
-        }, {
-          name: '退出登录',
-          to: 'logout'
-        }]
-      }
-    ]
+    deviceSettings: [{
+      name: 'security',
+      items: [{
+        name: '场景管理',
+        to: {
+          name: 'scene'
+        }
+      }, {
+        name: '退出登录',
+        to: 'logout'
+      }]
+    }]
   },
   account: {
     info: '账号信息',
@@ -118,15 +123,13 @@ export default{
       0: '其他',
       3: '电商'
     },
-    tabList: [
-      {
-        name: '我的场景',
-        id: 1
-      }, {
-        name: '协作场景',
-        id: 2
-      }
-    ],
+    tabList: [{
+      name: '我的场景',
+      id: 1
+    }, {
+      name: '协作场景',
+      id: 2
+    }],
     noScenes: '暂无任何场景。',
     placeholder: {
       searchID: '搜索场景'
@@ -193,11 +196,10 @@ export default{
   },
   myDevices: {
     add: '新增相机',
-    tabList: [
-      {
-        name: 'Falcon Visual',
-        id: 4
-      }
+    tabList: [{
+      name: 'Falcon Visual',
+      id: 4
+    }
       //  {
       //   name: '四维看看Lite',
       //   id: 0
@@ -224,15 +226,13 @@ export default{
     norecord: '暂无任何记录'
   },
   Spending: {
-    tabList: [
-      {
-        name: '扩容记录'
-      }, {
-        name: '充值记录'
-      }, {
-        name: '增值发票'
-      }
-    ],
+    tabList: [{
+      name: '扩容记录'
+    }, {
+      name: '充值记录'
+    }, {
+      name: '增值发票'
+    }],
     norecord: '暂无任何记录',
     placeholder: {
       searchID: '搜索设备S/N'