7-5-1

.hbuilderx/launch.json

@@ -10,6 +10,10 @@
      	{
      		"launchtype" : "local"
      	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
      	"type" : "uniCloud"
      }
     ]

app.js

@@ -14,7 +14,7 @@ if (process.env.NODE_ENV == "production") {
         // app名称
         appName: "GSR",
         // 版本
-        version: "1.1.7",
+        version: "1.1.8",
         // 移动端地址
         mobile: "https://service.gsras.com",
     };
@@ -34,7 +34,7 @@ if (process.env.NODE_ENV == "production") {
         // app名称
         appName: "GSR",
         // 版本
-        version: "1.1.7",
+        version: "1.1.8",
         // 移动端地址
         mobile: "https://service.gsras.com",
     };

base_info/baseinfo.txt

@@ -0,0 +1,2 @@
+别名：wwgsr.com
+密码：112233

i18n/lang/alb.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "اختر وسيلة الدفع",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"كمية الدفع",
 		"a4":"عدد المشتركين",
 		"a5":"درجة الائتمان"

i18n/lang/cn.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "选择付款方式",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"付款数量",
 		"a4":"认购数量",
 		"a5":"信用评分"

i18n/lang/de.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Wählen Sie die Zahlungsmethode aus",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Zahlungsmenge",
 		"a4":"Anzahl der Abonnements",
 		"a5":"Credit Score"

i18n/lang/en.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Select payment method",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Payment amount",
 		"a4":"Quantity Purchased",
 		"a5":"Credit Rating"

i18n/lang/fin.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Valitse maksutapa",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Tuen määrä",
 		"a4":"Tilausten lukumäärä",
 		"a5":"Luottoluokitus"

i18n/lang/fra.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Choisir le mode de paiement",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Nombre de paiements",
 		"a4":"Nombre d'abonnements",
 		"a5":"Cote de crédit"

i18n/lang/it.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Scelga il metodo di pagamento",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Quantità di pagamento",
 		"a4":"Numero di abbonamenti",
 		"a5":"Punteggio di credito"

i18n/lang/jp.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "支払い方法の選択",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"支払数量",
 		"a4":"購入数",
 		"a5":"与信評価"

i18n/lang/kor.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "지급수단선택",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"결제 수량",
 		"a4":"청약 수량",
 		"a5":"신용 평점"

i18n/lang/pl.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Wybierz metodę płatności",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Ilość płatności",
 		"a4":"Liczba subskrypcji",
 		"a5":"Punkty kredytowe"

i18n/lang/pt.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Seleccionar o método de pagamento",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Quantidade de pagamento",
 		"a4":"Número de assinaturas",
 		"a5":"Pontuação de crédito"

i18n/lang/spa.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Seleccionar el método de pago",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Cantidad pagada",
 		"a4":"Número de suscripciones",
 		"a5":"Calificación crediticia"

i18n/lang/swe.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Välj betalningsmetod",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Betalningskvantitet",
 		"a4":"Antal abonnemang",
 		"a5":"Kreditpoäng"

i18n/lang/tai.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "เลือกวิธีการชำระเงิน",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3": "ปริมาณการชำระเงิน",
 		"a4": "จำนวนสมาชิก",
 		"a5": "คะแนนเครดิต"

i18n/lang/tr.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Ödeme türünü seçin",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Ödeme miktarı",
 		"a4":"İmzalar sayısı",
 		"a5":"Kredi notu"

i18n/lang/tw.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "選擇支付方式",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"付款數量",
 		"a4":"認購數量",
 		"a5":"信用評分"

i18n/lang/ukr.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Оберіть спосіб оплати",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3":"Кількість платей",
 		"a4":"Кількість підписів",
 		"a5":"Кредитний результат"

i18n/lang/yindu.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "भुगतान विधि चुनें",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3": "पैमेंट मात्रा",
 		"a4": "सदस्यता की संख्या",
 		"a5": "क्रेडिट स्कोर"

i18n/lang/yue.json

