Fly 2 anos atrás
pai
commit
f2de09f377

+ 13 - 1
components/sharePage/sharePage.vue

@@ -20,7 +20,7 @@
 			</view>
 			<view class="share-footer">
 				<view class="share-list">
-					<view class="share-icons">
+					<view class="share-icons" @click.stop="copyLink()">
 						<text class="share-icon iconfont" style="color: #00b1ff;">&#xe65b;</text>
 						<text class="share-text">复制链接</text>
 					</view>
@@ -97,6 +97,18 @@
 			// },3000)
 		},
 		methods: {
+			copyLink(){
+				uni.setClipboardData({
+					data: this.qrcodeVal,
+					success: res =>{
+						uni.showToast({
+							title: '复制成功',
+							icon: 'none'
+						})
+					}
+				});
+				
+			},
 			drawCode() {
 				if (this.$refs.qrcodeRef) {
 					// this.$refs.qrcodeRef.crtQrCode()

+ 18 - 0
pages.json

@@ -287,6 +287,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/content/About-Us",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/content/activity-center",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "活动中心",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	"tabBar": {

+ 31 - 0
pages/content/About-Us.vue

@@ -0,0 +1,31 @@
+<template>
+	<view class="iframe-content">
+		<headContent borderBottom>
+			<template #left>
+				<reverse-back />
+			</template>
+			<template #content>
+				<view class="haed-title">
+					关于我们
+				</view>
+			</template>
+		</headContent>
+		<view class="iframe-box">
+			<iframe src="https://biking.zendesk.com/hc/zh-cn/sections/10626469683345" frameborder="0"></iframe>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

+ 13 - 12
pages/content/Google.vue

@@ -41,14 +41,14 @@
 <script>
 	import {
 		Api_getGoogle
-		
+
 	} from "@/api/index.js"
 	export default {
 		name: 'Google',
 		data() {
 			return {
 				val: '',
-				account:'',
+				account: '',
 				secret: "", // 密钥
 				codeurl: ""
 			};
@@ -58,23 +58,24 @@
 			this.getGoogle()
 		},
 		mounted() {
-			this.$refs.qrcodeRef._makeCode()
+		 
 		},
 		methods: {
 			getGoogle() {
 				Api_getGoogle().then(res => {
 					this.secret = res.secret
 					this.codeurl = res.codeurl
-					
+
 					this.$nextTick(() => {
-						if(this.codeurl){
-						this.$refs.qrcode._makeCode()
+						if (this.codeurl) {
+							this.$refs.qrcodeRef._makeCode()
 						}
 					})
 				})
 			},
-			openUrl(){
-				const url = 'https://m.torrent.org.cn/soft/2703.html'
+			openUrl() {
+				// const url = 'https://m.torrent.org.cn/soft/2703.html'
+				const url = 'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=zh&gl=US'
 				plus.runtime.openWeb(url);
 			},
 			copySecret(secret) {
@@ -82,19 +83,19 @@
 					data: secret,
 					success: res => {
 						uni.showToast({
-							title:'复制成功',
-							icon:'none'
+							title: '复制成功',
+							icon: 'none'
 						})
 					}
 				});
 
 
 			},
-			bind(){
+			bind() {
 				// this.type = opt?.type;
 				// this.account = opt?.account;
 				uni.navigateTo({
-					url:`/pages/login/safety-verification?type=2&account=${this.account}`
+					url: `/pages/login/safety-verification?type=2&account=${this.account}`
 				})
 			}
 		}

+ 31 - 0
pages/content/activity-center.vue

@@ -0,0 +1,31 @@
+<template>
+	<view class="iframe-content">
+		<headContent borderBottom>
+			<template #left>
+				<reverse-back />
+			</template>
+			<template #content>
+				<view class="haed-title">
+					活动中心
+				</view>
+			</template>
+		</headContent>
+		<view class="iframe-box">
+			<iframe src="https://biking.zendesk.com/hc/zh-cn/sections/10621646474513-%E6%B4%BB%E5%8A%A8%E4%B8%AD%E5%BF%83" frameborder="0"></iframe>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

+ 9 - 3
pages/content/mine.vue

@@ -245,7 +245,10 @@
 			},
 			// 关于我们
 			getAboutUs() {
-				this.getSinglePage(1)
+				// this.getSinglePage(1)
+				uni.navigateTo({
+					url:'/pages/content/About-Us'
+				})
 			},
 			// 安全退出
 			retreatFromLogin() {
@@ -263,9 +266,12 @@
 					url: '/pages/content/address'
 				})
 			},
-			// getAboutUs
 			openActivityCenter() {
-				this.getSinglePage(2)
+				// this.getSinglePage(2)
+				
+				uni.navigateTo({
+					url: '/pages/content/activity-center'
+				})
 			},
 
 			getSinglePage(id) {

+ 1 - 1
pages/contract/history/history-freight-space.vue

@@ -50,7 +50,7 @@
 
 						<view class="info-item">
 							<text class="info-item-lable">平仓数量(张)</text>
-							<text class="info-item-val">{{ item.number }}</text>
+							<text class="info-item-val">{{ item.share }}</text>
 						</view>
 						<view class="info-item">
 							<text class="info-item-lable">手续费(USDT)</text>

+ 2 - 2
pages/contract/history/turnover.vue

@@ -22,7 +22,7 @@
 					<view class="content-info">
 						<view class="info-item">
 							<text class="info-item-lable">数量(张)</text>
-							<text class="info-item-val">{{ item.number }}</text>
+							<text class="info-item-val">{{ item.share }}</text>
 						</view>
 						<view class="info-item">
 							<text class="info-item-lable">成交价格(USDT)</text>
@@ -30,7 +30,7 @@
 						</view>
 						<view class="info-item">
 							<text class="info-item-lable">成交额(USDT)</text>
-							<text class="info-item-val">{{ item.number }}</text>
+							<text class="info-item-val">{{ item.caution_money }}</text>
 						</view>
 
 

+ 6 - 6
pages/contract/modules/close-out.vue

@@ -53,7 +53,7 @@
 						<text class="restrict-lable">平仓数量(USDT)</text>
 						<view class="restrict-btn">
 							<text class="restrict-nums-text">可平仓位数量(张):</text>
-							<text class="restrict-nums">{{ content.number }}</text>
+							<text class="restrict-nums">{{ content.share }}</text>
 						</view>
 					</view>
 					<view class="restrict-input-box">
@@ -107,9 +107,9 @@
 		watch: {
 			percent: {
 				handler(newNum) {
-					if (newNum && this.content.number) {
-						let num = Math.ceil(this.content.number * newNum / 100)
-						this.numsk = num > this.content.number ? this.content.number : num
+					if (newNum && this.content.share) {
+						let num = Math.ceil(this.content.share * newNum / 100)
+						this.numsk = num > this.content.share ? this.content.share : num
 					} else {
 						this.numsk = ''
 					}
@@ -169,7 +169,7 @@
 			setCloseLever() {
 				// id	是	number	订单id
 				// share	否	number	【5-25】张数
-				if (this.numsk && this.numsk <= this.content.number) {
+				if (this.numsk && this.numsk <= this.content.share) {
 					this.closeLever({
 						id: this.content.id,
 						share: this.numsk
@@ -186,7 +186,7 @@
 				// share	否	number	【5-25】张数
 				this.closeLever({
 					id: this.content.id,
-					share: this.content.number
+					share: this.content.share
 				})
 
 			},

+ 1 - 1
pages/contract/sustainability/freight-space.vue

@@ -43,7 +43,7 @@
 						</view>
 						<view class="info-item">
 							<text class="info-item-lable">持仓数量(张)</text>
-							<text class="info-item-val">{{ item.number }}</text>
+							<text class="info-item-val">{{ item.share }}</text>
 						</view>
 						<view class="info-item">
 							<text class="info-item-lable">风险率(%)</text>

+ 1 - 1
pages/login/safety-verification.vue

@@ -145,7 +145,7 @@
 						case '1':
 							path = `/pages/login/reset-pswd?account=${this.account}&code=${this.code}`;
 							break
-						case '1':
+						case '2':
 							path = `/pages/content/google-verification`;
 							break
 

+ 17 - 0
static/css/index.scss

@@ -125,4 +125,21 @@ $r_bgColor01:rgba(255,0,0,0.1);
 				font-weight: 400;
 			}
 		}
+ }
+ 
+ .iframe-content {
+ 	width: 100%;
+ 	height: 100vh;
+ 	display: flex;
+ 	flex-direction: column;
+ 
+ 	.iframe-box {
+ 		flex: 1;
+ 
+ 		iframe {
+ 			width: 100%;
+ 			height: 100%;
+ 		}
+ 	}
+ 
  }