From bd20e911fda6e1b5e8827fd1a5b68c05c7277eeb Mon Sep 17 00:00:00 2001
From: sj <1304317391@qq.com>
Date: Thu, 17 Nov 2022 11:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=93=E5=AD=98=E5=8F=8A?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E7=AD=89=E7=BA=A7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue |  6 ++++--
 src/views/bxg/shop/user/form.vue  | 21 +++++++++++++++++++++
 vue.config.js                     | 25 +++++++++++++------------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index a897638..00ba116 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,8 +1,10 @@
 <template>
   <section class="app-main">
     <transition name="fade-transform" mode="out-in">
-      <keep-alive :include="cachedViews">
-        <router-view :key="key" />
+<!--      <keep-alive :include="cachedViews">-->
+<!--      改为所有页面都支持缓存-->
+      <keep-alive>
+      <router-view :key="key" />
       </keep-alive>
     </transition>
   </section>
diff --git a/src/views/bxg/shop/user/form.vue b/src/views/bxg/shop/user/form.vue
index adb2f2f..0c0f9a7 100644
--- a/src/views/bxg/shop/user/form.vue
+++ b/src/views/bxg/shop/user/form.vue
@@ -17,6 +17,12 @@
         <el-input v-model="form.integral" style="width: 370px;"
                   type="number" oninput="if(value>999999)value=999999"/>
       </el-form-item>
+      <el-form-item label="会员等级" >
+        <el-select v-model="form.level" filterable clearable>
+          <el-option v-for="item in levelList"
+                     :value="item.grade" :key="item.id" :label="item.name" ></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="商户管理">
         <el-radio v-model="form.adminid" :label="1">开启</el-radio>
         <el-radio v-model="form.adminid" :label="0">关闭</el-radio>
@@ -31,6 +37,7 @@
 
 <script>
 import { add, edit } from '@/api/bxg/yxUser'
+import {initData} from "@/api/bxg/data";
 export default {
   props: {
     isAdd: {
@@ -40,6 +47,7 @@ export default {
   },
   data() {
     return {
+      levelList:[],
       loading: false, dialog: false,
       form: {
         uid: '',
@@ -82,7 +90,20 @@ export default {
       }
     }
   },
+  created() {
+    this.getLevelList()
+  },
   methods: {
+    getLevelList() {
+      initData('bxg/api/yxSystemUserLevel', {
+        page: 0,
+        size: 999,
+        sort: 'id,desc',
+      }).then(data => {
+        this.levelList=data.content
+        // console.log('this.levelList',this.levelList)
+      })
+    },
     cancel() {
       this.resetForm()
     },
diff --git a/vue.config.js b/vue.config.js
index a941870..882a145 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,18 +33,19 @@ module.exports = {
     host: '0.0.0.0',
     port: port,
     open: false,
-    // proxy: {
-    //   // detail: https://cli.vuejs.org/config/#devserver-proxy
-    //   [process.env.VUE_APP_BASE_API]: {
-    //     // target: `http://localhost:48080`,
-    //     // target: `http://api-dashboard.yudao.iocoder.cn`,
-    //     target: `https://bxg.api.cyjyyjy.com`,
-    //     changeOrigin: true,
-    //     pathRewrite: {
-    //       ['^' + process.env.VUE_APP_BASE_API]: ''
-    //     }
-    //   }
-    // },
+    proxy: {
+      // detail: https://cli.vuejs.org/config/#devserver-proxy
+      [process.env.VUE_APP_BASE_API]: {
+        // target: `http://localhost:48080`,
+        // target: `http://api-dashboard.yudao.iocoder.cn`,
+        // target: `https://bxg.api.cyjyyjy.com`,
+        target: `http://127.0.0.1:48080`,
+        changeOrigin: true,
+        pathRewrite: {
+          ['^' + process.env.VUE_APP_BASE_API]: ''
+        }
+      }
+    },
     disableHostCheck: true
   },
   css: {