sileya-ai
/
vr-shopxo-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-sws' into dev

master
gongfuxiang 2024-04-02 11:35:54 +08:00
parent 0f2bc3d6b8 7fa8623095
commit 1ec534474b
7 changed files with 80 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/css/page.css
View File

@ -192,6 +192,9 @@ button:before {
.oh {
overflow: hidden;
}
.oa {
overflow: auto;
}
.dis-none {
display: none !important;
}
@ -1156,6 +1159,12 @@ button[disabled].bg-grey {
.self-e {
align-self: flex-end;
}
.flex-shrink {
flex-shrink: 0;
}
.flex-shrink-1 {
flex-shrink: 0;
}
.flex-width {
width: 0;
}

19
pages/plugins/coin/convert-list/convert-list.vue
View File

@ -1,9 +1,9 @@
<template>
<view :class="theme_view">
<view class="convert">
<view class="padding-main bg-white pr nav flex-row">
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_accounts_open_event">
<view>账户</view>
<view class="padding-main bg-white pr nav flex-row oa">
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_accounts_open_event">
<view>{{ accounts_name !== null && accounts_name !== '全部' ? accounts_name : '账户' }}</view>
<view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
</view>
@ -56,10 +56,10 @@
<view class="padding-horizontal-main text-size-xs">账户种类</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="accounts_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="accounts_list_event">全部</view>
</view>
<view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
@ -97,6 +97,7 @@
popup_accounts_status: false,
accounts_id: null,
accounts_list_index: null,
accounts_name: null,
accounts_list: [],
data_list: [],
@ -230,7 +231,7 @@
temp_data_list.push(temp_data[i]);
}
}
this.setData({
data_list: temp_data_list,
data_total: data.total,
@ -239,7 +240,7 @@
data_page: this.data_page + 1,
data_is_loading: 0,
});
// 是否还有数据
this.setData({
data_bottom_line_status: this.data_page > 1 && this.data_page > this.data_page_total,
@ -282,10 +283,12 @@
},
// 账户选择
accounts_event(e) {
accounts_list_event(e) {
console.log(e);
this.setData({
accounts_list_index: e.currentTarget.dataset.index,
accounts_id: e.currentTarget.dataset.value,
accounts_name: e.currentTarget.dataset.name,
popup_accounts_status: false,
data_page: 1,
});

32
pages/plugins/coin/recharge-list/recharge-list.vue
View File

@ -1,17 +1,17 @@
<template>
<view :class="theme_view">
<view class="convert">
<view class="padding-main bg-white pr nav flex-row">
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_accounts_open_event">
<view>账户</view>
<view class="padding-main bg-white pr nav flex-row oa">
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_accounts_open_event">
<view>{{ accounts_name !== null && accounts_name !== '全部' ? accounts_name : '账户' }}</view>
<view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_recharge_status_open_event">
<view>状态</view>
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_recharge_status_open_event">
<view>{{ recharge_status_name !== null && recharge_status_name !== '全部' ? recharge_status_name : '状态' }}</view>
<view class="pa right-0"><iconfont :name="popup_recharge_status_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_network_open_event">
<view>网络</view>
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_network_open_event">
<view>{{ network_name !== null && network_name !== '全部' ? network_name : '网络' }}</view>
<view class="pa right-0"><iconfont :name="popup_network_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
</view>
@ -65,10 +65,10 @@
<view class="padding-horizontal-main text-size-xs">账户种类</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="accounts_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="accounts_list_event">全部</view>
</view>
<view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
@ -83,10 +83,10 @@
<view class="padding-horizontal-main text-size-xs">提现类型</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="recharge_status_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="recharge_status_list_event">全部</view>
</view>
<view v-for="(item, index) in recharge_status_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.value" :data-index="index" @tap="recharge_status_list_event">{{ item.name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="recharge_status_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="recharge_status_list_event">{{ item.name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_recharge_status_close_event">
@ -101,10 +101,10 @@
<view class="padding-horizontal-main text-size-xs">提现类型</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="network_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="network_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="network_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="network_list_event">全部</view>
</view>
<view v-for="(item, index) in network_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="network_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.id" :data-index="index" @tap="network_list_event">{{ item.name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="network_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.id" :data-index="index" @tap="network_list_event">{{ item.name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_network_close_event">
@ -142,16 +142,19 @@
popup_accounts_status: false,
accounts_id: null,
accounts_list_index: null,
accounts_name: null,
accounts_list: [],
// 类型
popup_recharge_status_status: false,
status: null,
recharge_status_list_index: null,
recharge_status_name: null,
recharge_status_list: [],
// 网络
popup_network_status: false,
network_id: null,
network_list_index: null,
network_name: null,
network_list: [],
data_list: [],
@ -343,6 +346,7 @@
this.setData({
accounts_list_index: e.currentTarget.dataset.index,
accounts_id: e.currentTarget.dataset.value,
accounts_name: e.currentTarget.dataset.name,
popup_accounts_status: false,
data_page: 1,
});
@ -370,6 +374,7 @@
this.setData({
recharge_status_list_index: e.currentTarget.dataset.index,
status: e.currentTarget.dataset.value,
recharge_status_name: e.currentTarget.dataset.name,
popup_recharge_status_status: false,
data_page: 1,
});
@ -397,6 +402,7 @@
this.setData({
network_list_index: e.currentTarget.dataset.index,
network_id: e.currentTarget.dataset.value,
network_name: e.currentTarget.dataset.name,
popup_network_status: false,
data_page: 1,
});

42
pages/plugins/coin/transaction-list/transaction-list.vue
View File

@ -1,21 +1,21 @@
<template>
<view :class="theme_view">
<view class="transaction">
<view class="padding-main bg-white pr nav flex-row">
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_accounts_open_event">
<view>账户</view>
<view class="padding-main bg-white pr nav flex-row oa">
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_accounts_open_event">
<view>{{ accounts_name !== null && accounts_name !== '全部' ? accounts_name : '账户' }}</view>
<view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_operate_type_open_event">
<view>操作类型</view>
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_operate_type_open_event">
<view>{{ operate_type_name !== null && operate_type_name !== '全部' ? operate_type_name : '操作类型' }}</view>
<view class="pa right-0"><iconfont :name="popup_operate_type_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_business_type_open_event">
<view>业务类型</view>
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_business_type_open_event">
<view>{{ business_type_name !== null && business_type_name !== '全部' ? business_type_name : '业务类型' }}</view>
<view class="pa right-0"><iconfont :name="popup_business_type_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_coin_type_open_event">
<view>币类型</view>
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_coin_type_open_event">
<view>{{ coin_type_name !== null && coin_type_name !== '全部' ? coin_type_name : '币类型' }}</view>
<view class="pa right-0"><iconfont :name="popup_coin_type_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
</view>
@ -69,10 +69,10 @@
<view class="padding-horizontal-main text-size-xs">账户种类</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="accounts_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="accounts_list_event">全部</view>
</view>
<view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
@ -87,10 +87,10 @@
<view class="padding-horizontal-main text-size-xs">提现类型</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="operate_type_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="operate_type_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="operate_type_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="operate_type_list_event">全部</view>
</view>
<view v-for="(item, index) in operate_type_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="operate_type_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.value" :data-index="index" @tap="operate_type_list_event">{{ item.name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="operate_type_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="operate_type_list_event">{{ item.name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_operate_type_close_event">
@ -105,10 +105,10 @@
<view class="padding-horizontal-main text-size-xs">提现类型</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="business_type_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="business_type_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="business_type_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="business_type_list_event">全部</view>
</view>
<view v-for="(item, index) in business_type_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="business_type_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.value" :data-index="index" @tap="business_type_list_event">{{ item.name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="business_type_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="business_type_list_event">{{ item.name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_business_type_close_event">
@ -123,10 +123,10 @@
<view class="padding-horizontal-main text-size-xs">提现类型</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="coin_type_list_index === null ? 'cr-main bg-main-light' : ''" :data-value="null" :data-index="null" @tap="coin_type_list_event">全部</view>
<view class="item margin-sm padding-vertical-sm" :class="coin_type_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="coin_type_list_event">全部</view>
</view>
<view v-for="(item, index) in coin_type_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="coin_type_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.value" :data-index="index" @tap="coin_type_list_event">{{ item.name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="coin_type_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.name" :data-value="item.value" :data-index="index" @tap="coin_type_list_event">{{ item.name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_coin_type_close_event">
@ -164,21 +164,25 @@
popup_accounts_status: false,
accounts_id: null,
accounts_list_index: null,
accounts_name: null,
accounts_list: [],
// 操作类型
popup_operate_type_status: false,
operate_type: null,
operate_type_list_index: null,
operate_type_name: null,
operate_type_list: [],
// 业务类型
popup_business_type_status: false,
business_type: null,
business_type_list_index: null,
business_type_name: null,
business_type_list: [],
// 币类型
popup_coin_type_status: false,
coin_type: null,
coin_type_list_index: null,
coin_type_name: null,
coin_type_list: [],
data_list: [],
@ -373,6 +377,7 @@
this.setData({
accounts_list_index: e.currentTarget.dataset.index,
accounts_id: e.currentTarget.dataset.value,
accounts_name: e.currentTarget.dataset.name,
popup_accounts_status: false,
data_page: 1,
});
@ -400,6 +405,7 @@
this.setData({
operate_type_list_index: e.currentTarget.dataset.index,
operate_type: e.currentTarget.dataset.value,
operate_type_name: e.currentTarget.dataset.name,
popup_operate_type_status: false,
data_page: 1,
});
@ -427,6 +433,7 @@
this.setData({
business_type_list_index: e.currentTarget.dataset.index,
business_type: e.currentTarget.dataset.value,
business_type_name: e.currentTarget.dataset.name,
popup_business_type_status: false,
data_page: 1,
});
@ -454,6 +461,7 @@
this.setData({
coin_type_list_index: e.currentTarget.dataset.index,
coin_type: e.currentTarget.dataset.value,
coin_type_name: e.currentTarget.dataset.name,
popup_coin_type_status: false,
data_page: 1,
});

13
pages/plugins/coin/transfer-list/transfer-list.vue
View File

@ -1,9 +1,9 @@
<template>
<view :class="theme_view">
<view class="transfer-accounts">
<view class="padding-main bg-white pr nav flex-row">
<view class="flex-row align-c margin-right-main padding-right-xl pr" @tap="popup_accounts_open_event">
<view>账户</view>
<view class="padding-main bg-white pr nav flex-row oa">
<view class="flex-shrink flex-row align-c margin-right-xxxl padding-right-xl pr" @tap="popup_accounts_open_event">
<view>{{ accounts_name !== null && accounts_name !== '全部' ? accounts_name : '账户' }}</view>
<view class="pa right-0"><iconfont :name="popup_accounts_status ? 'icon-arrow-top' : 'icon-arrow-bottom'" size="24rpx"></iconfont></view>
</view>
</view>
@ -48,8 +48,11 @@
<view class="padding-vertical-lg">
<view class="padding-horizontal-main text-size-xs">账户种类</view>
<view class="popup_accounts_container padding-sm flex-row flex-warp align-c tc text-size-md">
<view class="flex-width-half-half">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === null ? 'cr-main bg-main-light' : ''" data-name="全部" :data-value="null" :data-index="null" @tap="accounts_list_event">全部</view>
</view>
<view v-for="(item, index) in accounts_list" class="flex-width-half-half" :key="index">
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
<view class="item margin-sm padding-vertical-sm" :class="accounts_list_index === index ? 'cr-main bg-main-light' : ''" :data-name="item.platform_name" :data-value="item.id" :data-index="index" @tap="accounts_list_event">{{ item.platform_name }}</view>
</view>
</view>
<view class="tc padding-top-lg br-t" @tap="popup_accounts_close_event">
@ -87,6 +90,7 @@
popup_accounts_status: false,
accounts_id: null,
accounts_list_index: null,
accounts_name: null,
accounts_list: [],
data_list: [],
@ -271,6 +275,7 @@
this.setData({
accounts_list_index: e.currentTarget.dataset.index,
accounts_id: e.currentTarget.dataset.value,
accounts_name: e.currentTarget.dataset.name,
popup_accounts_status: false,
data_page: 1,
});

2
pages/plugins/coin/transfer/transfer.css
View File

@ -2,10 +2,12 @@
background-color: #fafafc;
}
.accounts-btn,
.transfer-btn {
background: linear-gradient(107deg, #31B4FC 0%, #0842E2 100%);
}
.accounts-btn,
.transfer-btn:active {
background: linear-gradient(107deg, #168ACA 0%, #022A97 100%);
}

7
pages/plugins/coin/transfer/transfer.vue
View File

@ -17,12 +17,12 @@
</view>
<view class="bg-white padding-main radius-md margin-bottom-main">
<view class="padding-vertical-sm flex-row align-c">
<text class="text-size fw-b">收款账号</text>
<iconfont name="icon-scan" size="40rpx" @tap="scancode_event"></iconfont>
<view class="padding-left-lg flex-row jc-sb align-c flex-1 flex-width">
<view class="flex-1 padding-right-main">
<input type="text" name="receive_accounts_key" :value="receive_accounts_key" placeholder-class="text-size-md cr-grey-9" placeholder="请输入收款账号" @input="receive_accounts_key_change" />
</view>
<iconfont name="icon-scan" size="40rpx" @tap="scancode_event"></iconfont>
<button type="default" class="accounts-btn text-size-xs cr-white round" @tap="receive_accounts_key_event">确认</button>
</view>
</view>
</view>
@ -157,6 +157,9 @@
this.setData({
receive_accounts_key: e.detail.value,
});
},
// 确认收款账号
receive_accounts_key_event() {
this.get_data();
},
// 转账币