Merge branch 'master' into 'hjw1'

广告发布优化

See merge request spfm/spfm-market-front!84

src/pages/main/advReleaseAppro/index.vue

@@ -521,7 +521,7 @@
                 this.pageSize = v;
                 this.getList(this.params, this.pageSize);
             },
-            //申请
+            //申请  n是行
             dialogCheck(v, n) {
                 this.dialogStatus = true;
                 let infolist = Object.assign({}, n);

src/pages/main/advReleaseAppro/outdoors.vue

@@ -148,10 +148,11 @@
 					this.advDiscountSum += this.infodata[i].discountPrice;
 				}
 				if(!this.taxRate){
-					this.$message({
-						message: '请先选择供应商！',
-						type: 'error'
-					});
+					// console.log(this.taxRate)
+					// this.$message({
+					// 	message: '请先选择供应商！',
+					// 	type: 'error'
+					// });
 					return
 				}				
 				this.contractAdvCost = (this.advDiscountSum - this.otherDiscount) / (this.taxRate.split("%")[0]*1 + 100) * 100;

vue.config.js

@@ -93,7 +93,7 @@ module.exports = {
         proxy: {
             // 开发环境变化可注释 ⬇️⬇️
             "/market/CMK": {
-                target: "http://192.168.3.129:9113",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -101,7 +101,7 @@ module.exports = {
                 },
             },
             "/market/mk": {
-                target: "http://192.168.3.129:9113",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -109,7 +109,7 @@ module.exports = {
                 },
             },
             "/market/techcentergj": {
-                target: "http://192.168.3.129:9113",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -117,7 +117,7 @@ module.exports = {
                 },
             },
             "/mkWangge": {
-                target: "http://192.168.3.129:9113",
+                target: "http://124.223.66.248:9600",
                 ws: false,
                 changeOrigin: true,
                 pathRewrite: {
@@ -135,7 +135,7 @@ module.exports = {
                 // target: 'http://192.168.0.156:9600/',
                 // target: 'http://192.168.2.170:9600/',
                 // target: 'http://192.168.2.169:9600/',
-                target: "http://192.168.3.129:9600",
+                target: "http://124.223.66.248:9600",
                 changeOrigin: true,
             },
         },