panhui 3 سال پیش
والد
کامیت
d46f744b93

+ 1 - 0
package.json

@@ -30,6 +30,7 @@
     "lodash": "^4.17.21",
     "lodash": "^4.17.21",
     "mathjs": "^9.5.1",
     "mathjs": "^9.5.1",
     "mitt": "^3.0.0",
     "mitt": "^3.0.0",
+    "nim-web-sdk-ng": "^0.9.2",
     "qrcode": "^1.4.4",
     "qrcode": "^1.4.4",
     "query-string": "^7.0.1",
     "query-string": "^7.0.1",
     "queue": "^6.0.2",
     "queue": "^6.0.2",

+ 6 - 6
src/components/order/DomainInfo.vue

@@ -47,19 +47,19 @@ export default {
         domainName: {
         domainName: {
             type: String,
             type: String,
             default: () => {
             default: () => {
-                return "";
+                return '';
             }
             }
         },
         },
         id: {
         id: {
             type: String,
             type: String,
             default: () => {
             default: () => {
-                return "";
+                return '';
             }
             }
         }
         }
     },
     },
     data() {
     data() {
         return {
         return {
-            orderStatus: 'NOT_PAID',
+            orderStatus: 'NOT_PAID'
         };
         };
     },
     },
     // setup() {
     // setup() {
