Merge remote-tracking branch 'origin/0605' into feature/20200514_version

src/flexible.js

@@ -0,0 +1,118 @@
+
+;(function(win, lib) {
+  var doc = win.document;
+  var docEl = doc.documentElement;
+  var metaEl = doc.querySelector('meta[name="viewport"]');
+  var flexibleEl = doc.querySelector('meta[name="flexible"]');
+  var dpr = 0;
+  var scale = 0;
+  var tid;
+  var flexible = lib.flexible || (lib.flexible = {});
+
+  if (metaEl) {
+    console.warn('将根据已有的meta标签来设置缩放比例');
+    var match = metaEl.getAttribute('content').match(/initial\-scale=([\d\.]+)/);
+    if (match) {
+      scale = parseFloat(match[1]);
+      dpr = parseInt(1 / scale);
+    }
+  } else if (flexibleEl) {
+    var content = flexibleEl.getAttribute('content');
+    if (content) {
+      var initialDpr = content.match(/initial\-dpr=([\d\.]+)/);
+      var maximumDpr = content.match(/maximum\-dpr=([\d\.]+)/);
+      if (initialDpr) {
+        dpr = parseFloat(initialDpr[1]);
+        scale = parseFloat((1 / dpr).toFixed(2));
+      }
+      if (maximumDpr) {
+        dpr = parseFloat(maximumDpr[1]);
+        scale = parseFloat((1 / dpr).toFixed(2));
+      }
+    }
+  }
+
+  if (!dpr && !scale) {
+    var isAndroid = win.navigator.appVersion.match(/android/gi);
+    var isIPhone = win.navigator.appVersion.match(/iphone/gi);
+    var devicePixelRatio = win.devicePixelRatio;
+    if (isIPhone) {
+      // iOS下，对于2和3的屏，用2倍的方案，其余的用1倍方案
+      if (devicePixelRatio >= 3 && (!dpr || dpr >= 3)) {
+        dpr = 3;
+      } else if (devicePixelRatio >= 2 && (!dpr || dpr >= 2)){
+        dpr = 2;
+      } else {
+        dpr = 1;
+      }
+    } else {
+      // 其他设备下，仍旧使用1倍的方案
+      dpr = 1;
+    }
+    scale = 1 / dpr;
+  }
+
+  docEl.setAttribute('data-dpr', dpr);
+  if (!metaEl) {
+    metaEl = doc.createElement('meta');
+    metaEl.setAttribute('name', 'viewport');
+    metaEl.setAttribute('content', 'initial-scale=' + scale + ', maximum-scale=' + scale + ', minimum-scale=' + scale + ', user-scalable=no');
+    if (docEl.firstElementChild) {
+      docEl.firstElementChild.appendChild(metaEl);
+    } else {
+      var wrap = doc.createElement('div');
+      wrap.appendChild(metaEl);
+      doc.write(wrap.innerHTML);
+    }
+  }
+
+  function refreshRem(){
+    var width = docEl.getBoundingClientRect().width;
+    if (width / dpr > 540) {
+      width = width * dpr;
+    }
+    var rem = width / 10;
+    docEl.style.fontSize = rem + 'px';
+    flexible.rem = win.rem = rem;
+  }
+
+  win.addEventListener('resize', function() {
+    clearTimeout(tid);
+    tid = setTimeout(refreshRem, 300);
+  }, false);
+  win.addEventListener('pageshow', function(e) {
+    if (e.persisted) {
+      clearTimeout(tid);
+      tid = setTimeout(refreshRem, 300);
+    }
+  }, false);
+
+  if (doc.readyState === 'complete') {
+    doc.body.style.fontSize = 12 * dpr + 'px';
+  } else {
+    doc.addEventListener('DOMContentLoaded', function(e) {
+      doc.body.style.fontSize = 12 * dpr + 'px';
+    }, false);
+  }
+
+
+  refreshRem();
+
+  flexible.dpr = win.dpr = dpr;
+  flexible.refreshRem = refreshRem;
+  flexible.rem2px = function(d) {
+    var val = parseFloat(d) * this.rem;
+    if (typeof d === 'string' && d.match(/rem$/)) {
+      val += 'px';
+    }
+    return val;
+  }
+  flexible.px2rem = function(d) {
+    var val = parseFloat(d) / this.rem;
+    if (typeof d === 'string' && d.match(/px$/)) {
+      val += 'rem';
+    }
+    return val;
+  }
+
+})(window, window['lib'] || (window['lib'] = {}));

src/main.js

@@ -7,7 +7,7 @@ import axios from "axios";
 import QS from "qs";
 import "./iview";
 import "./vcharts";
-import "lib-flexible/flexible";
+import "./flexible";
 import _ from "lodash";
 
 Vue.prototype.$axios = axios;

src/pages/activity/ActivityPlan.vue

@@ -1,128 +1,128 @@
 <template>
   <div>
