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

Merge branch 'main' of https://gitea.lihaink.cn/mkm/OfficeApp into dev

Browse Source
This commit is contained in:
zmj 2023-12-04 09:17:36 +08:00
commit 96d2552de2
9 changed files with 433 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
App.vue
View File

@ -4,6 +4,7 @@
// #endif // #endif
import { import {
loginShopAccount, loginShopAccount,
loginParseToken,
userInfo userInfo
} from "@/api/oaUser.js" } from "@/api/oaUser.js"
export default { export default {
@ -33,9 +34,13 @@
uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP); uni.setStorageSync('uniMP', info.referrerInfo?.extraData?.uniMP);
uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token); uni.setStorageSync('APP_token', info.referrerInfo?.extraData?.token);
try { try {
let res = await loginShopAccount({ let res = await loginParseToken({
shop_token: info.referrerInfo?.extraData?.token // token:"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJjZXNoaS1taWRkbGUubGloYWluay5jbiIsImF1ZCI6ImNlc2hpLW1pZGRsZS5saWhhaW5rLmNuIiwiaWF0IjoxNzAwNzkzMjY2LCJuYmYiOjE3MDA3OTMyNjYsImV4cCI6MTcwMTM5ODA2NiwiZGF0YSI6eyJ1aWQiOjUsInBob25lIjoiMTc2ODUxNTE2NDMiLCJhdmF0YXIiOiIvcmVzb3VyY2UvaW1hZ2UvYWRtaW5hcGkvZGVmYXVsdC9kZWZhdWx0X2F2YXRhci5wbmciLCJuaWNrbmFtZSI6Ilx1NzUyOFx1NjIzNzE3Njg1MTUxNjQzIn19.ctEIiBUd6T6zpp9m3x5wdop5vnBcnpS6VOliy4uz9bc"
}); token: info.referrerInfo?.extraData?.token
})
// let res = await loginShopAccount({
// shop_token: info.referrerInfo?.extraData?.token
// });
this.$store.commit('SET_USERINFO', { this.$store.commit('SET_USERINFO', {
user: {}, user: {},
token: res.data.token token: res.data.token

5
api/oaUser.js
View File

@ -69,3 +69,8 @@ export const destroyAccount = (data) => oahttp.post('/user/destroy_account', dat
* 商城登录 * 商城登录
*/ */
export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data, { noAuth: true }) export const loginShopAccount = (data) => oahttp.post('/login/shop_account', data, { noAuth: true })
/**
* 中台登录
*/
export const loginParseToken = (data) => oahttp.post('/login/parseToken', data, { noAuth: true })

3
config/app.js
View File

@ -2,7 +2,7 @@ let httpApiThree;
let httpApi; // 总域名 let httpApi; // 总域名
let httpApiTwo; // 物流系统域名 let httpApiTwo; // 物流系统域名
const env = 'local'; // 开发 const env = 'dev'; // 开发
// const env = 'prod'; // 生产 // const env = 'prod'; // 生产
// const env = 'prew'; // 预上线 // const env = 'prew'; // 预上线
// const env = 'local'; // 本地 // const env = 'local'; // 本地
@ -19,7 +19,6 @@ switch (env) {
httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线 httpApiTwo = 'https://preview-logistics.lihaink.cn' //预上线
break; break;
case 'local': case 'local':
httpApi = 'http://192.168.1.20:8000' //预上线 httpApi = 'http://192.168.1.20:8000' //预上线
httpApiThree = 'http://192.168.1.20:8000' //预上线 httpApiThree = 'http://192.168.1.20:8000' //预上线
httpApiTwo = 'http://192.168.1.20:8000' //预上线 httpApiTwo = 'http://192.168.1.20:8000' //预上线

2
pages/logistics/deliveryDetil.vue
View File

@ -337,6 +337,8 @@
qrqodeFn() { qrqodeFn() {
// uni.navigateBack()
// return
let that = this let that = this
console.log(6666) console.log(6666)
uni.scanCode({ uni.scanCode({

11
pages/logistics/logisticDetil.vue
View File

@ -82,7 +82,7 @@
<!-- <u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx" <!-- <u--image style="flex: 2;" :showLoading="true" :src="item.goods_pic" width="100rpx"
height="100rpx" @click="click"></u--image> --> height="100rpx" @click="click"></u--image> -->
<text>X{{item.product_num}}{{item.goods_unit}}</text> <text>X{{item.product_num}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -211,7 +211,7 @@
<u--image style="flex: 2;margin-right: 20rpx;" radius='10' :showLoading="true" <u--image style="flex: 2;margin-right: 20rpx;" radius='10' :showLoading="true"
:src="item.goods_pic" width="100rpx" height="100rpx"></u--image> :src="item.goods_pic" width="100rpx" height="100rpx"></u--image>
<text style="width: 70vw;margin: 0;padding: 0;">{{item.goods_name}}</text> <text style="width: 70vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
<text>X{{item.product_num}}{{item.goods_unit}}</text> <text>X{{item.product_num}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -320,7 +320,7 @@
<u--image style="flex: 2;margin-right: 20rpx;" radius='10' :showLoading="true" <u--image style="flex: 2;margin-right: 20rpx;" radius='10' :showLoading="true"
:src="item.goods_pic" width="100rpx" height="100rpx"></u--image> :src="item.goods_pic" width="100rpx" height="100rpx"></u--image>
<text style="width: 70vw;margin: 0;padding: 0;">{{item.goods_name}}</text> <text style="width: 70vw;margin: 0;padding: 0;">{{item.goods_name}}</text>
<text>X{{item.product_num}}{{item.goods_unit}}</text> <text>X{{item.product_num}}</text>
</view> </view>
</view> </view>
</view> </view>
@ -377,6 +377,9 @@
import { import {
getDetil getDetil
} from "@/api/logistics.js" } from "@/api/logistics.js"
import {
Toast
} from "../../libs/uniApi"
export default { export default {
data() { data() {
return { return {
@ -419,6 +422,8 @@
setTimeout(() => { setTimeout(() => {
uni.navigateBack() uni.navigateBack()
}, 2000) }, 2000)
}).catch((err) => {
Toast(err.msg)
}) })
this.showPop = false this.showPop = false

4
pages/oaHome/oaHome.vue
View File

@ -315,6 +315,8 @@
// this.getUserIndex() // this.getUserIndex()
// this.getIndexList() // this.getIndexList()
let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id let user_id = JSON.parse(uni.getStorageSync("USER_INFO")).id
this.getOrderList();
console.log("show")
getAreaManagerApi({ getAreaManagerApi({
user_id user_id
}).then(res => { }).then(res => {
@ -335,7 +337,6 @@
this.initUserInfo(); this.initUserInfo();
this.showToask(); this.showToask();
// this.initOaHomeDada(); // this.initOaHomeDada();
this.getOrderList();
//#ifdef APP-PLUS //#ifdef APP-PLUS
this.noticeFn(); this.noticeFn();
// #endif // #endif
@ -434,6 +435,7 @@
// courier_id: 167 // courier_id: 167
}); });
this.orderList = res.data.data; this.orderList = res.data.data;
console.log("获取列表")
}, },
goOrderList() { goOrderList() {
uni.navigateTo({ uni.navigateTo({

2
store/modules/app.js
View File

@ -33,6 +33,8 @@ const mutations = {
state.token = null; state.token = null;
Cache.clear('USER_INFO') Cache.clear('USER_INFO')
Cache.clear('TOKEN') Cache.clear('TOKEN')
uni.clearStorageSync()
}, },
UPDATE_USERINFO(state, data) { UPDATE_USERINFO(state, data) {
let time = res.data.result.expires_time - Cache.time(); let time = res.data.result.expires_time - Cache.time();

785
subpkg/merchantDetails/merchantDetails.vue
View File

@ -1,424 +1,431 @@
<template> <template>
<view class=""> <view class="">
<view class="p_list"> <view class="p_list">
<view class="card"> <view class="card">
<view class="nav_bar"> <view class="nav_bar">
<view class="left"> <view class="left">
<image src="../../static/img/company/company.png"></image> <image src="../../static/img/company/company.png"></image>
<view>{{extend.company_name}}</view> <view>{{extend.company_name}}</view>
</view> </view>
</view> </view>
<view class="body"> <view class="body">
<view class="b_item name"> <view class="b_item name">
<view class="text"> <view class="text">
<view>审核类型:</view> <view>审核类型:</view>
<view>{{formData.name}}</view> <view>{{formData.name}}</view>
</view> </view>
<view class="type"> <view class="type">
<text v-if="formData.check_status==1" style="color: #ff7c32;">审核中</text> <text v-if="formData.check_status==1" style="color: #ff7c32;">审核中</text>
<text v-else-if="formData.check_status==2" style="color: #47be62;">已通过</text> <text v-else-if="formData.check_status==2" style="color: #47be62;">已通过</text>
<text v-else-if="formData.check_status==3" style="color: #FF0000;">未通过</text> <text v-else-if="formData.check_status==3" style="color: #FF0000;">未通过</text>
</view> </view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>商户分类:</view> <view>商户分类:</view>
<view>{{extend.category_name}}</view> <view>{{extend.category_name}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>店铺类型:</view> <view>店铺类型:</view>
<view>{{extend.type_name}}</view> <view>{{extend.type_name}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>店铺名称:</view> <view>店铺名称:</view>
<view>{{extend.mer_name}}</view> <view>{{extend.mer_name}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>申请时间:</view> <view>申请时间:</view>
<view>{{formData.create_time}}</view> <view>{{formData.create_time}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>联系方式:</view> <view>联系方式:</view>
<view>{{extend.master_phone}}</view> <view>{{extend.master_phone}}</view>
</view> </view>
<!-- <view class="b_item"> <!-- <view class="b_item">
<view>店铺所在地:</view> <view>店铺所在地:</view>
<view>泸州市江阳区通滩镇通滩社区</view> <view>泸州市江阳区通滩镇通滩社区</view>
</view> --> </view> -->
<view class="b_item"> <view class="b_item">
<view>详细地址:</view> <view>详细地址:</view>
<view>{{extend.address}}</view> <view>{{extend.address}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>公司名称:</view> <view>公司名称:</view>
<view>{{extend.company_name}}</view> <view>{{extend.company_name}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>法人姓名:</view> <view>法人姓名:</view>
<view>{{extend.master_name}}</view> <view>{{extend.master_name}}</view>
</view> </view>
<view class="b_item"> <view class="b_item">
<view>社会代码:</view> <view>社会代码:</view>
<view>{{extend.organization_code}}</view> <view>{{extend.organization_code}}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="card"> <view class="card">
<view class="nav_bar"> <view class="nav_bar">
<view class="left"> <view class="left">
<image src="../../static/img/company/SHZZ.png"></image> <image src="../../static/img/company/SHZZ.png"></image>
<view>商户资质信息</view> <view>商户资质信息</view>
</view> </view>
</view> </view>
<view class="body"> <view class="body">
<block v-for="(item, index) in extend.qualification"> <block v-for="(item, index) in extend.qualification">
<image @click="priview(item)" :src="item"></image> <image @click="priview(item)" :src="item"></image>
<view v-if="index<extend.qualification.length-1" style="border-top: 1px dashed #0022c7;margin: 28rpx 0;"> <view v-if="index<extend.qualification.length-1"
</view> style="border-top: 1px dashed #0022c7;margin: 28rpx 0;">
</block> </view>
</view> </block>
</view> </view>
<view v-if="is_transaction" class="card"> </view>
<view class="nav_bar"> <view v-if="is_transaction" class="card">
<view class="left"> <view class="nav_bar">
<image src="../../static/img/company/SHZZ.png"></image> <view class="left">
<view>身份证明信息</view> <image src="../../static/img/company/SHZZ.png"></image>
</view> <view>身份证明信息</view>
</view> </view>
<view class="body"> </view>
<view class="b_item"> <view class="body">
<view>银行账户姓名:</view> <view class="b_item">
<view>{{extend.bank_username}}</view> <view>开户银行名称:</view>
</view> <view>{{extend.bank_username}}</view>
<view class="b_item"> </view>
<view>开户行:</view> <view class="b_item">
<view>{{extend.bank_opening}}</view> <view>银行卡号:</view>
</view> <view>{{extend.bank_opening}}</view>
<view class="b_item"> </view>
<view>银行卡正面:</view> <view class="b_item">
</view> <view>银行卡正面:</view>
<image @click="priview(extend.bank_front)" :src="extend.bank_front"></image> </view>
<view class="b_item"> <image @click="priview(extend.bank_front)" :src="extend.bank_front"></image>
<view>银行卡反面:</view> <view class="b_item">
</view> <view>银行卡反面:</view>
<image @click="priview(extend.bank_back)" :src="extend.bank_back"></image> </view>
<view class="b_item"> <image @click="priview(extend.bank_back)" :src="extend.bank_back"></image>
<view>身份证正面:</view> <view class="b_item">
</view> <view>身份证正面:</view>
<image @click="priview(extend.cardno_front)" :src="extend.cardno_front"></image> </view>
<view class="b_item"> <image @click="priview(extend.cardno_front)" :src="extend.cardno_front"></image>
<view>身份证反面:</view> <view class="b_item">
</view> <view>身份证反面:</view>
<image @click="priview(extend.cardno_back)" :src="extend.cardno_back"></image> </view>
</view> <image @click="priview(extend.cardno_back)" :src="extend.cardno_back"></image>
</view> </view>
</view> </view>
<block v-if="formData.check_status!=2&&formData.check_status!=3&&formData.check_status"> </view>
<button class="btn" @click="tipShow = true">通过</button> <block v-if="formData.check_status!=2&&formData.check_status!=3&&formData.check_status">
<button class="btn" @click="modalShow = true" style="background-color: #fff;color: #0122c7;">拒绝</button> <button class="btn" @click="tipShow = true">通过</button>
</block> <button class="btn" @click="modalShow = true" style="background-color: #fff;color: #0122c7;">拒绝</button>
<block v-else-if="formData.check_status==3"> </block>
<view class="refuse"> <block v-else-if="formData.check_status==3">
未通过原因: {{formData.remark}} <view class="refuse">
</view> 未通过原因: {{formData.remark}}
</block> </view>
<u-popup :show="modalShow" :round="13" mode="center"> </block>
<view class="popup"> <u-popup :show="modalShow" :round="13" mode="center">
<view class="header"> <view class="popup">
<text>请输入拒绝原因</text> <view class="header">
<image @click="modalShow=false" src="../../static/icons/close.png"></image> <text>请输入拒绝原因</text>
</view> <image @click="modalShow=false" src="../../static/icons/close.png"></image>
<u--form labelPosition="left" :model="formData" :rules="rules" ref="uForm"> </view>
<u-form-item prop="remark"> <u--form labelPosition="left" :model="formData" :rules="rules" ref="uForm">
<u-textarea class="textarea" v-model="formData.remark" placeholder="请输入拒绝原因" type="textarea" <u-form-item prop="remark">
height="100"></u-textarea> <u-textarea class="textarea" v-model="formData.remark" placeholder="请输入拒绝原因" type="textarea"
</u-form-item> height="100"></u-textarea>
</u--form> </u-form-item>
<view class="p_btn"> </u--form>
<view></view> <view class="p_btn">
<view class="right_btn"> <view></view>
<button class="cal" @click="modalShow=false">取消</button> <view class="right_btn">
<button class="pri" @click="$u.throttle(noPass, 1500)">确认</button> <button class="cal" @click="modalShow=false">取消</button>
</view> <button class="pri" @click="$u.throttle(noPass, 1500)">确认</button>
</view> </view>
</view> </view>
</u-popup> </view>
<u-modal :show="tipShow" title="提示" content='确认信息无误再通过' closeOnClickOverlay showCancelButton @close="tipShow=false" </u-popup>
@cancel="tipShow=false" @confirm="$u.throttle(pass, 1500)"></u-modal> <u-modal :show="tipShow" title="提示" content='确认信息无误再通过' closeOnClickOverlay showCancelButton
</view> @close="tipShow=false" @cancel="tipShow=false" @confirm="$u.throttle(pass, 1500)"></u-modal>
</view>
</template> </template>
<script> <script>
import { Toast } from '../../libs/uniApi' import {
import { approveAudit, approveDetails } from "@/api/approve.js" Toast
export default { } from '../../libs/uniApi'
data() { import {
return { approveAudit,
modalShow: false, approveDetails
tipShow: false, } from "@/api/approve.js"
formData: { export default {
id: '', data() {
remark: '' return {
}, modalShow: false,
extend: { tipShow: false,
formData: {
id: '',
remark: ''
},
extend: {
}, },
is_transaction: false, // 是否为交易申请 is_transaction: false, // 是否为交易申请
rules: { rules: {
remark: { remark: {
type: 'string', type: 'string',
required: true, required: true,
message: '请输入原因', message: '请输入原因',
trigger: ['blur', 'change'] trigger: ['blur', 'change']
} }
} }
} }
}, },
onLoad(options) { onLoad(options) {
this.formData.id = +options.id; this.formData.id = +options.id;
options.name ? uni.setNavigationBarTitle({ options.name ? uni.setNavigationBarTitle({
title: options.name title: options.name
}) : null; }) : null;
if (options.name.includes('交易')) this.is_transaction = true; if (options.name.includes('交易')) this.is_transaction = true;
this.initData(); this.initData();
}, },
onShow() {}, onShow() {},
methods: { methods: {
async initData() { async initData() {
try { try {
let res = await approveDetails({ let res = await approveDetails({
id: this.formData.id id: this.formData.id
}); });
this.formData = res.data; this.formData = res.data;
this.extend = this.formData?.extend; this.extend = this.formData?.extend;
this.extend.qualification ? this.extend.qualification = JSON.parse(this.extend.qualification) : this.extend this.extend.qualification ? this.extend.qualification = JSON.parse(this.extend.qualification) :
.qualification = [] this.extend
} catch (e) { .qualification = []
//TODO handle the exception } catch (e) {
} //TODO handle the exception
}, }
async pass() { },
// check_status 2通过,3拒绝 async pass() {
await approveAudit({ // check_status 2通过,3拒绝
id: this.formData.id, await approveAudit({
check_status: 2 id: this.formData.id,
}) check_status: 2
this.tipShow = false; })
this.$nextTick(() => { this.tipShow = false;
Toast('已通过'); this.$nextTick(() => {
uni.$emit('initMerchant'); Toast('已通过');
uni.navigateBack(); uni.$emit('initMerchant');
}) uni.navigateBack();
}, })
async noPass() { },
await this.$refs.uForm.validate(); async noPass() {
await approveAudit({ await this.$refs.uForm.validate();
id: this.formData.id, await approveAudit({
check_status: 3, id: this.formData.id,
remark: this.formData.remark check_status: 3,
}) remark: this.formData.remark
this.modalShow = false; })
this.$nextTick(() => { this.modalShow = false;
Toast('已拒绝'); this.$nextTick(() => {
uni.navigateBack(); Toast('已拒绝');
}) uni.navigateBack();
}, })
priview(url) { },
uni.previewImage({ priview(url) {
urls: [url], uni.previewImage({
longPressActions: { urls: [url],
itemList: ['保存图片'], longPressActions: {
success: function(data) { itemList: ['保存图片'],
if (data.tapIndex === 0) { success: function(data) {
uni.saveImageToPhotosAlbum({ if (data.tapIndex === 0) {
filePath: url, uni.saveImageToPhotosAlbum({
success: function() { filePath: url,
uni.showToast({ success: function() {
title: '保存成功', uni.showToast({
icon: 'success' title: '保存成功',
}) icon: 'success'
}, })
fail: function() { },
uni.showToast({ fail: function() {
title: '保存失败', uni.showToast({
icon: 'none' title: '保存失败',
}) icon: 'none'
} })
}) }
} })
} }
} }
}) }
}, })
}, },
onPullDownRefresh() { },
uni.stopPullDownRefresh() onPullDownRefresh() {
} uni.stopPullDownRefresh()
} }
}
</script> </script>
<style lang="scss"> <style lang="scss">
.p_list { .p_list {
padding-top: 28rpx; padding-top: 28rpx;
.card { .card {
margin: 0 auto; margin: 0 auto;
margin-bottom: 28rpx; margin-bottom: 28rpx;
width: 694rpx; width: 694rpx;
background-color: #fff; background-color: #fff;
border-radius: 26rpx; border-radius: 26rpx;
overflow: hidden; overflow: hidden;
.nav_bar { .nav_bar {
background-color: #0122c7; background-color: #0122c7;
padding: 28rpx; padding: 28rpx;
color: #fff; color: #fff;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
.left { .left {
display: flex; display: flex;
font-size: 32rpx; font-size: 32rpx;
image { image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
margin-right: 16rpx; margin-right: 16rpx;
} }
} }
.right { .right {
display: flex; display: flex;
font-size: 28rpx; font-size: 28rpx;
align-items: center; align-items: center;
} }
} }
.body { .body {
font-size: 28rpx; font-size: 28rpx;
padding: 28rpx; padding: 28rpx;
.b_item { .b_item {
padding-bottom: 16rpx; padding-bottom: 16rpx;
display: flex; display: flex;
view:nth-child(1) { view:nth-child(1) {
flex-shrink: 0; flex-shrink: 0;
padding-right: 10rpx; padding-right: 10rpx;
} }
} }
.name { .name {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.text { .text {
flex: 1; flex: 1;
display: flex; display: flex;
view:nth-child(1) { view:nth-child(1) {
flex-shrink: 0; flex-shrink: 0;
} }
} }
.type { .type {
flex-shrink: 0; flex-shrink: 0;
} }
} }
image { image {
width: 638rpx; width: 638rpx;
height: 400rpx; height: 400rpx;
} }
} }
} }
} }
.btn { .btn {
width: 694rpx; width: 694rpx;
height: 100rpx; height: 100rpx;
margin: 28rpx auto; margin: 28rpx auto;
background-color: #0122c7; background-color: #0122c7;
border: 1rpx solid #0122c7; border: 1rpx solid #0122c7;
color: #fff; color: #fff;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.popup { .popup {
width: 694rpx; width: 694rpx;
border-radius: 26rpx; border-radius: 26rpx;
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;
.header { .header {
text-align: center; text-align: center;
background-color: #0122c7; background-color: #0122c7;
color: #fff; color: #fff;
font-size: 32rpx; font-size: 32rpx;
height: 100rpx; height: 100rpx;
line-height: 100rpx; line-height: 100rpx;
position: relative; position: relative;
image { image {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
position: absolute; position: absolute;
right: 28rpx; right: 28rpx;
top: 50%; top: 50%;
transform: translate(0, -50%); transform: translate(0, -50%);
} }
} }
.textarea { .textarea {
margin: 0 28rpx; margin: 0 28rpx;
margin-top: 8rpx; margin-top: 8rpx;
padding: 28rpx; padding: 28rpx;
background-color: #f4f4f4; background-color: #f4f4f4;
font-size: 32rpx !important; font-size: 32rpx !important;
border-radius: 26rpx; border-radius: 26rpx;
} }
.p_btn { .p_btn {
margin: 28rpx; margin: 28rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.right_btn { .right_btn {
display: flex; display: flex;
align-items: center; align-items: center;
.cal { .cal {
width: 150rpx; width: 150rpx;
font-size: 30rpx; font-size: 30rpx;
height: 86rpx; height: 86rpx;
line-height: 86rpx; line-height: 86rpx;
border-radius: 43rpx; border-radius: 43rpx;
font-size: 30rpx; font-size: 30rpx;
} }
.pri { .pri {
background-color: #0122c7; background-color: #0122c7;
color: #fff; color: #fff;
width: 238rpx; width: 238rpx;
height: 86rpx; height: 86rpx;
line-height: 86rpx; line-height: 86rpx;
border-radius: 43rpx; border-radius: 43rpx;
font-size: 30rpx; font-size: 30rpx;
} }
} }
} }
} }
.refuse { .refuse {
width: 694rpx; width: 694rpx;
padding: 28rpx; padding: 28rpx;
margin: 0 auto; margin: 0 auto;
margin-bottom: 28rpx; margin-bottom: 28rpx;
border-radius: 26rpx; border-radius: 26rpx;
// border: 1px solid #ff7c32; // border: 1px solid #ff7c32;
background-color: rgba(#ff7c32, 0.2); background-color: rgba(#ff7c32, 0.2);
color: #ff7c32; color: #ff7c32;
} }
</style> </style>

15
subpkg/topUp/topUp.vue
View File

@ -152,13 +152,14 @@
}) })
// console.log(res1.data, res1.data.config.package.split('=')[1]); // console.log(res1.data, res1.data.config.package.split('=')[1]);
let obj = { let obj = {
"appid": res1.data.appid, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致 "appid": res1.data.config
"noncestr": res1.data.noncestr, // 随机字符串 .appId, // 微信开放平台 - 应用 - AppId，注意和微信小程序、公众号 AppId 可能不一致
"package": res1.data.package, // 固定值 "noncestr": res1.data.config.nonceStr, // 随机字符串
"partnerid": res1.data.partnerid, // 微信支付商户号 "package": res1.data.config.package, // 固定值
"prepayid": res1.data.prepayid, // 统一下单订单号 "partnerid": res1.data.config.partnerid, // 微信支付商户号
"timestamp": res1.data.timestamp, // 时间戳（单位：秒） "prepayid": res1.data.config.package.split('=')[1], // 统一下单订单号
"sign": res1.data.sign "timestamp": res1.data.config.timestamp, // 时间戳（单位：秒）
"sign": res1.data.config.paySign
} }
uni.getProvider({ uni.getProvider({