@@ -1,7 +1,7 @@
 {
 	"add": {
 		"a1": "Chọn phương pháp thanh toán",
-		"a2": "Twitter",
+		"a2": "Line",
 		"a3": "Số lần thanh toán",
 		"a4": "Số đăng ký",
 		"a5": "Điểm tín dụng"

manifest.json

@@ -2,8 +2,8 @@
     "name" : "GSR",
     "appid" : "__UNI__EDBF4F5",
     "description" : "",
-    "versionName" : "1.1.7",
-    "versionCode" : 117,
+    "versionName" : "1.2.1",
+    "versionCode" : 121,
     "transformPx" : false,
     "app-plus" : {
         "nvueCompiler" : "uni-app",

pages/base/home.vue

@@ -378,7 +378,7 @@
 						</view> -->
 						<view @click="toShe" tag="div" class="d-flex w-3/12   flex-col align-center"
 							style="padding:0 6rpx;overflow:hidden;word-break:break-all;">
-							<img src="static/img/index/22.png" alt="" class="h-44" />
+							<img src="static/img/index/line.png" alt="" class="h-44" />
 							<span class="fn-md color-light p-y-xs" style="text-align: center;">{{
 						        $t("add.a2")
 						    }}</span>
@@ -616,7 +616,7 @@
 				setTheme: "setTheme",
 			}),
 			toShe(){
-				let url = 'https://twitter.com/gsr_io?s=11&t=rihyP-ZS9rUHEcPn0p7jbA'
+				let url = 'https://line.me/ti/p/WeaE7RPhc8'
 				// #ifdef H5
 				window.location.href = url
 				// #endif
@@ -659,7 +659,7 @@
 				// uni.navigateTo({
 				// 	url:'/pages/assets/web-view'
 				// })
-				let url = 'https://im.gsras.com/index/index/home?visiter_id=&visiter_name=&avatar=&business_id=2&groupid=0&special=2'
+				let url = 'https://im.pkex.ltd/index/index/home?visiter_id=&visiter_name=&avatar=&business_id=3&groupid=0&special=3'
 				// #ifdef H5
 				window.location.href = url
 				// #endif

pages/exchange/index.vue

@@ -69,7 +69,7 @@
           v-for="item in resolutions"
           :name="item.value"
           :title="item.label"
-          :key="item.label"
+          :key="item.label"
         >
         </van-tab>
       </van-tabs>
@@ -216,7 +216,7 @@ export default {
       buyList: [],
       sellList: [],
       tradeList: [],
-      activeTime: "1",
+      activeTime: "5",
       index: "",
       marketList: [],
       collect: [],
@@ -289,8 +289,11 @@ export default {
         parentItem.marketInfoList.forEach((item) => {
           list.push(item);
         });
-      });
-      return list.find((item) => item.pair_name == this.query.code);
+      });
+	  let bb = list.find((item) => item.pair_name == this.query.code)
+	  console.log(bb.price)
+	  return bb
+      // return list.find((item) => item.pair_name == this.query.code);
     },
     // 是否为自选
     isCoolect() {
@@ -427,8 +430,9 @@ export default {
     },
     // 链接socket
     linkSocket(symbol) {
-		console.log(this.ajax)
-      this.unSymbol = symbol;
+		console.log(this.query.contract,'this.query.contract')
+      this.unSymbol = symbol;
+	  console.log(this.ws,'this.ws','this.unSymbol',this.unSymbol);
       // 订阅买线
       this.ws.send({
         cmd: "sub",
@@ -492,7 +496,8 @@ export default {
         if (sub == `${this.ajax.sell}${symbol}`) {
           this.sellList = data;
         }
-        if (sub == `${this.ajax.trade}${symbol}`) {
+        if (sub == `${this.ajax.trade}${symbol}`) {
+			console.log(data,'data')
           this.tradeList.unshift(data);
           this.tradeList.pop();
         }

pages/exchange/open-position.vue

@@ -265,8 +265,11 @@
 				}).then((res) => {
 					this.sellList = res.data.swapSellList;
 					this.buyList = res.data.swapBuyList;
-					this.tradeList = res.data.swapTradeList;
+					this.tradeList = res.data.swapTradeList.reverse();
+					console.log(this.tradeList,'this.tradeList');
+					console.log(this.tradeList[0].price,'this.tradeList')
 					this.newPrice = this.tradeList[0] || {};
+					console.log(this.newPrice,new Date(this.newPrice.ts))
 					this.form.entrust_price = this.newPrice.price;
 					this.linkSocket(data.symbol);
 				});
@@ -283,7 +286,7 @@
 					toast: false
 				}).then((res) => {
 					this.accountInfo = res.data;
-					this.newPrice.price = res.data.realtime_price
+					// this.newPrice.price = res.data.realtime_price
 					console.log(res.data.realtime_price,'ddd')
 					if (!boo) {
 						this.form.lever_rate = res.data.lever_rate;
@@ -424,6 +427,7 @@
 			socketMessage() {
 				// 节流防抖
 				let buyFun = lodash.throttle((data) => {
+					
 					this.buyList = data;
 				}, 500);
 				let sellFun = lodash.throttle((data) => {
@@ -446,8 +450,8 @@
 						case `swapTradeList_${symbol}`:
 							this.tradeList.unshift(data);
 							this.tradeList.pop();
-							// this.newPrice = data;
-							console.log(data)
+							this.newPrice = data;
+							console.log(data,'data')
 							break;
 					}
 				});
@@ -462,6 +466,7 @@
 			this.socketMessage();
 			this.dtime = setInterval(() => {
 				this.contractAccount(true);
+				// this.getMarketInfo();
 			}, 3000);
 		},
 

pages/exchange/position.vue

@@ -38,7 +38,7 @@
               item.avail_position
             }}</view>
 				</view>
-				
+
 				<view class="d-flex">
 					<view class="row w-6/12 d-flex m-y-xs justify-between">
 						<view class="label fn-sm">{{ $t("contract.b1") }}</view>
@@ -83,10 +83,10 @@
 					</view> -->
 				</view>
 				<view class="row d-flex m-y-xs justify-between">
-
+					<!-- 平仓 -->
 					<v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs"
 						@click="closePositionShow(item)">{{ $t("contract.h3") }}</v-button>
-						<!-- 一建反向 -->
+					<!-- 一建反向 -->
 					<!-- <v-button type="green" size="small" class="opt-btn rounded-xs m-b-xs m-l-xs"
 						@click="onekeyReverse(item)">{{ $t("contract.k8") }}</v-button> -->
 					<!-- <v-button
@@ -97,6 +97,7 @@
               @click="ifCloseAllPosition(item)"
               >{{ $t("contract.h4") }}</v-button
             > -->
+					<!-- 止盈止损 -->
 					<v-button type="blue" class="opt-btn m-l-xs m-b-xs rounded-xs" size="small"
 						@click="toStoploss(item)">{{ $t("contract.h5") }}</v-button>
 					<v-button type="green-plain" class="m-l-xs m-b-xs d-inline-block rounded-xs" size="small" plain :to="{
@@ -190,12 +191,12 @@
 					</view>
 				</view>
 				<view class="p-x-md p-t-0">
-					<v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="number"
+					<input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="digit"
 						v-model="strategyForm.tp_trigger_price">
-						<template #left>
-							<span class="color-default">{{ $t("contract.i4") }}：</span>
-						</template>
-					</v-input>
+					<template #left>
+						<span class="color-default">{{ $t("contract.i4") }}：</span>
+					</template>
+					</input>
 					<view class="p-t-xs fn-sm color-tips" v-if="strategyForm.tp_trigger_price">
 						{{ $t("contract.i5") }}{{ strategyForm.tp_trigger_price
             }}{{ $t("contract.i6") }}
@@ -206,12 +207,12 @@
             }}
 						USDT
 					</view>
