Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-ui/src/views/pile/station/components/amend.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 修改默认费率 -->
+  <!-- 修改费率 -->
   <div>
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane label="基本信息" name="first">

jsowell-ui/src/views/pile/station/components/billing.vue

@@ -105,7 +105,7 @@
                     <el-button v-if="scope.row.memberFlag === '0'" type="text" size="small"
                                @click="outerVisible = true">绑定设备
                     </el-button>
-                    <el-button type="text" size="small" @click="handleUpdate(scope.row.templateId)">修改默认费率
+                    <el-button type="text" size="small" @click="handleUpdate(scope.row.templateId)">修改费率
                     </el-button>
                     <el-button type="text" size="small" @click="delBilling(scope.row.templateId)">删除</el-button>
                 </template>
@@ -141,7 +141,7 @@
             </div>
         </el-dialog>
         <el-dialog
-            title="修改默认费率"
+            title="修改费率"
             :visible.sync="amendDialog"
             width="70%"
             height="70%"

jsowell-ui/vue.config.js

@@ -35,10 +35,10 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
+        target: `http://localhost:8080`,
         // 更改代理为本地地址
         // target: `http://192.168.2.6:8080`,
-        target: `https://api.jsowellcloud.com`,
+        // target: `https://api.jsowellcloud.com`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",