Skip to content

S
shopxo-uniapp

纵之格 / shopxo-uniapp

通知 102
Star 3
Fork 4
S
shopxo-uniapp

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 a586f43b 编写于 作者: G gongfuxiang
浏览文件
操作

Merge branch 'dev-sws' into dev

上级 5222feaa 7f290abc
隐藏空白更改
内联 并排
Showing with 180 addition and 137 deletion
common/css/page.css
浏览文件 @ a586f43b
......@@ -898,6 +898,12 @@ button[disabled].bg-grey {
font-size: 28rpx;
white-space: initial;
}
/**
* 文字超出部分换行
*/
.warp {
word-break: break-all;
}
/**
* 基础导航
......
pages/plugins/coin/cash-list/cash-list.css
浏览文件 @ a586f43b
......@@ -10,6 +10,19 @@
min-width: 140rpx;
}
.recharge-del-btn {
padding: 0 60rpx;
font-size: 28rpx;
margin: 0 0 0 20rpx;
color: #0079ff !important;
background-color: #fff;
border: 2rpx solid #0079ff;
}
.recharge-del-btn:active {
opacity: 0.7;
}
/*
* 钱包弹窗
*/
......
pages/plugins/coin/cash-list/cash-list.vue
浏览文件 @ a586f43b
......@@ -26,23 +26,23 @@
<view class="convert-group-row">
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">提现单号：</text>
<text class="fw-b">{{ item.cash_no }}</text>
<text class="fw-b warp">{{ item.cash_no }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title title">平台：</text>
<text class="fw-b">{{ item.platform_name }}</text>
<text class="fw-b warp">{{ item.platform_name }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title title">充值网络：</text>
<text class="fw-b">{{ item.network_name }}</text>
<text class="fw-b warp">{{ item.network_name }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title title">充值地址：</text>
<text class="fw-b">{{ item.address }}</text>
<text class="fw-b warp">{{ item.address }}</text>
</view>
<view class="flex-row">
<text class="cr-grey-9 title">提现币：</text>
<text class="fw-b">{{ item.coin }}</text>
<text class="fw-b warp">{{ item.coin }}</text>
</view>
</view>
<div v-if="item.status == 0" class="br-t-dashed padding-top-main margin-top-main flex-row jc-e align-c">
......@@ -134,6 +134,8 @@
data_list_loding_status: 1,
data_bottom_line_status: false,
params: null,
// 弹窗距离顶部距离
popup_top_height: 0,
......@@ -174,9 +176,11 @@
// 调用公共事件方法
app.globalData.page_event_onload_handle(params);
// 设置参数
this.setData({
accounts_id: params.id,
});
if (params !== null && params.id) {
this.setData({
params: params,
});
}
},
onShow() {
......@@ -222,7 +226,6 @@
dataType: 'json',
success: (res) => {
uni.stopPullDownRefresh();
console.log(res.data.data);
if (res.data.code == 0) {
var data = res.data.data;
this.setData({
......@@ -230,10 +233,11 @@
recharge_status_list: data.recharge_status_list || [],
network_list: data.network_list || [],
});
if (data.accounts_list.length > 0) {
var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id);
if (data.accounts_list.length > 0 && this.params !== null && this.params.id) {
var index = data.accounts_list.findIndex((item) => item.id === this.params.id);
this.setData({
accounts_list_index: index,
accounts_id: data.accounts_list[index].id,
accounts_name: data.accounts_list[index].platform_name,
});
}
......@@ -338,11 +342,11 @@
// 账户打开
popup_accounts_open_event() {
if (!this.popup_recharge_status_status && !this.popup_network_status) {
this.setData({
popup_accounts_status: !this.popup_accounts_status,
});
}
this.setData({
popup_accounts_status: !this.popup_accounts_status,
popup_recharge_status_status: false,
popup_network_status: false,
});
},
// 账户关闭
......@@ -366,11 +370,11 @@
// 类型打开
popup_recharge_status_open_event() {
if (!this.popup_accounts_status && !this.popup_network_status) {
this.setData({
popup_recharge_status_status: !this.popup_recharge_status_status,
});
}
this.setData({
popup_recharge_status_status: !this.popup_recharge_status_status,
popup_accounts_status: false,
popup_network_status: false,
});
},
// 类型关闭
......@@ -394,11 +398,11 @@
// 网络打开
popup_network_open_event() {
if (!this.popup_accounts_status && !this.popup_recharge_status_status) {
this.setData({
popup_network_status: !this.popup_network_status,
});
}
this.setData({
popup_network_status: !this.popup_network_status,
popup_accounts_status: false,
popup_recharge_status_status: false,
});
},
// 网络关闭
......@@ -445,7 +449,6 @@
dataType: 'json',
success: (res) => {
uni.hideLoading();
console.log(res.data.data);
if (res.data.code == 0) {
this.setData({
data_page: 1,
......
pages/plugins/coin/collection/collection.vue
浏览文件 @ a586f43b
......@@ -15,7 +15,7 @@
<view class="pr">
<iconfont name="icon-sigh-o" size="32rpx"></iconfont>
</view>
<text class="margin-left-sm text-size-xs">说出来的是你想的，做出来的是你说的，交出来的是你做的</text>
<text class="margin-left-sm text-size-xs">扫一扫向对方发起转账，请核对认真账户后再确认转账！</text>
</view>
</view>
</view>
......
pages/plugins/coin/convert-list/convert-list.vue
浏览文件 @ a586f43b
......@@ -21,27 +21,27 @@
<view class="convert-group-row">
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">转换单号：</text>
<text class="fw-b">{{ item.convert_no }}</text>
<text class="fw-b warp">{{ item.convert_no }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">转出余额：</text>
<text class="fw-b">{{ item.convert_value }}</text>
<text class="fw-b warp">{{ item.convert_value }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">转出账户：</text>
<text class="fw-b">{{ item.send_accounts_id }}</text>
<text class="fw-b warp">{{ item.send_accounts_id }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">转入账户：</text>
<text class="fw-b">{{ item.receive_accounts_id }}</text>
<text class="fw-b warp">{{ item.receive_accounts_id }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">最新币：</text>
<text class="fw-b">{{ item.coin }}</text>
<text class="fw-b warp">{{ item.coin }}</text>
</view>
<view class="flex-row">
<text class="cr-grey-9 title">备注：</text>
<text class="fw-b">{{ item.note }}</text>
<text class="fw-b warp">{{ item.note }}</text>
</view>
</view>
</view>
......@@ -112,6 +112,8 @@
data_list_loding_status: 1,
data_bottom_line_status: false,
params: null,
// 弹窗距离顶部距离
popup_top_height: 0,
......@@ -146,9 +148,11 @@
// 调用公共事件方法
app.globalData.page_event_onload_handle(params);
// 设置参数
this.setData({
send_accounts_id: params.id,
});
if (params !== null && params.id) {
this.setData({
params: params.id,
});
}
},
onShow() {
......@@ -194,17 +198,17 @@
dataType: 'json',
success: (res) => {
uni.stopPullDownRefresh();
console.log(res.data.data);
if (res.data.code == 0) {
var data = res.data.data;
this.setData({
send_accounts_list: data.accounts_list || [],
receive_accounts_list: data.accounts_list || [],
});
if (data.accounts_list.length > 0) {
var index = data.accounts_list.findIndex((item) => item.id === this.send_accounts_id);
if (data.accounts_list.length > 0 && this.params !== null && this.params.id) {
var index = data.accounts_list.findIndex((item) => item.id === this.params.id);
this.setData({
send_accounts_list_index: index,
send_accounts_id: data.accounts_list[index].id,
send_accounts_name: data.accounts_list[index].platform_name,
});
}
......@@ -308,11 +312,10 @@
// 账户打开
popup_send_accounts_open_event() {
if (!this.popup_type_status) {
this.setData({
popup_send_accounts_status: !this.popup_send_accounts_status,
});
}
this.setData({
popup_send_accounts_status: !this.popup_send_accounts_status,
popup_receive_accounts_status: false,
});
},
// 账户关闭
......@@ -336,11 +339,10 @@
// 账户打开
popup_receive_accounts_open_event() {
if (!this.popup_type_status) {
this.setData({
popup_receive_accounts_status: !this.popup_receive_accounts_status,
});
}
this.setData({
popup_receive_accounts_status: !this.popup_receive_accounts_status,
popup_send_accounts_status: false,
});
},
// 账户关闭
......
pages/plugins/coin/detail/detail.vue
浏览文件 @ a586f43b
......@@ -4,7 +4,7 @@
<view>
<scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
<view class="coin-title flex-col padding-lg">
<view v-if="accounts_list.length > 0" class="margin-bottom-xxxxl margin-top-xl padding-bottom-main flex-row jc-sb align-c">
<view v-if="accounts_list.length > 0" class="margin-bottom-xxxxl padding-bottom-main flex-row jc-sb align-c">
<view class="flex-row">
<image v-if="accounts_list[accounts_list_index]['platform_icon']" :src="accounts_list[accounts_list_index]['platform_icon']" mode="widthFix" class="coin-content-list-img round" />
<view class="padding-left-main">
......@@ -42,22 +42,23 @@
<view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9">操作类型：</text>
<text class="fw-b">{{ item.operate_type_name }}</text>
<text class="fw-b warp">{{ item.operate_type_name }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9">操作数量：</text>
<text class="fw-b">{{ item.operate_coin }}</text>
<text class="fw-b warp">{{ item.operate_coin }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9">原始数量：</text>
<text class="fw-b">{{ item.original_coin }}</text>
<text class="fw-b warp">{{ item.original_coin }}</text>
</view>
<view class="flex-row">
<text class="cr-grey-9">最新数量：</text>
<text class="fw-b">{{ item.latest_coin }}</text>
<text class="fw-b warp">{{ item.latest_coin }}</text>
</view>
</view>
</view>
<view class="tc cr-main" :data-value="'/pages/plugins/coin/transaction-list/transaction-list?id=' + accounts_list[accounts_list_index]['id']" @tap="url_event">查看更多明细</view>
</view>
<view v-else>
<!-- 提示信息 -->
......@@ -98,7 +99,7 @@
<iconfont name="icon-close-o" size="28rpx" color="#999"></iconfont>
</view>
</view>
<view class="popup_user_detail_container padding-vertical-main flex-row flex-warp align-c tc text-size">
<view v-if="accounts_list.length > 0" class="popup_user_detail_container padding-vertical-main flex-row flex-warp align-c tc text-size">
<view class="flex-width-half">
<view class="item padding-vertical-lg radius margin-sm" :data-value="'/pages/plugins/coin/recharge-list/recharge-list?id=' + accounts_list[accounts_list_index]['id']" @tap="url_event">充值明细</view>
</view>
......@@ -186,11 +187,13 @@
// 调用公共事件方法
app.globalData.page_event_onload_handle(params);
// 设置参数
this.setData({
params: params,
});
this.coin_oprate_list[1].url = this.coin_oprate_list[1].url + '?id=' + params.id;
this.coin_oprate_list[0].url = this.coin_oprate_list[0].url + '?id=' + params.id;
if (params !== null && params.id) {
this.setData({
params: params,
});
this.coin_oprate_list[1].url = this.coin_oprate_list[1].url + '?id=' + params.id;
this.coin_oprate_list[0].url = this.coin_oprate_list[0].url + '?id=' + params.id;
}
this.init();
},
......@@ -233,13 +236,12 @@
data_list_loding_msg: '',
data_list_loding_status: 0,
});
for (var i = 0; i < data.accounts_list.length; i++) {
if (data.accounts_list[i].id === this.params.id) {
this.setData({
accounts_list_index: i,
});
}
if (data.accounts_list.length > 0 && this.params !== null && this.params.id) {
this.setData({
accounts_list_index: data.accounts_list.findIndex((item) => item.id === this.params.id),
});
}
console.log(this.accounts_list_index);
} else {
this.setData({
data_list_loding_status: 2,
......
pages/plugins/coin/recharge-list/recharge-list.vue
浏览文件 @ a586f43b
......@@ -26,23 +26,23 @@
<view class="convert-group-row">
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">充值单号：</text>
<text class="fw-b">{{ item.recharge_no }}</text>
<text class="fw-b warp">{{ item.recharge_no }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">平台：</text>
<text class="fw-b">{{ item.platform_name }}</text>
<text class="fw-b warp">{{ item.platform_name }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">充值网络：</text>
<text class="fw-b">{{ item.network_name }}</text>
<text class="fw-b warp">{{ item.network_name }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">充值地址：</text>
<text class="fw-b">{{ item.address }}</text>
<text class="fw-b warp">{{ item.address }}</text>
</view>
<view class="flex-row">
<text class="cr-grey-9 title">充值币：</text>
<text class="fw-b">{{ item.coin }}</text>
<text class="fw-b warp">{{ item.coin }}</text>
</view>
</view>
<div v-if="item.status == 0" class="br-t-dashed padding-top-main margin-top-main flex-row jc-e align-c">
......@@ -135,6 +135,8 @@
data_list_loding_status: 1,
data_bottom_line_status: false,
params: null,
// 弹窗距离顶部距离
popup_top_height: 0,
......@@ -175,9 +177,11 @@
// 调用公共事件方法
app.globalData.page_event_onload_handle(params);
// 设置参数
this.setData({
accounts_id: params.id,
});
if (params !== null && params.id) {
this.setData({
params: params,
});
}
},
onShow() {
......@@ -230,10 +234,11 @@
recharge_status_list: data.recharge_status_list || [],
network_list: data.network_list || [],
});
if (data.accounts_list.length > 0) {
var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id);
if (data.accounts_list.length > 0 && this.params !== null && this.params.id) {
var index = data.accounts_list.findIndex((item) => item.id === this.params.id);
this.setData({
accounts_list_index: index,
accounts_id: data.accounts_list[index].id,
accounts_name: data.accounts_list[index].platform_name,
});
}
......@@ -338,11 +343,11 @@
// 账户打开
popup_accounts_open_event() {
if (!this.popup_recharge_status_status && !this.popup_network_status) {
this.setData({
popup_accounts_status: !this.popup_accounts_status,
});
}
this.setData({
popup_accounts_status: !this.popup_accounts_status,
popup_recharge_status_status: false,
popup_network_status: false,
});
},
// 账户关闭
......@@ -366,11 +371,11 @@
// 类型打开
popup_recharge_status_open_event() {
if (!this.popup_accounts_status && !this.popup_network_status) {
this.setData({
popup_recharge_status_status: !this.popup_recharge_status_status,
});
}
this.setData({
popup_recharge_status_status: !this.popup_recharge_status_status,
popup_accounts_status: false,
popup_network_status: false,
});
},
// 类型关闭
......@@ -394,11 +399,11 @@
// 网络打开
popup_network_open_event() {
if (!this.popup_accounts_status && !this.popup_recharge_status_status) {
this.setData({
popup_network_status: !this.popup_network_status,
});
}
this.setData({
popup_network_status: !this.popup_network_status,
popup_accounts_status: false,
popup_recharge_status_status: false,
});
},
// 网络关闭
......@@ -445,7 +450,6 @@
dataType: 'json',
success: (res) => {
uni.hideLoading();
console.log(res.data.data);
if (res.data.code == 0) {
this.setData({
data_page: 1,
......
pages/plugins/coin/transaction-list/transaction-list.vue
浏览文件 @ a586f43b
......@@ -30,27 +30,27 @@
<view class="convert-group-row">
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">币类型：</text>
<text class="fw-b">{{ item.coin_type_name }}</text>
<text class="fw-b warp">{{ item.coin_type_name }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">操作类型：</text>
<text class="fw-b">{{ item.operate_type_name }}</text>
<text class="fw-b warp">{{ item.operate_type_name }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">操作币：</text>
<text class="fw-b">{{ item.operate_coin }}</text>
<text class="fw-b warp">{{ item.operate_coin }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">原始币：</text>
<text class="fw-b">{{ item.original_coin }}</text>
<text class="fw-b warp">{{ item.original_coin }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">最新币：</text>
<text class="fw-b">{{ item.latest_coin }}</text>
<text class="fw-b warp">{{ item.latest_coin }}</text>
</view>
<view class="flex-row">
<text class="cr-grey-9 title">描述：</text>
<text class="fw-b">{{ item.msg }}</text>
<text class="fw-b warp">{{ item.msg }}</text>
</view>
</view>
</view>
......@@ -157,6 +157,8 @@
data_list_loding_status: 1,
data_bottom_line_status: false,
params: null,
// 弹窗距离顶部距离
popup_top_height: 0,
......@@ -203,9 +205,11 @@
// 调用公共事件方法
app.globalData.page_event_onload_handle(params);
// 设置参数
this.setData({
accounts_id: params.id,
});
if (params !== null && params.id) {
this.setData({
params: params,
});
}
},
onShow() {
......@@ -251,7 +255,6 @@
dataType: 'json',
success: (res) => {
uni.stopPullDownRefresh();
console.log(res.data.data);
if (res.data.code == 0) {
var data = res.data.data;
this.setData({
......@@ -260,10 +263,11 @@
business_type_list: data.log_business_type_list || [],
coin_type_list: data.log_coin_type_list || [],
});
if (data.accounts_list.length > 0) {
var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id);
if (data.accounts_list.length > 0 && this.params !== null && this.params.id) {
var index = data.accounts_list.findIndex((item) => item.id === this.params.id);
this.setData({
accounts_list_index: index,
accounts_id: data.accounts_list[index].id,
accounts_name: data.accounts_list[index].platform_name,
});
}
......@@ -332,7 +336,7 @@
temp_data_list.push(temp_data[i]);
}
}
this.setData({
data_list: temp_data_list,
data_total: data.total,
......@@ -341,7 +345,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,
......@@ -369,11 +373,12 @@
// 账户打开
popup_accounts_open_event() {
if (!this.popup_operate_type_status && !this.popup_business_type_status && !this.popup_coin_type_status) {
this.setData({
popup_accounts_status: !this.popup_accounts_status,
});
}
this.setData({
popup_accounts_status: !this.popup_accounts_status,
popup_operate_type_status: false,
popup_business_type_status: false,
popup_coin_type_status: false,
});
},
// 账户关闭
......@@ -397,11 +402,12 @@
// 操作类型打开
popup_operate_type_open_event() {
if (!this.popup_accounts_status && !this.popup_business_type_status && !this.popup_coin_type_status) {
this.setData({
popup_operate_type_status: !this.popup_operate_type_status,
});
}
this.setData({
popup_operate_type_status: !this.popup_operate_type_status,
popup_accounts_status: false,
popup_business_type_status: false,
popup_coin_type_status: false,
});
},
// 操作类型关闭
......@@ -425,11 +431,12 @@
// 业务类型打开
popup_business_type_open_event() {
if (!this.popup_accounts_status && !this.popup_operate_type_status && !this.popup_coin_type_status) {
this.setData({
popup_business_type_status: !this.popup_business_type_status,
});
}
this.setData({
popup_business_type_status: !this.popup_business_type_status,
popup_accounts_status: false,
popup_operate_type_status: false,
popup_coin_type_status: false,
});
},
// 业务类型关闭
......@@ -453,11 +460,12 @@
// 币类型打开
popup_coin_type_open_event() {
if (!this.popup_accounts_status && !this.popup_operate_type_status && !this.popup_business_type_status) {
this.setData({
popup_coin_type_status: !this.popup_coin_type_status,
});
}
this.setData({
popup_coin_type_status: !this.popup_coin_type_status,
popup_accounts_status: false,
popup_operate_type_status: false,
popup_business_type_status: false,
});
},
// 币类型关闭
......
pages/plugins/coin/transfer-list/transfer-list.vue
浏览文件 @ a586f43b
......@@ -18,19 +18,19 @@
<view class="convert-group-row">
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">转账单号：</text>
<text class="fw-b">{{ item.transfer_no }}</text>
<text class="fw-b warp">{{ item.transfer_no }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">收款人：</text>
<text class="fw-b">{{ item.receive_user.username }}</text>
<text class="fw-b warp">{{ item.receive_user.username }}</text>
</view>
<view class="margin-bottom-sm flex-row">
<text class="cr-grey-9 title">转账币：</text>
<text class="fw-b">{{ item.coin }}</text>
<text class="fw-b warp">{{ item.coin }}</text>
</view>
<view class="flex-row">
<text class="cr-grey-9 title">转账备注：</text>
<text class="fw-b">{{ item.note }}</text>
<text class="fw-b warp">{{ item.note }}</text>
</view>
</view>
</view>
......@@ -83,6 +83,8 @@
data_list_loding_status: 1,
data_bottom_line_status: false,
params: null,
// 弹窗距离顶部距离
popup_top_height: 0,
......@@ -111,9 +113,11 @@
// 调用公共事件方法
app.globalData.page_event_onload_handle(params);
// 设置参数
this.setData({
accounts_id: params.id,
});
if (params !== null && params.id) {
this.setData({
params: params,
});
}
},
onShow() {
......@@ -163,10 +167,11 @@
this.setData({
accounts_list: data.accounts_list || [],
});
if (data.accounts_list.length > 0) {
var index = data.accounts_list.findIndex((item) => item.id === this.accounts_id);
if (data.accounts_list.length > 0 && this.params !== null && this.params.id) {
var index = data.accounts_list.findIndex((item) => item.id === this.params.id);
this.setData({
accounts_list_index: index,
accounts_id: data.accounts_list[index].id,
accounts_name: data.accounts_list[index].platform_name,
});
}
......
pages/plugins/coin/user/user.vue
浏览文件 @ a586f43b
......@@ -4,7 +4,7 @@
<view v-if="(data_base || null) != null">
<scroll-view :scroll-y="true" class="scroll-box" lower-threshold="60" @scroll="scroll_event">
<view class="coin-title flex-col padding-lg" :style="'background-image:url(' + wallet_static_url + 'user-head-bg.png)'">
<view class="margin-bottom-main flex-row jc-sb align-c margin-top-xl">
<view class="margin-bottom-main flex-row jc-sb align-c">
<view>
<view class="cr-base text-size-md">总数量</view>
<view class="text-size-40 fw-b">{{ is_price_show ? accounts_summary : '***' }}</view>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或