调整网点管理和发行产品

.env.development

@@ -12,15 +12,15 @@ ENV = 'development'
 # VITE_APP_BASE_URL = 'https://qtzl.etcjz.cn/dev/' #试运行环境/青云环境/生成环境地址
 # VITE_APP_BASE_URL = 'http://100.65.11.2:8086/nDev/' #线上地址 nDev
 # VITE_APP_BASE_URL = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev
-# VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 ndev
-VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 prod
+VITE_APP_BASE_URL = 'http://100.65.11.2:8086/ndev/' #线上地址 ndev
+# VITE_APP_BASE_URL = 'http://100.65.11.2:8086/prod/' #线上地址 prod
 
 # VITE_APP_BASE_URL = 'http://100.64.2.104:8086/html/'
 # VITE_APP_BASE_URL = 'http://100.64.2.111:50001/' #宇轩给测试环境
 # VITE_APP_BASE_URL = 'https://192.168.124.43:50001/' #宇轩服务器 
 # VITE_APP_BASE_URL = 'http://192.168.124.56:50001/' #试运行环境/青云环境/生成环境地址
-# VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址  ndev
-VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址  prod
+VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/ndev/' # 新地址  ndev
+# VITE_APP_BASE_URL_N = 'http://100.65.11.2:8086/prod/' # 新地址  prod
 
 # VITE_APP_BASE_URL_N = 'http://100.64.2.104:8087/nDev/' #线上地址 nDev  
 # VITE_APP_BASE_URL_N = 'https://qtzl.etcjz.cn/ndev/' # 新地址

src/views/onlineBusinessHall/onlineOperation/repositpry/index.vue