-    <Spin v-if="saving" fix>加载中...</Spin>
+    <Spin v-if="saving"
-    <Form ref="formValidate" :model="formValidate" :label-width="80">
+          fix>加载中...</Spin>
+    <Form ref="formValidate"
+          :model="formValidate"
+          :label-width="80">
       <Row :gutter="10">
         <i-col span="6">
-          <FormItem label="选择日期" prop>
+          <FormItem label="选择日期"
-            <Date-picker
+                    prop>
-              style="width: 100%"
+            <Date-picker style="width: 100%"
                          v-model="formValidate.date"
                          type="daterange"
                          placement="bottom-end"
-              placeholder="选择日期区间"
+                         placeholder="选择日期区间"></Date-picker>
-            ></Date-picker>
           </FormItem>
         </i-col>
         <i-col span="6">
-          <FormItem label="零售公司" prop>
+          <FormItem label="零售公司"
-            <Select
+                    prop>
-              v-model="formValidate.organizationId"
+            <Select v-model="formValidate.organizationId"
                     filterable
                     @on-change="selectCompany"
                     placeholder="全部"
-              clearable
+                    clearable>
-            >
+              <Option v-for="(item, index) in companyList"
-              <Option
-                v-for="(item, index) in companyList"
                       :key="index"
-                :value="item.value"
+                      :value="item.value">{{ item.label }}</Option>
-              >{{ item.label }}</Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="6">
-          <FormItem label="店铺" prop>
+          <FormItem label="店铺"
-            <Select v-model="formValidate.storeId" filterable placeholder="全部" clearable>
+                    prop>
-              <Option
+            <Select v-model="formValidate.storeId"
-                v-for="(item, index) in shopList"
+                    filterable
+                    placeholder="全部"
+                    clearable>
+              <Option v-for="(item, index) in shopList"
                       :key="index"
-                :value="item.value"
+                      :value="item.value">{{ item.label }}</Option>
-              >{{ item.label }}</Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="3">
-          <FormItem label="活动状态" prop>
+          <FormItem label="活动状态"
+                    prop>
             <Select v-model="formValidate.status">
-              <Option
+              <Option v-for="(item, index) in activityStatusList"
-                v-for="(item, index) in activityStatusList"
                       :key="index"
-                :value="item.value"
+                      :value="item.value">{{ item.label }}</Option>
-              >{{ item.label }}</Option>
             </Select>
           </FormItem>
         </i-col>
         <i-col span="3">
-          <Button type="primary" @click="() => {pageNum = 1;searchTable()}">查询</Button>
+          <Button type="primary"
+                  @click="() => {pageNum = 1;searchTable()}">查询</Button>
         </i-col>
       </Row>
       <Row style="margin-top:50px">
-        <Table
+        <Table :loading="loading"
-          :loading="loading"
                border
                @on-row-dblclick="showDetail"
                :columns="columns1"
-          :data="data"
+               :data="data">
-        >
+          <template slot-scope="{row}"
-          <template slot-scope="{row}" slot="qrCodeAction">
+                    slot="qrCodeAction">
-            <img
+            <img :src="require('../../../static/img/qrCode-init.png')"
-              :src="require('../../../static/img/qrCode-init.png')"
                  @click="navigateCode(row)"
-              class="table-img-qr-code"
+                 class="table-img-qr-code" />
-            />
           </template>
-          <template slot="action" slot-scope="{row}">
+          <template slot="action"
+                    slot-scope="{row}">
             <i-col span="12">
-              <Button
+              <Button ghost
-                ghost
                       :class="row.status > 2 ? 'router-btn disable' : 'router-btn'"
-                @click="() => {stop(row)}"
+                      @click="() => {stop(row)}">终止</Button>
-              >终止</Button>
             </i-col>
             <i-col span="12">
-              <Button ghost class="router-btn" @click="() => {modify(row)}">修改</Button>
+              <Button ghost
+                      class="router-btn"
+                      @click="() => {modify(row)}">修改</Button>
             </i-col>
           </template>
         </Table>
-        <Page
+        <Page :total="totalSize"
-          :total="totalSize"
               :current="pageNum"
               :page-size="pageSize"
               show-elevator
               show-total
               placement="top"
               @on-change="handlePage"
-          class-name="ks-page"
+              class-name="ks-page"></Page>
-        ></Page>
       </Row>
     </Form>
-    <useTable
+    <useTable ref="useTable"
-      ref="useTable"
               @doShow="doShow"
               :show="showUse"
               :isModify="true"
-      :schedule="activityInstance.scheduleVO"
+              :schedule="activityInstance.scheduleVO"></useTable>
-    ></useTable>
+    <Modal v-model="isShowDetail"
-    <Modal v-model="isShowDetail" title="活动计划详情" width="70%" :footer-hide="true">
+           title="活动计划详情"
-      <planDetail v-if="isShowDetail" :detail="detail"></planDetail>
+           width="70%"
+           :footer-hide="true">
+      <planDetail v-if="isShowDetail"
+                  :detail="detail"></planDetail>
     </Modal>
     <!-- 预览二维码 -->
