From 0a32f29f9682bc1e4e4f229c0d0c66aa0861b80e Mon Sep 17 00:00:00 2001
From: xy <271556543@qq.com>
Date: Tue, 30 Jul 2024 18:05:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                             |  4 +-
 .env.staging                                 |  3 +-
 src/api/common.js                            | 10 ++++
 src/utils/request.js                         |  2 +-
 src/views/area/index.vue                     | 60 ++++++++++++++++++++
 src/views/customer/component/addCustomer.vue |  1 +
 vue.config.js                                |  2 +-
 7 files changed, 77 insertions(+), 5 deletions(-)
 create mode 100644 src/api/common.js
 create mode 100644 src/views/area/index.vue

diff --git a/.env.development b/.env.development
index 15dbabb..03b4db5 100644
--- a/.env.development
+++ b/.env.development
@@ -2,6 +2,6 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = https://sstt.115.langye.net
-#VUE_APP_BASE_API = http://sstt.ali251.langye.net/
+#VUE_APP_BASE_API = https://sstt.115.langye.net
+VUE_APP_BASE_API = http://sstt.ali251.langye.net/
 VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file
diff --git a/.env.staging b/.env.staging
index a8793a0..8021542 100644
--- a/.env.staging
+++ b/.env.staging
@@ -4,5 +4,6 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = http://sstt.ali251.langye.net/
+VUE_APP_UPLOAD_API = http://sstt.ali251.langye.net/api/admin/upload-file
 
diff --git a/src/api/common.js b/src/api/common.js
new file mode 100644
index 0000000..8b213c6
--- /dev/null
+++ b/src/api/common.js
@@ -0,0 +1,10 @@
+import request from "@/utils/request";
+
+export function getVillages (params,isLoading) {
+  return request({
+    url: "/api/admin/chart/villages",
+    method: "get",
+    params,
+    isLoading
+  })
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 315dcd4..6c23ca5 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -14,7 +14,7 @@ let loading ;
 const service = axios.create({
   baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
-  timeout: 10000, // request timeout
+  timeout: 20000, // request timeout
   isLoading:true
 })
 
diff --git a/src/views/area/index.vue b/src/views/area/index.vue
new file mode 100644
index 0000000..9628f1b
--- /dev/null
+++ b/src/views/area/index.vue
@@ -0,0 +1,60 @@
+<template>
+  <div>
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" style="margin-bottom: 10px; border: 0px; margin-top: 15px" text="区域查询">
+        <div slot="content"></div>
+        <slot>
+          <div>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <Card dis-hover>
+      <el-tree :data="list" node-key="code" lazy :props="{ label: 'name' }" :load="loadNode"></el-tree>
+    </Card>
+  </div>
+</template>
+
+<script>
+import { getVillages } from "@/api/common";
+export default {
+  data() {
+    return {
+
+      total:0,
+      list:[],
+    }
+  },
+  methods: {
+    async loadNode (node, resolve) {
+      console.log(node)
+      const list = await this.getList({
+        pcode: node.data.code
+      })
+      resolve(list)
+    },
+
+    async getList(pcode = 0){
+      const res = await getVillages(pcode);
+      if (pcode === 0) {
+        this.list = res.list
+      } else {
+        return res.list
+      }
+      console.log(res)
+      // const res = await getList(this.select)
+      // this.total = res.total
+      // this.list = res.data
+      // console.log(this.list)
+    },
+
+  },
+  created() {
+    this.getList()
+  }
+}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/views/customer/component/addCustomer.vue b/src/views/customer/component/addCustomer.vue
index b5eab59..32184f3 100644
--- a/src/views/customer/component/addCustomer.vue
+++ b/src/views/customer/component/addCustomer.vue
@@ -185,6 +185,7 @@
           </div>
           <div class="xy-table-item-content" :class="ageTemp ? 'xy-table-item-outrange' : ''">
             <el-select
+              value-key="id"
               :value="pickedProduct.name"
               v-load-more="productLoad"
               placeholder="请选择产品"
diff --git a/vue.config.js b/vue.config.js
index b3e32aa..3ac1be9 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/admin/',
+  publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin/',
   outputDir: './dist',
   assetsDir: 'static',
   css: {