合并

dist/static/css/chunk-21eba102.fc1eae64.css

@@ -1 +1,5 @@
-.newBand[data-v-78374f6c]{display:inline-block}[data-v-78374f6c] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-78374f6c]{display:inline-block}.lookTitle[data-v-78374f6c]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-78374f6c]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-78374f6c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+<<<<<<< HEAD:dist/static/css/chunk-21eba102.fc1eae64.css
+.newBand[data-v-78374f6c]{display:inline-block}[data-v-78374f6c] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-78374f6c]{display:inline-block}.lookTitle[data-v-78374f6c]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-78374f6c]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-78374f6c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+=======
+.newBand[data-v-6fcf95dc]{display:inline-block}[data-v-6fcf95dc] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-6fcf95dc]{display:inline-block}.lookTitle[data-v-6fcf95dc]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-6fcf95dc]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-6fcf95dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+>>>>>>> master:dist/static/css/chunk-71b38ba0.bb27d388.css

dist/static/css/chunk-241ddcba.48caa840.css

@@ -0,0 +1 @@
+.bannerImg[data-v-1f862974],.bannerImg[data-v-3be1b20e],.bannerImg[data-v-7da15717],.bannerImg[data-v-0527b92a],.bannerImg[data-v-967d33b0],.bannerImg[data-v-a65b7c1c],.bannerImg[data-v-b1c03402],.bannerImg[data-v-f3784516]{height:60px}

dist/static/css/chunk-71b38ba0.bb27d388.css

@@ -0,0 +1,5 @@
+<<<<<<< HEAD:dist/static/css/chunk-21eba102.fc1eae64.css
+.newBand[data-v-78374f6c]{display:inline-block}[data-v-78374f6c] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-78374f6c]{display:inline-block}.lookTitle[data-v-78374f6c]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-78374f6c]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-78374f6c]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+=======
+.newBand[data-v-6fcf95dc]{display:inline-block}[data-v-6fcf95dc] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-6fcf95dc]{display:inline-block}.lookTitle[data-v-6fcf95dc]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-6fcf95dc]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-6fcf95dc]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}
+>>>>>>> master:dist/static/css/chunk-71b38ba0.bb27d388.css

src/views/businessManager/orderManager/financeManager.vue

@@ -894,7 +894,11 @@ export default {
           load.startLoading();
           axios(options).then((res) => {
             load.endLoading();
-            this.$message.info(res.data.data);
+            if(res.data.code == 200) {
+              this.$message.info(res.data.data);
+            } else {
+              this.$message.error(res.data.msg);
+            }
             // let blob = new Blob([res.data], {
             //   // type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8'
             //   type: "application/vnd.ms-excel;charset=utf-8",

src/views/businessManager/orderManager/income.vue

@@ -454,7 +454,11 @@ export default {
           axios(options)
             .then((res) => {
               load.endLoading();
-              this.$message.info(res.data.data);
+              if(res.data.code == 200) {
+                this.$message.info(res.data.data);
+              } else {
+                this.$message.error(res.data.msg);
+              }
               // this.$confirm(res.data.data, "提示", {
               //   confirmButtonText: "确定",
               //   cancelButtonText: "取消",