Quellcode durchsuchen

Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

xuqiang vor 4 Jahren
Ursprung
Commit
046edc989f

+ 1 - 1
src/main/nine-space/package.json

@@ -25,7 +25,7 @@
     "swiper": "^6.8.1",
     "v-charts": "^1.19.0",
     "vant": "^3.2.3",
-    "vconsole": "^3.9.3",
+    "vconsole": "^3.9.4",
     "vue": "^3.2.20",
     "vue-clipboard2": "^0.3.3",
     "vue-croppie": "^2.0.2",

+ 2 - 2
src/main/nine-space/src/main.js

@@ -15,8 +15,8 @@ import Driver from './components/Driver.vue';
 import common from './mixins/common';
 import VueClipboard from 'vue-clipboard2';
 import queryString from 'query-string';
-// import VConsole from 'vconsole';
-// const vConsole = new VConsole();
+import VConsole from 'vconsole';
+const vConsole = new VConsole();
 
 createApp(App)
     .use(Vant)

+ 15 - 0
src/main/nine-space/src/router/index.js

@@ -19,6 +19,21 @@ function jsapiSign() {
                     'scanQRCode'
                 ];
                 wx.config(res);
+                wx.ready(function () {
+                    wx.updateAppMessageShareData({
+                        title: '第九空间',
+                        desc: '全球首个基于区块链的游戏资产集换中心',
+                        link: location.origin + '/9th',
+                        imgUrl: 'https://9space-2021.oss-cn-shenzhen.aliyuncs.com/nft/2021-11-05-15-58-30YwqLzMjy.jpg',
+                        success: function () {}
+                    });
+                    wx.updateTimelineShareData({
+                        title: '第九空间-全球首个基于区块链的游戏资产集换中心',
+                        link: location.origin + '/9th',
+                        imgUrl: 'https://9space-2021.oss-cn-shenzhen.aliyuncs.com/nft/2021-11-05-15-58-30YwqLzMjy.jpg',
+                        success: function () {}
+                    });
+                });
             })
             .catch(e => {});
     }

+ 4 - 4
src/main/nine-space/yarn.lock

@@ -8968,10 +8968,10 @@ vary@~1.1.2:
   resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-vconsole@^3.9.3:
-  version "3.9.3"
-  resolved "https://registry.npmjs.org/vconsole/-/vconsole-3.9.3.tgz"
-  integrity sha512-zCkS85C21pyE+hJ+QEPFK6MVtkwc3XQE/ccvEnWPKq/Z9eMSOfSHOmBwoqZtYm7pnR+GTuJOsoDB8fvK3YuJTA==
+vconsole@^3.9.4:
+  version "3.9.4"
+  resolved "https://registry.npmmirror.com/vconsole/download/vconsole-3.9.4.tgz?cache=0&sync_timestamp=1635252962357&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvconsole%2Fdownload%2Fvconsole-3.9.4.tgz#a54356b12fc63456503762f687a65f9c470f968d"
+  integrity sha1-pUNWsS/GNFZQN2L2h6ZfnEcPlo0=
   dependencies:
     "@fortawesome/free-solid-svg-icons" "^5.15.3"
     cookie-storage "^6.1.0"

+ 6 - 6
src/main/resources/application.yaml

@@ -71,9 +71,9 @@ wx:
     sub-app-id:
     sub-mch-id:
     key-path: classpath:/cert/apiclient_cert.p12
-    notify-url: https://nft.9space.vip/notify/order/weixin
-    refund-notify-url: https://nft.9space.vip/wx/refundNotify
-    return-url: https://nft.9space.vip/9th/orders
+    notify-url: https://nfttest.9space.vip/notify/order/weixin
+    refund-notify-url: https://nfttest.9space.vip/wx/refundNotify
+    return-url: https://nfttest.9space.vip/9th/orders
 storage:
   provider: aliyun
   local_path: /var/www/upload/
@@ -84,7 +84,7 @@ aliyun:
   oss-bucket-name: 9space-2021
   oss-domain: https://9space-2021.oss-cn-shenzhen.aliyuncs.com
 general:
-  host: https://nft.9space.vip
+  host: https://nfttest.9space.vip
 #mychain:
 #  rest:
 #    bizid: a00e36c5
@@ -129,8 +129,8 @@ alipay:
   api-key: CRv5YFAOIEGY5PgVf14Y9g==
   app-cert-path: classpath:cert/appCertPublicKey_2021002120645023.crt
   root-cert-path: classpath:cert/alipayRootCert.crt
-  notify-url: https://nft.9space.vip/notify/order/alipay
-  return-url: https://nft.9space.vip/9th/home
+  notify-url: https://nfttest.9space.vip/notify/order/alipay
+  return-url: https://nfttest.9space.vip/9th/home
 ---
 
 spring: