Browse Source

Merge branch 'develop_szhj' of jianguan-web/qpls-md-html into develop

李磊 3 years ago
parent
commit
240f4b5faa

+ 0 - 1
src/config/router.config.js

@@ -30,7 +30,6 @@ export const asyncRouterMap = [
             path: '/home',
             name: 'home',
             redirect: '/home',
-            name: 'home',
             component: BlankLayout,
             meta: {
               title: '首页',

+ 1 - 0
src/views/numsGoodsShelves/settlementManagement/settlementDetail.vue

@@ -99,6 +99,7 @@ export default {
         this.spinning = true
         const paramsPage = Object.assign(parameter, this.queryParam)
         paramsPage.shelfSn = this.$route.params.shelfSn
+        paramsPage.payState = 'FINISH'
         return querySettleBillPage(paramsPage).then(res => {
           let data
           if (res.status == 200) {

+ 2 - 2
vue.config.js

@@ -109,8 +109,8 @@ const vueConfig = {
     proxy: {
       '/api': {
         // target: 'http://192.168.16.188:8503/qpls-md',
-        // target: 'http://frps.chelingzhu.com:7800/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://frps.chelingzhu.com:7800/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,