合并

components/entrustOrderList/entrustOrderList.vue

@@ -64,7 +64,8 @@
 								{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}}
 							</view> -->
 							<view class="title" v-show="type === 1">{{ i18n.ROE }}</view>
-							<view class="value"  v-show="type === 1" :style="
+							<view class="value" v-show="type === 1"
+								:style="
 							getValue(item.direction=='buy'
 							?(marketDetail.close-item.openedPrice)*item.hand/item.bondAmount:(item.openedPrice-marketDetail.close)*item.hand/item.bondAmount)>=0?'color:#00E8A2;':'color:#F4506A'">
 								<!-- {{getValue(item.profitAmount/item.bondAmount)}}% -->
@@ -91,7 +92,8 @@
 							<view class="title">{{ i18n.ROE }}</view>
 							<view class="value">
 								<!-- 	{{item.status=='undone'?i18n.undone:item.status=='opened'?i18n.opened:item.status=='revoked'?i18n.revoked:i18n.closed}} -->
-							<view class="value" :style="(item.profitAmount/item.bondAmount)*100>=0?'color:#00E8A2;':'color:#F4506A'">
+								<view class="value"
+									:style="(item.profitAmount/item.bondAmount)*100>=0?'color:#00E8A2;':'color:#F4506A'">
 									{{getValue(item.profitAmount/item.bondAmount)}}%
 								</view>
 							</view>
@@ -160,8 +162,8 @@
 
 		<!-- 追加保证金 -->
 		<u-modal :show="stopModalShowZui" :confirmText="i18n.Confirm" :cancelText="i18n.Cancel" :showCancelButton="true"
-			:title="i18n.Margincall" :content='i18n.WarmTipsText' @confirm="stopConfirm" @cancel="stopModalShowZui = false"
-			confirmColor="#00E8A2" cancelColor="#96959E">
+			:title="i18n.Margincall" :content='i18n.WarmTipsText' @confirm="stopConfirm"
+			@cancel="stopModalShowZui = false" confirmColor="#00E8A2" cancelColor="#96959E">
 			<view class="stopModel">
 				<view class="title">
 					<text class="left">{{ i18n.AmountTrue }}</text>
@@ -293,19 +295,31 @@
 			// 获取百分比位数
 			getValue(e) {
 				let data = e * 100
-				 data = parseFloat(data.toPrecision(10))
+				data = parseFloat(data)
 				data = String(data)
+				if (data.indexOf(".") != -1) {
 					return data.substring(0, data.indexOf(".") + 3);
+				} else {
+					return data
+				}
+
 			},
+			
 			// 获取位数
 			getPrice(s) {
 				var i = s;
 				/* 
 				js 数字精度问题
 				*/
-				i = parseFloat(i.toPrecision(10))
+				i = parseFloat(i)
 				i = String(i)
+				// return i.substring(0, i.indexOf(".") + 5);
+				if (i.indexOf(".") != -1) {
 					return i.substring(0, i.indexOf(".") + 5);
+				} else {
+					return i
+				}
+
 			},
 
 			stopModalChange() {
@@ -534,6 +548,7 @@
 		position: absolute;
 		right: 115rpx;
 	}
+
 	.closeBtn {
 		display: inline-block;
 		// width: 98rpx;
@@ -547,6 +562,7 @@
 		color: rgb(0, 232, 162);
 		margin-top: 22rpx;
 	}
+
 	/deep/ .u-empty {
 		top: 500% !important;
 	}

manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "samehome",
+    "name" : "Same home",
     "appid" : "__UNI__C4028F6",
     "description" : "",
     "versionName" : "1.0.0",
-    "versionCode" : "101",
+    "versionCode" : 100,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -84,7 +84,22 @@
                 }
             }
         },
-        "nativePlugins" : {}
+        "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" : "com.samehome",
+                    "ios_bundle_id" : "com.samehome",
+                    "isCloud" : true,
+                    "bought" : 1,
+                    "pid" : "6632",
+                    "parameters" : {}
+                }
+            }
+        }
     },
     "h5" : {
         "publicPath" : "/",
@@ -95,7 +110,7 @@
             "proxy" : {
                 "/api" : {
                     "ws" : false,
-                    "target" : "https://sapi.payairs.com",
+                    "target" : "https://api.gream.ltd",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

pages/markets/contractOrder.vue

@@ -284,9 +284,14 @@
 			// 获取百分比位数
 			getValue(e){
 				 let data = e*100
-				 data = parseFloat(data.toPrecision(10))
+				 data = parseFloat(data)
 				 data = String(data)
+				 if(data.indexOf(".")!=-1){
 					  return data.substring(0, data.indexOf(".") + 3);
+				 }else{
+					  return data;
+				 }
+				
 			},
 			// 获取位数
 			getPrice(s) {