npm - sale-client - Versions diffs - 4.2.71 → 4.2.72 - Mend

sale-client 4.2.71 → 4.2.72

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (148) hide show

package/build/dev-server.js CHANGED Viewed

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://192.168.50.67:31567/']
+const [ serverRul, localUrl ] = ['http://192.168.50.67:31567/', 'http://127.0.0.1:9026']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -19,48 +19,70 @@ var devConfig = {
       children: false // 不输出子模块构建信息
     },
     proxy: {
-    // '/api/af-revenue/batchdeduction/all': {
-    //   pathRewrite: {
-    //     '/api/af-revenue/batchdeduction/all': '/batchdeduction/all'
-    //   },
-    //   target: localUrl
-    // },
-    //   '/api/af-revenue/logic': {
-    //     pathRewrite: {
-    //       '/api/af-revenue/logic': '/logic'
-    //     },
-    //     target: localUrl
-    //   },
-      // '/api/af-revenue/file': {
-      //   // pathRewrite: {
-      //   //   '/api/af-revenue/file': '/file'
-      //   // },
-      //   target: localUrl
-      // },
-      // '/weixin2/rs':{
-      //
-      //   target: 'http://410663id1ia4.vicp.fun'
-      // },
-      // '/api/af-revenue/sql': {
-      //   pathRewrite: {
-      //     '/api/af-revenue/sql': '/sql'
-      //   },
-      //   target: localUrl
-      // },
-      '/rs/pay': {
-        target: 'http://localhost:8080'
+      '/api/af-revenue/logic/depositCharge': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: localUrl,
+        changeOrigin: true
+      },
+      '/api/af-revenue/logic': {
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: localUrl,
+        changeOrigin: true
       },
-      '/api/af-revenue': {
+      '/api/af-revenue/file': {
         pathRewrite: {
-          '/api/af-revenue': '/af-revenue'
+          '/api/af-revenue/file': '/file'
         },
-        target: "http://localhost:8080"
+        target: localUrl,
+        changeOrigin: true
+      },
+      'api/af-revenue/entity/save': {
+        pathRewrite: {
+          '/api/af-revenue/entity/save': '/entity/save'
+        },
+        target: localUrl,
+        changeOrigin: true
+      },
+      '/singlepage': {
+        // pathRewrite: {
+        //   '/weixin2/rs': '/rs'
+        // },
+        target: localUrl,
+        changeOrigin: true
+      },
+      '/weixin2/rs': {
+        pathRewrite: {
+          '/weixin2/rs': '/singlepage/weixin2/rs'
+        },
+        target: localUrl,
+        changeOrigin: true
+      },
+      '/api/af-revenue/sql': {
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
+        target: localUrl,
+        changeOrigin: true
+      },
+      '/rs/pay': {
+        target: serverRul,
+        changeOrigin: true
       },
       '/api': {
-        target: serverRul
+        target: serverRul,
+        changeOrigin: true
+      },
+      '/resource': {
+        target: serverRul,
+        changeOrigin: true
       },
       '/rs': {
-        target: serverRul
+        target: serverRul,
+        changeOrigin: true
       }
     }
   }

package/index.html CHANGED Viewed

@@ -12,8 +12,13 @@
       body{width: 100%;background:#7f8eaf  no-repeat center bottom; background-size: cover;}
       body .loginbg{ width:100%; height:100%; background:url(./static/loginbg.jpg) no-repeat center top;}
     </style>
-    <script src="https://webapi.amap.com/maps?v=1.4.2&key=4889f1e58df01cb40415536c8907bf64"></script>
-    <!--引入UI组件库（1.1版本） -->
+    <!--引入高德地图组件-->
+    <script type="text/javascript">
+      window._AMapSecurityConfig = {
+        securityJsCode: '91ebf08ec12862005c9ce8bbb888420f'
+      }
+    </script>
+    <script src="https://webapi.amap.com/maps?v=1.4.2&key=98e5146f671e38ea4d61bd37f5d064d8"></script>
     <script src="https://webapi.amap.com/ui/1.1/main.js?v=1.1.1"></script>
   </head>
   <body id="bodymain" class="themeOne">

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "4.2.71",
+  "version": "4.2.72",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/App.vue CHANGED Viewed

@@ -10,7 +10,7 @@
 </template>
 <script>
-import Vue from 'vue'
+// import Vue from 'vue'
 export default {
   ready () {

package/src/components/FilesManage/FileUserFiles.vue CHANGED Viewed

@@ -1046,7 +1046,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000, headers: {token: Vue.$login.jwt, Authorization: 'Bearer ' + Vue.$login.jwtNew}}).then((res) => {
                 if (res.data.data) {
                   let resultData = res.data.data

package/src/components/revenue/Common/EticketPrint.vue CHANGED Viewed

@@ -52,7 +52,7 @@ export default {
     async rushRedInvoice (data) {
       try {
         // 否则正常打票
-        let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
+        let result = await this.$resetpost('/invoice/rs/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
           resolveMsg: null,
           rejectMsg: '发票冲红失败!!'
         })
@@ -75,7 +75,7 @@ export default {
     async openETicket (id, model, f_charge_type, invoice_type, retry, is_tax, handplanTableName) {
       console.log('>>> f_invoice_type', invoice_type)
       try {
-        let result = await axios.post('/invoice/rs/logic/getInvoice', Object.assign({
+        let result = await this.$resetpost('/invoice/rs/logic/getInvoice', Object.assign({
           id,
           f_charge_type,
           retry,

package/src/components/revenue/HandManager/CardHand.vue CHANGED Viewed

@@ -20,7 +20,7 @@
                 <datepicker style="width:60%" id="startDate" placeholder="开始日期"
                             v-model="model.startDate"
                             :value.sync="model.startDate"
-                            :format="'yyyy-MM-dd'"
+                            :format="'yyyy-MM-dd 00:00:00'"
                             :show-reset-button="true">
                 </datepicker>
               </div>
@@ -30,7 +30,7 @@
                 <datepicker style="width:60%" id="endDate" placeholder="结束日期"
                             v-model="model.endDate"
                             :value.sync="model.endDate"
-                            :format="'yyyy-MM-dd'"
+                            :format="'yyyy-MM-dd 23:59:59'"
                             :show-reset-button="true">
                 </datepicker>
               </div>
@@ -445,8 +445,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
         orderitem: 'f_userinfo_code',
         model: new PagedList('api/af-revenue/sql/cardHands', 50, {orderitem: this.orderitem ? '"' + this.orderitem + ' "' : `'f_userinfo_code'`}, {f_actualtablebase: 0}),
         // model: new PagedList('api/af-revenue/sql/cardHands', 50),
-        startDate: Util.toStartAndEndDateString()[0],
-        endDate: Util.toStartAndEndDateString()[1],
+        startDate: Util.toStartAndEndDateString()[0] +' 00:00:00',
+        endDate: Util.toStartAndEndDateString()[1] +' 23:59:59',
         handDate: null,
         batch_audit: false,
         cardCental: false,
@@ -487,8 +487,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
       }
     },
     ready () {
-      this.$refs.paged.$refs.criteria.model.startDate = Util.toStartAndEndDateString()[0]
-      this.$refs.paged.$refs.criteria.model.endDate = Util.toStartAndEndDateString()[1]
+      this.$refs.paged.$refs.criteria.model.startDate = Util.toStartAndEndDateString()[0]+' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.endDate = Util.toStartAndEndDateString()[1]+' 23:59:59'
       loadParamGem(this)
       this.$nextTick(() => {
         if (this.shengyu == 'false') {