merge

.env.development

@@ -1,6 +1,6 @@
 VUE_APP_FILE_API = http://192.168.1.9:9114
 VUE_APP_GRID_API = http://192.168.1.19:9114
-NODE_ENV = production
+NODE_ENV = development
 
 VUE_APP_ENV = development
 outputDir = dist-dev

package.json

@@ -13,6 +13,7 @@
     "lint": "vue-cli-service lint",
     "analyz": "vue-cli-service build"
   },
+
   "dependencies": {
     "@fullcalendar/daygrid": "^5.10.1",
     "@fullcalendar/interaction": "^5.10.1",

public/index.html

@@ -33,8 +33,8 @@
   <!-- built files will be auto injected -->
   <script type="text/javascript">
     // window.staticHost = 'http://10.230.26.15:8000/mkt/'; // 正式
-    window.staticHost = 'http://10.149.85.91:8000/spfm/'; // 测试
-    // window.staticHost = 'http://192.168.2.92:9600';
+    // window.staticHost = 'http://10.149.85.91:8000/spfm/'; // 测试
+    window.staticHost = 'http://192.168.2.124:9600';
     // window.staticHost = 'http://43.138.50.94:9600/';
 
     // document.title = "hello";

src/pages/main/advertising/businessHall.vue

@@ -203,6 +203,7 @@
                                 </el-option>
                             </el-select>
                         </el-form-item>
+                        
                         <el-form-item>
                             <span>物料单位</span>
                             <el-input v-model="infolist.unit" disabled></el-input>
@@ -697,10 +698,12 @@ export default {
         };
     },
     computed: {
+        
         coefficient: function () {
             if (
                 this.infolist.width == undefined &&
                 this.infolist.length == undefined
+
             ) {
                 this.infolist.coefficient = "1";
                 this.settlementAmount();
@@ -762,6 +765,7 @@ export default {
                 },
                 data: { sceneName: v }
             }).then(res => {
+                console.log(res);
                 this.metirialOpt = res.data.data;
             });
         },

src/pages/main/advertising/materialApplicationc.vue

@@ -207,7 +207,7 @@
             searchInfo(v) {
                 this.params = {};
                 v[0] ? this.params.metirialName = v[0] : '';
-                v[0] ? this.params.regionName = v[0] : '';
+                v[1] ? this.params.regionName = v[1] : '';
                 this.getList(this.params, this.pageSize);
             },
             //获取列表

src/pages/main/advertising/materialApplistatic.vue

@@ -80,7 +80,8 @@ import mySearch from "../../../components/search.vue";
             //搜索数据
             searchInfo(v) {
                 this.params = {};
-                v[0] ? this.params.metirialName = v[0] : '';
+                v[0] ? this.params.regionName = v[0] : '';
+                v[1] ? this.params.metirialName = v[1] : ''
                 this.getList(this.params, this.pageSize);
             },
             //获取列表