update

web-vue-admin/src/api/index.ts

@@ -240,5 +240,12 @@ export const onFindBysub= async(data:any)=>{
   });
 } 
 
+export const onUpDown= async(data:any)=>{
+  return  await request({
+    url: `/goods/UporDown`,
+    method:'post',
+    data
+  });
+} 
 // /goods/findBysub
 // /pay/DisableAli
\ No newline at end of file

web-vue-admin/src/utils/request.ts

@@ -6,7 +6,7 @@ import { getToken } from "./token";
 const instance = axios.create({
   baseURL: process.env.VUE_APP_MODE,
   // 设置相应的时间
-  timeout: 5000,
+  timeout: 10000,
   headers: {
     Accept: "application/json",
     "Content-Type": "application/json",

web-vue-admin/src/views/goods-cabinet/index.vue

@@ -150,7 +150,7 @@
 <script lang="ts" setup>
 import { ref, reactive, defineExpose, onMounted, watch, toRaw} from "vue";
 import { LeftOutlined } from "@ant-design/icons-vue";
-import { onSelectGoods, onUpdateGoods,onFindbyLikeName, } from "@/api/index";
+import { onSelectGoods, onUpdateGoods,onFindbyLikeName,onUpDown } from "@/api/index";
 import { getUid } from "@/utils/userInfo";
 import { Form, message, Upload, UploadProps } from 'ant-design-vue';
 import { QuillEditor } from '@vueup/vue-quill'
@@ -354,7 +354,7 @@ const onBack = async (e: Number) => {
   const prarms: any = {
     size: 10,
     page: 1,
-    strtus: '3',
+    strtus: status.value,
     uid,
   }
   const data:any = await onSelectGoods(prarms);
@@ -401,16 +401,21 @@ const onSubmit = () => {
 };
 const onDel = async (e: any) => {
   const uid = getUid();
-  e.status = "1";
-  e.uid = uid
-  const data = await onUpdateGoods(e);
+ const params = {
+    goodsid:e.goodsid,
+    uid
+  }
+  const data = await onUpDown(params);
   await init();
 };
 const onPush = async (e: any) => {
+  console.log(e);
   const uid = getUid();
-  e.status = "0";
-  e.uid = uid
-  const data = await onUpdateGoods(e);
+  const params = {
+    goodsid:e.goodsid,
+    uid
+  }
+  const data = await onUpDown(params);
   await init();
 };
 
@@ -419,7 +424,7 @@ const init = async () => {
   const prarms: any = {
     size: 10,
     page: 1,
-    strtus: 3,
+    strtus: status.value,
     uid,
   }
   const data:any = await onSelectGoods(prarms);

web-vue-admin/src/views/home/index.vue

@@ -15,7 +15,7 @@
               </a-menu>
             </template>
             <div class="header-right">
-                <RadarChartOutlined  style="font-size: 18px;color: white;"/><span style="font-size: 16px;color: white;">{{ info.name }}</span>
+                <UserOutlined  style="font-size: 18px;margin-right: 10px;color: white;"/><span style="font-size: 16px;color: white;">{{ info.name }}</span>
               </div>
           </a-dropdown>
         <div class="header-right">
@@ -65,8 +65,8 @@ import { useRouter } from "vue-router";
 import { useStore } from "vuex";
 import {
   BellOutlined,
-  RadarChartOutlined,
   DashOutlined,
+  UserOutlined
 } from "@ant-design/icons-vue";
 import type { MenuProps } from 'ant-design-vue';
 import {onLogOut} from '@/api/index';

web-vue-admin/src/views/pay-bind/index.vue

@@ -73,17 +73,17 @@
         </template>
       </a-table>
       <div v-else>
-        <a-form :label-col="{ span: 2 }" :wrapper-col="{ span: 12 }">
+        <a-form :label-col="{ span: 3 }" :wrapper-col="{ span: 12 }">
           <a-form-item label="通道名称" has-feedback labelAlign="left" v-bind="validateInfos.name">
             <a-input v-model:value="modelRef.name" placeholder="请输入通道名称" />
           </a-form-item>
-          <a-form-item label="appid:" has-feedback labelAlign="left" v-bind="validateInfos.appid">
+          <a-form-item :label="appidName" has-feedback labelAlign="left" v-bind="validateInfos.appid">
             <a-input v-model:value="modelRef.appid" placeholder="请输入appid" />
           </a-form-item>
-          <a-form-item label="商户id:" has-feedback labelAlign="left" v-bind="validateInfos.privatekey">
+          <a-form-item :label="goodsId" has-feedback labelAlign="left" v-bind="validateInfos.privatekey">
             <a-input v-model:value="modelRef.privatekey" placeholder="请输入商户id" />
           </a-form-item>
-          <a-form-item label="密钥:" has-feedback labelAlign="left" v-bind="validateInfos.alipaypublickey">
+          <a-form-item :label="labelKey" has-feedback labelAlign="left" v-bind="validateInfos.alipaypublickey">
             <a-input v-model:value="modelRef.alipaypublickey" placeholder="请输入密钥" />
           </a-form-item>
           <!-- <a-form-item
@@ -158,6 +158,7 @@ interface AppFormStateAl {
   // server_url: String;
 }
 const useForm = Form.useForm;
+
 const columns = ref<any>([
   {
     title: "支付通道名称",
@@ -199,7 +200,9 @@ const checked2 = ref<any>(false)
 const status = ref(0);
 let modelRef = reactive<any>({});
 let rulesRef = reactive<any>({});
-
+const appidName = ref<any>('appid:')
+const goodsId = ref<any>('商户id:')
+const labelKey  = ref<any>('密钥')
 const query: any = computed({
   get: () => {
     return route.query;
@@ -394,7 +397,11 @@ const onDis = async(e: any) => {
    newData = await onDisableAli(prarms)
   }
   if(newData.state === 1){
-    message.success('成功')
+    if(e.paystate === 0){
+    message.success('关闭成功')
+    }else{
+      message.success('开启成功')
+    }
   }
   let data:any={
 
@@ -431,8 +438,9 @@ onMounted(async () => {
       columns.value= columns.value.filter((item:any)=>{
         return item.key !== 'zfb'
       });
-      
-    
+      appidName.value = 'appid:'
+      goodsId.value ='商户id:'
+      labelKey.value = '密钥'
     rulesRef = reactive({
       mchid: [
         {
@@ -474,6 +482,9 @@ onMounted(async () => {
       // server_url: "",
     });
   } else {
+     appidName.value = '支付宝APPID:'
+      goodsId.value ='支付宝RSA(开发者公钥):'
+      labelKey.value = '支付宝RSA(开发者密钥):'
      columns.value= columns.value.filter((item:any)=>{
         return item.key !== 'wx'
       });
@@ -527,6 +538,9 @@ defineExpose({
   route,
   checked1,
   checked2,
+  appidName,
+  goodsId,
+  labelKey,
   showModal,
   handleOk,
   formState,

web-vue-admin/src/views/pay-info/index.vue

 <template>
 <div>
   <div style="display: flex;margin-bottom: 20px;">
-    <a-input-search v-model:value="value" placeholder="请输入订单号" style="width: 200px" @search="onSearch" />
+    <a-input-search v-model:value="value" placeholder="请输入订单号" style="width: 200px" @search="onSearchOrd" />
   </div>
 
   <a-table :columns="columns" :data-source="list" @change="tableChange" :pagination="pagination" :scroll="{ y:  'calc(100vh - 300px)' }">
@@ -134,6 +134,19 @@ const onSearch = async () => {
     }
   }
 }
+const onSearchOrd =async()=>{
+  const uid = getUid()
+  const prarms= {
+    orderid:value.value,
+    uid
+  }
+  const data:any = await onFindPayOrderid(prarms)
+  if (data.state === 1) {
+      list.value = [data.data]
+      pagination.value.total = data.data.count
+
+  }
+}
 const tableChange = async (e:any) => {
   const uid = getUid()
   const prarms: any = {