修改

main.js

@@ -66,7 +66,6 @@ App.mpType = 'app'
 
 
 
-
 Vue.config.productionTip = false
 
 const app = new Vue({

pages/menu/market/index.css

@@ -49,11 +49,11 @@
 .title_item .imgcon {}
 
 .green {
-	background-color: #6FCF97;
+	background-color: #3CCA94;
 }
 
 .red {
-	background-color: #EB5757;
+	background-color: #F62329;
 }
 
 .main .item {
@@ -64,14 +64,28 @@
 
 .main .item .text2 {
 	color: #0F1828;
-	font-size: 24rpx;
+	font-size: 26rpx;
+	line-height: 40rpx;
 	font-weight: 500;
+}
+.pairs {
+	width: 30%;
+	text-align: left;
+}
+.price {
+	width: 40%;
+	
+	text-align: right;
+	padding-right: 5%;
+}
+.chang {
+	width: 30%;
 	text-align: center;
 }
 
 .main .item .text2 .t1 {
-	color: #7D87A6;
+	color: #D4D4D4;
-	font-size: 28rpx;
+	font-size: 22rpx;
 }
 
 .main .item .btn {
@@ -80,9 +94,10 @@
 	justify-content: center;
 	border-radius: 8rpx;
 	color: #fff;
-	font-size: 24rpx;
+	font-size: 22rpx;
-	height: 58rpx;
+	margin: auto;
-	width: 160rpx;
+	height: 54rpx;
+	width: 140rpx;
 }
 
 .main .item .btn .img1 {

pages/menu/market/index.vue

@@ -6,50 +6,36 @@
 		</navigation>
 		<view class="main">
 			<view class="title_item flex">
-				<view class="text1">Tranding Pairs</view>
+				<view class="text1 pairs">Tranding Pairs</view>
-				<view class="text1">Price/Vol</view>
+				<view class="text1 price">Price/Vol</view>
-				<view class="text1   flex">
+				<view class="text1  chang">
 					24h Chang
 
 				</view>
 			</view>
 			<view class="scroll">
 				<view class="item flex" v-for="(item,index) in recordInfo">
-					<view class="text2">
+					<view class="text2 pairs">
-						{{item.name}}/USDT
+						<strong>{{item.name}}</strong><span class="t1">/USDT</span>
 					</view>
-					<view class="text2">
+					<view class="text2 price">
 						<view class="">
-							{{item.current_price_usd}}/{{item.current_price}}
+							<strong>${{item.current_price_usd}}</strong>
+						</view>
+						<view class="t1">
+							{{item.current_price}}
 						</view>
 
 					</view>
 					<view class="btn " :class="item.change_percent>0?'red':'green'">
-						<image src="../../../static/tongyonh/arrow-down-left1.png" mode="aspectFit" class="img1"
+						<!-- <image src="../../../static/tongyonh/arrow-down-left1.png" mode="aspectFit" class="img1"
 							v-if="item.change_percent>=0"></image>
 						<image src="../../../static/tongyonh/arrow-down-left.png" mode="aspectFit" class="img1"
-							v-if="item.change_percent<0"></image>
+							v-if="item.change_percent<0"></image> -->
-						{{item.change_percent}}%
+						{{item.change_percent>0?'+':''}}{{item.change_percent}}%
 					</view>
 				</view>
 			</view>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 		</view>
 
 		<tab-bar :selectActive="3"></tab-bar>

pages/menu/wallet/index.vue

@@ -125,7 +125,6 @@
 		// 	}, 500);
 		// },
 		methods: {
-			
 			goOther() {
 				console.log(this.userObj2, 8888)
 				let item = JSON.stringify(this.userObj2)
@@ -160,14 +159,21 @@
 			// 唤醒摄像头
 			chooseImage() {
 				var _this = this
-				uni.chooseImage({
+				uni.scanCode({
-					count: 1, //默认9
-					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
-					sourceType: ['album', 'camera'], //从相册选择、摄像头
 					success: function(res) {
-						_this.imgShow = res.tempFilePaths[0]
+						console.log('扫码内容',res.result)
+						_this.imgShow = res.result;
 					}
 				});
+
+				// uni.chooseImage({
+				// 	count: 1, //默认9
+				// 	sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				// 	sourceType: ['album', 'camera'], //从相册选择、摄像头
+				// 	success: function(res) {
+				// 		_this.imgShow = res.tempFilePaths[0]
+				// 	}
+				// });
 				// ass()
 			},
 

unpackage/dist/dev/app-plus/app-view.js

@@ -4641,11 +4641,7 @@ if(false) {}
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ./node_modules/css-loader/dist/runtime/api.js */ 13);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-<<<<<<< HEAD
 exports.push([module.i, "\n.renYou {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\r\n\tposition: absolute;\r\n\tright: 30rpx;\n}\n.head {\r\n\t/* background: #FAFAFA !important; */\r\n\tposition: -webkit-sticky;\r\n\tposition: sticky;\r\n\r\n\r\n\r\n\r\n\ttop: 0;\r\n\r\n\tz-index: 999;\n}\n.big_title {\r\n\tfont-size: 36rpx;\n}\n.main .money_con {\r\n\tdisplay: block;\r\n\twidth: 95%;\r\n\tmargin: 0 auto;\r\n\tmargin-top: 50rpx;\r\n\tmargin-bottom: 50rpx;\r\n\theight: 320rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\tpadding: 40rpx 50rpx;\r\n\tborder-radius: 24rpx;\n}\n.textcon1 {\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tjustify-content: space-between;\r\n\tline-height: 56rpx;\n}\n.textcon1 .text1 {\r\n\tcolor: #fff;\r\n\tfont-size: 56rpx;\n}\n.textcon1 .text1 .text2 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .img1 {\r\n\twidth: 100rpx;\r\n\theight: 110rpx;\n}\n.textcon1 .v1 {}\n.textcon1 .v1 .t1 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .v1 .t2 {\r\n\tcolor: #fff;\r\n\tfont-size: 24rpx;\n}\n.textcon1 .v2 {\r\n\tmargin-right: 100rpx;\n}\n.select_con {\r\n\twidth: 100%;\r\n\tpadding-bottom: 260rpx;\n}\n.select_con .select {\r\n\tmargin: 0 12px;\r\n\tborder-radius: 30rpx;\r\n\tbackground-color: #fff;\r\n\tbox-shadow: 0 0 30px #EBEEF1;\n}\n .u-tabs {\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tborder-radius: 30rpx 30rpx 0 0;\n}\n.select_con .item1 {\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\r\n\tpadding-top: 60rpx;\r\n\tpadding-bottom: 50rpx;\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tpadding-left: 40rpx;\r\n\tpadding-right: 24rpx;\n}\n.select_con .item1 .lef_con {\r\n\tdisplay: flex;\r\n\talign-items: center;\n}\n.select_con .item1 .lef_con .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.select_con .item1 .lef_con .textcon {\r\n\tmargin-left: 24rpx;\n}\n.select_con .item1 .lef_con .textcon .text1 {\r\n\tfont-size: 26rpx;\n}\n.select_con .item1 .lef_con .textcon .text2 {\r\n\tfont-size: 22rpx;\r\n\tcolor: #999;\n}\n.select_con .item1 .rig_con .text1 {\r\n\tfont-size: 24rpx;\n}\n.select_con .item1 .rig_con .img1 {\r\n\twidth: 28rpx;\r\n\theight: 20rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.select_con .item1 .rig_con .img2 {\r\n\twidth: 28rpx;\r\n\theight: 40rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.btnconn {\r\n\tposition: fixed;\r\n\tbottom: 0;\r\n\tbackground-color: #fff;\r\n\tpadding: 24rpx 24rpx;\r\n\twidth: 100%;\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\n}\n.btnconn .btn {\r\n\twidth: 306rpx;\r\n\tline-height: 78rpx;\r\n\tborder-radius: 30rpx;\r\n\tborder: 2rpx solid #5B53FF;\r\n\ttext-align: center;\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tcolor: #5B53FF;\r\n\tjustify-content: center;\r\n\tfont-size: 28rpx;\r\n\tposition: relative;\n}\n.active {\r\n\tcolor: #fff !important;\r\n\tbackground-color: #5B53FF;\n}\n.btnconn .btn .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.arrow-up-left {\r\n\twidth: 44rpx;\r\n\theight: 44rpx;\r\n\tposition: absolute;\r\n\ttop: 50%;\r\n\t-webkit-transform: translateY(-50%);\r\n\t        transform: translateY(-50%);\r\n\tleft: 68rpx;\n}\n.btn13 {\r\n\tmargin-left: 40rpx;\n}\n.main .money_con {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #6441CF, #877BFE);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con2 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con3 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #B6162A, #F96D7D);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.select_con .item1 .rig_con .text1 uni-text {\r\n\tmargin-left: 10rpx;\n}\n .u-empty {\r\n\tpadding: 30px !important;\n}\r\n", ""]);
-=======
-exports.push([module.i, ".renYou {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\r\n\tposition: absolute;\r\n\tright: 30rpx;\n}\n.big_title {\r\n\tfont-size: 36rpx;\n}\n.main .money_con {\r\n\tdisplay: block;\r\n\twidth: 95%;\r\n\tmargin: 0 auto;\r\n\tmargin-top: 50rpx;\r\n\tmargin-bottom: 50rpx;\r\n\theight: 320rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\tpadding: 40rpx 50rpx;\r\n\tborder-radius: 24rpx;\n}\n.textcon1 {\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tjustify-content: space-between;\r\n\tline-height: 56rpx;\n}\n.textcon1 .text1 {\r\n\tcolor: #fff;\r\n\tfont-size: 56rpx;\n}\n.textcon1 .text1 .text2 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .img1 {\r\n\twidth: 100rpx;\r\n\theight: 110rpx;\n}\n.textcon1 .v1 {}\n.textcon1 .v1 .t1 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .v1 .t2 {\r\n\tcolor: #fff;\r\n\tfont-size: 24rpx;\n}\n.textcon1 .v2 {\r\n\tmargin-right: 100rpx;\n}\n.select_con {\r\n\twidth: 100%;\r\n\tpadding-bottom: 260rpx;\n}\n.select_con .select {\r\n\tmargin: 0 12px;\r\n\tborder-radius: 30rpx;\r\n\tbackground-color: #fff;\r\n\tbox-shadow: 0 0 30px #EBEEF1;\n}\n .u-tabs {\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tborder-radius: 30rpx 30rpx 0 0;\n}\n.select_con .item1 {\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\r\n\tpadding-top: 60rpx;\r\n\tpadding-bottom: 50rpx;\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tpadding-left: 40rpx;\r\n\tpadding-right: 24rpx;\n}\n.select_con .item1 .lef_con {\r\n\tdisplay: flex;\r\n\talign-items: center;\n}\n.select_con .item1 .lef_con .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.select_con .item1 .lef_con .textcon {\r\n\tmargin-left: 24rpx;\n}\n.select_con .item1 .lef_con .textcon .text1 {\r\n\tfont-size: 26rpx;\n}\n.select_con .item1 .lef_con .textcon .text2 {\r\n\tfont-size: 22rpx;\r\n\tcolor: #999;\n}\n.select_con .item1 .rig_con .text1 {\r\n\tfont-size: 24rpx;\n}\n.select_con .item1 .rig_con .img1 {\r\n\twidth: 28rpx;\r\n\theight: 20rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.select_con .item1 .rig_con .img2 {\r\n\twidth: 28rpx;\r\n\theight: 40rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.btnconn {\r\n\tposition: fixed;\r\n\tbottom: 0;\r\n\tbackground-color: #fff;\r\n\tpadding: 24rpx 24rpx;\r\n\twidth: 100%;\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\n}\n.btnconn .btn {\r\n\twidth: 306rpx;\r\n\tline-height: 78rpx;\r\n\tborder-radius: 30rpx;\r\n\tborder: 2rpx solid #5B53FF;\r\n\ttext-align: center;\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tcolor: #5B53FF;\r\n\tjustify-content: center;\r\n\tfont-size: 28rpx;\r\n\tposition: relative;\n}\n.active {\r\n\tcolor: #fff !important;\r\n\tbackground-color: #5B53FF;\n}\n.btnconn .btn .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.arrow-up-left {\r\n\twidth: 44rpx;\r\n\theight: 44rpx;\r\n\tposition: absolute;\r\n\ttop: 50%;\r\n\t-webkit-transform: translateY(-50%);\r\n\t        transform: translateY(-50%);\r\n\tleft: 68rpx;\n}\n.btn13 {\r\n\tmargin-left: 40rpx;\n}\n.main .money_con {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #6441CF, #877BFE);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con2 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con3 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #B6162A, #F96D7D);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.select_con .item1 .rig_con .text1 uni-text {\r\n\tmargin-left: 10rpx;\n}\n .u-empty {\r\n\tpadding: 30px !important;\n}\r\n", ""]);
->>>>>>> 012bb590d30f8222b9d00491d044a9868f059f81
 // Exports
 module.exports = exports;
 
@@ -10626,22 +10622,18 @@ var render = function() {
                       staticClass: _vm._$g("9-" + $30, "sc"),
                       attrs: { _i: "9-" + $30 }
                     },
-                    [_vm._v(_vm._$g("9-" + $30, "t0-0") + "/USDT")]
+                    [
-                  ),
+                      _c("strong", { attrs: { _i: "10-" + $30 } }, [
+                        _vm._v(_vm._$g("10-" + $30, "t0-0"))
+                      ]),
                       _c(
-                    "v-uni-view",
+                        "span",
                         {
-                      staticClass: _vm._$g("10-" + $30, "sc"),
+                          staticClass: _vm._$g("11-" + $30, "sc"),
-                      attrs: { _i: "10-" + $30 }
+                          attrs: { _i: "11-" + $30 }
                         },
-                    [
+                        [_vm._v("/USDT")]
-                      _c("v-uni-view", { attrs: { _i: "11-" + $30 } }, [
-                        _vm._v(
-                          _vm._$g("11-" + $30, "t0-0") +
-                            "/" +
-                            _vm._$g("11-" + $30, "t0-1")
                       )
-                      ])
                     ],
                     1
                   ),
@@ -10649,33 +10641,44 @@ var render = function() {
                     "v-uni-view",
                     {
                       staticClass: _vm._$g("12-" + $30, "sc"),
-                      class: _vm._$g("12-" + $30, "c"),
                       attrs: { _i: "12-" + $30 }
                     },
                     [
-                      _vm._$g("13-" + $30, "i")
+                      _c(
-                        ? _c("v-uni-image", {
+                        "v-uni-view",
-                            staticClass: _vm._$g("13-" + $30, "sc"),
+                        { attrs: { _i: "13-" + $30 } },
-                            attrs: {
+                        [
-                              src: _vm._$g("13-" + $30, "a-src"),
+                          _c("strong", { attrs: { _i: "14-" + $30 } }, [
-                              mode: "aspectFit",
+                            _vm._v("$" + _vm._$g("14-" + $30, "t0-0"))
-                              _i: "13-" + $30
+                          ])
-                            }
+                        ],
-                          })
+                        1
-                        : _vm._e(),
+                      ),
-                      _vm._$g("14-" + $30, "i")
+                      _c(
-                        ? _c("v-uni-image", {
+                        "v-uni-view",
-                            staticClass: _vm._$g("14-" + $30, "sc"),
+                        {
-                            attrs: {
+                          staticClass: _vm._$g("15-" + $30, "sc"),
-                              src: _vm._$g("14-" + $30, "a-src"),
+                          attrs: { _i: "15-" + $30 }
-                              mode: "aspectFit",
+                        },
-                              _i: "14-" + $30
+                        [_vm._v(_vm._$g("15-" + $30, "t0-0"))]
-                            }
+                      )
-                          })
-                        : _vm._e(),
-                      _vm._v(_vm._$g("12-" + $30, "t2-0") + "%")
                     ],
                     1
+                  ),
+                  _c(
+                    "v-uni-view",
+                    {
+                      staticClass: _vm._$g("16-" + $30, "sc"),
+                      class: _vm._$g("16-" + $30, "c"),
+                      attrs: { _i: "16-" + $30 }
+                    },
+                    [
+                      _vm._v(
+                        _vm._$g("16-" + $30, "t0-0") +
+                          _vm._$g("16-" + $30, "t0-1") +
+                          "%"
+                      )
+                    ]
                   )
                 ],
                 1
@@ -10686,7 +10689,7 @@ var render = function() {
         ],
         1
       ),
-      _c("tab-bar", { attrs: { _i: 15 } })
+      _c("tab-bar", { attrs: { _i: 17 } })
     ],
     1
   )
@@ -10831,7 +10834,7 @@ if(false) {}
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ./node_modules/css-loader/dist/runtime/api.js */ 13);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-exports.push([module.i, ".main_con {\r\n\tpadding: 0 24rpx;\r\n\tpadding-bottom: 250rpx;\r\n\tmargin-top: 80rpx;\r\n\tposition: relative;\n}\n.head {\r\n\t/* background: #FAFAFA !important; */\r\n\tposition: -webkit-sticky;\r\n\tposition: sticky;\r\n\r\n\r\n\r\n\r\n\ttop: 0;\n}\n.main_con .title {\r\n\tpadding-top: 36rpx;\r\n\tpadding-bottom: 28rpx;\r\n\tfont-size: 36rpx;\r\n\tfont-weight: 500;\r\n\tcolor: #0F1828;\n}\n.main {\r\n\tbackground-color: #fff;\r\n\tborder-radius: 15rpx;\r\n\tpadding: 0 24rpx;\r\n\tmargin-top: 50rpx;\r\n\tbox-shadow: 0 20rpx 20rpx 20rpx #ECEFF2;\n}\n.flex {\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\n}\n.title_item {\r\n\tpadding-top: 32rpx;\r\n\tpadding-bottom: 20rpx;\r\n\tborder-bottom: 2rpx solid #F4F7FE;\r\n\tcolor: #7D87A6;\r\n\tfont-size: 26rpx;\n}\n.title_item .imgcon {}\n.green {\r\n\tbackground-color: #6FCF97;\n}\n.red {\r\n\tbackground-color: #EB5757;\n}\n.main .item {\r\n\tborder-bottom: 2rpx solid #F4F7FE;\r\n\tpadding: 34rpx 0;\r\n\tline-height: 58rpx;\n}\n.main .item .text2 {\r\n\tcolor: #0F1828;\r\n\tfont-size: 24rpx;\r\n\tfont-weight: 500;\r\n\ttext-align: center;\n}\n.main .item .text2 .t1 {\r\n\tcolor: #7D87A6;\r\n\tfont-size: 28rpx;\n}\n.main .item .btn {\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tjustify-content: center;\r\n\tborder-radius: 8rpx;\r\n\tcolor: #fff;\r\n\tfont-size: 24rpx;\r\n\theight: 58rpx;\r\n\twidth: 160rpx;\n}\n.main .item .btn .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.Colorimg {\r\n\tdisplay: block;\r\n\twidth: 24rpx;\r\n\theight: 24rpx;\n}\n.title_item .imgcon {\r\n\tmargin-left: 14rpx;\n}\n.scroll {\r\n\tmax-height: 1160rpx;\r\n\toverflow: scroll;\n}\r\n", ""]);
+exports.push([module.i, ".main_con {\r\n\tpadding: 0 24rpx;\r\n\tpadding-bottom: 250rpx;\r\n\tmargin-top: 80rpx;\r\n\tposition: relative;\n}\n.head {\r\n\t/* background: #FAFAFA !important; */\r\n\tposition: -webkit-sticky;\r\n\tposition: sticky;\r\n\r\n\r\n\r\n\r\n\ttop: 0;\n}\n.main_con .title {\r\n\tpadding-top: 36rpx;\r\n\tpadding-bottom: 28rpx;\r\n\tfont-size: 36rpx;\r\n\tfont-weight: 500;\r\n\tcolor: #0F1828;\n}\n.main {\r\n\tbackground-color: #fff;\r\n\tborder-radius: 15rpx;\r\n\tpadding: 0 24rpx;\r\n\tmargin-top: 50rpx;\r\n\tbox-shadow: 0 20rpx 20rpx 20rpx #ECEFF2;\n}\n.flex {\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\n}\n.title_item {\r\n\tpadding-top: 32rpx;\r\n\tpadding-bottom: 20rpx;\r\n\tborder-bottom: 2rpx solid #F4F7FE;\r\n\tcolor: #7D87A6;\r\n\tfont-size: 26rpx;\n}\n.title_item .imgcon {}\n.green {\r\n\tbackground-color: #3CCA94;\n}\n.red {\r\n\tbackground-color: #F62329;\n}\n.main .item {\r\n\tborder-bottom: 2rpx solid #F4F7FE;\r\n\tpadding: 34rpx 0;\r\n\tline-height: 58rpx;\n}\n.main .item .text2 {\r\n\tcolor: #0F1828;\r\n\tfont-size: 26rpx;\r\n\tline-height: 40rpx;\r\n\tfont-weight: 500;\n}\n.pairs {\r\n\twidth: 30%;\r\n\ttext-align: left;\n}\n.price {\r\n\twidth: 40%;\r\n\t\r\n\ttext-align: right;\r\n\tpadding-right: 5%;\n}\n.chang {\r\n\twidth: 30%;\r\n\ttext-align: center;\n}\n.main .item .text2 .t1 {\r\n\tcolor: #D4D4D4;\r\n\tfont-size: 22rpx;\n}\n.main .item .btn {\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tjustify-content: center;\r\n\tborder-radius: 8rpx;\r\n\tcolor: #fff;\r\n\tfont-size: 22rpx;\r\n\tmargin: auto;\r\n\theight: 54rpx;\r\n\twidth: 140rpx;\n}\n.main .item .btn .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.Colorimg {\r\n\tdisplay: block;\r\n\twidth: 24rpx;\r\n\theight: 24rpx;\n}\n.title_item .imgcon {\r\n\tmargin-left: 14rpx;\n}\n.scroll {\r\n\tmax-height: 1160rpx;\r\n\toverflow: scroll;\n}\r\n", ""]);
 // Exports
 module.exports = exports;
 
@@ -18362,11 +18365,7 @@ var render = function() {
                   _c(
                     "v-uni-view",
                     { staticClass: _vm._$g(5, "sc"), attrs: { _i: 5 } },
-<<<<<<< HEAD
-                    [_vm._v("Fingerprint password")]
-=======
                     [_vm._v(_vm._$g(5, "t0-0"))]
->>>>>>> 012bb590d30f8222b9d00491d044a9868f059f81
                   ),
                   _c("u-switch", {
                     attrs: { _i: 6 },
@@ -18386,9 +18385,6 @@ var render = function() {
               ),
               _c(
                 "v-uni-view",
-<<<<<<< HEAD
-                { staticClass: _vm._$g(7, "sc"), attrs: { _i: 7 } },
-=======
                 {
                   staticClass: _vm._$g(7, "sc"),
                   attrs: { _i: 7 },
@@ -18398,16 +18394,11 @@ var render = function() {
                     }
                   }
                 },
->>>>>>> 012bb590d30f8222b9d00491d044a9868f059f81
                 [
                   _c(
                     "v-uni-view",
                     { staticClass: _vm._$g(8, "sc"), attrs: { _i: 8 } },
-<<<<<<< HEAD
-                    [_vm._v("Language settings")]
-=======
                     [_vm._v(_vm._$g(8, "t0-0"))]
->>>>>>> 012bb590d30f8222b9d00491d044a9868f059f81
                   ),
                   _c(
                     "v-uni-view",
@@ -18439,11 +18430,7 @@ var render = function() {
                   _c(
                     "v-uni-view",
                     { staticClass: _vm._$g(13, "sc"), attrs: { _i: 13 } },
-<<<<<<< HEAD
-                    [_vm._v("Currency")]
-=======
                     [_vm._v(_vm._$g(13, "t0-0"))]
->>>>>>> 012bb590d30f8222b9d00491d044a9868f059f81
                   ),
                   _c(
                     "v-uni-view",
@@ -18475,11 +18462,7 @@ var render = function() {
                   _c(
                     "v-uni-view",
                     { staticClass: _vm._$g(18, "sc"), attrs: { _i: 18 } },
-<<<<<<< HEAD
-                    [_vm._v("Node settings")]
-=======
                     [_vm._v(_vm._$g(18, "t0-0"))]
->>>>>>> 012bb590d30f8222b9d00491d044a9868f059f81
                   ),
                   _c("v-uni-image", {
                     staticClass: _vm._$g(19, "sc"),
@@ -22295,11 +22278,7 @@ if(false) {}
 var ___CSS_LOADER_API_IMPORT___ = __webpack_require__(/*! ./node_modules/css-loader/dist/runtime/api.js */ 13);
 exports = ___CSS_LOADER_API_IMPORT___(false);
 // Module
-<<<<<<< HEAD
 exports.push([module.i, "\n.renYou {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\r\n\tposition: absolute;\r\n\tright: 30rpx;\n}\n.head {\r\n\t/* background: #FAFAFA !important; */\r\n\tposition: -webkit-sticky;\r\n\tposition: sticky;\r\n\r\n\r\n\r\n\r\n\ttop: 0;\r\n\r\n\tz-index: 999;\n}\n.big_title {\r\n\tfont-size: 36rpx;\n}\n.main .money_con {\r\n\tdisplay: block;\r\n\twidth: 95%;\r\n\tmargin: 0 auto;\r\n\tmargin-top: 50rpx;\r\n\tmargin-bottom: 50rpx;\r\n\theight: 320rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\tpadding: 40rpx 50rpx;\r\n\tborder-radius: 24rpx;\n}\n.textcon1 {\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tjustify-content: space-between;\r\n\tline-height: 56rpx;\n}\n.textcon1 .text1 {\r\n\tcolor: #fff;\r\n\tfont-size: 56rpx;\n}\n.textcon1 .text1 .text2 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .img1 {\r\n\twidth: 100rpx;\r\n\theight: 110rpx;\n}\n.textcon1 .v1 {}\n.textcon1 .v1 .t1 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .v1 .t2 {\r\n\tcolor: #fff;\r\n\tfont-size: 24rpx;\n}\n.textcon1 .v2 {\r\n\tmargin-right: 100rpx;\n}\n.select_con {\r\n\twidth: 100%;\r\n\tpadding-bottom: 260rpx;\n}\n.select_con .select {\r\n\tmargin: 0 12px;\r\n\tborder-radius: 30rpx;\r\n\tbackground-color: #fff;\r\n\tbox-shadow: 0 0 30px #EBEEF1;\n}\n .u-tabs {\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tborder-radius: 30rpx 30rpx 0 0;\n}\n.select_con .item1 {\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\r\n\tpadding-top: 60rpx;\r\n\tpadding-bottom: 50rpx;\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tpadding-left: 40rpx;\r\n\tpadding-right: 24rpx;\n}\n.select_con .item1 .lef_con {\r\n\tdisplay: flex;\r\n\talign-items: center;\n}\n.select_con .item1 .lef_con .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.select_con .item1 .lef_con .textcon {\r\n\tmargin-left: 24rpx;\n}\n.select_con .item1 .lef_con .textcon .text1 {\r\n\tfont-size: 26rpx;\n}\n.select_con .item1 .lef_con .textcon .text2 {\r\n\tfont-size: 22rpx;\r\n\tcolor: #999;\n}\n.select_con .item1 .rig_con .text1 {\r\n\tfont-size: 24rpx;\n}\n.select_con .item1 .rig_con .img1 {\r\n\twidth: 28rpx;\r\n\theight: 20rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.select_con .item1 .rig_con .img2 {\r\n\twidth: 28rpx;\r\n\theight: 40rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.btnconn {\r\n\tposition: fixed;\r\n\tbottom: 0;\r\n\tbackground-color: #fff;\r\n\tpadding: 24rpx 24rpx;\r\n\twidth: 100%;\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\n}\n.btnconn .btn {\r\n\twidth: 306rpx;\r\n\tline-height: 78rpx;\r\n\tborder-radius: 30rpx;\r\n\tborder: 2rpx solid #5B53FF;\r\n\ttext-align: center;\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tcolor: #5B53FF;\r\n\tjustify-content: center;\r\n\tfont-size: 28rpx;\r\n\tposition: relative;\n}\n.active {\r\n\tcolor: #fff !important;\r\n\tbackground-color: #5B53FF;\n}\n.btnconn .btn .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.arrow-up-left {\r\n\twidth: 44rpx;\r\n\theight: 44rpx;\r\n\tposition: absolute;\r\n\ttop: 50%;\r\n\t-webkit-transform: translateY(-50%);\r\n\t        transform: translateY(-50%);\r\n\tleft: 68rpx;\n}\n.btn13 {\r\n\tmargin-left: 40rpx;\n}\n.main .money_con {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #6441CF, #877BFE);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con2 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con3 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #B6162A, #F96D7D);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.select_con .item1 .rig_con .text1 uni-text {\r\n\tmargin-left: 10rpx;\n}\n .u-empty {\r\n\tpadding: 30px !important;\n}\r\n", ""]);
-=======
-exports.push([module.i, ".renYou {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\r\n\tposition: absolute;\r\n\tright: 30rpx;\n}\n.big_title {\r\n\tfont-size: 36rpx;\n}\n.main .money_con {\r\n\tdisplay: block;\r\n\twidth: 95%;\r\n\tmargin: 0 auto;\r\n\tmargin-top: 50rpx;\r\n\tmargin-bottom: 50rpx;\r\n\theight: 320rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\tpadding: 40rpx 50rpx;\r\n\tborder-radius: 24rpx;\n}\n.textcon1 {\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tjustify-content: space-between;\r\n\tline-height: 56rpx;\n}\n.textcon1 .text1 {\r\n\tcolor: #fff;\r\n\tfont-size: 56rpx;\n}\n.textcon1 .text1 .text2 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .img1 {\r\n\twidth: 100rpx;\r\n\theight: 110rpx;\n}\n.textcon1 .v1 {}\n.textcon1 .v1 .t1 {\r\n\tcolor: #fff;\r\n\tfont-size: 32rpx;\n}\n.textcon1 .v1 .t2 {\r\n\tcolor: #fff;\r\n\tfont-size: 24rpx;\n}\n.textcon1 .v2 {\r\n\tmargin-right: 100rpx;\n}\n.select_con {\r\n\twidth: 100%;\r\n\tpadding-bottom: 260rpx;\n}\n.select_con .select {\r\n\tmargin: 0 12px;\r\n\tborder-radius: 30rpx;\r\n\tbackground-color: #fff;\r\n\tbox-shadow: 0 0 30px #EBEEF1;\n}\n .u-tabs {\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tborder-radius: 30rpx 30rpx 0 0;\n}\n.select_con .item1 {\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\r\n\tpadding-top: 60rpx;\r\n\tpadding-bottom: 50rpx;\r\n\tborder-bottom: 2rpx solid #F6F8FD;\r\n\tpadding-left: 40rpx;\r\n\tpadding-right: 24rpx;\n}\n.select_con .item1 .lef_con {\r\n\tdisplay: flex;\r\n\talign-items: center;\n}\n.select_con .item1 .lef_con .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.select_con .item1 .lef_con .textcon {\r\n\tmargin-left: 24rpx;\n}\n.select_con .item1 .lef_con .textcon .text1 {\r\n\tfont-size: 26rpx;\n}\n.select_con .item1 .lef_con .textcon .text2 {\r\n\tfont-size: 22rpx;\r\n\tcolor: #999;\n}\n.select_con .item1 .rig_con .text1 {\r\n\tfont-size: 24rpx;\n}\n.select_con .item1 .rig_con .img1 {\r\n\twidth: 28rpx;\r\n\theight: 20rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.select_con .item1 .rig_con .img2 {\r\n\twidth: 28rpx;\r\n\theight: 40rpx;\r\n\tfloat: right;\r\n\tmargin-top: 20rpx;\n}\n.btnconn {\r\n\tposition: fixed;\r\n\tbottom: 0;\r\n\tbackground-color: #fff;\r\n\tpadding: 24rpx 24rpx;\r\n\twidth: 100%;\r\n\tdisplay: flex;\r\n\tjustify-content: space-between;\n}\n.btnconn .btn {\r\n\twidth: 306rpx;\r\n\tline-height: 78rpx;\r\n\tborder-radius: 30rpx;\r\n\tborder: 2rpx solid #5B53FF;\r\n\ttext-align: center;\r\n\tdisplay: flex;\r\n\talign-items: center;\r\n\tcolor: #5B53FF;\r\n\tjustify-content: center;\r\n\tfont-size: 28rpx;\r\n\tposition: relative;\n}\n.active {\r\n\tcolor: #fff !important;\r\n\tbackground-color: #5B53FF;\n}\n.btnconn .btn .img1 {\r\n\twidth: 48rpx;\r\n\theight: 48rpx;\n}\n.arrow-up-left {\r\n\twidth: 44rpx;\r\n\theight: 44rpx;\r\n\tposition: absolute;\r\n\ttop: 50%;\r\n\t-webkit-transform: translateY(-50%);\r\n\t        transform: translateY(-50%);\r\n\tleft: 68rpx;\n}\n.btn13 {\r\n\tmargin-left: 40rpx;\n}\n.main .money_con {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #6441CF, #877BFE);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con2 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #FF820C, #FFB606);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.main .money_con3 {\r\n\tmargin-top: 32rpx;\r\n\tbackground-image: linear-gradient(to right, #B6162A, #F96D7D);\r\n\theight: 320rpx;\r\n\tpadding: 40rpx 36rpx;\r\n\tposition: relative;\r\n\tborder-radius: 24rpx;\n}\n.select_con .item1 .rig_con .text1 uni-text {\r\n\tmargin-left: 10rpx;\n}\n .u-empty {\r\n\tpadding: 30px !important;\n}\r\n", ""]);
->>>>>>> 012bb590d30f8222b9d00491d044a9868f059f81
 // Exports
 module.exports = exports;
 

utils/api.js

@@ -8,6 +8,9 @@ const api = {
 	getNftCollectionList: (params) => Vue.prototype.$axios.get('/api/nft/getNftCollectionList?' + qs.stringify(
 		params)),
 	getContractInfoList: (params) => Vue.prototype.$axios.get('/api/contract/getContractInfoList?' + qs.stringify(params)),
+	//获取汇率
+	getCoinRate: (params) => Vue.prototype.$axios.get('/api/coinRate/getCoinRate?' + qs.stringify(params)),
+
 	//--------------------------------- free ---------------------------------
 
 }