@@ -156,7 +156,6 @@ function handleDelete(idx: any, row: any) {
   BaseService.post('/managew/knowledgebase/deleteById', data).then(
     (res: any) => {
       if (res && res.code === 0) {
-        let bizContent = JSON.parse(res.bizContent)
         ElMessage.success('操作成功')
         getList()
         cancel()
@@ -255,7 +254,7 @@ function getList() {
   })
 }
 //获取所有业务类型
-const businessTypeList = ref([])
+const businessTypeList = ref<any>([])
 function getBusinessType() {
   BaseService.post('/iaw/app/issue/knowledgebase/getBusinessType', {}).then(
     (res: any) => {
@@ -298,7 +297,6 @@ function getFeedBackNo(data) {
   BaseService.post('/iaw/app/issue/knowledgebase/addFeedBackNo', data).then(
     (res: any) => {
       if (res && res.code === 0) {
-        let bizContent = JSON.parse(res.bizContent)
         ElMessage.success('操作成功')
         getList()
         cancel()
@@ -316,7 +314,6 @@ function getFeedBack(data) {
   BaseService.post('/iaw/app/issue/knowledgebase/addFeedBack', data).then(
     (res: any) => {
       if (res && res.code === 0) {
-        let bizContent = JSON.parse(res.bizContent)
         ElMessage.success('操作成功')
         getList()
         cancel()

src/views/onlineBusinessHall/productManagement/releaseProduct/index.vue

@@ -965,7 +965,6 @@ function handleDelete(idx: any, row: any) {
     if (res && res.code === 0) {
       ElMessage.success('操作成功')
       getList()
-      cancel()
     } else {
       ElMessage.error(res.message)
     }
@@ -1127,7 +1126,7 @@ function submit(data: any) {
           return items
         }
       })
-
+      datas.isPay = datas.isPay ? parseInt(datas.isPay) : ''
       // console.log('请请i参数', datas)
       BaseService.postN(api, datas).then((res: any) => {
         if (res && res.code === 0) {
@@ -1141,6 +1140,7 @@ function submit(data: any) {
     })
   })
 }
+
 const productStandardsIdList = ref()
 // 获取产品标准列表
 function getProductStandardsIdList() {
@@ -1789,6 +1789,10 @@ function changeBillingMode(value, index) {
   console.log(value, index, 'value, index')
   unitChange(false, dataForm.useFeeList, value, index)
 }
+const isPayOptions = ref([
+  { value: '1', label: '是' },
+  { value: '0', label: '否' },
+])
 let formLabelWidth = '180px'
 //表单数据配置
 let field = ref<any>({
@@ -1964,6 +1968,7 @@ let field = ref<any>({
         listData: toolsData,
       },
     },
+
     {
       prop: 'ecpDetail',
       label: '店铺名称',
@@ -1976,6 +1981,18 @@ let field = ref<any>({
         required: false,
       },
     },
+    {
+      prop: 'isPay',
+      label: '是否支付',
+      listData: isPayOptions,
+      form: {
+        width: '45%',
+        formLabelWidth: formLabelWidth,
+        type: 'select',
+        required: true,
+        listData: isPayOptions,
+      },
+    },
     {
       prop: 'customerType',
       label: '支持车辆所属性质', //用户类型
@@ -1989,6 +2006,7 @@ let field = ref<any>({
         listData: USER_TYPE,
       },
     },
+
     {
       prop: 'vanType',
       label: '车辆类型',

src/views/system/branch/index.vue

@@ -50,6 +50,22 @@
               <el-input maxlength="60" v-trim clearable v-model="addForm.tel" placeholder="请输入联系人电话" />
             </div>
           </el-form-item>
+          <el-form-item label="经度:" prop="longitude">
+            <div style="width: 100%">
+              <el-input maxlength="60" v-trim clearable v-model="addForm.longitude" placeholder="请输入经度" />
+            </div>
+          </el-form-item>
+          <el-form-item label="纬度:" prop="latitude">
+            <div style="width: 100%">
+              <el-input maxlength="60" v-trim clearable v-model="addForm.latitude" placeholder="请输入纬度" />
+            </div>
+          </el-form-item>
+          <el-form-item label="半径距离:" prop="radial">
+            <div style="width: 100%">
+              <el-input maxlength="60" v-trim clearable v-model="addForm.radial" placeholder="请输入半径距离" />
+            </div>
+          </el-form-item>
+
           <el-form-item label="所属渠道:" prop="agencyId">
             <div style="width: 100%">
               <el-select clearable filterable v-model="addForm.agencyId" style="width: 100%" placeholder="请选择所属渠道"
@@ -86,14 +102,7 @@
   import BaseService from '@/utils/baseService' //引入接口请求
   import { ElMessage, ElMessageBox } from 'element-plus' //提示
   import { getCache } from '@/utils/cache'
-  import {
-    addApi,
-    updateApi,
-    addFirstDotApi,
-    queryApi,
-    deleteApi,
-    parentSelectApi,
-  } from '@/api/system/branch'
+
   import { IObject } from '@/types/interface'
   import { useDebounce } from '@/utils/utils'
   import { useRoute } from 'vue-router'
@@ -127,6 +136,9 @@
     name: [{ required: true, message: '请输入', trigger: 'blur' }],
     address: [{ required: true, message: '请输入', trigger: 'blur' }],
     tel: [{ required: true, message: '请输入', trigger: 'blur' }],
+    longitude: [{ required: true, message: '请输入', trigger: 'blur' }],
+    latitude: [{ required: true, message: '请输入', trigger: 'blur' }],
+    radial: [{ required: true, message: '请输入', trigger: 'blur' }],
     agencyId: [{ required: true, message: '请选择', trigger: 'blur' }],
   })
   const typeOption = ref('')

vite.config.js

@@ -12,6 +12,7 @@ export default defineConfig(({ command, mode }) => {
   //https://blog.csdn.net/huanglgln/article/details/121635053  vite获取.env.development配置环境
   // 使用 import.meta.env.VITE_APP_BASE_URL
   //loadEnv(mode, process.cwd())
+
   const env = loadEnv(mode, process.cwd())
 
   return {
@@ -59,12 +60,10 @@ export default defineConfig(({ command, mode }) => {
     //启动服务配置
     server: {
       host: '0.0.0.0',
-      port: 8085,
+      port: 8086,
       open: true, // 类型： boolean | string在服务器启动时自动在浏览器中打开应用程序；
       cors: true, // 类型： boolean | CorsOptions 为开发服务器配置 CORS。默认启用并允许任何源
       hmr: true,
-      usePolling:true,
-
       proxy: {
         '/common': {
           target: 'https://medusa.etcjz.cn', //这里填入你要请求的接口的前缀