diff --git a/App.vue b/App.vue
index a52828da..5cead81a 100644
--- a/App.vue
+++ b/App.vue
@@ -7,10 +7,13 @@
data: {
// 基础配置
// 数据接口请求地址
- request_url: 'https://d1.shopxo.vip/',
+ // request_url: 'https://d1.shopxo.vip/',
+ request_url: 'http://shopxo.com/',
+
// 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/)
- static_url: 'https://d1.shopxo.vip/',
+ // static_url: 'https://d1.shopxo.vip/',
+ static_url: 'http://shopxo.com/',
// 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立)
system_type: 'default',
diff --git a/common/css/lib.css b/common/css/lib.css
index d0345615..01529397 100644
--- a/common/css/lib.css
+++ b/common/css/lib.css
@@ -31,7 +31,7 @@
}
.margin-xxxl {
margin: 48rpx;
-}
+}
.margin-xxxxl {
margin: 56rpx;
}
@@ -62,7 +62,7 @@
}
.margin-top-xxxl {
margin-top: 48rpx;
-}
+}
.margin-top-xxxxl {
margin-top: 56rpx;
}
@@ -93,7 +93,7 @@
}
.margin-right-xxxl {
margin-right: 48rpx;
-}
+}
.margin-right-xxxxl {
margin-right: 56rpx;
}
@@ -124,7 +124,7 @@
}
.margin-left-xxxl {
margin-left: 48rpx;
-}
+}
.margin-left-xxxxl {
margin-left: 56rpx;
}
@@ -155,7 +155,7 @@
}
.margin-bottom-xxxl {
margin-bottom: 48rpx;
-}
+}
.margin-bottom-xxxxl {
margin-bottom: 56rpx;
}
@@ -199,9 +199,9 @@
.margin-vertical-xxxl {
margin-top: 48rpx;
margin-bottom: 48rpx;
-}
-.margin-vertical-xxxxl {
- margin-top: 56rpx;
+}
+.margin-vertical-xxxxl {
+ margin-top: 56rpx;
margin-bottom: 56rpx;
}
.margin-horizontal-0 {
@@ -244,9 +244,9 @@
.margin-horizontal-xxxl {
margin-left: 48rpx;
margin-right: 48rpx;
-}
-.margin-horizontal-xxxxl {
- margin-left: 56rpx;
+}
+.margin-horizontal-xxxxl {
+ margin-left: 56rpx;
margin-right: 56rpx;
}
.padding-0 {
@@ -279,8 +279,8 @@
}
.padding-xxxl {
padding: 48rpx;
-}
-.padding-xxxxl {
+}
+.padding-xxxxl {
padding: 56rpx;
}
.padding-top-xsss {
@@ -310,8 +310,8 @@
}
.padding-top-xxxl {
padding-top: 48rpx;
-}
-.padding-top-xxxxl {
+}
+.padding-top-xxxxl {
padding-top: 56rpx;
}
.padding-right-xsss {
@@ -341,8 +341,8 @@
}
.padding-right-xxxl {
padding-right: 48rpx;
-}
-.padding-right-xxxxl {
+}
+.padding-right-xxxxl {
padding-right: 56rpx;
}
.padding-left-xsss {
@@ -372,8 +372,8 @@
}
.padding-left-xxxl {
padding-left: 48rpx;
-}
-.padding-left-xxxxl {
+}
+.padding-left-xxxxl {
padding-left: 56rpx;
}
.padding-bottom-xsss {
@@ -403,8 +403,8 @@
}
.padding-bottom-xxxl {
padding-bottom: 48rpx;
-}
-.padding-bottom-xxxxl {
+}
+.padding-bottom-xxxxl {
padding-bottom: 56rpx;
}
.padding-vertical-0 {
@@ -447,9 +447,9 @@
.padding-vertical-xxxl {
padding-top: 48rpx;
padding-bottom: 48rpx;
-}
-.padding-vertical-xxxxl {
- padding-top: 56rpx;
+}
+.padding-vertical-xxxxl {
+ padding-top: 56rpx;
padding-bottom: 56rpx;
}
.padding-horizontal-0 {
@@ -492,9 +492,9 @@
.padding-horizontal-xxxl {
padding-left: 48rpx;
padding-right: 48rpx;
-}
-.padding-horizontal-xxxxl {
- padding-left: 56rpx;
+}
+.padding-horizontal-xxxxl {
+ padding-left: 56rpx;
padding-right: 56rpx;
}
@@ -532,43 +532,47 @@
}
.text-size-xxxl {
font-size: 84rpx !important;
-}
-
-/**
- * 行间距
- */
-.lh-il {
- line-height: initial;
-}
+}
+
+.text-size-40 {
+ font-size: 80rpx !important;
+}
+
+/**
+ * 行间距
+ */
+.lh-il {
+ line-height: initial;
+}
.lh-0 {
line-height: 0 !important;
-}
-.lh-xs {
- line-height: 24rpx;
-}
-.lh-sm {
- line-height: 26rpx;
-}
-.lh-md {
- line-height: 28rpx;
-}
-.lh,
-.lh-default {
- line-height: 32rpx;
-}
-.lh-lg {
- line-height: 36rpx;
-}
-.lh-xl {
- line-height: 48rpx;
-}
-.lh-xxl {
- line-height: 64rpx;
-}
-.lh-xxxl {
- line-height: 84rpx;
-}
-
+}
+.lh-xs {
+ line-height: 24rpx;
+}
+.lh-sm {
+ line-height: 26rpx;
+}
+.lh-md {
+ line-height: 28rpx;
+}
+.lh,
+.lh-default {
+ line-height: 32rpx;
+}
+.lh-lg {
+ line-height: 36rpx;
+}
+.lh-xl {
+ line-height: 48rpx;
+}
+.lh-xxl {
+ line-height: 64rpx;
+}
+.lh-xxxl {
+ line-height: 84rpx;
+}
+
/**
* 细微偏移量
*/
@@ -589,16 +593,16 @@
}
.top-xl {
top: 10rpx;
-}
+}
.top-xxl {
top: 12rpx;
-}
+}
.top-xxxl {
top: 16rpx;
-}
+}
.top-xxxxl {
top: 20rpx;
-}
+}
.top-xxxxxl {
top: 24rpx;
}
@@ -619,16 +623,16 @@
}
.left-xl {
left: 10rpx;
-}
+}
.left-xxl {
left: 12rpx;
-}
+}
.left-xxxl {
left: 16rpx;
-}
+}
.left-xxxxl {
left: 20rpx;
-}
+}
.left-xxxxxl {
left: 24rpx;
}
@@ -649,16 +653,16 @@
}
.bottom-xl {
bottom: 10rpx;
-}
+}
.bottom-xxl {
bottom: 12rpx;
-}
+}
.bottom-xxxl {
bottom: 16rpx;
-}
+}
.bottom-xxxxl {
bottom: 20rpx;
-}
+}
.bottom-xxxxxl {
bottom: 24rpx;
}
@@ -679,16 +683,16 @@
}
.right-xl {
right: 10rpx;
-}
+}
.right-xxl {
right: 12rpx;
-}
+}
.right-xxxl {
right: 16rpx;
-}
+}
.right-xxxxl {
right: 20rpx;
-}
+}
.right-xxxxxl {
right: 24rpx;
}
\ No newline at end of file
diff --git a/common/css/page.css b/common/css/page.css
index 6a584683..1ddbb8cb 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -225,6 +225,9 @@ button:before {
.radius {
border-radius: 10rpx !important;
}
+.radius-lg {
+ border-radius: 32rpx !important;
+}
.round {
border-radius: 50rpx !important;
}
diff --git a/components/iconfont/iconfont.vue b/components/iconfont/iconfont.vue
index 2e38de22..f5140feb 100644
--- a/components/iconfont/iconfont.vue
+++ b/components/iconfont/iconfont.vue
@@ -31,7 +31,7 @@
/* iconfont.css全局注册需要将src切换成绝对路径 */
/* @/static/icon/ */
@import url('@/static/icon/iconfont.css');
- /* @import url('https://at.alicdn.com/t/c/font_4227145_r2jv37yqfec.css'); */
+ /* @import url('https://at.alicdn.com/t/c/font_4227145_kbr2f9jt68b.css'); */
.iconfont {
display: inline-block;
diff --git a/pages.json b/pages.json
index ab88c368..f2e993fe 100644
--- a/pages.json
+++ b/pages.json
@@ -1232,6 +1232,80 @@
}
}
]
+ },
+ {
+ "root": "pages/plugins/coin",
+ "pages": [{
+ "path": "user/user",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "auto",
+ "titlePenetrate":"YES",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "虚拟币"
+ }
+ },
+ {
+ "path": "recharge/recharge",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "auto",
+ "titlePenetrate":"YES",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "充值"
+ }
+ },
+ {
+ "path": "convert/convert",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "auto",
+ "titlePenetrate":"YES",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "转换"
+ }
+ },
+ {
+ "path": "withdrawal/withdrawal",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "auto",
+ "titlePenetrate":"YES",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "提现"
+ }
+ },
+ {
+ "path": "detail/detail",
+ "style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || APP
+ "navigationStyle": "custom",
+ // #endif
+ // #ifdef MP-ALIPAY
+ "transparentTitle": "auto",
+ "titlePenetrate":"YES",
+ // #endif
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "明细"
+ }
+ }
+ ]
}
],
"globalStyle": {
diff --git a/pages/plugins/coin/convert/convert.css b/pages/plugins/coin/convert/convert.css
new file mode 100644
index 00000000..e69de29b
diff --git a/pages/plugins/coin/convert/convert.vue b/pages/plugins/coin/convert/convert.vue
new file mode 100644
index 00000000..cd908bbb
--- /dev/null
+++ b/pages/plugins/coin/convert/convert.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+ 总数量
+ {{ is_price_show ? '5410.00' : '***' }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.num }}
+ {{ item.price }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/coin/detail/detail.css b/pages/plugins/coin/detail/detail.css
new file mode 100644
index 00000000..e69de29b
diff --git a/pages/plugins/coin/detail/detail.vue b/pages/plugins/coin/detail/detail.vue
new file mode 100644
index 00000000..63e38bca
--- /dev/null
+++ b/pages/plugins/coin/detail/detail.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+ 总数量
+ {{ is_price_show ? '5410.00' : '***' }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.num }}
+ {{ item.price }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/coin/recharge/recharge.css b/pages/plugins/coin/recharge/recharge.css
new file mode 100644
index 00000000..e69de29b
diff --git a/pages/plugins/coin/recharge/recharge.vue b/pages/plugins/coin/recharge/recharge.vue
new file mode 100644
index 00000000..24cabdce
--- /dev/null
+++ b/pages/plugins/coin/recharge/recharge.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+ 总数量
+ {{ is_price_show ? '5410.00' : '***' }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.num }}
+ {{ item.price }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/coin/user/user.css b/pages/plugins/coin/user/user.css
new file mode 100644
index 00000000..bfbc87e7
--- /dev/null
+++ b/pages/plugins/coin/user/user.css
@@ -0,0 +1,25 @@
+.coin-title {
+ background-size: 100% auto;
+ padding-top: 130rpx;
+ /* #ifndef H5 */
+ padding-top: calc(var(--status-bar-height) + 5px + 130rpx);
+ /* #endif */
+ border-bottom-left-radius: 60rpx;
+ border-bottom-right-radius: 60rpx;
+}
+
+.coin-oprate-list {
+ --size: 96rpx;
+ width: var(--size);
+ height: var(--size);
+ border-radius: 32rpx;
+}
+
+.coin-content {
+
+}
+.coin-content-list-img {
+ --size: 80rpx;
+ width: var(--size);
+ height: var(--size) !important;
+}
\ No newline at end of file
diff --git a/pages/plugins/coin/user/user.vue b/pages/plugins/coin/user/user.vue
new file mode 100644
index 00000000..c2a47642
--- /dev/null
+++ b/pages/plugins/coin/user/user.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+ 总数量
+ {{ is_price_show ? '5410.00' : '***' }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.num }}
+ {{ item.price }}
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/plugins/coin/withdrawal/withdrawal.css b/pages/plugins/coin/withdrawal/withdrawal.css
new file mode 100644
index 00000000..e69de29b
diff --git a/pages/plugins/coin/withdrawal/withdrawal.vue b/pages/plugins/coin/withdrawal/withdrawal.vue
new file mode 100644
index 00000000..c5053291
--- /dev/null
+++ b/pages/plugins/coin/withdrawal/withdrawal.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
+
+
+ 总数量
+ {{ is_price_show ? '5410.00' : '***' }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.num }}
+ {{ item.price }}
+
+
+
+
+
+
+
+
+
+
diff --git a/static/icon/iconfont.css b/static/icon/iconfont.css
index 580059d9..b70c6469 100644
--- a/static/icon/iconfont.css
+++ b/static/icon/iconfont.css
@@ -14,6 +14,34 @@
-moz-osx-font-smoothing: grayscale;
}
+.icon-zhuanzhang:before {
+ content: "\e71b";
+}
+
+.icon-shoukuan:before {
+ content: "\e71c";
+}
+
+.icon-zhuanhuan2:before {
+ content: "\e71d";
+}
+
+.icon-withdrawal:before {
+ content: "\e717";
+}
+
+.icon-recharge:before {
+ content: "\e718";
+}
+
+.icon-convert:before {
+ content: "\e719";
+}
+
+.icon-detail:before {
+ content: "\e71a";
+}
+
.icon-store:before {
content: "\e6f3";
}
@@ -158,7 +186,7 @@
content: "\e6d1";
}
-.icon-mendian-sousuosm:before {
+.icon-scan:before {
content: "\e6cf";
}
diff --git a/static/icon/iconfont.ttf b/static/icon/iconfont.ttf
index 45491192..04ece078 100644
Binary files a/static/icon/iconfont.ttf and b/static/icon/iconfont.ttf differ