lhl 3 years ago
parent
commit
f5636dbdb3
100 changed files with 559 additions and 328 deletions
  1. 101 67
      lang/en.js
  2. 2 2
      manifest.json
  3. BIN
      unpackage/cache/apk/__UNI__F0EBD91_cm.apk
  4. 1 1
      unpackage/cache/apk/apkurl
  5. 0 0
      unpackage/cache/apk/cmManifestCache.json
  6. 0 1
      unpackage/cache/wgt/__UNI__F0EBD91/app-config-service.js
  7. 0 0
      unpackage/cache/wgt/__UNI__F0EBD91/app-service.js
  8. 0 0
      unpackage/cache/wgt/__UNI__F0EBD91/app-view.js
  9. 8 4
      unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/js/kline.js
  10. 152 95
      unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/js/uni.webview.1.5.2.js
  11. 4 4
      unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/js/utils.js
  12. 4 4
      unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/local.html
  13. 0 0
      unpackage/cache/wgt/__UNI__F0EBD91/manifest.json
  14. BIN
      unpackage/cache/wgt/__UNI__F0EBD91/static/icon/reback.png
  15. BIN
      unpackage/cache/wgt/__UNI__F0EBD91/static/img/flower.png
  16. BIN
      unpackage/cache/wgt/__UNI__F0EBD91/static/img/gou.png
  17. 0 1
      unpackage/dist/build/app-plus/app-config-service.js
  18. 0 0
      unpackage/dist/build/app-plus/app-service.js
  19. 0 0
      unpackage/dist/build/app-plus/app-view.js
  20. 122 40
      unpackage/dist/build/app-plus/hybrid/html/js/kline.js
  21. 152 95
      unpackage/dist/build/app-plus/hybrid/html/js/uni.webview.1.5.2.js
  22. 4 4
      unpackage/dist/build/app-plus/hybrid/html/js/utils.js
  23. 8 8
      unpackage/dist/build/app-plus/hybrid/html/local.html
  24. 0 0
      unpackage/dist/build/app-plus/manifest.json
  25. BIN
      unpackage/dist/build/app-plus/static/icon/reback.png
  26. BIN
      unpackage/dist/build/app-plus/static/img/flower.png
  27. BIN
      unpackage/dist/build/app-plus/static/img/gou.png
  28. BIN
      unpackage/dist/build/h5/11-25-1.rar
  29. 1 1
      unpackage/dist/build/h5/index.html
  30. BIN
      unpackage/dist/build/h5/static/img/gou.png
  31. 0 0
      unpackage/dist/build/h5/static/js/index.9e9635e6.js
  32. 0 0
      unpackage/dist/build/h5/static/js/index.d2e7c32d.js
  33. 0 0
      unpackage/dist/build/h5/static/js/pages-heyue-heyue.6ba84385.js
  34. 0 0
      unpackage/dist/build/h5/static/js/pages-heyue-heyue.9611cbe8.js
  35. 0 0
      unpackage/dist/build/h5/static/js/pages-heyue-heyue~pages-transaction-bbjy.496677ac.js
  36. 0 0
      unpackage/dist/build/h5/static/js/pages-heyue-heyue~pages-transaction-bbjy.5b1287f4.js
  37. 0 0
      unpackage/dist/build/h5/static/js/pages-heyue-tradlist.50058827.js
  38. 0 0
      unpackage/dist/build/h5/static/js/pages-heyue-tradlist.6034424d.js
  39. 0 0
      unpackage/dist/build/h5/static/js/pages-index-ggDetail.2d5fbb0d.js
  40. 0 0
      unpackage/dist/build/h5/static/js/pages-index-ggDetail.4ad8d85f.js
  41. 0 0
      unpackage/dist/build/h5/static/js/pages-index-gglist.121af2eb.js
  42. 0 0
      unpackage/dist/build/h5/static/js/pages-index-gglist.baf52275.js
  43. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.006323a7.js
  44. 0 0
      unpackage/dist/build/h5/static/js/pages-index-index.226d0bec.js
  45. 0 0
      unpackage/dist/build/h5/static/js/pages-index-kf.3cd4e7c7.js
  46. 0 0
      unpackage/dist/build/h5/static/js/pages-index-kf.bd875088.js
  47. 0 0
      unpackage/dist/build/h5/static/js/pages-index-language.6ba4fd43.js
  48. 0 0
      unpackage/dist/build/h5/static/js/pages-index-rg.2f95eb00.js
  49. 0 0
      unpackage/dist/build/h5/static/js/pages-index-rg.61e3be5d.js
  50. 0 0
      unpackage/dist/build/h5/static/js/pages-index-rgDetail.4b203893.js
  51. 0 0
      unpackage/dist/build/h5/static/js/pages-index-rgDetail.a18a362b.js
  52. 0 0
      unpackage/dist/build/h5/static/js/pages-index-rg~pages-index-rgDetail.41a790fc.js
  53. 0 0
      unpackage/dist/build/h5/static/js/pages-index-rg~pages-index-rgDetail.5e36d55c.js
  54. 0 0
      unpackage/dist/build/h5/static/js/pages-public-forget.3957a304.js
  55. 0 0
      unpackage/dist/build/h5/static/js/pages-public-forget.54465fbf.js
  56. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.8b1f688f.js
  57. 0 0
      unpackage/dist/build/h5/static/js/pages-public-login.98898068.js
  58. 0 0
      unpackage/dist/build/h5/static/js/pages-public-register.38e40f46.js
  59. 0 0
      unpackage/dist/build/h5/static/js/pages-public-register.e99d3253.js
  60. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-bbjy.9ddd0564.js
  61. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-bbjy.cdf0d3ab.js
  62. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-bblist.66568f85.js
  63. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-cbdetail.6222188d.js
  64. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-cbdetail.9199ea05.js
  65. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-cbdetail~pages-transaction-tbdetail.c675dcf6.js
  66. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-cbdetail~pages-transaction-tbdetail.e84b1d10.js
  67. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-cblist.560eeccb.js
  68. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-cblist.89a73328.js
  69. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-tbdetail.7b602923.js
  70. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-tbdetail.df38d9e3.js
  71. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-tblist.05dca7f7.js
  72. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-tblist.67d7523f.js
  73. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-transaction.205306c7.js
  74. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-transaction.d45ce7c2.js
  75. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-transactionDetail.275d905e.js
  76. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-transactionDetail.8af4c4f3.js
  77. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-transfer.610bf8aa.js
  78. 0 0
      unpackage/dist/build/h5/static/js/pages-transaction-transfer.905451dc.js
  79. 0 0
      unpackage/dist/build/h5/static/js/pages-user-authrz.54b66cdd.js
  80. 0 0
      unpackage/dist/build/h5/static/js/pages-user-authrz.55e71983.js
  81. 0 0
      unpackage/dist/build/h5/static/js/pages-user-cbDetail.a9a44550.js
  82. 0 0
      unpackage/dist/build/h5/static/js/pages-user-cbDetail.e3e1957a.js
  83. 0 0
      unpackage/dist/build/h5/static/js/pages-user-cbRecord.6a60bb0f.js
  84. 0 0
      unpackage/dist/build/h5/static/js/pages-user-cbRecord.aa477ab6.js
  85. 0 0
      unpackage/dist/build/h5/static/js/pages-user-coininfo.3b649a43.js
  86. 0 0
      unpackage/dist/build/h5/static/js/pages-user-coininfo.81682b36.js
  87. 0 0
      unpackage/dist/build/h5/static/js/pages-user-menu.6dc9163b.js
  88. 0 0
      unpackage/dist/build/h5/static/js/pages-user-myrg.868654e1.js
  89. 0 1
      unpackage/dist/build/h5/static/js/pages-user-myrg.f047f1a9.js
  90. 0 0
      unpackage/dist/build/h5/static/js/pages-user-respwd.0972877b.js
  91. 0 0
      unpackage/dist/build/h5/static/js/pages-user-respwd.39973e87.js
  92. 0 0
      unpackage/dist/build/h5/static/js/pages-user-tbDetail.c1b03227.js
  93. 0 0
      unpackage/dist/build/h5/static/js/pages-user-tbDetail.e8c41b5a.js
  94. 0 0
      unpackage/dist/build/h5/static/js/pages-user-tbRecord.92145e3d.js
  95. 0 0
      unpackage/dist/build/h5/static/js/pages-user-tbRecord.f3ad4564.js
  96. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.00b0f8e5.js
  97. 0 0
      unpackage/dist/build/h5/static/js/pages-user-user.e2e12c2a.js
  98. 0 0
      unpackage/dist/dev/app-plus/app-service.js
  99. 0 0
      unpackage/dist/dev/app-plus/manifest.json
  100. BIN
      unpackage/release/apk/__UNI__F0EBD91__20221125193654.apk

