fix: merge

dist/css/chunk-6d0d53fe.4ec6facc.css → dist/css/chunk-9c2279b0.f315b81b.css

-[data-v-1bc200c8] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-1bc200c8] .el-button{border-style:dashed}.el-icon-warning[data-v-77230a36]{color:#faad14;font-size:21px}.logistics-info[data-v-4f0cd98a]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-4f0cd98a]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-4f0cd98a]{display:inline-block}.logistics-info span+span[data-v-4f0cd98a]{margin-left:10px}.logistics-step[data-v-4f0cd98a]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-4f0cd98a]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-4f0cd98a]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-4f0cd98a]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-4f0cd98a]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-4f0cd98a]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-4f0cd98a]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-73b5382e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-73b5382e]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-7e9e03b8]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-7e9e03b8]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-7e9e03b8]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-7e9e03b8]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-7e9e03b8]{margin-bottom:5px;line-height:16px}
\ No newline at end of file
+[data-v-25f84e59] .el-divider--horizontal{margin:16px 0;margin-top:20px}.upload[data-v-25f84e59] .el-button{border-style:dashed}.el-icon-warning[data-v-77230a36]{color:#faad14;font-size:21px}.logistics-info[data-v-4f0cd98a]{display:-webkit-box;display:-ms-flexbox;display:flex}.logistics-info>div[data-v-4f0cd98a]{-webkit-box-flex:1;-ms-flex:1;flex:1}.logistics-info span[data-v-4f0cd98a]{display:inline-block}.logistics-info span+span[data-v-4f0cd98a]{margin-left:10px}.logistics-step[data-v-4f0cd98a]{margin-top:24px;background:#fafafa;padding:15px 0}.logistics-step h3[data-v-4f0cd98a]{color:#303133;font-size:16px;border-bottom:1px solid #dcdfe6;padding:0 20px 15px 20px}.logistics-step .logistics-list[data-v-4f0cd98a]{height:328px;overflow-y:auto;padding:20px}.logistics-step .logistics-item[data-v-4f0cd98a]{position:relative;padding-bottom:10px}.logistics-step .logistics-line-step[data-v-4f0cd98a]{display:-webkit-box;display:-ms-flexbox;display:flex;font-size:12px}.logistics-step .logistics-line-step .time[data-v-4f0cd98a]{margin-right:20px;width:160px;line-height:22px;font-weight:500;color:#303133}.logistics-step .logistics-line-step .content[data-v-4f0cd98a]{color:#303133;-webkit-box-flex:1;-ms-flex:1;flex:1;line-height:22px}.write-off[data-v-73b5382e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#303133}.write-off .code[data-v-73b5382e]{margin-top:20px;color:#f5222d;font-size:20px}.goods-info[data-v-7e9e03b8]{height:100%;display:-webkit-box;display:-ms-flexbox;display:flex}.goods-info img[data-v-7e9e03b8]{width:62px;height:62px;border:1px solid #f1f3f7;border-radius:5px}.goods-info .goods-text[data-v-7e9e03b8]{margin-left:18px;font-size:13px;color:#303133;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.goods-info .goods-text-info[data-v-7e9e03b8]{color:#909399;font-size:12px}.goods-info .goods-text-name[data-v-7e9e03b8]{margin-bottom:5px;line-height:16px}
\ No newline at end of file

src/views/performance-manage/components/bulk-delivery-dialog.vue

@@ -16,7 +16,7 @@
           <span slot="tip"></span>
           <el-button icon="iconfont-components4 icon-cp-shangc upload-icon">上传</el-button>
         </dm-upload-file>
-        <el-link class="ml20" style="position:absolute;right:20px;top:10px" type="primary" href="/static/批量发货模板.xlsx">下载批量发货的模版</el-link>
+        <el-button class="ml20" style="position:absolute;right:20px;top:10px" type="text" @click="downloadFile">下载批量发货的模版</el-button>
       </div>
       <div class="mt10" style="margin-left:90px">
         成功<span style="color:#2f54eb">{{successCount}}</span>条，失败<span style="color:#F5222d">{{failedCount}}</span>条
@@ -74,6 +74,10 @@ export default {
     this.visible = true;
   },
   methods: {
+    downloadFile() {
+      const prev = process.env['NODE_ENV'] === 'development' ? '' : '/welfare'; // eslint-disable-line
+      location.href = `${prev}/static/批量发货模板.xlsx`;
+    },
     handleConfirm() {
       this.visible = false;
     },