wgh/coreshoppro
1
0
Fork 0
mirror of http://git.coreshop.cn/jianweie/coreshoppro.git synced 2025-12-06 16:03:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

【新增】增加【用户提现】功能开关，前端根据设置限制访问，同时优化充值后台设置后前端的限制。

Browse Source
This commit is contained in:
jianweie code
2023-11-18 19:33:38 +08:00
parent 3b93ccbf0b
commit 33bd32870e
7 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CoreCms.Net.Configuration/SystemSettingConstVars.cs
View File

@@ -536,6 +536,10 @@ namespace CoreCms.Net.Configuration
/// </summary>
public const string ShowStoreBalanceRechargeSwitch = "showStoreBalanceRechargeSwitch";
/// <summary>
/// 是否允许提现
/// </summary>
public const string IsAllowWithdrawCash = "isAllowWithdrawCash";
/// <summary>
/// 显示增值服务板块

3
CoreCms.Net.Configuration/SystemSettingDictionary.cs
View File

@@ -47,6 +47,7 @@ namespace CoreCms.Net.Configuration
//开关功能
di.Add(SystemSettingConstVars.ShowStoreBalanceRechargeSwitch, new DictionaryKeyValues() { sKey = "显示充值功能", sValue = "2" });
di.Add(SystemSettingConstVars.IsAllowWithdrawCash, new DictionaryKeyValues() { sKey = "是否允许提现", sValue = "2" });
di.Add(SystemSettingConstVars.ShowVas, new DictionaryKeyValues() { sKey = "显示增值服务板块", sValue = "2" });
di.Add(SystemSettingConstVars.ShowStoresSwitch, new DictionaryKeyValues() { sKey = "显示门店列表", sValue = "2" });
@@ -259,8 +260,6 @@ namespace CoreCms.Net.Configuration
//小程序直播
di.Add(SystemSettingConstVars.ShowLiveBroadCast, new DictionaryKeyValues() { sKey = "显示小程序直播入口", sValue = "2" });
return di;
}

9
CoreCms.Net.Uni-App/CoreShop/pages/member/balance/index/index.vue
View File

@@ -21,7 +21,7 @@
<u-icon name="gift" size="16" class="coreshop-text-grey" label="账户充值"></u-icon>
</view>
</view>
<view class="coreshop-list-item arrow" @click="navigateToHandle('/pages/member/balance/withdrawCash/withdrawCash')">
<view class="coreshop-list-item arrow" v-if="isAllowWithdrawCash" @click="navigateToHandle('/pages/member/balance/withdrawCash/withdrawCash')">
<view class="content">
<u-icon name="rmb" size="16" class="coreshop-text-yellow" label="余额提现"></u-icon>
</view>
@@ -51,13 +51,16 @@
data() {
return {
userInfo: {},
platform: 'ios',
platform: 'ios'
}
},
computed: {
showRecharge() {
return this.$store.state.config.showStoreBalanceRechargeSwitch === 1;
}
},
isAllowWithdrawCash() {
return this.$store.state.config.isAllowWithdrawCash === 1;
},
},
onShow() {
this.getUserInfo();

16
CoreCms.Net.Uni-App/CoreShop/pages/member/balance/recharge/recharge.vue
View File

@@ -10,7 +10,7 @@
<view slot="right">
</view>
</u-navbar>
<view class="coreshop-bg-white coreshop-margin-10 coreshop-padding-10">
<view class="coreshop-bg-white coreshop-margin-10 coreshop-padding-10" v-if="showRecharge">
<u--form :model="form" :rules="rules" ref="uForm" errorType="message" labelPosition="left" labelWidth="80">
<u-form-item label="当前金额" borderBottom>
<view class="coreshop-text-red coreshop-text-price coreshop-font-17">{{ user.balance || '0'}}</view>
@@ -54,6 +54,15 @@
<u-button type="error" size="normal" @click="navigateToHandle">去支付</u-button>
</view>
</view>
<view v-else>
<view class="page-box">
<view>
<view class="coreshop-emptybox">
<u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="150" mode="order" text="暂未充值功能"></u-empty>
</view>
</view>
</view>
</view>
</view>
</template>
@@ -83,6 +92,11 @@
orderType: this.$globalConstVars.paymentType.recharge // 储值类型
}
},
computed: {
showRecharge() {
return this.$store.state.config.showStoreBalanceRechargeSwitch === 1;
}
},
onReady() {
this.$refs.uForm.setRules(this.rules);
},