+ 101 - 67
lang/en.js

@@ -102,6 +102,106 @@ module.exports = {
 		tbslbnw: 'The number of withdrawals cannot be 0',
 		qsrscdz: 'Please enter the upload address',
 	},
+	kf: {
+		kf: 'Customer service',
+		zx: 'on line',
+		nh: 'Hello, may I help you?',
+		qsrxxnr: 'Please enter the information content',
+		fs: 'Send'
+	},
+	mm: {
+		mm: 'Password',
+		wlnd: '*For the security of your funds, you are not allowed to withdraw money within 24 hours after your login password is changed 。',
+		jmm: 'Old password ',
+		qsrjmm: 'Please enter the old password',
+		xmm: 'New password',
+		qsrxmm: 'Please enter the new password',
+		qrmm: 'Confirm password',
+		qsrqrmm: 'Please enter the password for confirmation',
+		tj: 'Submit',
+		lcmmbyz: 'Two passwords are different',
+		xgcg: 'Modify successfully'
+	},
+	smrz: {
+		smrz: 'Real name authentication',
+		wcsmrz: 'After the completion of real-name authentication, the corresponding rights and interests can be obtained',
+		gjsm: 'Advanced real name',
+		xm: 'Name',
+		qsrxm: 'Please enter your name',
+		sfzhm: 'ID card',
+		qsrsfzhm: 'Please enter your ID card number',
+		scsfzzm: 'Upload front ID card',
+		scsfzfm: 'Upload the back of your ID card',
+		gjtj: 'Advanced submission',
+		qsrsfz: 'Please enter your ID card',
+		qscsfzzm: 'Please upload the front of your ID card',
+		qscsfzfm: 'Please upload the reverse side of your ID card',
+		tjcg: 'Submit successfully'
+	},
+	user: {
+		zc: 'Property',
+		zhzzczh: 'Total account assets equivalent',
+		zclb: 'List of Assets',
+		cb: 'Charge money',
+		tb: 'Mention money',
+		ky: 'usable',
+		dj: 'freeze',
+		zh: 'convert',
+		yyzjtjcz: 'Due to the delay of fund statistics, the account balance may not be the latest balance. If you need the accurate balance, please check the relevant account page',
+		qd: 'Confirm',
+		cwjl: 'Financial record ',
+		sl: 'Number',
+		zt: 'Type',
+		zj: 'Increase',
+		js: 'Reduce',
+		sj: 'Time',
+		hz: 'Transfer',
+		hzlx: 'Type of swivel',
+		zjhz: 'Transfer of funds',
+		zjzhzhyzh: 'Fund  to contract ',
+		hyzhzzjzh: 'Contract to fund ',
+		zjzh: 'Account',
+		kyye: 'Balance',
+		hyzh: 'Account of contract',
+		qsrhzsl: 'Enter the number of transfers',
+		tj: 'Submit',
+		hzcg: 'Successful transfer'
+	},
+	jy: {
+		bbjysc: 'Coin exchange market',
+		usdtsc: 'USDT market'
+	},
+	login: {
+
+		dl: 'Login',
+		zc: 'Register',
+		yx: 'Mail',
+		qsryx: 'Please put it in the mailbox',
+		mm: 'Password',
+		qsrmm: 'Please enter the password',
+		wjmm: 'Forget the password ',
+		qsrzqdyx: 'Please enter the correct email address',
+		dlcg: 'Login successfully',
+		czmm: 'Reset passwords',
+		xmm: 'New password',
+		yxyzm: 'Email verification code',
+		yzm: 'Code',
+		qsryzm: 'Please enter the verification code',
+		qsrxmm: 'Please enter a new password',
+		qrmm: 'Confirm password',
+		yqm: 'Invitation code',
+		qsryqm: 'Please enter the invitation code',
+		zcjbsty: 'Registration is consent',
+		yhfwxy: 'User Service Agreement',
+		zccg: 'Registered successfully'
+	},
+	popup: {
+		qrtcdl: 'Confirm Logout',
+		qr: 'Confirm',
+		ts: 'Hint',
+		nwdl: 'You are not logged in. Do you want to log in now?',
+		qx: 'Cancel'
+	},
 	hy: {
 		jg: 'price',
 		sl: 'number',
@@ -167,71 +267,5 @@ module.exports = {
 		gm: 'buy',
 		cs: 'sell',
 		lsjl: 'history'
-	},
-	hy: {
-			jg: 'price',
-			sl: 'number',
-			jyfx: 'Direction of trade',
-			sz: 'rose',
-			xd: 'fall',
-			xjwt: 'limit order',
-			sjwt: 'market order',
-			jygs: 'lot size',
-			ggbs: 'leverage multiple',
-			zsj: 'stop loss price',
-			zyj: 'stop profit price',
-			bzj: 'Margin',
-			kyhyye: 'free margin',
-			sxf: 'Fees',
-			zd: 'long',
-			zk: 'long short',
-			zc: 'position',
-			kcdj: 'opening unit price',
-			dqjg: 'current price',
-			ykzt: 'break even status',
-			ykje: 'profit and loss amount',
-			wtsj: 'Commissioning time',
-			pcsj: 'Liquidation time',
-			wtjg: 'Commission price',
-			zydj: 'stop profit',
-			zkdj: 'Stop loss',
-			qr: 'confirm',
-			qx: 'cancel',
-			tjz: 'process',
-			ts: 'prompt',
-			gdcg: 'Successful order placement',
-			jycg: 'Successful transaction',
-			sjjzz: 'loading',
-			pc: 'ring out',
-			sfljpc: 'Whether to close the position immediately. After confirmation, it cannot be modified',
-			pccg: 'Successful closing of positions',
-			cx: 'repeal',
-			sfljcx: 'Whether to cancel immediately. After confirmation, it cannot be modified',
-			qqz:'loading',
-			cxcg: 'Succeeded in canceling',
-			djhq: 'get',
-			qbdd: 'all orders',
-			cp: 'product',
-			ssjg: 'real time price',
-			jrdz: 'up and down today',
-			wtss: 'hands',
-			yl: 'profit',
-			ks: 'losses',
-			qbwt: 'entrusted',
-			qbcc: 'position',
-			cjmx: 'obviously',
-			mr: 'buy',
-			mc: 'sell',
-			sjcj: 'actual',
-			sj: 'time',
-			wtj: 'commission price',
-			jye: 'turnover',
-			cjzj: 'total',
-			cjjj: 'average',
-			cjl: 'turnove',
-			wc: 'complete',
-			gm: 'buy',
-			cs: 'sell',
-			lsjl: 'history'
-		}
+	}
 }

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "GRAYSCALE",
     "appid" : "__UNI__F0EBD91",
     "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
