Browse Source

fix,修改城市选择器

DESKTOP-DRSBVSO\admin 8 months ago
parent
commit
c1e11b55d2
4 changed files with 36 additions and 10 deletions
  1. 3 1
      .env.development
  2. 2 0
      .gitignore
  3. 4 3
      package.json
  4. 27 6
      src/views/community/communityList/index.vue

+ 3 - 1
.env.development

@@ -7,7 +7,9 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.101.6:9990'
 # VUE_APP_BASE_API = 'https://dgtest.alitest.yaoyuankj.top'
 # VUE_APP_BASE_API = 'http://test.diangou.yaoyuankj.top'
-VUE_APP_BASE_API = 'https://diangou.yaoyuankj.top'
+#VUE_APP_BASE_API = 'https://diangou.yaoyuankj.top'
+
+VUE_APP_BASE_API = 'http://test.diangou.com'
 
 # socket 连接地址
 # VUE_APP_WS_URL = 'ws://0.0.0.0:8324'

+ 2 - 0
.gitignore

@@ -21,3 +21,5 @@ selenium-debug.log
 
 package-lock.json
 yarn.lock
+pnpm-lock.yaml
+package.json

+ 4 - 3
package.json

@@ -50,7 +50,7 @@
     "axios": "0.18.1",
     "clipboard": "^2.0.6",
     "codemirror": "5.45.0",
-    "core-js": "^2.6.12",
+    "core-js": "^3.41.0",
     "cos-js-sdk-v5": "^1.4.5",
     "crypto-js": "^4.1.1",
     "driver.js": "0.9.5",
@@ -63,7 +63,7 @@
     "html2canvas": "^1.1.0",
     "js-cookie": "2.2.0",
     "jsonlint": "1.6.3",
-    "jszip": "3.2.1",
+    "jszip": "^3.10.1",
     "krry-transfer": "^1.2.21",
     "lowdb": "^1.0.0",
     "moment": "^2.29.1",
@@ -94,8 +94,9 @@
     "xlsx": "0.14.1"
   },
   "devDependencies": {
-    "@babel/core": "7.0.0",
+    "@babel/core": "^7.26.10",
     "@babel/register": "7.0.0",
+    "@vue/babel-preset-app": "^5.0.8",
     "@vue/cli-plugin-babel": "3.5.3",
     "@vue/cli-plugin-eslint": "^3.9.1",
     "@vue/cli-plugin-unit-jest": "3.5.3",

+ 27 - 6
src/views/community/communityList/index.vue

@@ -13,9 +13,22 @@
                 <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="城市:">
+<!--           <el-form-item label="城市:">
               <citySelect :city="tableFrom.whole_city" @change="changeCity"></citySelect>
-            </el-form-item>
+            </el-form-item> -->
+
+           <el-form-item label="城市:">
+                <el-cascader
+                  v-model="tableFrom.keyword"
+                  class="selWidth"
+                  :options="proviceData"
+                  :props="props"
+                  filterable
+                  clearable
+                  @change="changeCity"
+                />
+            </el-form-item>
+
             <el-form-item label="分类名称:" style="display: inline-block;">
               <el-select v-model="tableFrom.category_id" clearable filterable placeholder="请选择" class="selWidth"
                 @change="getList(1)">
@@ -357,7 +370,8 @@ export default {
     return {
       myHeaders: {
         "X-Token": getToken()
-      },
+      },
+
       videoLink: "",
       upload: {
         videoIng: false // 是否显示进度条;
@@ -461,7 +475,13 @@ export default {
       },
       isShowEdit: false,
       switch_type: 1, //1推广视频 2发现
-      findList: [], //发现列表
+      findList: [], //发现列表
+      props: {
+          value : city_id,
+          label : name,
+          emitPath: false,
+        },
+      proviceData: []
     };
   },
 
@@ -536,8 +556,9 @@ export default {
     },
     //城市选择
     changeCity(city) {
-      console.log("city", city);
-      this.tableFrom.whole_city = city;
+      console.log("city--------11111-------------", city);
+      // this.tableFrom.whole_city = city;
+      this.proviceData = city;
       this.getList(1);
     },
     // 列表