updatye

web-vue-admin/.env.dev

 VUE_APP_MODE = 'dev'
 NODE_ENV = 'development'
-VUE_APP_BASE_URL = ''
+VUE_APP_BASE_URL = 'http://47.102.211.197:8092'
 VUE_APP_TEXT = '测试环境'
\ No newline at end of file

web-vue-admin/.env.pro → web-vue-admin/.env.prod

 VUE_APP_MODE = 'prod'
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = ''
+VUE_APP_BASE_URL = 'http://47.102.211.197:8092'
 VUE_APP_TEXT = '生产环境'
\ No newline at end of file

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

@@ -2,6 +2,8 @@ import axios from "axios";
 import { message } from "ant-design-vue";
 import { getToken } from "./token";
 // 创建axios实例
+console.log(process.env.VUE_APP_BASE_URL,'process.env');
+
 const instance = axios.create({
   baseURL: "http://192.168.3.131:8080/",
   // 设置相应的时间

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

@@ -20,6 +20,7 @@
       </div>
     </div>
     <div class="goods-list" v-if="!isShowGoods">
+    
       <a-table :columns="columns" :data-source="data">
         <template #headerCell="{ column }">
           <template v-if="column.key === 'name'">
@@ -69,13 +70,20 @@
       </a-table>
     </div>
     <div v-if="isShowGoods">
-      <GoodsBags :props="{ propsData }" @onBack="onBack"></GoodsBags>
+      <div style="display: flex; align-items: center; justify-content: space-between" v-if="isShowGoods">
+          <a-button class="small left" @click="onBack">
+            <template #icon>
+              <LeftOutlined />
+            </template>
+          </a-button>
+        </div>
+      <GoodsBags :props="{ propsData }" ></GoodsBags>
     </div>
   </div>
 </template>
 <script lang="ts" setup>
 import { ref, reactive, defineExpose } from "vue";
-import { SmileOutlined, DownOutlined } from "@ant-design/icons-vue";
+import { SmileOutlined, DownOutlined,LeftOutlined } from "@ant-design/icons-vue";
 import GoodsBags from "./components/index.vue";
 const columns = [
   {
@@ -177,5 +185,20 @@ defineExpose({
   .goods-list {
     margin-top: 10px;
   }
+  .small {
+    border: none;
+    height: 30px;
+    width: 50px;
+  }
+
+  .left {
+    border-left: 1px solid rgb(236, 236, 236);
+    border-top: 1px solid rgb(236, 236, 236);
+    border-bottom: 1px solid rgb(236, 236, 236);
+    border-right-width: 80%;
+    border-right: 1px solid rgb(236, 236, 236);
+    border-bottom-left-radius: 25px;
+    border-top-left-radius: 25px;
+  }
 }
 </style>

web-vue-admin/src/views/pay-config/compoents/header/index.vue

@@ -92,7 +92,7 @@ const onOpenInfo = (record:any, index:any, column:any) => {
     path:'/home/paybind',
     query:{
       isShow:1,
-      mode:record.mode
+      paytype:record.paytype
     }
   })
 };

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

@@ -13,7 +13,7 @@
         <ContentHeaders v-if="ShowIcon.HeaderIcon" :list="list" ></ContentHeaders>
       </div>
     </a-layout-content>
-    <a-layout-content class="body-content">
+    <!-- <a-layout-content class="body-content">
       <div>
         <div class="header-title">
           <span>域名配置</span
@@ -38,7 +38,7 @@
         </div>
         <ContentFooters v-if="ShowIcon.FooterIcon"></ContentFooters>
       </div>
-    </a-layout-footer>
+    </a-layout-footer> -->
   </a-layout>
 </template>
 <script lang="ts" setup>
@@ -52,7 +52,7 @@ import { DownOutlined, UpOutlined } from "@ant-design/icons-vue";
       BodyIcon: Boolean;
       FooterIcon: Boolean;
     }
-    let list = ref<Object>([{name:'1',num:2,status:'0',mode:'zfb'},{name:'2',num:2,status:'1',mode:'wx'},{name:'3',num:2,status:'0',mode:'jd'},{name:'4',num:2,status:'0',mode:'hb'},{name:'5',num:2,status:'0',mode:'yl'}])
+    let list = ref<Object>([{name:'1',num:2,status:'0',paytype:'2'},{name:'2',num:2,status:'1',paytype:'1'},{name:'3',num:2,status:'0',paytype:'3'},{name:'4',num:2,status:'0',paytype:'4'},{name:'5',num:2,status:'0',paytype:'5'}])
     const ShowIcon = reactive<ShowIcon>({
       HeaderIcon: true,
       BodyIcon: true,

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

 <template>
-<div>支付链接</div>
+    <div>
+        <div style="display: flex;align-items: center;justify-content: space-between;">
+            <div>
+                <a-space direction="vertical">
+                    <a-select v-model:value="value1" :size="size" style="width: 200px" :options="options"></a-select>
+                </a-space>
+                <a-input-search v-model:value="value" placeholder="input search text" style="width: 200px"
+                    @search="onSearch" />
+                <a-space direction="vertical">
+                    <a-select v-model:value="value1" :size="size" style="width: 200px" :options="options"></a-select>
+                </a-space>
+            </div>
+            <div>
+                <a-button type="primary" block>新建支付项</a-button>
+            </div>
+        </div>
+        <div style="margin-top: 10px;">
+            <a-table :dataSource="dataSource" :columns="columns" />
+        </div>
+    </div>
 </template>
+
 <script lang="ts" setup>
+import type { SelectProps } from 'ant-design-vue';
+import { ref, defineExpose } from 'vue';
+const popupScroll = () => {
+    console.log('popupScroll');
+};
+const value = ref<string>('');
+
+const onSearch = (searchValue: string) => {
+    console.log('use value', searchValue);
+    console.log('or use this.value', value.value);
+};
+const options = [...Array(25)].map((_, i) => ({ value: (i + 10).toString(36) + (i + 1) }))
+const dataSource = [
+    {
+        key: '1',
+        name: '胡彦斌',
+        age: 32,
+        address: '西湖区湖底公园1号',
+    },
+    {
+        key: '2',
+        name: '胡彦祖',
+        age: 42,
+        address: '西湖区湖底公园1号',
+    },
+]
 
+const columns = [
+    {
+        title: '姓名',
+        dataIndex: 'name',
+        key: 'name',
+    },
+    {
+        title: '年龄',
+        dataIndex: 'age',
+        key: 'age',
+    },
+    {
+        title: '住址',
+        dataIndex: 'address',
+        key: 'address',
+    },
+]
+defineExpose({
+    size: ref<SelectProps['size']>('middle'),
+    value1: ref('a1'),
+    options,
+    value,
+    onSearch,
+    dataSource,
+    columns
+})
 </script>
 <style lang="less" scoped>
-
 </style>
\ No newline at end of file

web-vue-admin/vue.config.js

@@ -28,7 +28,7 @@ module.exports = {
     devServer: {
       proxy: {
           '/api': {
-              target: 'http://47.102.211.197:8092',  //请求对象
+              target:process.env.VUE_APP_BASE_URL,
               ws: true,//代理websocked
               changeOrigin: true,
               secure: false, //target是否为https接口