diff --git a/App.vue b/App.vue
index 9a72b9f..7ed9da1 100644
--- a/App.vue
+++ b/App.vue
@@ -30,10 +30,14 @@
}
console.log('ss' + JSON.stringify(uni.getSystemInfoSync()))
const response = await this.$api.appVersion(param)
+ // console.log(response)
+ if(!response.isUpgrade){
+ return;
+ }
plus.runtime.getProperty(plus.runtime.appid, (wgtinfo) => {
- console.log('当前版本号' + wgtinfo.versionCode)
- console.log((wgtinfo.versionCode < response.versionCode))
- console.log(wgtinfo.versionCode, response.versionCode)
+ // console.log('当前版本号' + wgtinfo.versionCode)
+ // console.log((wgtinfo.versionCode < response.versionCode))
+ // console.log(wgtinfo.versionCode, response.versionCode)
if (wgtinfo.versionCode < response.versionCode) {
console.log('更新了吗')
let that = this;
diff --git a/components/entrustOrderList/entrustOrderList.vue b/components/entrustOrderList/entrustOrderList.vue
index 556e15f..3120871 100644
--- a/components/entrustOrderList/entrustOrderList.vue
+++ b/components/entrustOrderList/entrustOrderList.vue
@@ -1,533 +1,608 @@
-
-
-
- {{ i18n.CurrentEntrust }}
-
- {{ i18n.Position }}
-
- {{ i18n.Closed }}
-
- {{ i18n.Revoked }}
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ {{ i18n.StyPrice }}
+ {{ i18n.ExpectProfit }} {{ stopLimitData.winStopPrice }}
+
+
+
+
+
+
+
+ {{ i18n.StsPrice }}
+ {{ i18n.ExpectLoss }} {{ stopLimitData.lossStopPrice }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/components/transaction/transaction.vue b/components/transaction/transaction.vue
index b8d5b20..3d6c4cd 100644
--- a/components/transaction/transaction.vue
+++ b/components/transaction/transaction.vue
@@ -56,12 +56,12 @@
@@ -90,7 +90,7 @@
contractConfig: {
type: Object,
default: () => {
- leverage: [10]
+
}
},
symbol: {
@@ -112,6 +112,7 @@
}
},
},
+
data() {
return {
math:null,
@@ -137,6 +138,14 @@
return this.$t("markets");
},
},
+ watch: {
+ contractConfig: {
+ deep: true,
+ handler: function (n,i) {
+ this.leverageValue = n.leverage[0];
+ }
+ }
+ },
mounted() {
this.leverageValue = this.contractConfig.leverage[0];
this.coinPrice = this.marketDetail.close
diff --git a/manifest.json b/manifest.json
index 7bd7c09..d813aab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -46,26 +46,9 @@
/* ios打包配置 */
"ios" : {},
/* SDK配置 */
- "sdkConfigs" : {
- "ad" : {}
- }
+ "sdkConfigs" : {}
},
- "nativePlugins" : {
- "HF-Step" : {
- "__plugin_info__" : {
- "name" : "原生计步器（Android和IOS） - [试用版，仅用于自定义调试基座]",
- "description" : "计步器，原生计步器插件,安卓,IOS",
- "platforms" : "Android,iOS",
- "url" : "https://ext.dcloud.net.cn/plugin?id=6632",
- "android_package_name" : "",
- "ios_bundle_id" : "",
- "isCloud" : true,
- "bought" : 0,
- "pid" : "6632",
- "parameters" : {}
- }
- }
- }
+ "nativePlugins" : {}
},
"h5" : {
"publicPath" : "/",
diff --git a/pages/charity/details.vue b/pages/charity/details.vue
index 8d91f4f..27183c5 100644
--- a/pages/charity/details.vue
+++ b/pages/charity/details.vue
@@ -45,7 +45,7 @@
+ border="none" :placeholder="i18n.PleaseChooseCoin" v-model="coinInfo.coinCode" :disabled="true">
{{coinInfo.coinCode}}
diff --git a/pages/charity/index.vue b/pages/charity/index.vue
index 4d94936..18e3966 100644
--- a/pages/charity/index.vue
+++ b/pages/charity/index.vue
@@ -1,7 +1,16 @@
-
+
+
+
+
+
+
+
+
+
+
@@ -160,6 +169,66 @@
}
}
+
+
+ .charityListH5{
+ // width: 318rpx;
+ margin: 40rpx 38rpx 0 40rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ flex-wrap: wrap;
+
+ .item {
+ position: relative;
+ width: 318rpx;
+ height: 430rpx;
+ box-sizing: border-box;
+ background-color: #323045;
+ border-radius: 20rpx;
+ margin-bottom: 32rpx;
+
+ /deep/.img {
+ overflow: hidden;
+ border-radius: 20rpx;
+ }
+
+ .title {
+ height: 72rpx;
+ line-height: 35rpx;
+ font-size: 32rpx;
+ margin: 24rpx 20rpx 12rpx;
+ // 超出字符省略成...
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box; //兼容
+ word-wrap: break-word;
+ white-space: normal !important;
+ -webkit-line-clamp: 2; //显示行数
+ -webkit-box-orient: vertical;
+ }
+
+ .target {
+ height: 40rpx;
+ line-height: 40rpx;
+ color: $mainColor;
+ font-size: 26rpx;
+ margin-left: 20rpx;
+ }
+
+ .progressbar {
+ margin: 12rpx 20rpx 0;
+
+ /deep/.u-line-progress__text {
+ color: #000;
+ font-size: 16rpx;
+ transform: scale(0.66) // 字体超过12px以下的需要缩放 8/12 =0.666
+ }
+ }
+
+ }
+ }
+
diff --git a/pages/home/index.vue b/pages/home/index.vue
index dabc1fd..e57c596 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -7,90 +7,100 @@
- {{ i18n.customerService }}
-
- {{ langTrue }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ i18n.Recharge }}
+ {{ i18n.customerService }}
+
+
+ {{ langTrue }}
+
+
+
+
+
+
-
-
- {{ i18n.Mine }}
+
+
+
+
+
+
+
+
-
-
- {{ i18n.Subcription }}
+
+
+
+
+ {{ i18n.Recharge }}
+
+
+
+ {{ i18n.Mine }}
+
+
+
+ {{ i18n.Subcription }}
+
-
-
-
-
- {{ i18n.TodaySteps }}
-
-
- {{ i18n.ReceiveEarnings }}
+
+
+
+ {{ i18n.TodaySteps }}
+
+
+
+ {{ i18n.ReceiveEarnings }}
+
+
-
-
-
-
+
+
+
+
+
-
-
- {{ item.adTitle }}
+
+
+ {{ item.adTitle }}
+
-
-
-
-
+
+
-
-
+ -->
+
+
+
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 44ff315..402e205 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -108,7 +108,7 @@
password: "",
email: '',
payPassword: '',
- inviteCode: 'gyUafm',
+ inviteCode: '',
code: '',
lang: '',
},
@@ -159,8 +159,10 @@
return this.$t("login");
},
},
- onLoad() {
- // console.log(this.$t('login.emailInputMessage'));
+ onLoad(res) {
+ if(res){
+ this.userInfo.inviteCode=res.inviteCode
+ }
},
watch: {
'userInfo.email': {
diff --git a/pages/markets/index.vue b/pages/markets/index.vue
index d3b88cb..448e49d 100644
--- a/pages/markets/index.vue
+++ b/pages/markets/index.vue
@@ -1,32 +1,37 @@
-
+
- {{ i18n.TrandingPair }}
- {{ i18n.LatestPrice }}
- {{ i18n.RiseAndfall }}
-
-
-
-
-
-
-
- {{item.pair}}
- {{ item.price}}
-
- {{item.percent>=0?'+'+item.percent:item.percent}}%
+ {{ i18n.TrandingPair }}
+ {{ i18n.LatestPrice }}
+ {{ i18n.RiseAndfall }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.pair}}
+ {{ item.price}}
+
+ {{item.percent>=0?'+'+item.percent:item.percent}}%
+
+
+
+
-
-
-
-