Commit d2c99d52 by liuliufashi

update

parent 8a865fd2
VUE_APP_MODE = 'dev' VUE_APP_MODE = 'dev'
NODE_ENV = 'development' NODE_ENV=production browserify -g envify -e main.js | uglifyjs -c -m > build.js
VUE_APP_BASE_URL = '/iships/' VUE_APP_BASE_URL = '/iships/'
VUE_APP_MODE = 'http://47.102.211.197:8092' VUE_APP_MODE = 'http://47.102.211.197:8092'
VUE_APP_TEXT = '测试环境' VUE_APP_TEXT = '测试环境'
\ No newline at end of file
No preview for this file type
import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router' import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router'
import {getToken} from "@/utils/token" import {getToken} from "@/utils/token"
import Login from '@/views/login/index.vue' import Login from '@/views/login/index.vue'
import Home from '@/views/home/index.vue' import Home from '@/views/home/index.vue'
import Error from '@/views/404/index.vue' import Error from '@/views/404/index.vue'
import { onGetRouter } from '@/utils/userInfo' import { onGetRouter } from '@/utils/userInfo'
console.log(onGetRouter(),'getRouter');
const routes: Array<RouteRecordRaw> = [ const routes: Array<RouteRecordRaw> = [
{ {
...@@ -63,15 +62,15 @@ const routes: Array<RouteRecordRaw> = [ ...@@ -63,15 +62,15 @@ const routes: Array<RouteRecordRaw> = [
} }
] ]
const router = createRouter({ const router = createRouter({
history: createWebHistory(), history: createWebHashHistory(),
routes routes
}) })
// router.beforeEach((to,from,next)=>{ router.beforeEach((to,from,next)=>{
// const token:any = getToken const token:any = getToken
// if(token){ if(token){
// next() next()
// }else{ }else{
// router.push('/login') router.push('/login')
// } }
// }) })
export default router export default router
...@@ -21,20 +21,14 @@ ...@@ -21,20 +21,14 @@
<div style="margin-top: 10px"> <div style="margin-top: 10px">
<a-table :columns="columns" :data-source="list" :pagination="false" v-if="isShowTable"> <a-table :columns="columns" :data-source="list" :pagination="false" v-if="isShowTable">
<template #bodyCell="{ column, record }"> <template #bodyCell="{ column, record }">
<template v-if="column.key === 'wx'"> <template v-if="column.key === 'wx' && record.paytype == '1'">
<div v-if="record.paytype == '1'"> <div>
<CheckCircleFilled style="font-size:25px; color:rgb(12, 191, 33);"></CheckCircleFilled> <CheckCircleFilled style="font-size: 25px; color: rgb(12, 191, 33)"></CheckCircleFilled>
</div>
<div v-else>
<CloseCircleFilled style="font-size:25px;color: rgb(250, 116, 116);"></CloseCircleFilled>
</div> </div>
</template> </template>
<template v-else-if="column.key === 'zfb'"> <template v-else-if="column.key === 'zfb' && record.paytype == '2'">
<div v-if="record.paytype == '2'"> <div>
<CheckCircleFilled style="font-size:25px;color:rgb(12, 191, 33);"></CheckCircleFilled> <CheckCircleFilled style="font-size: 25px; color: rgb(12, 191, 33)"></CheckCircleFilled>
</div>
<div v-else>
<CloseCircleFilled style="font-size:25px;color: rgb(250, 116, 116);"></CloseCircleFilled>
</div> </div>
</template> </template>
<template v-else-if="column.key === 'tags'"> <template v-else-if="column.key === 'tags'">
...@@ -120,18 +114,23 @@ ...@@ -120,18 +114,23 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { defineExpose, ref, reactive, computed, toRaw, onMounted } from "vue"; import { defineExpose, ref, reactive, computed, toRaw, onMounted } from "vue";
import { useRoute } from "vue-router"; import { useRoute, useRouter } from "vue-router";
import { Form } from "ant-design-vue"; import { Form } from "ant-design-vue";
import { import {
LeftOutlined, LeftOutlined,
MenuUnfoldOutlined, MenuUnfoldOutlined,
CheckCircleFilled, CheckCircleFilled,
CloseCircleFilled,
} from "@ant-design/icons-vue"; } from "@ant-design/icons-vue";
import { onZfbPay, onWxPay, onfindAli, onfindWX, onUpdate, onUpdateWX } from "@/api/index"; import {
onZfbPay,
onWxPay,
onfindAli,
onfindWX,
onUpdate,
onUpdateWX,
} from "@/api/index";
import { message } from "ant-design-vue"; import { message } from "ant-design-vue";
import { getUid } from "@/utils/userInfo"; import { getUid } from "@/utils/userInfo";
import router from "@/router";
interface FormState { interface FormState {
name: String; name: String;
} }
...@@ -140,7 +139,7 @@ interface AppFormStateWX { ...@@ -140,7 +139,7 @@ interface AppFormStateWX {
appid: String; appid: String;
name: String; name: String;
mchid: String; mchid: String;
mchkey:String; mchkey: String;
// server_url: String; // server_url: String;
} }
interface AppFormStateAl { interface AppFormStateAl {
...@@ -152,7 +151,7 @@ interface AppFormStateAl { ...@@ -152,7 +151,7 @@ interface AppFormStateAl {
// server_url: String; // server_url: String;
} }
const useForm = Form.useForm; const useForm = Form.useForm;
const columns = [ const columns = ref<any>([
{ {
title: "支付通道名称", title: "支付通道名称",
dataIndex: "name", dataIndex: "name",
...@@ -181,13 +180,14 @@ const columns = [ ...@@ -181,13 +180,14 @@ const columns = [
title: "操作", title: "操作",
key: "ref", key: "ref",
}, },
]; ]);
const list = ref([]); const list = ref([]);
const route = useRoute(); const route = useRoute();
const status = ref(0) const router = useRouter();
let modelRef = reactive<any>({}) const status = ref(0);
let rulesRef = reactive<any>({}) let modelRef = reactive<any>({});
let rulesRef = reactive<any>({});
const query: any = computed({ const query: any = computed({
get: () => { get: () => {
...@@ -197,29 +197,26 @@ const query: any = computed({ ...@@ -197,29 +197,26 @@ const query: any = computed({
return route.query; return route.query;
}, },
}); });
const dataFrom = ref<any>({}) const dataFrom = ref<any>({});
const onChangeWeight = async (record: any) => { const onChangeWeight = async (record: any) => {
const prarms = { const prarms = {
uid: getUid(), uid: getUid(),
...record ...record,
} };
let data: any = { let data: any = {};
}
if (query.value.paytype == 1) { if (query.value.paytype == 1) {
data = await onUpdateWX(JSON.stringify(prarms)) data = await onUpdateWX(JSON.stringify(prarms));
} else if (query.value.paytype == 2) { } else if (query.value.paytype == 2) {
data = await onUpdate(JSON.stringify(prarms)) data = await onUpdate(JSON.stringify(prarms));
} }
if (data.state == 1) { if (data.state == 1) {
message.success('修改成功') message.success("修改成功");
await init() await init();
} }
};
}
const { resetFields, validate, validateInfos } = useForm(modelRef, rulesRef); const { resetFields, validate, validateInfos } = useForm(modelRef, rulesRef);
const onSubmit = async () => { const onSubmit = async () => {
...@@ -228,7 +225,7 @@ const onSubmit = async () => { ...@@ -228,7 +225,7 @@ const onSubmit = async () => {
let data: any = {}; let data: any = {};
const prarms = { const prarms = {
paytype: query.value.paytype, paytype: query.value.paytype,
uid:getUid(), uid: getUid(),
...toRaw(modelRef), ...toRaw(modelRef),
}; };
if (status.value === 1) { if (status.value === 1) {
...@@ -239,22 +236,22 @@ const onSubmit = async () => { ...@@ -239,22 +236,22 @@ const onSubmit = async () => {
paytype: dataFrom.value.paytype, paytype: dataFrom.value.paytype,
status: dataFrom.value.status, status: dataFrom.value.status,
weight: dataFrom.value.weight, weight: dataFrom.value.weight,
mchid:toRaw(modelRef).mchid, mchid: toRaw(modelRef).mchid,
mchkey:toRaw(modelRef).mchkey, mchkey: toRaw(modelRef).mchkey,
...toRaw(modelRef) ...toRaw(modelRef),
} };
if (query.value.paytype == "1") { if (query.value.paytype == "1") {
data = await onUpdateWX(JSON.stringify(dataFrom.value)) data = await onUpdateWX(JSON.stringify(dataFrom.value));
} else if (query.value.paytype == "2") { } else if (query.value.paytype == "2") {
data = await onUpdate(JSON.stringify(dataFrom.value)) data = await onUpdate(JSON.stringify(dataFrom.value));
} }
if (data.state === 1) { if (data.state === 1) {
isShowTable.value = true isShowTable.value = true;
message.success(data.message, 10); message.success(data.message, 10);
} else { } else {
message.warning(data.message, 10); message.warning(data.message, 10);
} }
await init() await init();
} else { } else {
if (query.value.paytype == 1) { if (query.value.paytype == 1) {
data = await onWxPay(prarms); data = await onWxPay(prarms);
...@@ -262,12 +259,12 @@ const onSubmit = async () => { ...@@ -262,12 +259,12 @@ const onSubmit = async () => {
data = await onZfbPay(prarms); data = await onZfbPay(prarms);
} }
if (data.state === 1) { if (data.state === 1) {
isShowTable.value = true isShowTable.value = true;
message.success(data.message, 10); message.success(data.message, 10);
} else { } else {
message.warning(data.message, 10); message.warning(data.message, 10);
} }
await init() await init();
} }
}) })
.catch((err) => { .catch((err) => {
...@@ -294,51 +291,48 @@ const onFinishFailed = (errorInfo: any) => { ...@@ -294,51 +291,48 @@ const onFinishFailed = (errorInfo: any) => {
console.log("Failed:", errorInfo); console.log("Failed:", errorInfo);
}; };
const onSetShowTable = async (data: any) => { const onSetShowTable = async (data: any) => {
console.log(data,'data'); console.log(data, "data");
status.value = 1 status.value = 1;
isShowTable.value = false; isShowTable.value = false;
if(query.value.paytype == 1){ if (query.value.paytype == 1) {
const { mchid, mchkey, appid, name } = data const { mchid, mchkey, appid, name } = data;
const uid: any = getUid() const uid: any = getUid();
modelRef.privatekey = mchid modelRef.privatekey = mchid;
modelRef.alipaypublickey = mchkey modelRef.alipaypublickey = mchkey;
modelRef.appid = appid modelRef.appid = appid;
modelRef.name = name modelRef.name = name;
// modelRef.server_url =server_url // modelRef.server_url =server_url
modelRef.uid = uid modelRef.uid = uid;
}else{ } else {
const { alipaypublickey, privatekey, appid, name } = data const { alipaypublickey, privatekey, appid, name } = data;
const uid: any = getUid() const uid: any = getUid();
modelRef.alipaypublickey = alipaypublickey modelRef.alipaypublickey = alipaypublickey;
modelRef.privatekey = privatekey modelRef.privatekey = privatekey;
modelRef.appid = appid modelRef.appid = appid;
modelRef.name = name modelRef.name = name;
// modelRef.server_url =server_url // modelRef.server_url =server_url
modelRef.uid = uid modelRef.uid = uid;
} }
dataFrom.value = data dataFrom.value = data;
}; };
const onCreated = () => { const onCreated = () => {
isShowTable.value = false; isShowTable.value = false;
} };
const onSetBackShowTable = () => { const onSetBackShowTable = () => {
router.go(-1) router.go(-1);
}; };
const onDis = (data: any) => { const onDis = (data: any) => {
console.log(data, 'data'); console.log(data, "data");
};
}
const onCreate = () => { const onCreate = () => {
modelRef.name = formState.name modelRef.name = formState.name;
visible.value = !visible.value visible.value = !visible.value;
onCreated() onCreated();
} };
const init = async () => { const init = async () => {
const uid: any = getUid() const uid: any = getUid();
let data: any = {} let data: any = {};
if (query.value.paytype == 1) { if (query.value.paytype == 1) {
data = await onfindWX(uid); data = await onfindWX(uid);
} else if (query.value.paytype == 2) { } else if (query.value.paytype == 2) {
...@@ -346,12 +340,37 @@ const init = async () => { ...@@ -346,12 +340,37 @@ const init = async () => {
} }
list.value = data.data; list.value = data.data;
return list; return list;
} };
onMounted(async () => { onMounted(async () => {
await init() await init();
let rulesRef let rulesRef;
let modelRef let modelRef;
if(query.value.paytype == 1) { if (query.value.paytype == 1) {
columns.value = [
{
title: "支付通道名称",
dataIndex: "name",
key: "name",
},
{
title: "微信",
dataIndex: "wx",
key: "wx",
},
{
title: "状态",
key: "status",
dataIndex: "status",
},
{
title: "权重",
key: "weight",
},
{
title: "操作",
key: "ref",
},
];
rulesRef = reactive({ rulesRef = reactive({
mchid: [ mchid: [
{ {
...@@ -383,7 +402,6 @@ onMounted(async () => { ...@@ -383,7 +402,6 @@ onMounted(async () => {
message: "请输入appid", message: "请输入appid",
}, },
], ],
}); });
modelRef = reactive<AppFormStateWX>({ modelRef = reactive<AppFormStateWX>({
mchid: "", mchid: "",
...@@ -393,7 +411,32 @@ onMounted(async () => { ...@@ -393,7 +411,32 @@ onMounted(async () => {
name: "", name: "",
// server_url: "", // server_url: "",
}); });
}else{ } else {
columns.value = [
{
title: "支付通道名称",
dataIndex: "name",
key: "name",
},
{
title: "支付宝",
dataIndex: "zfb",
key: "zfb",
},
{
title: "状态",
key: "status",
dataIndex: "status",
},
{
title: "权重",
key: "weight",
},
{
title: "操作",
key: "ref",
},
];
rulesRef = reactive({ rulesRef = reactive({
alipaypublickey: [ alipaypublickey: [
{ {
...@@ -425,7 +468,6 @@ onMounted(async () => { ...@@ -425,7 +468,6 @@ onMounted(async () => {
message: "请输入appid", message: "请输入appid",
}, },
], ],
}); });
modelRef = reactive<AppFormStateAl>({ modelRef = reactive<AppFormStateAl>({
alipaypublickey: "", alipaypublickey: "",
...@@ -436,12 +478,13 @@ onMounted(async () => { ...@@ -436,12 +478,13 @@ onMounted(async () => {
// server_url: "", // server_url: "",
}); });
} }
return {rulesRef,modelRef} return { rulesRef, modelRef, columns };
}); });
defineExpose({ defineExpose({
list, list,
columns, columns,
visible, visible,
route,
showModal, showModal,
handleOk, handleOk,
formState, formState,
...@@ -457,7 +500,7 @@ defineExpose({ ...@@ -457,7 +500,7 @@ defineExpose({
query, query,
onChangeWeight, onChangeWeight,
onDis, onDis,
modelRef modelRef,
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
module.exports = { module.exports = {
mode: 'production',
rules: [{ rules: [{
test: /\.less$/, test: /\.less$/,
use: [{ use: [{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment