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;

77
subpkg/topUp/topUp.vue
View File

@ -17,9 +17,12 @@
<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="title">注意事项</view>
@ -30,10 +33,22 @@
</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 {
@ -45,7 +60,8 @@
payTimer: null,
timeCount: 5,
task_id: -1, //任务id,当为任务时,不可自选充值金额
task: {}
task: {},
obj: "323",
}
},
// 点击充值记录
@ -61,6 +77,12 @@
}
},
methods: {
aa() {
return JSON.parse(this.obj)
},
changePrice(index) {
if (this.changeMoney == index) this.changeMoney = -1;
else this.changeMoney = index;
@ -100,10 +122,10 @@
this.timeCount = 5;
}
}, 1000)
}
else Toast(this.timeCount+'秒后再支付!')
} else Toast(this.timeCount + '秒后再支付!')
},
goRecharge() {
let that = this
// console.log(obj);
uni.showLoading({
title: '获取支付信息',
@ -115,7 +137,9 @@
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,14 +152,15 @@
})
// 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) => {
@ -156,16 +181,21 @@
from: data.from,
}).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) {
uni.$emit('upBuyShare');
uni.navigateBack();
}
else{
} else {
userInfo().then(user => {
this.$store.commit('setUserInfo', user.data);
this.$store.commit(
'setUserInfo',
user.data);
})
}
})
@ -179,7 +209,8 @@
})
},
complete: () => {
if(this.task_id<=0)this.payMoney.money = '';
if (this.task_id <= 0) this.payMoney.money =
'';
},
});
}
@ -250,6 +281,7 @@
font-size: 32rpx;
font-weight: 400;
color: #333333;
text:nth-child(1) {
flex-shrink: 0;
margin-right: 18rpx;
@ -327,6 +359,7 @@
font-weight: 400;
color: #FFFFFF;
}
.btn2 {
background-color: #fff;
color: #333;

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('提交成功');