-					<v-input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="number"
+					<input class="p-sm rounded border m-t-sm" :placeholder="$t('contract.i3')" type="digit"
 						v-model="strategyForm.sl_trigger_price">
-						<template #left>
-							<span class="color-default">{{ $t("contract.i7") }}：</span>
-						</template>
-					</v-input>
+					<template #left>
+						<span class="color-default">{{ $t("contract.i7") }}：</span>
+					</template>
+					</input>
 					<view class="p-t-xs fn-sm color-tips" v-if="strategyForm.sl_trigger_price">
 						{{ $t("contract.i5") }}{{ strategyForm.sl_trigger_price
             }}{{ $t("contract.i8") }}
@@ -347,7 +348,7 @@
 				});
 			},
 			closePosition() {
-				
+
 				if (!this.form.amount) {
 					return this.$toast(this.$t('contract.h9'))
 				}

pages/pledge/detail.vue

@@ -108,7 +108,7 @@
                             <text class="x-form--label">{{ $t("pledge.a2") }}</text>
                             <view class="x-form__item-container">
                                 <input class="x-form--input" type="number" @input="inputAmount" v-model="form.num"   />
-                                <text class="x-form__append">USDT</text>
+                                <text class="x-form__append">{{ pledge.coin_name }}</text>
                             </view>
                             <!-- <text class="x-form--tips">≈ {{tusdt_num}} USDT + {{taxn_num}} {{two_coin_name}}</text> -->
                         </view>