-    <Modal
+    <Modal v-model="isShow"
-      v-model="isShow"
            :title="showStoreName"
            :footer-hide="true"
            width="230"
            class-name="vertical-center-modal"
-      @on-ok="ok"
+           @on-ok="ok">
-    >
       <div slot="header">
         <p></p>
       </div>
       <p>{{this.showStoreName}}</p>
-      <img :src="qrCodeImage" style="width:200px;height:200px;" />
+      <img :src="qrCodeImage"
+           style="width:200px;height:200px;" />
       <div style="text-align: center;">
-        <Button ghost type="primary" @click="download(rowData)">下载</Button>
+        <Button ghost
+                type="primary"
+                @click="download(rowData)">下载</Button>
       </div>
     </Modal>
   </div>
@@ -436,7 +436,6 @@ export default {
       });
     },
     navigateCode (instance) {
-      return;
       this.$router.push({
         path: "/activity/plan/code",
         query: { instanceId: instance.id }

src/pages/activity/addActivity.vue

@@ -1,22 +1,25 @@
 <template>
-  <Modal
+  <Modal v-model="dispalyModal"
-    v-model="dispalyModal"
          width="1000"
          :loading="true"
          :mask-closable="false"
          @on-visible-change="visibleChange"
-    @on-cancel="cancel"
+         @on-cancel="cancel">
-  >
+    <p slot="header"
-    <p slot="header" style="color:#f60;text-align:left">
+       style="color:#f60;text-align:left">
       <span>配置活动</span>
     </p>
     <div>基本配置</div>
-    <Form ref="formValidate" :model="formValidate" :rules="ruleValidate" :label-width="80">
+    <Form ref="formValidate"
+          :model="formValidate"
+          :rules="ruleValidate"
+          :label-width="80">
       <Row>
-        <i-col style="text-align: left;" span="8">
+        <i-col style="text-align: left;"
-          <FormItem label prop="logo">
+               span="8">
-            <Upload
+          <FormItem label
-              ref="upload"
+                    prop="logo">
+            <Upload ref="upload"
                     :show-upload-list="false"
                     :on-success="uploadImgSuccess"
                     :format="['jpg', 'jpeg', 'png']"
@@ -25,72 +28,97 @@
                     multiple
                     type="drag"
                     action
-              style="display: inline-block;"
+                    style="display: inline-block;">
-            >
               <div style="width: 200px;height:200px;line-height: 200px;">
                 <span v-if="!formValidate.logo">请上传图片</span>
-                <img
+                <img v-if="formValidate.logo"
-                  v-if="formValidate.logo"
                      :src="`/kiisoo-ic` + formValidate.logo"
                      alt
-                  style="width: 100%; height: auto"
+                     style="width: 100%; height: auto" />
-                />
               </div>
             </Upload>
           </FormItem>
         </i-col>
-        <i-col span="15" offset="1">
+        <i-col span="15"
-          <FormItem label="活动名称" prop="name">
+               offset="1">
-            <i-input type="text" v-model="formValidate.name" placeholder="请输入活动名称"></i-input>
+          <FormItem label="活动名称"
+                    prop="name">
+            <i-input type="text"
+                     v-model="formValidate.name"
+                     placeholder="请输入活动名称"></i-input>
           </FormItem>
-          <Form-item label="活动描述" prop="description">
+          <Form-item label="活动描述"
-            <i-input
+                     prop="description">
-              v-model="formValidate.description"
+            <i-input v-model="formValidate.description"
                      type="textarea"
                      :autosize="{ minRows: 3 }"
-              placeholder="请输入活动描述"
+                     placeholder="请输入活动描述"></i-input>
-            ></i-input>
           </Form-item>
-          <Form-item label="欢迎语" prop="description">
+          <Form-item label="欢迎语"
-            <i-input
+                     prop="description">
-              v-model="formValidate.welcome"
+            <i-input v-model="formValidate.welcome"
                      type="textarea"
                      :autosize="{ minRows: 3 }"
-              placeholder="请输入欢迎语"
+                     placeholder="请输入欢迎语"></i-input>
-            ></i-input>
           </Form-item>
-          <FormItem label="APPID" prop="appId">
+          <FormItem label="标题"
-            <i-input type="text" v-model="formValidate.appId" placeholder="请输入appid"></i-input>
+                    prop="title">
+            <i-input type="text"
+                     v-model="formValidate.title"
+                     placeholder="请输入标题"></i-input>
           </FormItem>
-          <FormItem label="URI" prop="uri">
+          <FormItem label="APPID"
-            <i-input type="text" v-model="formValidate.uri" placeholder="请输入URI"></i-input>
+                    prop="appId">
+            <i-input type="text"
+                     v-model="formValidate.appId"
+                     placeholder="请输入appid"></i-input>
+          </FormItem>
+          <FormItem label="URI"
+                    prop="uri">
+            <i-input type="text"
+                     v-model="formValidate.uri"
+                     placeholder="请输入URI"></i-input>
           </FormItem>
         </i-col>
       </Row>
     </Form>
     <div class="topic">活动类型</div>
-    <Row :gutter="10" class="inputItem" v-for="(item, index) in formValidate.params" :key="index">
+    <Row :gutter="10"
+         class="inputItem"
+         v-for="(item, index) in formValidate.params"
+         :key="index">
       <i-col :span="2">类型{{ index + 1 }}</i-col>
       <i-col :span="9">
-        <i-input class="inputClass" type="text" v-model="item.name" placeholder="请输入活动类型名称"></i-input>
+        <i-input class="inputClass"
+                 type="text"
+                 v-model="item.name"
+                 placeholder="请输入活动类型名称"></i-input>
       </i-col>
       <i-col :span="9">
-        <i-input
+        <i-input class="inputClass"
-          class="inputClass"
                  type="text"
                  style="margin-left: 20px"
                  v-model="item.defaultVal"
-          placeholder="请输入参数"
+                 placeholder="请输入参数"></i-input>
-        ></i-input>
       </i-col>
       <i-col :span="4">
-        <Button style="margin-left: 20px" type="error" @click="delActivityInput(index)">删除</Button>
+        <Button style="margin-left: 20px"
+                type="error"
+                @click="delActivityInput(index)">删除</Button>
       </i-col>
     </Row>
-    <Button style="margin-top: 10px" type="primary" @click="addActivityInput">+添加活动类型</Button>
+    <Button style="margin-top: 10px"
+            type="primary"
+            @click="addActivityInput">+添加活动类型</Button>
     <div slot="footer">
-      <Button type="primary" shape="circle" :loading="modal_loading" @click="cancel">取消</Button>
+      <Button type="primary"
-      <Button type="primary" shape="circle" :loading="modal_loading" @click="save">确定</Button>
+              shape="circle"
+              :loading="modal_loading"
+              @click="cancel">取消</Button>
+      <Button type="primary"
+              shape="circle"
+              :loading="modal_loading"
+              @click="save">确定</Button>
     </div>
   </Modal>
 </template>
@@ -114,6 +142,7 @@ export default {
         description: [
           { required: true, message: "活动描述不能为空", trigger: "blur" }
         ],
+        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
         appId: [{ required: true, message: "appId不能为空", trigger: "blur" }],
         uri: [{ required: true, message: "URI不能为空", trigger: "blur" }],
         welcome: [{ required: true, message: "请输入欢迎语", trigger: "blur" }]
@@ -207,6 +236,7 @@ export default {
       const me = this;
       let data = new FormData();
       data.append("file", res);
+      data.append("needMediaId", true)
       axios({
         method: "post",
         url: "/upload",
@@ -218,6 +248,7 @@ export default {
         if (res.data.success) {
           // me.formValidate.logo = res.data.results;
           me.$set(me.formValidate, "logo", res.data.results.localPath);
+          me.$set(me.formValidate, "mediaId", res.data.results.mediaId);
           console.log(me.formValidate.logo);
         }
       });

src/pages/recruit/BulletinIndex.vue

@@ -3,15 +3,20 @@
     <template>
       <Row class="search-row">
         <i-col span="8">
-            <p class="" style="font-size: 16px;line-height: 22px;margin-top: 10px;margin-left: 20px;margin-right: 20px;">招募令</p>
+          <p class=""
-            <p class="" style="font-size: 13px;line-height: 32px;margin-left: 20px;margin-right: 20px;">便于门店进行推广员招募</p>
+             style="font-size: 16px;line-height: 22px;margin-top: 10px;margin-left: 20px;margin-right: 20px;">招募令</p>
+          <p class=""
+             style="font-size: 13px;line-height: 32px;margin-left: 20px;margin-right: 20px;">便于门店进行推广员招募</p>
         </i-col>
         <i-col span="8">
-            <span class="">使用范围：26家零售公司，785家店铺</span>
+          <span class="">使用范围：{{welcome.company.length || 0}}家零售公司，{{welcome.stores.length || 0}}家店铺</span>
-            <span class="" style="border: 0px; color: rgb(52, 150, 235); margin-left: 15px; cursor: pointer;"  @click="showStores">修改</span>
+          <span class=""
+                style="border: 0px; color: rgb(52, 150, 235); margin-left: 15px; cursor: pointer;"
+                @click="showStores">修改</span>
         </i-col>
         <i-col span="8">
-            <i-switch size="large" @on-change="witchChange">
+          <i-switch size="large"
+                    @on-change="witchChange">
             <span slot="open">开启</span>
             <span slot="close">关闭</span>
           </i-switch>
@@ -20,11 +25,14 @@
       <div>
         <p style="margin:10px 0 10px -480px;text-align:center">招募海报</p>
         <div style="text-align: center;">
-          <img style="width:500px;height:500px" :src="imgUrl" alt="">
+          <img style="width:500px;height:500px"
+               :src="imgUrl"
+               alt="">
 
         </div>
         <!-- <div style="margin-top:20px;text-align: center;"><Button ghost type="primary">上传</Button></div> -->
-        <Upload v-show="showUpload" ref="upload"
+        <Upload v-show="showUpload"
+                ref="upload"
                 :show-upload-list="false"
                 :on-success="uploadImgSuccess"
                 :format="['jpg', 'jpeg', 'png']"
@@ -33,11 +41,18 @@
                 multiple
                 action=""
                 style="padding-top:10px;text-align: center;">
-                <Button ghost type="primary">上传</Button>
+          <Button ghost
+                  type="primary">上传</Button>
         </Upload>
         <div style="margin-top:20px;text-align: center;">
-          <Button type="primary" size="large" @click="onEdit" style="margin-right:10px">{{btnStr}}</Button>
+          <Button type="primary"
-          <Button v-show="showUpload" type="text" size="large" @click="onCancel">取消</Button>
+                  size="large"
+                  @click="onEdit"
+                  style="margin-right:10px">{{btnStr}}</Button>
+          <Button v-show="showUpload"
+                  type="text"
+                  size="large"
+                  @click="onCancel">取消</Button>
         </div>
       </div>
     </template>
@@ -54,7 +69,6 @@ import bulletinService from '../../services/recruit/Bulletin'
 import http from '../../services/CommonHttp';
 import axios from "axios";
 export default {
-  inject:['reload'],
   components: {
     selectStoreStep,
   },
@@ -72,7 +86,8 @@ export default {
       btnStr: '编辑',
       imgUrl: '',
       onWitch: false,
-      uploadUrl:""
+      uploadUrl: "",
+      oldImg: ""
     };
   },
   mounted: function () {
@@ -81,6 +96,7 @@ export default {
   created () {
     this.initData();
   },
+  inject: ['reload'],
   methods: {
     witchChange (status) {
       this.onWitch = status;
@@ -91,9 +107,10 @@ export default {
         console.log(data);
         if (data.data.results.scheduleVO.params.length > 0) {
           that.imgUrl = http.getBaseUrl() + data.data.results.scheduleVO.params[0].defaultVal;
+          that.oldImg = http.getBaseUrl() + data.data.results.scheduleVO.params[0].defaultVal;
         }
         that.initData = data.data.results;
-
+        that.welcome = { ...that.initData, company: [...that.initData.organizations] };
       }, function (err) {
         that.$Message.error("网络异常，请重试");
         that.setNoLoading();
@@ -102,11 +119,11 @@ export default {
     doShow () {
       this.showStoreCheck = false
       this.welcome = store.getters.useData
-      console.log(this.welcome);
+      console.log('@', this.welcome);
     },
     showStores () {
-      console.log({ ...store.getters.useData, ...this.welcome })
+      console.log(this.welcome, { ...store.getters.useData, ...this.welcome, ...this.initData })
-      store.commit('SET_useData', { ...store.getters.useData, ...this.welcome })
+      store.commit('SET_useData', { ...store.getters.useData, ...this.welcome, ...this.initData })
       this.showStoreCheck = true
     },
     onEdit () {
@@ -114,43 +131,47 @@ export default {
         this.showUpload = true;
         this.btnStr = '保存'
       } else {
-        this.initData.isGetActivityInfo = true;
+        let _this = this;
-        try{
-          if(this.welcome.stores.length>0){
         this.initData.stores = this.welcome.stores;
+        this.initData.company = this.welcome.company;
+        let param = this.initData
+        if (param.stores.length <= 0) {
+          _this.$Message.error("请至少选择一个店铺");
+          _this.loading = false;
+          return false;
         }
-        }catch(e){
+        param.isGetActivityInfo = true;
-          console.log(e);
-        }
         if (this.onWitch) {
-          this.initData.status = 1;
+          param.status = 1;
-          this.initData.stores.forEach(item => {
+          param.stores.forEach(item => {
             item.status = 1;
           })
         } else {
-          this.initData.status = 3;
+          param.status = 3;
-          this.initData.stores.forEach(item => {
+          param.stores.forEach(item => {
             item.status = 2;
           })
         }
         if (this.uploadUrl != "") {
-          this.initData.scheduleVO.params.forEach(item => {
+          param.scheduleVO.params.forEach(item => {
             item.defaultVal = item.description = this.uploadUrl;
 
           })
         }
-        let that = this;
+        bulletinService.dosave(param, function (data) {
-        bulletinService.dosave(this.initData, function (data) {
           console.log(data);
-          that.reload();
+          _this.$Message.info("保存成功");
+          _this.btnStr = '编辑'
+          _this.showUpload = false;
         }, function (err) {
-            that.$Message.error("网络异常，请重试");
+          _this.$Message.error("网络异常，请重试");
-            that.setNoLoading();
+          _this.setNoLoading();
         });
       }
     },
     onCancel () {
       this.showUpload = false;
+      this.imgUrl = this.oldImg;
       this.btnStr = '编辑'
     },
     uploadImgSuccess (res, file) {

src/pages/recruit/CheckList.vue

@@ -564,4 +564,7 @@
     .search-btn{
         margin-left: 40px;
     }
+    .ivu-tabs{
+        overflow :inherit;
+    }
 </style>

src/pages/shop/IncreaseWelcomeEdit.vue

@@ -2,92 +2,117 @@
   <div class>
     <Row>
       <i-col :span="12">
-        <Form ref="welcomeForm" :model="welcome" :rules="welcomeRules">
+        <Form ref="welcomeForm"
-          <FormItem label="欢迎语内容" prop="content">
+              :model="welcome"
-            <i-input
+              :rules="welcomeRules">
-              v-model="welcome.content"
+          <FormItem label="欢迎语内容"
+                    prop="content">
+            <i-input v-model="welcome.content"
                      type="textarea"
                      style="height: 220px"
                      :autosize="{ minRows: 10, maxRows: 10 }"
-              placeholder="请输入欢迎语内容,最多100个字"
+                     placeholder="请输入欢迎语内容,最多100个字"></i-input>
-            ></i-input>
           </FormItem>
-          <Row
+          <Row style="margin-bottom: 10px"
-            style="margin-bottom: 10px"
                :gutter="10"
                class="inputItem"
                v-for="(item, index) in welcome.params"
-            :key="index"
+               :key="index">
-          >
             <div v-if="item.type == 3">
-              <i-col style="line-height: 32px" :span="2">标题 {{ index + 1 }}</i-col>
+              <i-col style="line-height: 32px"
+                     :span="2">标题 {{ index + 1 }}</i-col>
               <i-col :span="3">
-                <i-input class="inputClass" type="text" disabled v-model="item.key"></i-input>
+                <i-input class="inputClass"
+                         type="text"
+                         disabled
+                         v-model="item.key"></i-input>
               </i-col>
-              <i-col style="line-height: 32px" :span="2">APPID {{ index + 1 }}</i-col>
+              <i-col style="line-height: 32px"
+                     :span="2">APPID {{ index + 1 }}</i-col>
               <i-col :span="3">
-                <i-input class="inputClass" type="text" disabled v-model="item.defaultVal"></i-input>
+                <i-input class="inputClass"
+                         type="text"
+                         disabled
+                         v-model="item.defaultVal"></i-input>
               </i-col>
-              <i-col style="line-height: 32px" :span="2">URI {{ index + 1 }}</i-col>
+              <i-col style="line-height: 32px"
+                     :span="2">URI {{ index + 1 }}</i-col>
               <i-col :span="3">
-                <i-input class="inputClass" type="text" disabled v-model="item.description"></i-input>
+                <i-input class="inputClass"
+                         type="text"
+                         disabled
+                         v-model="item.description"></i-input>
               </i-col>
-              <i-col style="line-height: 32px" :span="2">MediaId{{ index + 1 }}</i-col>
+              <i-col style="line-height: 32px"
+                     :span="2">MediaId{{ index + 1 }}</i-col>
               <i-col :span="3">
-                <i-input class="inputClass" type="text" disabled v-model="item.limitLower"></i-input>
+                <i-input class="inputClass"
+                         type="text"
+                         disabled
+                         v-model="item.limitLower"></i-input>
               </i-col>
             </div>
             <div v-else-if="item.type == 2">
-              <i-col style="line-height: 32px" :span="4">标题 {{ index + 1 }}</i-col>
+              <i-col style="line-height: 32px"
+                     :span="4">标题 {{ index + 1 }}</i-col>
               <i-col :span="6">
-                <i-input class="inputClass" type="text" disabled v-model="item.description"></i-input>
+                <i-input class="inputClass"
+                         type="text"
+                         disabled
+                         v-model="item.description"></i-input>
               </i-col>
-              <i-col style="line-height: 32px" :span="4">URL {{ index + 1 }}</i-col>
+              <i-col style="line-height: 32px"
+                     :span="4">URL {{ index + 1 }}</i-col>
               <i-col :span="6">
-                <i-input class="inputClass" type="text" disabled v-model="item.defaultVal"></i-input>
+                <i-input class="inputClass"
+                         type="text"
+                         disabled
+                         v-model="item.defaultVal"></i-input>
               </i-col>
             </div>
             <div v-else>
-              <i-col style="line-height: 32px" :span="4">{{ item.name }}{{ index + 1 }}</i-col>
+              <i-col style="line-height: 32px"
+                     :span="4">{{ item.name }}{{ index + 1 }}</i-col>
               <i-col :span="16">
-                <i-input class="inputClass" type="text" disabled v-model="item.defaultVal"></i-input>
+                <i-input class="inputClass"
+                         type="text"
+                         disabled
+                         v-model="item.defaultVal"></i-input>
               </i-col>
             </div>
             <i-col :span="4">
-              <Button type="error" @click="delActivityInput(index)">删除</Button>
+              <Button type="error"
+                      @click="delActivityInput(index)">删除</Button>
             </i-col>
           </Row>
-          <FormItem>
+          <FormItem v-if="paramFilter()">
-            <Button type="text" @click="() => (showMessageTypes = true)" icon="md-add">添加图片/网页/小程序消息</Button>
+            <Button type="text"
+                    @click="() => (showMessageTypes = true)"
+                    icon="md-add">添加图片/网页/小程序消息</Button>
           </FormItem>
           <FormItem label="配置范围: ">
-            <span
+            <span @click="showStores"
-              @click="showStores"
+                  v-if="welcome.stores.length > 0">{{ welcome.stores[0].name }}等{{ welcome.stores.length }}家店铺</span>
-              v-if="welcome.stores.length > 0"
+            <Button type="text"
-            >{{ welcome.stores[0].name }}等{{ welcome.stores.length }}家店铺</span>
-            <Button
-              type="text"
                     v-if="welcome.stores.length <= 0"
                     @click="showStores"
-              icon="md-add"
+                    icon="md-add">全部店铺</Button>
-            >全部店铺</Button>
           </FormItem>
           <FormItem>
-            <Button
+            <Button type="primary"
-              type="primary"
                     :loading="loading"
                     long
-              @click="submit"
+                    @click="submit">{{loading ? "保存中" : "确定"}}</Button>
-            >{{loading ? "保存中" : "确定"}}</Button>
           </FormItem>
         </Form>
       </i-col>
     </Row>
-    <Modal v-model="showMessageTypes" title="添加图片/网页/小程序消息" :footer-hide="true">
+    <Modal v-model="showMessageTypes"
+           title="添加图片/网页/小程序消息"
+           :footer-hide="true">
       <Row :gutter="24">
-        <i-col :span="8" v-if="imageFilter()">
+        <i-col :span="8">
-          <Upload
+          <Upload ref="upload"
-            ref="upload"
                   :show-upload-list="false"
                   :on-success="uploadImgSuccess"
                   :format="['jpg', 'jpeg', 'png']"
@@ -97,49 +122,77 @@
                   multiple
                   type="drag"
                   action
-            style="width: 100%;"
+                  style="width: 100%;">
-          >
             <div style="width: 100%;">
-              <Button long type="primary">{{imageUploading ? "上传中..." : "图片"}}</Button>
+              <Button long
+                      type="primary">{{imageUploading ? "上传中..." : "图片"}}</Button>
             </div>
           </Upload>
         </i-col>
         <i-col :span="8">
-          <Button long @click="doShowWeb" v-if="webFilter()" type="primary">网页</Button>
+          <Button long
+                  @click="doShowWeb"
+                  type="primary">网页</Button>
         </i-col>
         <i-col :span="8">
-          <Button long @click="doShowMini" v-if="miniFilter()" type="primary">小程序</Button>
+          <Button long
+                  @click="doShowMini"
+                  type="primary">小程序</Button>
         </i-col>
       </Row>
     </Modal>
-    <Modal v-model="showWeb" title="添加网页消息" :loading="true">
+    <Modal v-model="showWeb"
-      <Form ref="webForm" :model="webForm" :rules="webFormRules">
+           title="添加网页消息"
-        <FormItem label="标题" prop="title">
+           :loading="true">
-          <i-input v-model="webForm.title" type="text" placeholder="请输入网页标题"></i-input>
+      <Form ref="webForm"
+            :model="webForm"
+            :rules="webFormRules">
+        <FormItem label="标题"
+                  prop="title">
+          <i-input v-model="webForm.title"
+                   type="text"
+                   placeholder="请输入网页标题"></i-input>
         </FormItem>
-        <FormItem label="添加网页消息" prop="url">
+        <FormItem label="添加网页消息"
-          <i-input v-model="webForm.url" type="text" placeholder="以http或https开头"></i-input>
+                  prop="url">
+          <i-input v-model="webForm.url"
+                   type="text"
+                   placeholder="以http或https开头"></i-input>
         </FormItem>
       </Form>
       <div slot="footer">
-        <Button type="primary" @click="cancelWeb">取消</Button>
+        <Button type="primary"
-        <Button type="primary" @click="okWeb">确定</Button>
+                @click="cancelWeb">取消</Button>
+        <Button type="primary"
+                @click="okWeb">确定</Button>
       </div>
     </Modal>
-    <Modal v-model="showMini" title="添加小程序消息" :loading="true">
+    <Modal v-model="showMini"
-      <Form ref="miniForm" :model="miniForm" :rules="miniFormRules">
+           title="添加小程序消息"
-        <FormItem label="标题" prop="key">
+           :loading="true">
-          <i-input v-model="miniForm.key" type="text" placeholder="请输入标题"></i-input>
+      <Form ref="miniForm"
+            :model="miniForm"
+            :rules="miniFormRules">
+        <FormItem label="标题"
+                  prop="key">
+          <i-input v-model="miniForm.key"
+                   type="text"
+                   placeholder="请输入标题"></i-input>
         </FormItem>
-        <FormItem label="APPID" prop="appid">
+        <FormItem label="APPID"
-          <i-input v-model="miniForm.appid" type="text" placeholder="请输入appid"></i-input>
+                  prop="appid">
+          <i-input v-model="miniForm.appid"
+                   type="text"
+                   placeholder="请输入appid"></i-input>
         </FormItem>
-        <FormItem label="URI" prop="uri">
+        <FormItem label="URI"
-          <i-input v-model="miniForm.uri" type="text" placeholder="请输入URl"></i-input>
+                  prop="uri">
+          <i-input v-model="miniForm.uri"
+                   type="text"
+                   placeholder="请输入URl"></i-input>
         </FormItem>
         <FormItem label="封面图">
-          <Upload
+          <Upload ref="upload"
-            ref="upload"
                   :show-upload-list="false"
                   :on-success="miniUploadImgSuccess"
                   :format="['jpg', 'jpeg', 'png']"
@@ -148,32 +201,29 @@
                   multiple
                   type="drag"
                   action
-            style="display: inline-block;"
+                  style="display: inline-block;">
-          >
             <div style="width: 200px;height:200px;line-height: 200px;border:1px dashed #dedede">
               <span v-if="!miniForm.limitUpper">请上传图片</span>
-              <img
+              <img v-if="miniForm.limitUpper"
-                v-if="miniForm.limitUpper"
                    :src="`/kiisoo-ic` + miniForm.limitUpper"
                    alt
-                style="width: 100%; height: auto"
+                   style="width: 100%; height: auto" />
-              />
             </div>
           </Upload>
         </FormItem>
       </Form>
       <div slot="footer">
-        <Button type="primary" @click="cancelMini">取消</Button>
+        <Button type="primary"
-        <Button type="primary" @click="okMini">确定</Button>
+                @click="cancelMini">取消</Button>
+        <Button type="primary"
+                @click="okMini">确定</Button>
       </div>
     </Modal>
-    <selectStoreStep
+    <selectStoreStep :title="'配置范围'"
-      :title="'配置范围'"
                      :isModify="id>0"
                      @doShow="doShow"
                      :schedule="welcome"
-      :show="showStoreCheck"
+                     :show="showStoreCheck"></selectStoreStep>
-    ></selectStoreStep>
   </div>
 </template>
 
@@ -260,20 +310,8 @@ export default {
     selectStoreStep
   },
   methods: {
-    webFilter() {
+    paramFilter () {
-      return (
+      return this.welcome.params.length < 1;
-        this._.filter(this.welcome.params, item => item.type == 2).length < 1
-      );
-    },
-    imageFilter() {
-      return (
-        this._.filter(this.welcome.params, item => item.type == 1).length < 1
-      );
-    },
-    miniFilter() {
-      return (
-        this._.filter(this.welcome.params, item => item.type == 3).length < 1
-      );
     },
     doShow () {
       this.showStoreCheck = false;

src/pages/shop/IncreaseWelcomeList.vue

@@ -204,6 +204,6 @@ export default {
   height: 30px;
 }
 button:hover {
-  background: inherit !important;
+  /*background: inherit !important;*/
 }
 </style>

src/services/CommonHttp.js

@@ -7,7 +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' ? 'https://wxtk.bsdits.com/kiisoo-ic/' : '/kiisoo-ic'
+  process.env.NODE_ENV === 'production' ? '/kiisoo-ic/' : '/kiisoo-ic'
 
 //响应时间
 axios.defaults.timeout = 120000

vue.config.js

@@ -6,11 +6,11 @@ module.exports = {
   // publicPath: process.env.NODE_ENV === 'production' ? '/public/' : './',
 
   /* history模式 */
-    publicPath: process.env.NODE_ENV === 'production' ? '/dist/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/',
   /* 输出文件目录：在npm run build时，生成文件的目录名称 */
   outputDir: 'dist',
   /* 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录 */
-    assetsDir: "assets",
+  assetsDir: 'assets',
   /* 是否在构建生产包时生成 sourceMap 文件，false将提高构建速度 */
   productionSourceMap: false,
   /* 默认情况下，生成的静态资源在它们的文件名中包含了 hash 以便更好的控制缓存，你可以通过将这个选项设为 false 来关闭文件名哈希。(false的时候就是让原来的文件名不改变) */
@@ -30,7 +30,7 @@ module.exports = {
     /* 使用代理 后台接口路径 */
     // proxy: 'http://192.168.1.123:8312/'
     // proxy: 'http://192.168.31.177:8312/'
-        proxy: 'http://localhost:8312/'
+    proxy: 'http://localhost:8080/',
     // proxy: 'http://jdxdev.vipgz4.idcfengye.com/'
-    }
+  },
 }