16
CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue
View File

@@ -10,7 +10,7 @@
<view slot="right">
</view>
</u-navbar>
<view class="content">
<view class="content" v-if="isAllowWithdrawCash">
<view class="coreshop-tabbar-height">
<!-- 我的银行卡信息 -->
<view class="coreshop-list menu sm-border margin-top" v-if="userbankCard" @click="toBankCardList">
@@ -54,6 +54,15 @@
<u-button size="normal" v-else-if="!isSubmit" disabled>确认提现</u-button>
</view>
</view>
<view v-else>
<view class="page-box">
<view>
<view class="coreshop-emptybox">
<u-empty :icon="$globalConstVars.apiFilesUrl+'/static/images/empty/coupon.png'" icon-size="150" mode="order" text="暂未开启提现功能"></u-empty>
</view>
</view>
</view>
</view>
</view>
</template>
@@ -109,7 +118,10 @@
} else {
return ''
}
}
},
isAllowWithdrawCash() {
return this.$store.state.config.isAllowWithdrawCash === 1;
},
},
methods: {
// 获取我的默认银行卡信息

8
CoreCms.Net.Web.Admin/wwwroot/views/shop/setting/index.html
View File

@@ -52,6 +52,7 @@
<blockquote class="layui-elem-quote" style="padding-top: 20px;line-height: 30px;">
1、如果开启【显示门店列表】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序涉及多个商家提供商品的在线交易及配送，请补充选择：电商平台-电商平台类目。】</text>”，可先关闭，审核后再开启。<br />
2、如果开启【显示充值】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉及账户充值服务，需补充商家自营-预付卡销售-发行方类目。】</text>”，可先关闭，审核后再开启。<br />
2、如果开启【是否允许提现】模块，则微信小程序审核如果发现可能会失败，并提示“<text style="color: #ff0000;">【小程序页面内容涉嫌收集用户信息，包括但不限于银行卡，手机号码等。】</text>”，可先关闭，审核后再开启。<br />
</blockquote>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['showStoresSwitch']['sKey']}}：</label>
@@ -67,6 +68,13 @@
<input type="radio" lay-filter="showStoreBalanceRechargeSwitch" name="showStoreBalanceRechargeSwitch" value="2" title="不开启" {{d.data.configs['showStoreBalanceRechargeSwitch']['sValue']==="2" ? 'checked':''}}>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">{{d.data.configs['isAllowWithdrawCash']['sKey']}}：</label>
<div class="layui-input-inline layui-inline-7">
<input type="radio" lay-filter="isAllowWithdrawCash" name="isAllowWithdrawCash" value="1" title="开启" {{d.data.configs['isAllowWithdrawCash']['sValue']==="1" ? 'checked':''}}>
<input type="radio" lay-filter="isAllowWithdrawCash" name="isAllowWithdrawCash" value="2" title="不开启" {{d.data.configs['isAllowWithdrawCash']['sValue']==="2" ? 'checked':''}}>
</div>
</div>
<blockquote class="layui-elem-quote" style="padding-top: 20px;line-height: 30px;">
控制首页是否弹出弹窗广告
</blockquote>

2
CoreCms.Net.Web.WebApi/Controllers/CommonController.cs
View File

@@ -99,6 +99,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
var shopBeiAn = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopBeiAn); //店铺备案
var shopDesc = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShopDesc); //店铺描述
var showStoreBalanceRechargeSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoreBalanceRechargeSwitch).ObjectToInt(2); //显示充值功能
var isAllowWithdrawCash = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.IsAllowWithdrawCash).ObjectToInt(2); //显示充值功能
var showStoresSwitch = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowStoresSwitch).ObjectToInt(2); //显示门店列表
var showVas = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.ShowVas).ObjectToInt(2); //显示增值服务板块
@@ -197,6 +198,7 @@ namespace CoreCms.Net.Web.WebApi.Controllers
storeSwitch,
showStoresSwitch,
showStoreBalanceRechargeSwitch,
isAllowWithdrawCash,
cateStyle,
cateType,
toCashMoneyLow,