mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支付

Browse Source
This commit is contained in:
zmj 2023-11-20 14:41:58 +08:00
parent dcf5a1a22f
commit 1f0ea2fe29
4 changed files with 391 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
components/task/taskItem.vue
View File

@ -151,6 +151,10 @@
], // 村管理跳转/subpkg/townTask/townTask的任务 1
navToList: ["village_task_type_4", "village_task_type_5", "town_task_type_6", "town_task_type_master_6", ],
// 新增入股任务跳转/subpkg/townTask/villageTask6
navToVillageTask6List: ['village_task_type_8', 'town_task_type_master_2', 'town_task_type_master_7',
'town_task_type_master_8'
]
};
@ -206,6 +210,10 @@
return this.navTo(
`/subpkg/townTask/villageTask4?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
);
if (this.navToVillageTask6List.includes(this.$props.datas.task_type_value))
return this.navTo(
`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
);
switch (this.$props.datas.task_type_value) {
case "1":
if (this.$store.state.app.userInfo.admin_id) this.navTo(
@ -239,27 +247,27 @@
// case 67:
// this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
// break;
case "village_task_type_8":
this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
break;
case "town_task_type_master_2":
this.navTo(
`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
);
break;
// case "village_task_type_8":
// this.navTo(`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}`);
// break;
// case "town_task_type_master_2":
// this.navTo(
// `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
// );
// break;
case "town_task_type_master_3":
this.navTo(`/subpkg/townTask/gatherRecords?task_id=${this.$props.datas?.id}`);
break;
case "town_task_type_master_7":
this.navTo(
`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
);
break;
case "town_task_type_master_8":
this.navTo(
`/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
);
break;
// case "town_task_type_master_7":
// this.navTo(
// `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
// );
// break;
// case "town_task_type_master_8":
// this.navTo(
// `/subpkg/townTask/villageTask6?task_id=${this.$props.datas?.id}&type_value=${this.$props.datas.task_type_value}`
// );
// break;
default:
this.navTo('');
break;

133
subpkg/topUp/topUp.vue
View File

@ -17,11 +17,14 @@
<view v-else class="item" :class="index==changeMoney?'active':''" @click="changePrice(index)"
v-for="(item, index) in priceList" :key="index">{{item}}</view>
</view>
<input v-if="priceList[changeMoney]=='自定义'" class="input" type="digit" placeholder="输入充值金额(元)" v-model="payMoney.money" />
<input v-if="priceList[changeMoney]=='自定义'" class="input" type="digit" placeholder="输入充值金额(元)"
v-model="payMoney.money" />
<button class="btn" @click="pay">充值</button>
<button class="btn btn2" @click="navToRecord">充值记录</button>
</view>
<!-- <view class="tip">
<!-- <view class="tip">
<view class="title">注意事项</view>
<view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
</view>
@ -30,14 +33,26 @@
</template>
<script>
import { recharge, payWay, payPrepay, wechatJsConfig, payStatus } from "@/api/pay.js"
import { userInfo } from "@/api/oaUser.js"
import { Toast } from '@/libs/uniApi.js'
import { taskShareholder } from "@/api/task.js"
import {
recharge,
payWay,
payPrepay,
wechatJsConfig,
payStatus
} from "@/api/pay.js"
import {
userInfo
} from "@/api/oaUser.js"
import {
Toast
} from '@/libs/uniApi.js'
import {
taskShareholder
} from "@/api/task.js"
export default {
data() {
return {
priceList: ['10元','50元','100元','500元','1000元','5000元','10000元', '自定义'],
priceList: ['10元', '50元', '100元', '500元', '1000元', '5000元', '10000元', '自定义'],
changeMoney: -1,
payMoney: {
money: ''
@ -45,36 +60,43 @@
payTimer: null,
timeCount: 5,
task_id: -1, //任务id,当为任务时,不可自选充值金额
task: {}
task: {},
obj: "323",
}
},
// 点击充值记录
onNavigationBarButtonTap(res){
onNavigationBarButtonTap(res) {
if (res.index === 0) {
this.navToRecord();
}
},
onLoad(options) {
if(options.task_id){
this.task_id=options.task_id;
if (options.task_id) {
this.task_id = options.task_id;
this.loadTask();
}
},
methods: {
changePrice(index){
if(this.changeMoney == index)this.changeMoney = -1;
aa() {
return JSON.parse(this.obj)
},
changePrice(index) {
if (this.changeMoney == index) this.changeMoney = -1;
else this.changeMoney = index;
if(this.priceList[index]=='自定义')this.payMoney.money = '';
if (this.priceList[index] == '自定义') this.payMoney.money = '';
else this.payMoney.money = this.priceList[index].split('元')[0];
},
// 跳转充值记录
navToRecord(){
navToRecord() {
uni.navigateTo({
url: '/subpkg/topUpList/topUpList'
})
},
// 加载任务
async loadTask(){
async loadTask() {
uni.showLoading({
title: '加载中',
mask: true
@ -87,35 +109,37 @@
uni.hideLoading();
},
//充值
pay(){
if(!this.payMoney.money)return Toast('请先填写充值金额!')
if(this.payMoney.money<=0)return Toast('充值金额不能小于0!')
if(this.payTimer==null){
pay() {
if (!this.payMoney.money) return Toast('请先填写充值金额!')
if (this.payMoney.money <= 0) return Toast('充值金额不能小于0!')
if (this.payTimer == null) {
this.goRecharge();
this.payTimer = setInterval(()=>{
this.payTimer = setInterval(() => {
this.timeCount--;
if(this.timeCount<=0){
if (this.timeCount <= 0) {
clearInterval(this.payTimer);
this.payTimer = null;
this.timeCount = 5;
}
}, 1000)
}
else Toast(this.timeCount+'秒后再支付!')
} else Toast(this.timeCount + '秒后再支付!')
},
goRecharge() {
let that = this
// console.log(obj);
uni.showLoading({
title:'获取支付信息',
title: '获取支付信息',
success: async () => {
let queryData = {
money: this.payMoney.money,
type:300
type: 300
};
if(this.task_id>0) {
if (this.task_id > 0) {
queryData.task_id = this.task_id;
}
let { data } = await recharge(queryData);
let {
data
} = await recharge(queryData);
let res = await payWay({
order_id: data.order_id,
from: data.from,
@ -128,21 +152,22 @@
})
// console.log(res1.data, res1.data.config.package.split('=')[1]);
let obj = {
"appid": res1.data.config.appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
"noncestr": res1.data.config.nonceStr, // 随机字符串
"package": res1.data.config.package, // 固定值
"partnerid": res1.data.config.partnerid, // 微信支付商户号
"prepayid": res1.data.config.package.split('=')[1], // 统一下单订单号
"timestamp": res1.data.config.timestamp, // 时间戳（单位：秒）
"sign": res1.data.config.paySign
"appid": res1.data.appid, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
"noncestr": res1.data.noncestr, // 随机字符串
"package": res1.data.package, // 固定值
"partnerid": res1.data.partnerid, // 微信支付商户号
"prepayid": res1.data.prepayid, // 统一下单订单号
"timestamp": res1.data.timestamp, // 时间戳（单位：秒）
"sign": res1.data.sign
}
uni.getProvider({
service: 'payment',
success: (paymentList) => {
// console.log(paymentList);
uni.hideLoading();
uni.showLoading({
title:'微信支付中'
title: '微信支付中'
})
uni.requestPayment({
provider: 'wxpay',
@ -154,18 +179,23 @@
payStatus({
order_id: data.order_id,
from: data.from,
}).then((status)=>{
}).then((status) => {
uni.showToast({
icon: status.data.pay_status?'success':'none',
title: status.data.pay_status?'支付成功':'支付失败'
icon: status.data
.pay_status ?
'success' : 'none',
title: status.data
.pay_status ?
'支付成功' : '支付失败'
})
if(this.task_id>0){
if (this.task_id > 0) {
uni.$emit('upBuyShare');
uni.navigateBack();
}
else{
userInfo().then(user=>{
this.$store.commit('setUserInfo', user.data);
} else {
userInfo().then(user => {
this.$store.commit(
'setUserInfo',
user.data);
})
}
})
@ -174,12 +204,13 @@
console.log(e);
uni.hideLoading();
uni.showToast({
icon:'error',
icon: 'error',
title: '支付失败!'
})
},
complete: () => {
if(this.task_id<=0)this.payMoney.money = '';
if (this.task_id <= 0) this.payMoney.money =
'';
},
});
}
@ -187,8 +218,8 @@
},
fail: (e) => {
uni.showToast({
icon:'error',
title:'请先安装微信'
icon: 'error',
title: '请先安装微信'
})
}
})
@ -250,7 +281,8 @@
font-size: 32rpx;
font-weight: 400;
color: #333333;
text:nth-child(1){
text:nth-child(1) {
flex-shrink: 0;
margin-right: 18rpx;
}
@ -327,7 +359,8 @@
font-weight: 400;
color: #FFFFFF;
}
.btn2{
.btn2 {
background-color: #fff;
color: #333;
border: 1px solid #eee;

2
subpkg/townTask/villageTask4.vue
View File

@ -163,8 +163,6 @@
}
},
async submitFn() {
if (!this.amount) return Toast("请输入金额")
let data = {
id: this.task_id,

3
subpkg/townTask/villageTask6.vue
View File

@ -211,9 +211,6 @@
video_annex: this.videoList
});
}
this.other.is_commit = 1;
this.approve_status = 1;
Toast('提交成功');