@@ -72,9 +72,9 @@ export default {
     mixins: [order, product],
     mixins: [order, product],
     methods: {
     methods: {
         pay(orderStatus) {
         pay(orderStatus) {
-            let domainName = this.domainName
-            let pay = "1"
-            let id = this.id
+            let domainName = this.domainName;
+            let pay = '1';
+            let id = this.id;
             if (orderStatus == this.orderStatus) {
             if (orderStatus == this.orderStatus) {
                 this.$router.push({
                 this.$router.push({
                     path: '/domainSubmit',
                     path: '/domainSubmit',

+ 7 - 4
src/mixins/order.js

@@ -1,7 +1,8 @@
 export default {
 export default {
     data() {
     data() {
         return {
         return {
-            statusOptions: [{
+            statusOptions: [
+                {
                     label: '未支付',
                     label: '未支付',
                     value: 'NOT_PAID'
                     value: 'NOT_PAID'
                 },
                 },
@@ -18,7 +19,8 @@ export default {
                     value: 'CANCELLED'
                     value: 'CANCELLED'
                 }
                 }
             ],
             ],
-            statusDomain: [{
+            statusDomain: [
+                {
                     label: '待支付',
                     label: '待支付',
                     value: 'NOT_PAID'
                     value: 'NOT_PAID'
                 },
                 },
@@ -35,7 +37,8 @@ export default {
                     value: 'CANCELLED'
                     value: 'CANCELLED'
                 }
                 }
             ],
             ],
-            payMethodOptions: [{
+            payMethodOptions: [
+                {
                     label: '微信',
                     label: '微信',
                     value: 'WEIXIN'
                     value: 'WEIXIN'
                 },
                 },
@@ -46,4 +49,4 @@ export default {
             ]
             ]
         };
         };
     }
     }
-};
+};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 13613
src/plugins/NIM_Web_Chatroom_nodejs_v9.6.4.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 13880
src/plugins/NIM_Web_NIM_nodejs_v9.6.4.js


+ 22 - 21
src/plugins/chat.js

@@ -1,4 +1,4 @@
-import NIM from './NIM_Web_Chatroom_v9.6.4';
+import NIM from 'nim-web-sdk-ng';
 import http from './http';
 import http from './http';
 import store from '../store';
 import store from '../store';
 var data = {};
 var data = {};
@@ -60,27 +60,28 @@ var data = {};
 var nim = null;
 var nim = null;
 
 
 function initChat() {
 function initChat() {
-    http.post('/neteaseUser/create?userId=' + store.state.userInfo.id).then(res => {
+    console.log('34664');
+    http.http.post('/neteaseUser/create?userId=' + store.state.userInfo.id).then(res => {
         console.log(res);
         console.log(res);
-        // NIM.getInstance({
-        //     debug: true, // 是否开启日志,将其打印到console。集成开发阶段建议打开。
-        //     appKey: '872dd9d0a0f8eda25b579654745db459',
-        //     account: 'account', //账号
-        //     token: 'token',
-        //     db: true, //若不要开启数据库请设置false。SDK默认为true。
-        //     // privateConf: {}, // 私有化部署方案所需的配置
-        //     onconnect: onConnect,
-        //     onroamingmsgs: onRoamingMsgs,
-        //     onofflinemsgs: onOfflineMsgs,
-        //     onmsg: onMsg,
-        //     onwillreconnect: onWillReconnect,
-        //     ondisconnect: onDisconnect,
-        //     onerror: onError,
-        //     onteams: onTeams,
-        //     onteammembers: onTeamMembers,
-        //     //onsyncteammembersdone: onSyncTeamMembersDone,
-        //     onupdateteammember: onUpdateTeamMember
-        // });
+        NIM.getInstance({
+            debug: true, // 是否开启日志,将其打印到console。集成开发阶段建议打开。
+            appKey: '872dd9d0a0f8eda25b579654745db459',
+            account: store.state.userInfo.id, //账号
+            token: res.token,
+            db: true, //若不要开启数据库请设置false。SDK默认为true。
+            // privateConf: {}, // 私有化部署方案所需的配置
+            onconnect: onConnect,
+            onroamingmsgs: onRoamingMsgs,
+            onofflinemsgs: onOfflineMsgs,
+            onmsg: onMsg,
+            onwillreconnect: onWillReconnect,
+            ondisconnect: onDisconnect,
+            onerror: onError,
+            onteams: onTeams,
+            onteammembers: onTeamMembers,
+            //onsyncteammembersdone: onSyncTeamMembersDone,
+            onupdateteammember: onUpdateTeamMember
+        });
     });
     });
 }
 }
 
 

+ 3 - 3
src/views/DomainSubmit.vue

@@ -76,7 +76,7 @@ export default {
             tradeCode: '',
             tradeCode: '',
             domain: '',
             domain: '',
             price: 40,
             price: 40,
-            payName: "",
+            payName: '',
             id: '',
             id: '',
             payInfos: [
             payInfos: [
                 {
                 {
@@ -113,7 +113,7 @@ export default {
     },
     },
     methods: {
     methods: {
         pay() {
         pay() {
-            console.log("thsksk",this.payName)
+            console.log('thsksk', this.payName);
             if (this.payName == '1') {
             if (this.payName == '1') {
                 if (this.tradeCode == '') {
                 if (this.tradeCode == '') {
                     this.showPwdDialog = true;
                     this.showPwdDialog = true;
@@ -289,4 +289,4 @@ export default {
         background: @bg3;
         background: @bg3;
     }
     }
 }
 }
-</style>
+</style>

+ 9 - 4
src/views/order/Orders.vue

@@ -15,9 +15,7 @@
                     <div class="btn" :class="{ active: type === 'DEFAULT' }" @click="changeActive('DEFAULT')">
                     <div class="btn" :class="{ active: type === 'DEFAULT' }" @click="changeActive('DEFAULT')">
                         铸造订单
                         铸造订单
                     </div>
                     </div>
-                    <div class="btn" :class="{ active: type === 'BLI' }" @click="changeActive('BLI')">
-                        绿洲易拍
-                    </div>
+                    <div class="btn" :class="{ active: type === 'BLI' }" @click="changeActive('BLI')">绿洲易拍</div>
                     <div class="btn" :class="{ active: type === 'METANAME' }" @click="changeActive('METANAME')">
                     <div class="btn" :class="{ active: type === 'METANAME' }" @click="changeActive('METANAME')">
                         元域名
                         元域名
                     </div>
                     </div>
@@ -104,7 +102,14 @@
             ></order-info-act>
             ></order-info-act>
             <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
             <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
         </van-list>
         </van-list>
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData" v-if="type == 'BLI'">
+        <van-list
+            class="list"
+            v-model:loading="loading"
+            :finished="finished"
+            finished-text=""
+            @load="getData"
+            v-if="type == 'BLI'"
+        >
             <order-info-auction
             <order-info-auction
                 @delFn="delFn"
                 @delFn="delFn"
                 v-for="(item, index) in list"
                 v-for="(item, index) in list"

+ 1 - 1
src/views/product/HopeMarket.vue

@@ -909,7 +909,7 @@ export default {
 }
 }
 .classify-content {
 .classify-content {
     background-color: #222426;
     background-color: #222426;
-    padding:0 16px 16px;
+    padding: 0 16px 16px;
 }
 }
 .classify-list {
 .classify-list {
     .flex();
     .flex();

+ 14 - 1
yarn.lock

@@ -6076,6 +6076,11 @@ locate-path@^5.0.0:
   dependencies:
   dependencies:
     p-locate "^4.1.0"
     p-locate "^4.1.0"
 
 
+lodash-es@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
+  integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
+
 lodash.debounce@^4.0.8:
 lodash.debounce@^4.0.8:
   version "4.0.8"
   version "4.0.8"
   resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
   resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
@@ -6543,6 +6548,14 @@ nice-try@^1.0.4:
   resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"
   resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 
+nim-web-sdk-ng@^0.9.2:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/nim-web-sdk-ng/-/nim-web-sdk-ng-0.9.2.tgz#bd8211ae9b572a0b76d2ee02515596edb0709e40"
+  integrity sha512-plW3uM1GL82pxr/zaANWll5tL3Nsi5gyL952bfYu7h6Yu/mGlgScMgIU6lJ4BcNYvEuw0lj6StAnNDeFf8RvCg==
+  dependencies:
+    lodash-es "^4.17.21"
+    platform "^1.3.6"
+
 no-case@^2.2.0:
 no-case@^2.2.0:
   version "2.3.2"
   version "2.3.2"
   resolved "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"
   resolved "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"
@@ -7191,7 +7204,7 @@ pkg-dir@^4.1.0:
   dependencies:
   dependencies:
     find-up "^4.0.0"
     find-up "^4.0.0"
 
 
-platform@^1.3.1:
+platform@^1.3.1, platform@^1.3.6:
   version "1.3.6"
   version "1.3.6"
   resolved "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz"
   resolved "https://registry.npmjs.org/platform/-/platform-1.3.6.tgz"
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==
   integrity sha512-fnWVljUchTro6RiCFvCXBbNhJc2NijN7oIQxbwsyL0buWJPG85v81ehlHI9fXrJsMNgTofEoWIQeClKpgxFLrg==

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است