+    "versionName" : "1.0.2",
+    "versionCode" : 102,
     "transformPx" : false,
     "app-plus" : {
         /* 5+App特有相关 */

BIN
unpackage/cache/apk/__UNI__F0EBD91_cm.apk


+ 1 - 1
unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/5b0d76d0-6bf9-11ed-89be-a5c5e58a6110
+https://ide.dcloud.net.cn/build/download/761d5960-6cb5-11ed-a003-05dd3d09a9f5

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/apk/cmManifestCache.json


File diff suppressed because it is too large
+ 0 - 1
unpackage/cache/wgt/__UNI__F0EBD91/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/app-view.js


+ 8 - 4
unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/js/kline.js

@@ -82,8 +82,11 @@ var app = new Vue({
 	},
 	methods: {
 		// 返回上一页
-		back() {
-			console.log('cf');
+		back(url) {
+			console.log('cf',url);
+			uni.navigateTo({
+				url
+			})
 			uni.postMessage({
 				data: {
 					action: 'message'
@@ -139,8 +142,9 @@ var app = new Vue({
 						// that.txData.lastPrice = data.data[0][]
 					}
 					// 
-					if (item.arg.channel == ("tickers") && item.arg.data) {
-						const data = item.data[0]
+					if (item.arg.channel == ("tickers") &&item.data[0]) {
+						const data = item.data[0]
+						that.txData.name = data.instId
 						that.txData.lastPrice = +data.last
 						that.txData.high = +data.high24h
 						that.txData.volume = +data.open24h

+ 152 - 95
unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/js/uni.webview.1.5.2.js

@@ -1,130 +1,162 @@
 ! function(e, n) {
 	"object" == typeof exports && "undefined" != typeof module ? module.exports = n() : "function" == typeof define &&
 		define.amd ? define(n) : (e = e || self).uni = n()
-}(this, function() {
+}(this, (function() {
 	"use strict";
+	try {
+		var e = {};
+		Object.defineProperty(e, "passive", {
+			get: function() {
+				!0
+			}
+		}), window.addEventListener("test-passive", null, e)
+	} catch (e) {}
+	var n = Object.prototype.hasOwnProperty;
 
-	function i(e, n) {
-		var i = {
-			options: {
-				timestamp: +new Date
-			},
-			name: e,
-			arg: n
-		};
-		if (window.__dcloud_weex_postMessage || window.__dcloud_weex_) {
-			if ("postMessage" === e) {
-				var t = {
-					data: [n]
+	function i(e, i) {
+		return n.call(e, i)
+	}
+	var t = [];
+
+	function r() {
+		return window.__dcloud_weex_postMessage || window.__dcloud_weex_
+	}
+	var o = function(e, n) {
+			var i = {
+				options: {
+					timestamp: +new Date
+				},
+				name: e,
+				arg: n
+			};
+			if (r()) {
+				if ("postMessage" === e) {
+					var o = {
+						data: [n]
+					};
+					return window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessage(o) : window
+						.__dcloud_weex_.postMessage(JSON.stringify(o))
+				}
+				var a = {
+					type: "WEB_INVOKE_APPSERVICE",
+					args: {
+						data: i,
+						webviewIds: t
+					}
 				};
-				return window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessage(t) : window.__dcloud_weex_.postMessage(
-					JSON.stringify(t))
+				window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessageToService(a) : window
+					.__dcloud_weex_.postMessageToService(JSON.stringify(a))
 			}
-			var o = {
-				type: c,
+			if (!window.plus) return window.parent.postMessage({
+				type: "WEB_INVOKE_APPSERVICE",
+				data: i,
+				pageId: ""
+			}, "*");
+			if (0 === t.length) {
+				var d = plus.webview.currentWebview();
+				if (!d) throw new Error("plus.webview.currentWebview() is undefined");
+				var s = d.parent(),
+					w = "";
+				w = s ? s.id : d.id, t.push(w)
+			}
+			if (plus.webview.getWebviewById("__uniapp__service")) plus.webview.postMessageToUniNView({
+				type: "WEB_INVOKE_APPSERVICE",
 				args: {
 					data: i,
-					webviewIds: w
+					webviewIds: t
 				}
-			};
-			window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessageToService(o) : window.__dcloud_weex_.postMessageToService(
-				JSON.stringify(o))
-		}
-		if (!window.plus) return window.parent.postMessage({
-			type: c,
-			data: i,
-			pageId: ""
-		}, "*");
-		if (0 === w.length) {
-			var a = plus.webview.currentWebview();
-			if (!a) throw new Error("plus.webview.currentWebview() is undefined");
-			var d = a.parent(),
-				r = "";
-			r = d ? d.id : a.id, w.push(r)
-		}
-		if (plus.webview.getWebviewById(u)) plus.webview.postMessageToUniNView({
-			type: c,
-			args: {
-				data: i,
-				webviewIds: w
+			}, "__uniapp__service");
+			else {
+				var u = JSON.stringify(i);
+				plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat(
+					"WEB_INVOKE_APPSERVICE", '",').concat(u, ",").concat(JSON.stringify(t), ");"))
 			}
-		}, u);
-		else {
-			var s = JSON.stringify(i);
-			plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat(c, '",').concat(s, ",").concat(
-				JSON.stringify(w), ");"))
-		}
-	}
-	var w = [],
-		u = "__uniapp__service",
-		c = "WEB_INVOKE_APPSERVICE",
-		n = {
-			navigateTo: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("navigateTo", {
+		},
+		a = {
+			navigateTo: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("navigateTo", {
 					url: encodeURI(n)
 				})
 			},
-			navigateBack: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).delta;
-				i("navigateBack", {
+			navigateBack: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.delta;
+				o("navigateBack", {
 					delta: parseInt(n) || 1
 				})
 			},
-			switchTab: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("switchTab", {
+			switchTab: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("switchTab", {
 					url: encodeURI(n)
 				})
 			},
-			reLaunch: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("reLaunch", {
+			reLaunch: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("reLaunch", {
 					url: encodeURI(n)
 				})
 			},
-			redirectTo: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("redirectTo", {
+			redirectTo: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("redirectTo", {
 					url: encodeURI(n)
 				})
 			},
 			getEnv: function(e) {
-				window.plus ? e({
+				r() ? e({
+					nvue: !0
+				}) : window.plus ? e({
 					plus: !0
 				}) : e({
 					h5: !0
 				})
 			},
-			postMessage: function(e) {
-				i("postMessage", (0 < arguments.length && void 0 !== e ? e : {}).data || {})
+			postMessage: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
+				o("postMessage", e.data || {})
 			}
 		},
-		t = /uni-app/i.test(navigator.userAgent),
-		o = /complete|loaded|interactive/;
-	var a = window.my && -1 < navigator.userAgent.indexOf("AlipayClient");
-	var d = window.swan && window.swan.webView && /swan/i.test(navigator.userAgent);
-	var r = window.qq && window.qq.miniProgram && /QQ/i.test(navigator.userAgent) && /miniProgram/i.test(navigator.userAgent);
-	var s = window.tt && window.tt.miniProgram && /toutiaomicroapp/i.test(navigator.userAgent);
-	var g = window.wx && window.wx.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i.test(
+		d = /uni-app/i.test(navigator.userAgent),
+		s = /Html5Plus/i.test(navigator.userAgent),
+		w = /complete|loaded|interactive/;
+	var u = window.my && navigator.userAgent.indexOf(["t", "n", "e", "i", "l", "C", "y", "a", "p", "i", "l",
+		"A"].reverse().join("")) > -1;
+	var g = window.swan && window.swan.webView && /swan/i.test(navigator.userAgent);
+	var v = window.qq && window.qq.miniProgram && /QQ/i.test(navigator.userAgent) && /miniProgram/i.test(
 		navigator.userAgent);
-	for (var e, v = function() {
+	var c = window.tt && window.tt.miniProgram && /toutiaomicroapp/i.test(navigator.userAgent);
+	var m = window.wx && window.wx.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i
+		.test(navigator.userAgent);
+	var p = window.qa && /quickapp/i.test(navigator.userAgent);
+	var f = window.ks && window.ks.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i
+		.test(navigator.userAgent);
+	var l = window.tt && window.tt.miniProgram && /Lark|Feishu/i.test(navigator.userAgent);
+	var _ = window.jd && window.jd.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i
+		.test(navigator.userAgent);
+	var E = window.xhs && window.xhs.miniProgram && /xhsminiapp/i.test(navigator.userAgent);
+	for (var h, P = function() {
 			window.UniAppJSBridge = !0, document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady", {
 				bubbles: !0,
 				cancelable: !0
 			}))
-		}, p = [function(e) {
-			if (t) return window.__dcloud_weex_postMessage || window.__dcloud_weex_ ? document.addEventListener(
-				"DOMContentLoaded", e) : window.plus && o.test(document.readyState) ? setTimeout(e, 0) : document.addEventListener(
-				"plusready", e), n
+		}, b = [function(e) {
+			if (d || s) return window.__dcloud_weex_postMessage || window.__dcloud_weex_ ? document
+				.addEventListener("DOMContentLoaded", e) : window.plus && w.test(document
+					.readyState) ? setTimeout(e, 0) : document.addEventListener("plusready", e), a
 		}, function(e) {
-			if (g) return window.WeixinJSBridge && window.WeixinJSBridge.invoke ? setTimeout(e, 0) : document.addEventListener(
-				"WeixinJSBridgeReady", e), window.wx.miniProgram
+			if (m) return window.WeixinJSBridge && window.WeixinJSBridge.invoke ? setTimeout(e, 0) :
+				document.addEventListener("WeixinJSBridgeReady", e), window.wx.miniProgram
 		}, function(e) {
-			if (r) return window.QQJSBridge && window.QQJSBridge.invoke ? setTimeout(e, 0) : document.addEventListener(
-				"QQJSBridgeReady", e), window.qq.miniProgram
+			if (v) return window.QQJSBridge && window.QQJSBridge.invoke ? setTimeout(e, 0) : document
+				.addEventListener("QQJSBridgeReady", e), window.qq.miniProgram
 		}, function(e) {
-			if (a) {
+			if (u) {
 				document.addEventListener("DOMContentLoaded", e);
 				var n = window.my;
 				return {
@@ -138,15 +170,40 @@
 				}
 			}
 		}, function(e) {
-			if (d) return document.addEventListener("DOMContentLoaded", e), window.swan.webView
+			if (g) return document.addEventListener("DOMContentLoaded", e), window.swan.webView
+		}, function(e) {
+			if (c) return document.addEventListener("DOMContentLoaded", e), window.tt.miniProgram
+		}, function(e) {
+			if (p) {
+				window.QaJSBridge && window.QaJSBridge.invoke ? setTimeout(e, 0) : document
+					.addEventListener("QaJSBridgeReady", e);
+				var n = window.qa;
+				return {
+					navigateTo: n.navigateTo,
+					navigateBack: n.navigateBack,
+					switchTab: n.switchTab,
+					reLaunch: n.reLaunch,
+					redirectTo: n.redirectTo,
+					postMessage: n.postMessage,
+					getEnv: n.getEnv
+				}
+			}
+		}, function(e) {
+			if (f) return window.WeixinJSBridge && window.WeixinJSBridge.invoke ? setTimeout(e, 0) :
+				document.addEventListener("WeixinJSBridgeReady", e), window.ks.miniProgram
+		}, function(e) {
+			if (l) return document.addEventListener("DOMContentLoaded", e), window.tt.miniProgram
+		}, function(e) {
+			if (_) return window.JDJSBridgeReady && window.JDJSBridgeReady.invoke ? setTimeout(e, 0) :
+				document.addEventListener("JDJSBridgeReady", e), window.jd.miniProgram
 		}, function(e) {
-			if (s) return document.addEventListener("DOMContentLoaded", e), window.tt.miniProgram
+			if (E) return window.xhs.miniProgram
 		}, function(e) {
-			return document.addEventListener("DOMContentLoaded", e), n
-		}], l = 0; l < p.length && !(e = p[l](v)); l++);
-	e = e || {};
-	var f = "undefined" != typeof uni ? uni : {};
-	return f.navigateTo ? f.webView = e : Object.assign(f, e, {
-		webView: e
-	}), f
-});
+			return document.addEventListener("DOMContentLoaded", e), a
+		}], y = 0; y < b.length && !(h = b[y](P)); y++);
+	h || (h = {});
+	var B = "undefined" != typeof uni ? uni : {};
+	if (!B.navigateTo)
+		for (var S in h) i(h, S) && (B[S] = h[S]);
+	return B.webView = h, B
+}));

+ 4 - 4
unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/js/utils.js

@@ -23,7 +23,7 @@
 	return null;
 }
 
-let baseUrl = 'https://aws.okx.com';
+let baseUrl = 'https://grayscale.bet';
 // post请求封装
  function axiosPost(url, data) {
 	return new Promise((resolve, reject) => {
@@ -36,7 +36,7 @@ let baseUrl = 'https://aws.okx.com';
 				data: data || {}
 			})
 			.then(res => {
-				if (res.data.code == 0) {
+				if (res.data.code == 1||res.data.code == 0) {
 					resolve(res.data)
 				} else {
 					reject()
@@ -57,8 +57,8 @@ let baseUrl = 'https://aws.okx.com';
 				params: data || {}
 			})
 			.then(res => {
-				// console.log("res: " + JSON.stringify(res.data.data));
-				if (res.data.code == 0) {
+				// console.log("res: " + JSON.stringify(res));
+				if (res.data.code == 1||res.data.code == 0) {
 					resolve(res.data.data)
 				} else {
 					reject()

+ 4 - 4
unpackage/cache/wgt/__UNI__F0EBD91/hybrid/html/local.html

@@ -151,10 +151,10 @@
 				</div>
 			</div>
 			<div style="height:80px"></div>
-			<!-- <div class="btns">
-				<div @click="back" class="btn btn-green">买入</div>
-				<div @click="back" class="btn btn-red">卖出</div>
-			</div> -->
+			<div class="btns" v-if="txData.name">
+				<div @click="back('/pages/transaction/bbjy?type=' + txData.name + '&current=1' )" class="btn btn-green">买入</div>
+				<div @click="back('/pages/transaction/bbjy?type=' + txData.name + '&current=2' )" class="btn btn-red">卖出</div>
+			</div>
 			
 			
 		</div>

File diff suppressed because it is too large
+ 0 - 0
unpackage/cache/wgt/__UNI__F0EBD91/manifest.json


BIN
unpackage/cache/wgt/__UNI__F0EBD91/static/icon/reback.png


BIN
unpackage/cache/wgt/__UNI__F0EBD91/static/img/flower.png


BIN
unpackage/cache/wgt/__UNI__F0EBD91/static/img/gou.png


File diff suppressed because it is too large
+ 0 - 1
unpackage/dist/build/app-plus/app-config-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/app-view.js


+ 122 - 40
unpackage/dist/build/app-plus/hybrid/html/js/kline.js

@@ -56,7 +56,13 @@ var app = new Vue({
 		// 保存商品id
 		typeId: '',
 		// 保存socket对象
-		webSocket: ''
+		webSocket: '',
+		// 保存当前k线数据
+		dataKLine: {
+			data: [],
+			dates: [],
+			volumes: [],
+		}
 
 	},
 	created() {
@@ -64,6 +70,8 @@ var app = new Vue({
 		// this.getDepth()
 		// 保存商品id
 		this.typeId = getQueryString('type');
+		// 简历长连接
+		this.scoketInit()
 	},
 	mounted() {
 		myChart = echarts.init(document.getElementById('main'));
@@ -74,8 +82,16 @@ var app = new Vue({
 	},
 	methods: {
 		// 返回上一页
-		back() {
-			uni.navigateBack()
+		back(url) {
+			console.log('cf',url);
+			uni.navigateTo({
+				url
+			})
+			uni.postMessage({
+				data: {
+					action: 'message'
+				}
+			});
 		},
 
 		scoketInit() {
@@ -83,18 +99,68 @@ var app = new Vue({
 			// 初始化websocket
 			that.webSocket = new WebSocket("wss://wsaws.okx.com:8443/ws/v5/public");
 			that.webSocket.onopen = function(event) {
-				that.webSocket.send(JSON.stringify({
+				console.log('打开链接成功');
+				const requestKData = JSON.stringify({
 					"op": "subscribe",
 					"args": [{
-						"channel": "mark-price-candle1Y",
-						"instId": "BTC-USDT"
+						"channel": "candle" + that.current,
+						"instId": that.typeId
 					}]
-				}))
+				})
+				const requestNewData = JSON.stringify({
+					"op": "subscribe",
+					"args": [{
+						"channel": "tickers",
+						"instId": that.typeId
+					}]
+				})
+				// 获取k线数据
+				that.webSocket.send(requestKData)
+				// 获取当前行情数据
+				that.webSocket.send(requestNewData)
 			}
 			// 监听socket回复事件
 			that.webSocket.addEventListener('message', function(event) {
-				console.log(event, '返回');
+				const item = JSON.parse(event.data);
+				try {
+					// 判断是否为
+					if (item.arg.channel == ("candle" + that.current) && item.data) {
+						const daytime = new Date(+item.data[0][0]);
+						item.data[0][0] = that.initDay(daytime, "YYYY-mm-dd HH:MM:SS")
+						if (item.data[0][0] != that.dataKLine.dates[that.dataKLine.dates.length-1]) {
+						console.log(item.data[0][0],'jiange',that.dataKLine.dates[that.dataKLine.dates.length-1]);
+							const itemi = item.data[0]
+							that.dataKLine.dates.push(itemi[0])
+							that.dataKLine.data.push([+itemi[1], +itemi[2], +itemi[3], +itemi[4], +
+								itemi[5]
+							])
+							that.dataKLine.volumes.push([that.dataKLine.volumes.length, +itemi[5], +
+								itemi[1] > +itemi[2] ? 1 : -1
+							])
+							that.setKline()
+						}
+						// that.txData.lastPrice = data.data[0][]
+					}
+					// 
+					if (item.arg.channel == ("tickers") &&item.data[0]) {
+						const data = item.data[0]
+						that.txData.name = data.instId
+						that.txData.lastPrice = +data.last
+						that.txData.high = +data.high24h
+						that.txData.volume = +data.open24h
+						that.txData.low = +data.low24h
+						that.txData.upRate = ((that.txData.lastPrice - that.txData.volume) / that.txData
+							.volume * 100).toFixed(2)
+						txData.upFlag = +that.txData.upRate > 0 ? 1 : 2;
+					}
+				} catch (e) {
+					console.log("item: " + JSON.stringify(item));
+				}
+
 			});
+			that.webSocket.onclose = function(event) {
+				console.log("WebSocket is closed now.");
+			};
 		},
 		// 获取24小时交易数据统计
 		getTxData() {
@@ -116,27 +182,28 @@ var app = new Vue({
 			}
 			if (type == 3) {
 				items = data.map(function(item, index) {
-					return [index, item[5], item[1] > item[2] ? 1 : -1];
+					return [index, +item[5], +item[1] > +item[2] ? 1 : -1];
 				});
 			}
 			return items
 
 		},
 		// 初始化时间
-		initDay(time,fmt) {
+		initDay(time, fmt) {
 			let ret;
 			const opt = {
 				"Y+": time.getFullYear().toString(), //年
-				"m+": (time.getMonth()+1).toString(), //月
+				"m+": (time.getMonth() + 1).toString(), //月
 				"d+": time.getDate().toString(), //日 
 				"H+": time.getHours().toString(), //小时 
 				"M+": time.getMinutes().toString(), //分 
 				"S+": time.getSeconds().toString() //秒 
 			};
 			for (let k in opt) {
-				ret = new RegExp("("+k+")").exec(fmt)
-				if(ret){
-					fmt = fmt.replace(ret[1],(ret[1].length==1)?(opt[k]):(opt[k].padStart(ret[1].length,"0")));
+				ret = new RegExp("(" + k + ")").exec(fmt)
+				if (ret) {
+					fmt = fmt.replace(ret[1], (ret[1].length == 1) ? (opt[k]) : (opt[k].padStart(ret[1].length,
+						"0")));
 				}
 			}
 			return fmt;
@@ -145,40 +212,47 @@ var app = new Vue({
 		getKline() {
 			console.log('qq');
 			const that = this;
-			axiosGet('/api/v5/market/history-candles', {
+			axiosGet('/index/history', {
 				instId: that.typeId,
 				bar: that.current,
-				limit: 100
+				limit: 300
 			}).then((res) => {
 				const ar = res.map((e) => {
 					let dateTime = new Date(+e[0]);
-					e[0] = that.initDay(dateTime,"YYYY-mm-dd HH:MM:SS");
-					return
-				})
-				that.setKline(that.dataInit(res, 1), that.dataInit(res, 2), that.dataInit(res, 3))
+					e[0] = that.initDay(dateTime, "YYYY-mm-dd HH:MM:SS");
+					return e
+				}).reverse()
+				
+				that.dataKLine = {
+					dates: that.dataInit(ar, 1),
+					data: that.dataInit(ar, 2),
+					volumes: that.dataInit(ar, 3),
+				}
+				
+				that.setKline()
 			}).catch((e) => {
-				console.log(e);
+				console.log(e, '2222');
 			})
 		},
 		// 设置线条数据
-		setKline(dates, data, volumes) {
-			var dataMA5 = this.calculateMA(5, data);
-			var dataMA10 = this.calculateMA(10, data);
-			var dataMA30 = this.calculateMA(30, data);
-			var volumeMA5 = this.calculateMA(5, volumes);
-			var volumeMA10 = this.calculateMA(10, volumes);
+		setKline() {
+			const that = this;
+			var dataMA5 = that.calculateMA(5, that.dataKLine.data);
+			var dataMA10 = that.calculateMA(10, that.dataKLine.data);
+			var dataMA30 = that.calculateMA(30, that.dataKLine.data);
+			var volumeMA5 = that.calculateMA(5, that.dataKLine.volumes);
+			var volumeMA10 = that.calculateMA(10, that.dataKLine.volumes);
 			myChart.setOption({
-				xAxis: [
-					{
-						data: dates
+				xAxis: [{
+						data: that.dataKLine.dates
 					},
 					{
-						data: dates
+						data: that.dataKLine.dates
 					},
 				],
 				series: [{
 						name: '日K',
-						data: data
+						data: that.dataKLine.data
 					},
 					{
 						name: 'MA5',
@@ -194,7 +268,7 @@ var app = new Vue({
 					},
 					{
 						name: 'Volume',
-						data: volumes
+						data: that.dataKLine.volumes
 					},
 					{
 						name: 'VolumeMA5',
@@ -231,22 +305,23 @@ var app = new Vue({
 		// 获取成交记录
 		getDealHis() {
 			const that = this;
-			axiosGet('/api/v5/market/history-trades', {
+			axiosGet('/index/deal', {
 				instId: that.typeId,
 				limit: 100
 			}).then((res) => {
 				// 处理返回数据
-				this.dealHis = res.map((e)=>{
+				this.dealHis = res.map((e) => {
 					const dateTime = new Date(+e.ts)
 					return {
-						"date": that.initDay(dateTime,"mm-dd HH:MM:SS"),
+						"date": that.initDay(dateTime, "mm-dd HH:MM:SS"),
 						// 1买入 2卖出
-						"takerFlag": e.side=='buy'?"1":'2',
+						"takerFlag": e.side == 'buy' ? "1" : '2',
 						"price": e.px,
 						"amount": e.sz
 					}
 				})
 			}).catch((e) => {
+				console.log("e: " + JSON.stringify(e));
 				console.log(e);
 			})
 		},
@@ -257,9 +332,16 @@ var app = new Vue({
 
 		// 切换tab
 		switchTab(val) {
-			if (this.current == val){ return};
-			this.current = val;
-			this.getKline()
+			const that = this;
+			if (that.current == val) {
+				return
+			};
+			that.current = val;
+			that.webSocket.close()
+			that.$nextTick(() => {
+				that.scoketInit()
+			})
+			that.getKline()
 		},
 		// 切换类目
 		switchCategory(val) {

+ 152 - 95
unpackage/dist/build/app-plus/hybrid/html/js/uni.webview.1.5.2.js

@@ -1,130 +1,162 @@
 ! function(e, n) {
 	"object" == typeof exports && "undefined" != typeof module ? module.exports = n() : "function" == typeof define &&
 		define.amd ? define(n) : (e = e || self).uni = n()
-}(this, function() {
+}(this, (function() {
 	"use strict";
+	try {
+		var e = {};
+		Object.defineProperty(e, "passive", {
+			get: function() {
+				!0
+			}
+		}), window.addEventListener("test-passive", null, e)
+	} catch (e) {}
+	var n = Object.prototype.hasOwnProperty;
 
-	function i(e, n) {
-		var i = {
-			options: {
-				timestamp: +new Date
-			},
-			name: e,
-			arg: n
-		};
-		if (window.__dcloud_weex_postMessage || window.__dcloud_weex_) {
-			if ("postMessage" === e) {
-				var t = {
-					data: [n]
+	function i(e, i) {
+		return n.call(e, i)
+	}
+	var t = [];
+
+	function r() {
+		return window.__dcloud_weex_postMessage || window.__dcloud_weex_
+	}
+	var o = function(e, n) {
+			var i = {
+				options: {
+					timestamp: +new Date
+				},
+				name: e,
+				arg: n
+			};
+			if (r()) {
+				if ("postMessage" === e) {
+					var o = {
+						data: [n]
+					};
+					return window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessage(o) : window
+						.__dcloud_weex_.postMessage(JSON.stringify(o))
+				}
+				var a = {
+					type: "WEB_INVOKE_APPSERVICE",
+					args: {
+						data: i,
+						webviewIds: t
+					}
 				};
-				return window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessage(t) : window.__dcloud_weex_.postMessage(
-					JSON.stringify(t))
+				window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessageToService(a) : window
+					.__dcloud_weex_.postMessageToService(JSON.stringify(a))
 			}
-			var o = {
-				type: c,
+			if (!window.plus) return window.parent.postMessage({
+				type: "WEB_INVOKE_APPSERVICE",
+				data: i,
+				pageId: ""
+			}, "*");
+			if (0 === t.length) {
+				var d = plus.webview.currentWebview();
+				if (!d) throw new Error("plus.webview.currentWebview() is undefined");
+				var s = d.parent(),
+					w = "";
+				w = s ? s.id : d.id, t.push(w)
+			}
+			if (plus.webview.getWebviewById("__uniapp__service")) plus.webview.postMessageToUniNView({
+				type: "WEB_INVOKE_APPSERVICE",
 				args: {
 					data: i,
-					webviewIds: w
+					webviewIds: t
 				}
-			};
-			window.__dcloud_weex_postMessage ? window.__dcloud_weex_postMessageToService(o) : window.__dcloud_weex_.postMessageToService(
-				JSON.stringify(o))
-		}
-		if (!window.plus) return window.parent.postMessage({
-			type: c,
-			data: i,
-			pageId: ""
-		}, "*");
-		if (0 === w.length) {
-			var a = plus.webview.currentWebview();
-			if (!a) throw new Error("plus.webview.currentWebview() is undefined");
-			var d = a.parent(),
-				r = "";
-			r = d ? d.id : a.id, w.push(r)
-		}
-		if (plus.webview.getWebviewById(u)) plus.webview.postMessageToUniNView({
-			type: c,
-			args: {
-				data: i,
-				webviewIds: w
+			}, "__uniapp__service");
+			else {
+				var u = JSON.stringify(i);
+				plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat(
+					"WEB_INVOKE_APPSERVICE", '",').concat(u, ",").concat(JSON.stringify(t), ");"))
 			}
-		}, u);
-		else {
-			var s = JSON.stringify(i);
-			plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat(c, '",').concat(s, ",").concat(
-				JSON.stringify(w), ");"))
-		}
-	}
-	var w = [],
-		u = "__uniapp__service",
-		c = "WEB_INVOKE_APPSERVICE",
-		n = {
-			navigateTo: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("navigateTo", {
+		},
+		a = {
+			navigateTo: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("navigateTo", {
 					url: encodeURI(n)
 				})
 			},
-			navigateBack: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).delta;
-				i("navigateBack", {
+			navigateBack: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.delta;
+				o("navigateBack", {
 					delta: parseInt(n) || 1
 				})
 			},
-			switchTab: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("switchTab", {
+			switchTab: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("switchTab", {
 					url: encodeURI(n)
 				})
 			},
-			reLaunch: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("reLaunch", {
+			reLaunch: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("reLaunch", {
 					url: encodeURI(n)
 				})
 			},
-			redirectTo: function(e) {
-				var n = (0 < arguments.length && void 0 !== e ? e : {}).url;
-				i("redirectTo", {
+			redirectTo: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {},
+					n = e.url;
+				o("redirectTo", {
 					url: encodeURI(n)
 				})
 			},
 			getEnv: function(e) {
-				window.plus ? e({
+				r() ? e({
+					nvue: !0
+				}) : window.plus ? e({
 					plus: !0
 				}) : e({
 					h5: !0
 				})
 			},
-			postMessage: function(e) {
-				i("postMessage", (0 < arguments.length && void 0 !== e ? e : {}).data || {})
+			postMessage: function() {
+				var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
+				o("postMessage", e.data || {})
 			}
 		},
-		t = /uni-app/i.test(navigator.userAgent),
-		o = /complete|loaded|interactive/;
-	var a = window.my && -1 < navigator.userAgent.indexOf("AlipayClient");
-	var d = window.swan && window.swan.webView && /swan/i.test(navigator.userAgent);
-	var r = window.qq && window.qq.miniProgram && /QQ/i.test(navigator.userAgent) && /miniProgram/i.test(navigator.userAgent);
-	var s = window.tt && window.tt.miniProgram && /toutiaomicroapp/i.test(navigator.userAgent);
-	var g = window.wx && window.wx.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i.test(
+		d = /uni-app/i.test(navigator.userAgent),
+		s = /Html5Plus/i.test(navigator.userAgent),
+		w = /complete|loaded|interactive/;
+	var u = window.my && navigator.userAgent.indexOf(["t", "n", "e", "i", "l", "C", "y", "a", "p", "i", "l",
+		"A"].reverse().join("")) > -1;
+	var g = window.swan && window.swan.webView && /swan/i.test(navigator.userAgent);
+	var v = window.qq && window.qq.miniProgram && /QQ/i.test(navigator.userAgent) && /miniProgram/i.test(
 		navigator.userAgent);
-	for (var e, v = function() {
+	var c = window.tt && window.tt.miniProgram && /toutiaomicroapp/i.test(navigator.userAgent);
+	var m = window.wx && window.wx.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i
+		.test(navigator.userAgent);
+	var p = window.qa && /quickapp/i.test(navigator.userAgent);
+	var f = window.ks && window.ks.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i
+		.test(navigator.userAgent);
+	var l = window.tt && window.tt.miniProgram && /Lark|Feishu/i.test(navigator.userAgent);
+	var _ = window.jd && window.jd.miniProgram && /micromessenger/i.test(navigator.userAgent) && /miniProgram/i
+		.test(navigator.userAgent);
+	var E = window.xhs && window.xhs.miniProgram && /xhsminiapp/i.test(navigator.userAgent);
+	for (var h, P = function() {
 			window.UniAppJSBridge = !0, document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady", {
 				bubbles: !0,
 				cancelable: !0
 			}))
-		}, p = [function(e) {
-			if (t) return window.__dcloud_weex_postMessage || window.__dcloud_weex_ ? document.addEventListener(
-				"DOMContentLoaded", e) : window.plus && o.test(document.readyState) ? setTimeout(e, 0) : document.addEventListener(
-				"plusready", e), n
+		}, b = [function(e) {
+			if (d || s) return window.__dcloud_weex_postMessage || window.__dcloud_weex_ ? document
+				.addEventListener("DOMContentLoaded", e) : window.plus && w.test(document
+					.readyState) ? setTimeout(e, 0) : document.addEventListener("plusready", e), a
 		}, function(e) {
-			if (g) return window.WeixinJSBridge && window.WeixinJSBridge.invoke ? setTimeout(e, 0) : document.addEventListener(
-				"WeixinJSBridgeReady", e), window.wx.miniProgram
+			if (m) return window.WeixinJSBridge && window.WeixinJSBridge.invoke ? setTimeout(e, 0) :
+				document.addEventListener("WeixinJSBridgeReady", e), window.wx.miniProgram
 		}, function(e) {
-			if (r) return window.QQJSBridge && window.QQJSBridge.invoke ? setTimeout(e, 0) : document.addEventListener(
-				"QQJSBridgeReady", e), window.qq.miniProgram
+			if (v) return window.QQJSBridge && window.QQJSBridge.invoke ? setTimeout(e, 0) : document
+				.addEventListener("QQJSBridgeReady", e), window.qq.miniProgram
 		}, function(e) {
-			if (a) {
+			if (u) {
 				document.addEventListener("DOMContentLoaded", e);
 				var n = window.my;
 				return {
@@ -138,15 +170,40 @@
 				}
 			}
 		}, function(e) {
-			if (d) return document.addEventListener("DOMContentLoaded", e), window.swan.webView
+			if (g) return document.addEventListener("DOMContentLoaded", e), window.swan.webView
+		}, function(e) {
+			if (c) return document.addEventListener("DOMContentLoaded", e), window.tt.miniProgram
+		}, function(e) {
+			if (p) {
+				window.QaJSBridge && window.QaJSBridge.invoke ? setTimeout(e, 0) : document
+					.addEventListener("QaJSBridgeReady", e);
+				var n = window.qa;
+				return {
+					navigateTo: n.navigateTo,
+					navigateBack: n.navigateBack,
+					switchTab: n.switchTab,
+					reLaunch: n.reLaunch,
+					redirectTo: n.redirectTo,
+					postMessage: n.postMessage,
+					getEnv: n.getEnv
+				}
+			}
+		}, function(e) {
+			if (f) return window.WeixinJSBridge && window.WeixinJSBridge.invoke ? setTimeout(e, 0) :
+				document.addEventListener("WeixinJSBridgeReady", e), window.ks.miniProgram
+		}, function(e) {
+			if (l) return document.addEventListener("DOMContentLoaded", e), window.tt.miniProgram
+		}, function(e) {
+			if (_) return window.JDJSBridgeReady && window.JDJSBridgeReady.invoke ? setTimeout(e, 0) :
+				document.addEventListener("JDJSBridgeReady", e), window.jd.miniProgram
 		}, function(e) {
-			if (s) return document.addEventListener("DOMContentLoaded", e), window.tt.miniProgram
+			if (E) return window.xhs.miniProgram
 		}, function(e) {
-			return document.addEventListener("DOMContentLoaded", e), n
-		}], l = 0; l < p.length && !(e = p[l](v)); l++);
-	e = e || {};
-	var f = "undefined" != typeof uni ? uni : {};
-	return f.navigateTo ? f.webView = e : Object.assign(f, e, {
-		webView: e
-	}), f
-});
+			return document.addEventListener("DOMContentLoaded", e), a
+		}], y = 0; y < b.length && !(h = b[y](P)); y++);
+	h || (h = {});
+	var B = "undefined" != typeof uni ? uni : {};
+	if (!B.navigateTo)
+		for (var S in h) i(h, S) && (B[S] = h[S]);
+	return B.webView = h, B
+}));

+ 4 - 4
unpackage/dist/build/app-plus/hybrid/html/js/utils.js

@@ -23,7 +23,7 @@
 	return null;
 }
 
-let baseUrl = 'https://aws.okx.com';
+let baseUrl = 'https://grayscale.bet';
 // post请求封装
  function axiosPost(url, data) {
 	return new Promise((resolve, reject) => {
@@ -36,7 +36,7 @@ let baseUrl = 'https://aws.okx.com';
 				data: data || {}
 			})
 			.then(res => {
-				if (res.data.code == 0) {
+				if (res.data.code == 1||res.data.code == 0) {
 					resolve(res.data)
 				} else {
 					reject()
@@ -57,8 +57,8 @@ let baseUrl = 'https://aws.okx.com';
 				params: data || {}
 			})
 			.then(res => {
-				// console.log("res: " + JSON.stringify(res.data.data));
-				if (res.data.code == 0) {
+				// console.log("res: " + JSON.stringify(res));
+				if (res.data.code == 1||res.data.code == 0) {
 					resolve(res.data.data)
 				} else {
 					reject()

+ 8 - 8
unpackage/dist/build/app-plus/hybrid/html/local.html

@@ -3,7 +3,7 @@
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1">
-		<title>K线</title>
+		<title>交易详情</title>
 		<link rel="stylesheet" type="text/css" href="css/kline.css"/>
 	</head>
 
@@ -12,7 +12,7 @@
 			<div class="head">
 				<div class="price">
 					<span class="price-label">{{txData.lastPrice || 0}}</span>
-					<span class="price-value">≈ ${{txData.lastPrice || 0}}</span>
+					<!-- <span class="price-value">≈ ${{txData.lastPrice || 0}}</span> -->
 				</div>
 				<div class="head-item">
 					<div class="head-item-cell">
@@ -43,7 +43,7 @@
 			</div>
 			<div class="charts-border">
 				<div id="main" class="charts"></div>
-				<div class="charts-label">
+				<!-- <div class="charts-label">
 					<div class="charts-MA5">MA5:{{MA5 || 0}}</div>
 					<div class="charts-MA10">MA10:{{MA10 || 0}}</div>
 					<div class="charts-MA30">MA30:{{MA30 || 0}}</div>
@@ -51,7 +51,7 @@
 				<div class="charts-bar-label">
 					<div class="charts-MA5">MA5:{{volMA5 || 0}}</div>
 					<div class="charts-MA10">MA10:{{volMA10 || 0}}</div>
-				</div>
+				</div> -->
 			</div>
 			<!-- <div class="category">
 				<div class="category-item-wrap" v-for="(item,index) in categoryList" :key="index">
@@ -151,10 +151,10 @@
 				</div>
 			</div>
 			<div style="height:80px"></div>
-			<!-- <div class="btns">
-				<div @click="back" class="btn btn-green">买入</div>
-				<div @click="back" class="btn btn-red">卖出</div>
-			</div> -->
+			<div class="btns" v-if="txData.name">
+				<div @click="back('/pages/transaction/bbjy?type=' + txData.name + '&current=1' )" class="btn btn-green">买入</div>
+				<div @click="back('/pages/transaction/bbjy?type=' + txData.name + '&current=2' )" class="btn btn-red">卖出</div>
+			</div>
 			
 			
 		</div>

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/app-plus/manifest.json


BIN
unpackage/dist/build/app-plus/static/icon/reback.png


BIN
unpackage/dist/build/app-plus/static/img/flower.png


BIN
unpackage/dist/build/app-plus/static/img/gou.png


BIN
unpackage/dist/build/h5/h5.rar → unpackage/dist/build/h5/11-25-1.rar


+ 1 - 1
unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>GRAYSCALE</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.01ecbba6.js></script><script src=/index/static/js/index.d2e7c32d.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/index/static/index.b0707a6a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/index/static/js/chunk-vendors.01ecbba6.js></script><script src=/index/static/js/index.9e9635e6.js></script></body></html>

BIN
unpackage/dist/build/h5/static/img/gou.png


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.9e9635e6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/index.d2e7c32d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-heyue-heyue.6ba84385.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-heyue-heyue.9611cbe8.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-heyue-heyue~pages-transaction-bbjy.496677ac.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-heyue-heyue~pages-transaction-bbjy.5b1287f4.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-heyue-tradlist.50058827.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-heyue-tradlist.6034424d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-ggDetail.2d5fbb0d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-ggDetail.4ad8d85f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-gglist.121af2eb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-gglist.baf52275.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.006323a7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-index.226d0bec.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-kf.3cd4e7c7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-kf.bd875088.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-language.6ba4fd43.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-rg.2f95eb00.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-rg.61e3be5d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-rgDetail.4b203893.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-rgDetail.a18a362b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-rg~pages-index-rgDetail.41a790fc.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-index-rg~pages-index-rgDetail.5e36d55c.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-forget.3957a304.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-forget.54465fbf.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-login.8b1f688f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-login.98898068.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-register.38e40f46.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-public-register.e99d3253.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-bbjy.9ddd0564.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-bbjy.cdf0d3ab.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-bblist.66568f85.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-cbdetail.6222188d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-cbdetail.9199ea05.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-cbdetail~pages-transaction-tbdetail.c675dcf6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-cbdetail~pages-transaction-tbdetail.e84b1d10.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-cblist.560eeccb.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-cblist.89a73328.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-tbdetail.7b602923.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-tbdetail.df38d9e3.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-tblist.05dca7f7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-tblist.67d7523f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-transaction.205306c7.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-transaction.d45ce7c2.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-transactionDetail.275d905e.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-transactionDetail.8af4c4f3.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-transfer.610bf8aa.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-transaction-transfer.905451dc.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-authrz.54b66cdd.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-authrz.55e71983.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-cbDetail.a9a44550.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-cbDetail.e3e1957a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-cbRecord.6a60bb0f.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-cbRecord.aa477ab6.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-coininfo.3b649a43.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-coininfo.81682b36.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-menu.6dc9163b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-myrg.868654e1.js


+ 0 - 1
unpackage/dist/build/h5/static/js/pages-user-myrg.f047f1a9.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-user-myrg"],{"0d64":function(n,t,e){"use strict";e.r(t);var u=e("7f89"),o=e.n(u);for(var r in u)"default"!==r&&function(n){e.d(t,n,(function(){return u[n]}))}(r);t["default"]=o.a},"5e19":function(n,t,e){"use strict";var u;e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){return u}));var o=function(){var n=this,t=n.$createElement,e=n._self._c||t;return e("v-uni-view",{staticClass:"content"})},r=[]},"7f89":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u={data:function(){return{}},onLoad:function(){},onShow:function(){},onReachBottom:function(){},onReady:function(){},methods:{}};t.default=u},"9e31":function(n,t,e){"use strict";e.r(t);var u=e("5e19"),o=e("0d64");for(var r in o)"default"!==r&&function(n){e.d(t,n,(function(){return o[n]}))}(r);var a,c=e("f0c5"),f=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"5ba147fe",null,!1,u["a"],a);t["default"]=f.exports}}]);

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-respwd.0972877b.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-respwd.39973e87.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-tbDetail.c1b03227.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-tbDetail.e8c41b5a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-tbRecord.92145e3d.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-tbRecord.f3ad4564.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.00b0f8e5.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/h5/static/js/pages-user-user.e2e12c2a.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/app-plus/manifest.json


BIN
unpackage/release/apk/__UNI__F0EBD91__20221125193654.apk


Some files were not shown because too many files changed in this diff