Merge branch 'master' of ssh://git.xingtongworld.com:10022/xioayue/nvr_coin_web

config/index.js

@@ -24,7 +24,7 @@ module.exports = {
             '/api': {
                 // target: 'http://qkladmin2.ruanmeng.top/',
                 // target: 'https://guanli.coin.amatak.net/',
-                target: 'https://ser.ybgcoins.com/',
+                target: 'https://mgsc.nvrcoin.com/',
                 changeOrigin: true,
                 // pathRewrite: {
                 //     // 请求时 将api替换成实际的apis等

package.json

@@ -32,6 +32,7 @@
     "pako": "^2.0.2",
     "popper.js": "^1.16.0",
     "pygmentize-bundled": "^2.3.0",
+    "qs": "^6.11.2",
     "swiper": "^6.0.4",
     "vue": "^2.5.2",
     "vue-awesome-swiper": "^3.1.3",
@@ -74,7 +75,6 @@
     "less": "^3.10.3",
     "less-loader": "^5.0.0",
     "node-notifier": "^5.1.2",
-    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "^3.2.0",
     "ora": "^1.2.0",
     "portfinder": "^1.0.13",
@@ -83,6 +83,7 @@
     "postcss-url": "^7.2.1",
     "prettier": "^1.12.1",
     "rimraf": "^2.6.0",
+    "sass": "^1.63.6",
     "sass-loader": "^7.3.1",
     "sass-resources-loader": "^2.0.3",
     "semver": "^5.3.0",

rd.md

@@ -0,0 +1,23 @@
+
+
+## 变更记录
+
+[node-sass 替换为 sass](https://blog.csdn.net/weixin_41223575/article/details/128687533)
+
+node-sass 替换为 sass
+原因：安装 node-sass 的项目依赖 node 的版本，维护的项目依赖的 node 版本和自己电脑安装的 node 版本不一致的问题（没必要一直升级 node 版本，把时间花在搞环境上）。
+
+方案：
+```
+1.要么电脑安装 nvm 管理切换不同的 node 版本，切换还是不太方便，而且不能同时启动依赖 node 版本不一样的两个项目。
+
+2.项目的依赖不应该再依赖 node 的版本，比如 node-sass 这种只用于开发环境的依赖项，所以把 node-sass 替换为 sass（推荐）。
+
+步骤：卸载 node-sass ，安装 sass，项目全局搜索 ::v-deep , 把 ::v-deep 替换为 ::v-deep。
+
+1.卸载 node-sass：npm uninstall node-sass
+
+2.安装 sass：npm install sass --save-dev
+
+3.全局搜索替换：::v-deep 替换为 ::v-deep
+```

src/assets/scss/base/_common.scss

@@ -237,12 +237,13 @@ $i: 1;
 $basew: 24;
 
 @while $i <=$basew {
-    .w-#{$i}\/#{$basew} {
-        width: #{$i/$basew * 100}#{"%"};
+    $bv:calc($i/$basew);
+    .w-\$bv {
+        width: $bv*100%;
     }
 
-    .h-#{$i}\/#{$basew} {
-        height: #{$i/$basew * 100}#{"%"};
+    .h-\$bv {
+        height: $bv*100%;
     }
 
     $i: $i + 1;

src/index.html

@@ -21,7 +21,7 @@
         for (var i = 0; i < mobileAgent.length; i++) {
             if (browser.indexOf(mobileAgent[i]) != -1) {
                 //todo 手机版跳转
-                window.location.href = 'https://h5.ybgcoins.com';
+                window.location.href = 'https://mobile.nvrcoin.com';
                 break;
             }
         }
@@ -68,13 +68,13 @@
     <script src="/static/libs/jquery.mCustomScrollbar.js"></script>
     <script src="/static/js/custom.js"></script>
     <script src="/static/libs/skroll.min.js"></script>
-    <script src="https://www.ybgcoins.com/newlink/pako.min.js"></script>
+    <script src="https://www.ybgcoins.info/newlink/pako.min.js"></script>
     <script>
         window.custom = "dark"; // 默认主题
-        window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://ser.ybgcoins.com/api/sliderVerify' : 'https://ser.ybgcoins.com/api/sliderVerify' %>";
+        window.api_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://mgsc.nvrcoin/api/sliderVerify' : 'https://mgsc.nvrcoin/api/sliderVerify' %>";
         // window.api_path =  "<%= htmlWebpackPlugin.options.isProduct ? 'http://qkladmin2.ruanmeng.top/api/sliderVerify' : 'http://qkladmin2.ruanmeng.top/api/sliderVerify' %>";
         // window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'wss://guanli.coin.amatak.net/ws1' : 'wss://guanli.coin.amatak.net/ws1' %>";
-        window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://ser.ybgcoins.com/api' : 'https://ser.ybgcoins.com/api' %>";
+        window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'https://mgsc.nvrcoin/api' : 'https://mgsc.nvrcoin/api' %>";
 
         // window.ws_path = "<%= htmlWebpackPlugin.options.isProduct ? 'ws://qkladmin2.ruanmeng.top:2346' : 'ws://qkladmin2.ruanmeng.top:2346' %>";
 

src/utils/consts.js

@@ -15,18 +15,18 @@ export default {
                     FAIL : 2,
                 }
             },
-            mobileUrl:'https://ser.ybgcoins.com',
+            mobileUrl:'https://mobile.nvrcoin.com',
             Server: {
                 Path: {
                     // API: isProduct ? `http://qkladmin2.ruanmeng.top/api/` : `/api/`,
-                    BASE:isProduct?`https://ser.ybgcoins.com`:`https://ser.ybgcoins.com`,
-                    API: isProduct ? `https://ser.ybgcoins.com/api/` : `/api/`,
+                    BASE:isProduct?`https://mgsc.nvrcoin.com`:`https://mgsc.nvrcoin.com`,
+                    API: isProduct ? `https://mgsc.nvrcoin.com/api/` : `/api/`,
                     // WS: isProduct ? `ws://qkladmin2.ruanmeng.top:2346` : `ws://qkladmin2.ruanmeng.top:2346`,
                     // WS1: isProduct ? `ws://qkladmin2.ruanmeng.top:2348` : `ws://qkladmin2.ruanmeng.top:2348`,
                     // WS: isProduct ? `wss://guanli.coin.amatak.net/ws1` : `wss://guanli.coin.amatak.net/ws1`,
-                    WS: isProduct ? `wss://ser.ybgcoins.com/ws1` : `wss://ser.ybgcoins.com/ws1`,
+                    WS: isProduct ? `wss://mgsc.nvrcoin.com/ws1` : `wss://mgsc.nvrcoin.com/ws1`,
                     // WS1: isProduct ? `wss://guanli.coin.amatak.net/ws2` : `wss://guanli.coin.amatak.net/ws2`,
-                    WS1: isProduct ? `wss://ser.ybgcoins.com/ws2` : `wss://ser.ybgcoins.com/ws2`,
+                    WS1: isProduct ? `wss://mgsc.nvrcoin.com/ws2` : `wss://mgsc.nvrcoin.com/ws2`,
                 }
             }
         };

src/views/college/detail.vue

@@ -78,7 +78,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ {
+::v-deep {
     .el-breadcrumb__inner a, .el-breadcrumb__inner.is-link{
         color: #606266;
     }

src/views/contract/exchange-store.vue

@@ -480,7 +480,7 @@ export default {
     .btn,.kaicang{
         font-size: 0.9rem;
     }
-    /* /deep/ .el-slider__stop{
+    /* ::v-deep .el-slider__stop{
         background-color: ;
     } */
 </style>

src/views/forgotPwd/index.vue

@@ -112,7 +112,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ .el-input__inner,.form-control{
+::v-deep .el-input__inner,.form-control{
     padding-top:.375rem;
     padding-bottom:.375rem;
     height: 45px !important;

src/views/notice/detail.vue

@@ -76,7 +76,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ {
+::v-deep {
     .el-breadcrumb__inner a, .el-breadcrumb__inner.is-link{
         color: #606266;
     }

src/views/option/index.vue

@@ -287,7 +287,7 @@ export default {
   border: none;
 }
 
-/deep/ .el-collapse-item:last-child {
+::v-deep .el-collapse-item:last-child {
   .el-collapse-item__header {
     border-bottom: 0;
   }

src/views/otc/ad.vue

@@ -165,7 +165,7 @@ export default {
   justify-content: center;
   background: linear-gradient(to right, #6d9ef9, #1f5df4);
 }
-/deep/ .el-dialog {
+::v-deep .el-dialog {
   background-color: #222e3d;
   color: #fff;
   &__title {

src/views/otc/index.vue

@@ -326,7 +326,7 @@ export default {
   justify-content: center;
   background: linear-gradient(to right, #6d9ef9, #1f5df4);
 }
-/deep/ .el-dialog {
+::v-deep .el-dialog {
   background-color: #222e3d;
   color: #fff;
   &__title {

src/views/otc/order.vue

@@ -172,7 +172,7 @@ export default {
   justify-content: center;
   background: linear-gradient(to right, #6d9ef9, #1f5df4);
 }
-/deep/ .el-dialog {
+::v-deep .el-dialog {
   background-color: #222e3d;
   color: #fff;
   &__title {

src/views/profile/certification.vue

@@ -397,7 +397,7 @@ export default {
 
 <style scoped lang="scss">
 .upload-demo {
-  /deep/ .el-upload-dragger {
+  ::v-deep .el-upload-dragger {
     width: 300px;
     height: 150px;
   }
@@ -408,7 +408,7 @@ export default {
     object-fit: cover;
   }
 }
- /deep/{
+ ::v-deep{
    .el-step__title.is-process{
     color: white;
   }

src/views/purchase/index.vue

@@ -461,7 +461,7 @@ export default {
 .table tr:hover{
     background: #e9e9e9 !important;
 }
-/deep/ {
+::v-deep {
   .el-step__icon {
     background: #222e3d;
   }

src/views/wallet/address.vue

@@ -392,7 +392,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-/deep/ {
+::v-deep {
   .el-collapse {
     border-top-color: #4e4e5d;
     border-bottom-color: #4e4e5d;

src/views/wallet/exchange-assets.vue

@@ -758,7 +758,7 @@ created() {
   border-bottom: 1px solid;
 }
 .upload-demo {
-  /deep/ .el-upload-dragger {
+  ::v-deep .el-upload-dragger {
     width: 200px;
     height: 150px;
   }
@@ -769,7 +769,7 @@ created() {
     object-fit: cover;
   }
 }
- /deep/{
+ ::v-deep{
    .el-step__title.is-process{
     color: white;
   }