diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index 1865218..cc36071 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -64,21 +64,26 @@
                @on-row-dblclick="showDetail"
                :columns="columns1"
                :data="data">
-            <template slot-scope="{row}" slot="qrCodeAction">
-                <img :src="require('../../../static/img/qrCode-init.png')" @click="navigateCode(row)"
-                     class="table-img-qr-code"/>
-            </template>
-            <template slot="action" slot-scope="{row}">
-              <i-col span="12">
-                <Button ghost class="router-btn" 
-                        @click="() => {stop(row)}">终止</Button>
-              </i-col>
-              <i-col span="12">
-                <Button ghost class="router-btn"
-                        @click="() => {modify(row)}">修改</Button>
-              </i-col>
-            </template>
-            
+          <template slot-scope="{row}"
+                    slot="qrCodeAction">
+            <img :src="require('../../../static/img/qrCode-init.png')"
+                 @click="navigateCode(row)"
+                 class="table-img-qr-code" />
+          </template>
+          <template slot="action"
+                    slot-scope="{row}">
+            <i-col span="12">
+              <Button ghost
+                      class="router-btn"
+                      @click="() => {stop(row)}">终止</Button>
+            </i-col>
+            <i-col span="12">
+              <Button ghost
+                      class="router-btn"
+                      @click="() => {modify(row)}">修改</Button>
+            </i-col>
+          </template>
+
         </Table>
         <Page :total="totalSize"
               :current="pageNum"
@@ -103,21 +108,23 @@
                   :detail="detail"></planDetail>
     </Modal>
     <!-- 预览二维码 -->
-    <Modal
-        v-model="isShow"
-        :title="showStoreName"
-        :footer-hide="true"
-        width="230"
-        class-name="vertical-center-modal"
-        @on-ok="ok">
-        <div slot="header">
-            <p></p>
-        </div>
-        <p>{{this.showStoreName}}</p>
-        <img :src="qrCodeImage" style="width:200px;height:200px;"/>
-        <div style="text-align: center;">
-            <Button ghost type="primary" @click="download(rowData)">下载</Button>
-        </div>
+    <Modal v-model="isShow"
+           :title="showStoreName"
+           :footer-hide="true"
+           width="230"
+           class-name="vertical-center-modal"
+           @on-ok="ok">
+      <div slot="header">
+        <p></p>
+      </div>
+      <p>{{this.showStoreName}}</p>
+      <img :src="qrCodeImage"
+           style="width:200px;height:200px;" />
+      <div style="text-align: center;">
+        <Button ghost
+                type="primary"
+                @click="download(rowData)">下载</Button>
+      </div>
     </Modal>
   </div>
 </template>
@@ -139,7 +146,7 @@ export default {
   data () {
     const _this = this;
     return {
-      showStoreName:"",
+      showStoreName: "",
       isShow: false,
       loading: false,
       isShowDetail: false,
@@ -456,6 +463,7 @@ export default {
       if (params.status == 0) {
         params.status = undefined;
       }
+      params.categoryCode = "promotion"
       params.date = undefined;
       http.get("/activity/instance/list", params).then(res => {
         const data = res.data.results.this || {};
@@ -496,7 +504,7 @@ export default {
       debugger
       let fileName = index.name + "-门店码";
       http.downloadImg({
-          url: index.qrCodeAction
+        url: index.qrCodeAction
       }, fileName, function (/*data*/) {
 
       })
@@ -517,7 +525,7 @@ export default {
 }
 .router-btn {
   border: none;
-  color: #3496EB !important;
+  color: #3496eb !important;
   margin-left: -15px;
 }
 .table-img-qr-code {
@@ -526,7 +534,7 @@ export default {
   width: 30px;
   height: 30px;
 }
-button:hover {    
-  background:inherit!important;
+button:hover {
+  background: inherit !important;
 }
 </style>
diff --git a/src/services/CommonHttp.js b/src/services/CommonHttp.js
index 2ceec20..c9ae297 100755
--- a/src/services/CommonHttp.js
+++ b/src/services/CommonHttp.js
@@ -7,9 +7,7 @@ import commonUtils from '../utils/Common'
 // http://mf.kiisoo.com:58080/
 // axios.defaults.baseURL = 'https://wxtk.bsdits.com/kiisoo-ic/';
 axios.defaults.baseURL =
-  process.env.NODE_ENV === 'production'
-    ? 'http://111.231.218.44:8080/kiisoo-ic'
-    : '/kiisoo-ic'
+  process.env.NODE_ENV === 'production' ? '/kiisoo-ic' : '/kiisoo-ic'
 
 //响应时间
 axios.defaults.timeout = 120000