diff --git a/Laravel/app/Http/Controllers/API/Admin/ConfigController.php b/Laravel/app/Http/Controllers/API/Admin/ConfigController.php index 39eaa91..841e3b1 100644 --- a/Laravel/app/Http/Controllers/API/Admin/ConfigController.php +++ b/Laravel/app/Http/Controllers/API/Admin/ConfigController.php @@ -12,7 +12,7 @@ class ConfigController extends Controller //获取站点配置信息 public function GetConfigInfo(){ $configs = new ConfigService(); - return $configs->GetConfigInfo(['站点名称','站点图片','存款利率','管理员手机号']); + return $configs->GetConfigInfo(['站点名称','站点图片','存款利率','管理员手机号','H5业务开关']); } public function SaveConfig(){ $info = request('info'); diff --git a/Laravel/app/Http/Controllers/API/H5/MemberController.php b/Laravel/app/Http/Controllers/API/H5/MemberController.php index bab1d88..e454cb7 100644 --- a/Laravel/app/Http/Controllers/API/H5/MemberController.php +++ b/Laravel/app/Http/Controllers/API/H5/MemberController.php @@ -84,7 +84,7 @@ class MemberController } } $memberInfo->first_name_char = !empty($memberInfo->name) ? mb_substr($memberInfo->name, 0, 1, 'UTF-8') : ''; - $configs=DB::table('configs')->whereIn('label',['存款利率','借款利率'])->get(); + $configs=DB::table('configs')->whereIn('label',['存款利率','借款利率','H5业务开关'])->get(); foreach ($configs as $config) { $memberInfo->{$config->label}=$config->value; } diff --git a/Laravel/app/Http/Controllers/API/H5/TransactionController.php b/Laravel/app/Http/Controllers/API/H5/TransactionController.php index 9655cef..9176f53 100644 --- a/Laravel/app/Http/Controllers/API/H5/TransactionController.php +++ b/Laravel/app/Http/Controllers/API/H5/TransactionController.php @@ -172,9 +172,9 @@ class TransactionController $userid = $request->get('userid');//中间件产生的参数 $amount = request('amount'); $img = request('img'); - if (empty($img)) { - return \Yz::echoError1('请上传充值凭证！'); - } +// if (empty($img)) { +// return \Yz::echoError1('请上传充值凭证！'); +// } if (empty($amount) || $amount < 10000) { return \Yz::echoError1('充值金额不能小于10000元'); } diff --git a/admin/src/views/SystemMngr/SystemConfig.vue b/admin/src/views/SystemMngr/SystemConfig.vue index 3dad6cf..ca2ed7a 100644 --- a/admin/src/views/SystemMngr/SystemConfig.vue +++ b/admin/src/views/SystemMngr/SystemConfig.vue @@ -23,45 +23,63 @@ 保 存 - - - 业务相关设置 - - - - - - - *注意此处设置的是年化收益率 - - - - + + 业务相关设置 + + + + + + + *注意此处设置的是年化收益率 + + + + 保 存 - - - - - - *设置管理员手机号，充值、提现等短信通知会发送到此手机 - - - - + + + + *设置管理员手机号，充值、提现等短信通知会发送到此手机 + + + + 保 存 - + + + + +
+
+ {{ key }} + +
+
+ *控制H5端各项业务功能的开启与关闭 + + + @@ -92,23 +110,28 @@ configInfo.value.站点图片 = res.data } //获取配置信息 - const GetConfig=()=>{ - loading.value=true + const GetConfig = () => { + loading.value = true GetConfigInfo().then(res => { - loading.value=false - if(res.status){ - configInfo.value.站点名称=res.data.站点名称 - configInfo.value.站点图片=res.data.站点图片 - logo.value=import.meta.env.VITE_APP_FILE+configInfo.value.站点图片 - configInfo.value.存款利率=res.data.存款利率 - configInfo.value.管理员手机号=res.data.管理员手机号 - } + loading.value = false + if (res.status) { + configInfo.value.站点名称 = res.data.站点名称 + configInfo.value.站点图片 = res.data.站点图片 + logo.value = import.meta.env.VITE_APP_FILE + configInfo.value.站点图片 + configInfo.value.存款利率 = res.data.存款利率 + configInfo.value.管理员手机号 = res.data.管理员手机号 + configInfo.value.H5业务开关 = JSON.parse(res.data.H5业务开关) + + console.log(configInfo.value) + + } }) } //修改信息 - let configInfo=ref({ - name:'', - logo:'' + let configInfo = ref({ + name: '', + logo: '', + 'H5业务开关': {} }); const saveInfo = (data) => { loading.value = true @@ -121,45 +144,50 @@ message: '保存成功', type: 'success', }) - setTimeout(() => { - location.reload(); - }, 500) } else { ElMessage.error(res.msg) } }) } - onMounted(()=>{ + //处理H5业务开关切换 + const handleH5SwitchChange = (key, value) => { + //创建包含H5业务开关的完整数据对象 + const data = { + 'H5业务开关': JSON.stringify(configInfo.value.H5业务开关) + } + saveInfo(data) + } + onMounted(() => { GetConfig() }) \ No newline at end of file diff --git a/h5/pages.json b/h5/pages.json index 3f4e318..5684f36 100644 --- a/h5/pages.json +++ b/h5/pages.json @@ -1,11 +1,5 @@ { - "pages": [{ - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "会员管理", - "navigationStyle": "custom" - } - }, + "pages": [ { "path" : "pages/login", "style" : diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue index ea41c51..fe25006 100644 --- a/h5/pages/index/index.vue +++ b/h5/pages/index/index.vue @@ -1,64 +1,6 @@ @@ -72,31 +14,10 @@ onShow } from "@dcloudio/uni-app" - let icon_chongzhi = ref({ - color: '#FF8A5B', - size: '28', - type: 'vip' - }); - let icon_xiaofei = ref({ - color: '#26CED0', - size: '28', - type: 'hand-up' - }); - const ToUserList = (type) => { - sessionStorage.setItem('userlist_type', type) - uni.switchTab({ - url: '/pages/user/list' - }) - } - const goto = (page) => { - uni.navigateTo({ - url: page - }) - } - let List = ref([]); + onShow(() => { - sessionStorage.setItem('userlist_type', '') + }) @@ -107,62 +28,5 @@ background-color: #fff; } - .top { - display: flex; - justify-content: space-around; - } - - .top_left { - border: 1rpx solid #ccc; - width: 240rpx; - padding: 40rpx; - border-radius: 20rpx; - height: 400rpx; - font-size: 50rpx; - font-weight: 700; - background-color: #26CED0; - color: #fff; - } - - .top_right { - font-size: 40rpx; - } - - .top_right1 { - border: 1rpx solid #ccc; - width: 240rpx; - padding: 40rpx; - border-radius: 20rpx; - height: 145rpx; - font-weight: 700; - background-color: #00BBF9; - color: #fff; - } - - .top_right2 { - border: 1rpx solid #ccc; - width: 240rpx; - padding: 40rpx; - border-radius: 20rpx; - margin-top: 28rpx; - height: 145rpx; - font-weight: 700; - background-color: #FF8A5B; - color: #fff; - } - - .title { - font-size: 35rpx; - font-weight: 700; - margin-top: 10rpx; - margin-bottom: 18rpx; - color: #00BBF9; - display: flex; - } - - .bottom { - height: calc(100vh - 720rpx); - overflow: scroll; - - } + \ No newline at end of file diff --git a/h5/pages/user/recharge.vue b/h5/pages/user/recharge.vue index 5738d51..10bac19 100644 --- a/h5/pages/user/recharge.vue +++ b/h5/pages/user/recharge.vue @@ -147,13 +147,6 @@ // return; // } - if (!imageUrl.value) { - uni.showToast({ - title: '请上传充值截图', - icon: 'none' - }); - return; - } TransactionRecharge({ amount:amount.value, diff --git a/h5/pages/user/user_center.vue b/h5/pages/user/user_center.vue index f2906ee..857bf39 100644 --- a/h5/pages/user/user_center.vue +++ b/h5/pages/user/user_center.vue @@ -137,6 +137,7 @@ MemberGetInfo().then(res => { if (res.status) { userInfo.value=res.data.info + userInfo.value.H5业务开关=JSON.parse(userInfo.value.H5业务开关) } }) } @@ -150,16 +151,37 @@ }) } const RechargeClick=()=>{ + if(userInfo.value.H5业务开关.充值!==1){ + uni.showToast({ + title: '此业务暂未开放', + icon: 'none' + }); + return false + } uni.navigateTo({ url:'/pages/user/recharge' }) } const WithdrawClick=()=>{ + if(userInfo.value.H5业务开关.提现!==1){ + uni.showToast({ + title: '此业务暂未开放', + icon: 'none' + }); + return false + } uni.navigateTo({ url:'/pages/user/withdraw?mp='+userInfo.value.balance }) } const LoanClick=()=>{ + if(userInfo.value.H5业务开关.借款!==1){ + uni.showToast({ + title: '此业务暂未开放', + icon: 'none' + }); + return false + } uni.navigateTo({ url:'/pages/user/loan?rate='+userInfo.value.借款利率 }) diff --git a/h5/unpackage/dist/build/web/index.html b/h5/unpackage/dist/build/web/index.html index c49949c..7e76c6e 100644 --- a/h5/unpackage/dist/build/web/index.html +++ b/h5/unpackage/dist/build/web/index.html @@ -1,7 +1,7 @@ - + +