From 4e3e08705adfa1370a620f1267f59ec70ff62ba5 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Thu, 4 Jun 2020 13:56:12 +0800
Subject: [PATCH] 1

---
 src/pages/activity/selectStoreStep.vue |   6 +-
 src/pages/shop/IncreaseWelcomeEdit.vue | 300 +++++++++++++++----------
 src/pages/shop/IncreaseWelcomeList.vue |  33 ++-
 3 files changed, 211 insertions(+), 128 deletions(-)

diff --git a/src/pages/activity/selectStoreStep.vue b/src/pages/activity/selectStoreStep.vue
index 01c0977..cf11fe8 100644
--- a/src/pages/activity/selectStoreStep.vue
+++ b/src/pages/activity/selectStoreStep.vue
@@ -2,7 +2,7 @@
   <div class="use_box">
     <Modal :scrollable="false"
            v-model="showUse"
-           title="使用活动"
+           :title="title"
            @on-cancel="cancel"
            :loading="true"
            width="70%">
@@ -69,6 +69,10 @@ export default {
     isModify: {
       type: Boolean,
       default: false
+    },
+    title: {
+      type: String,
+      default: "使用活动"
     }
   },
   watch: {
diff --git a/src/pages/shop/IncreaseWelcomeEdit.vue b/src/pages/shop/IncreaseWelcomeEdit.vue
index 4ae5617..7efe419 100644
--- a/src/pages/shop/IncreaseWelcomeEdit.vue
+++ b/src/pages/shop/IncreaseWelcomeEdit.vue
@@ -2,167 +2,227 @@
   <div class>
     <Row>
       <i-col :span="12">
-        <Form ref="welcomeForm" :model="welcome" :rules="welcomeRules">
-          <FormItem label="欢迎语内容" prop="content">
-            <i-input
-              v-model="welcome.content"
-              type="textarea"
-              style="height: 220px"
-              :autosize="{ minRows: 10, maxRows: 10 }"
-              placeholder="请输入欢迎语内容,最多100个字"
-            ></i-input>
+        <Form ref="welcomeForm"
+              :model="welcome"
+              :rules="welcomeRules">
+          <FormItem label="欢迎语内容"
+                    prop="content">
+            <i-input v-model="welcome.content"
+                     type="textarea"
+                     style="height: 220px"
+                     :autosize="{ minRows: 10, maxRows: 10 }"
+                     placeholder="请输入欢迎语内容,最多100个字"></i-input>
           </FormItem>
-          <Row
-            style="margin-bottom: 10px"
-            :gutter="10"
-            class="inputItem"
-            v-for="(item, index) in welcome.params"
-            :key="index"
-          >
+          <Row style="margin-bottom: 10px"
+               :gutter="10"
+               class="inputItem"
+               v-for="(item, index) in welcome.params"
+               :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 :span="8">
-                <i-input class="inputClass" type="text" disabled v-model="item.description"></i-input>
+              <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-col>
-              <i-col style="line-height: 32px" :span="4">URL {{ index + 1 }}</i-col>
-              <i-col :span="8">
-                <i-input class="inputClass" type="text" disabled v-model="item.defaultVal"></i-input>
+              <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-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>
-            <Button type="text" @click="() => (showMessageTypes = true)" icon="md-add">添加图片/网页/小程序消息</Button>
+            <Button type="text"
+                    @click="() => (showMessageTypes = true)"
+                    icon="md-add">添加图片/网页/小程序消息</Button>
           </FormItem>
           <FormItem label="配置范围: ">
-            <span
-              @click="showStores"
-              v-if="welcome.stores.length > 0"
-            >{{ welcome.stores[0].name }}等{{ welcome.stores.length }}家店铺</span>
-            <Button
-              type="text"
-              v-if="welcome.stores.length <= 0"
-              @click="showStores"
-              icon="md-add"
-            >全部店铺</Button>
+            <span @click="showStores"
+                  v-if="welcome.stores.length > 0">{{ welcome.stores[0].name }}等{{ welcome.stores.length }}家店铺</span>
+            <Button type="text"
+                    v-if="welcome.stores.length <= 0"
+                    @click="showStores"
+                    icon="md-add">全部店铺</Button>
           </FormItem>
           <FormItem>
-            <Button type="primary" long @click="submit">确定</Button>
+            <Button type="primary"
+                    long
+                    @click="submit">确定</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">
-          <Upload
-            ref="upload"
-            :show-upload-list="false"
-            :on-success="uploadImgSuccess"
-            :format="['jpg', 'jpeg', 'png']"
-            :max-size="2048"
-            :on-exceeded-size="onExceededSize"
-            :before-upload="handleBeforeUpload"
-            multiple
-            type="drag"
-            action
-            style="width: 100%;"
-          >
+          <Upload ref="upload"
+                  :show-upload-list="false"
+                  :on-success="uploadImgSuccess"
+                  :format="['jpg', 'jpeg', 'png']"
+                  :max-size="2048"
+                  :on-exceeded-size="onExceededSize"
+                  :before-upload="handleBeforeUpload"
+                  multiple
+                  type="drag"
+                  action
+                  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" type="primary">网页</Button>
+          <Button long
+                  @click="doShowWeb"
+                  type="primary">网页</Button>
         </i-col>
         <i-col :span="8">
-          <Button long @click="doShowMini" type="primary">小程序</Button>
+          <Button long
+                  @click="doShowMini"
+                  type="primary">小程序</Button>
         </i-col>
       </Row>
     </Modal>
-    <Modal v-model="showWeb" title="添加网页消息" :loading="true">
-      <Form ref="webForm" :model="webForm" :rules="webFormRules">
-        <FormItem label="标题" prop="url">
-          <i-input v-model="webForm.title" type="text" placeholder="请输入网页标题"></i-input>
+    <Modal v-model="showWeb"
+           title="添加网页消息"
+           :loading="true">
+      <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">
-          <i-input v-model="webForm.url" type="text" placeholder="以http或https开头"></i-input>
+        <FormItem label="添加网页消息"
+                  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" @click="okWeb">确定</Button>
+        <Button type="primary"
+                @click="cancelWeb">取消</Button>
+        <Button type="primary"
+                @click="okWeb">确定</Button>
       </div>
     </Modal>
-    <Modal v-model="showMini" title="添加小程序消息" :loading="true">
-      <Form ref="miniForm" :model="miniForm" :rules="miniFormRules">
-        <FormItem label="标题" prop="key">
-          <i-input v-model="miniForm.key" type="text" placeholder="请输入标题"></i-input>
+    <Modal v-model="showMini"
+           title="添加小程序消息"
+           :loading="true">
+      <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">
-          <i-input v-model="miniForm.appid" type="text" placeholder="请输入appid"></i-input>
+        <FormItem label="APPID"
+                  prop="appid">
+          <i-input v-model="miniForm.appid"
+                   type="text"
+                   placeholder="请输入appid"></i-input>
         </FormItem>
-        <FormItem label="URI" prop="uri">
-          <i-input v-model="miniForm.uri" type="text" placeholder="请输入URl"></i-input>
+        <FormItem label="URI"
+                  prop="uri">
+          <i-input v-model="miniForm.uri"
+                   type="text"
+                   placeholder="请输入URl"></i-input>
         </FormItem>
         <FormItem label="封面图">
-          <Upload
-            ref="upload"
-            :show-upload-list="false"
-            :on-success="miniUploadImgSuccess"
-            :format="['jpg', 'jpeg', 'png']"
-            :max-size="2048"
-            :before-upload="handleBeforeUploadMini"
-            multiple
-            type="drag"
-            action
-            style="display: inline-block;"
-          >
+          <Upload ref="upload"
+                  :show-upload-list="false"
+                  :on-success="miniUploadImgSuccess"
+                  :format="['jpg', 'jpeg', 'png']"
+                  :max-size="2048"
+                  :before-upload="handleBeforeUploadMini"
+                  multiple
+                  type="drag"
+                  action
+                  style="display: inline-block;">
             <div style="width: 200px;height:200px;line-height: 200px;border:1px dashed #dedede">
               <span v-if="!miniForm.limitUpper">请上传图片</span>
-              <img
-                v-if="miniForm.limitUpper"
-                :src="`/kiisoo-ic` + miniForm.limitUpper"
-                alt
-                style="width: 100%; height: auto"
-              />
+              <img v-if="miniForm.limitUpper"
+                   :src="`/kiisoo-ic` + miniForm.limitUpper"
+                   alt
+                   style="width: 100%; height: auto" />
             </div>
           </Upload>
         </FormItem>
       </Form>
       <div slot="footer">
-        <Button type="primary" @click="cancelMini">取消</Button>
-        <Button type="primary" @click="okMini">确定</Button>
+        <Button type="primary"
+                @click="cancelMini">取消</Button>
+        <Button type="primary"
+                @click="okMini">确定</Button>
       </div>
     </Modal>
-    <selectStoreStep :isModify="id>0" @doShow="doShow" :schedule="welcome" :show="showStoreCheck"></selectStoreStep>
+    <selectStoreStep :title="'配置范围'"
+                     :isModify="id>0"
+                     @doShow="doShow"
+                     :schedule="welcome"
+                     :show="showStoreCheck"></selectStoreStep>
   </div>
 </template>
 
@@ -181,7 +241,7 @@ const validateUrl = (rule, value, callback) => {
   }
 };
 export default {
-  data() {
+  data () {
     return {
       showStoreCheck: false,
       showWeb: false,
@@ -226,7 +286,7 @@ export default {
   },
   watch: {
     welcome: {
-      handler() {
+      handler () {
         store.commit("SET_useData", {
           ...store.getters.useData,
           ...this.welcome
@@ -236,7 +296,7 @@ export default {
       deep: true
     }
   },
-  created() {
+  created () {
     this.id = this.$route.query.id;
     // store.commit("SET_useData", { ...store.getters.useData, ...this.welcome });
     console.log(this.$route);
@@ -248,14 +308,14 @@ export default {
     selectStoreStep
   },
   methods: {
-    doShow() {
+    doShow () {
       this.showStoreCheck = false;
       this.welcome = store.getters.useData;
     },
-    onExceededSize() {
+    onExceededSize () {
       console.log("失败");
     },
-    getDetail(instanceId) {
+    getDetail (instanceId) {
       let _this = this;
       ActivityManager.instanceDetail(
         {
@@ -270,7 +330,7 @@ export default {
         }
       );
     },
-    showStores() {
+    showStores () {
       console.log({ ...store.getters.useData, ...this.welcome });
       store.commit("SET_useData", {
         ...this.welcome,
@@ -278,16 +338,16 @@ export default {
       });
       this.showStoreCheck = true;
     },
-    uploadImgSuccess(res, file) {},
-    miniUploadImgSuccess(res, file) {},
-    cancelWeb() {
+    uploadImgSuccess (res, file) { },
+    miniUploadImgSuccess (res, file) { },
+    cancelWeb () {
       this.showWeb = false;
     },
-    doShowWeb() {
+    doShowWeb () {
       this.showWeb = true;
       this.webForm = { url: "", title: "" };
     },
-    doShowMini() {
+    doShowMini () {
       this.showMini = true;
       this.miniForm = {
         appid: "",
@@ -297,10 +357,10 @@ export default {
         key: ""
       };
     },
-    cancelMini() {
+    cancelMini () {
       this.showMini = false;
     },
-    okWeb() {
+    okWeb () {
       let _this = this;
       this.$refs["webForm"].validate(valid => {
         if (valid) {
@@ -320,7 +380,7 @@ export default {
         }
       });
     },
-    okMini() {
+    okMini () {
       let _this = this;
       this.$refs["miniForm"].validate(valid => {
         if (valid) {
@@ -340,11 +400,11 @@ export default {
         }
       });
     },
-    delActivityInput(index) {
+    delActivityInput (index) {
       this.welcome.params.splice(index, 1);
       this.$forceUpdate();
     },
-    handleBeforeUploadMini(res) {
+    handleBeforeUploadMini (res) {
       const me = this;
       let data = new FormData();
       data.append("file", res);
@@ -358,7 +418,7 @@ export default {
         headers: {
           "Content-Type": "multipart/form-data"
         }
-      }).then(function(res) {
+      }).then(function (res) {
         me.imageUploading = false;
         if (res.data.success) {
           // me.formValidate.logo = res.data.results;
@@ -369,7 +429,7 @@ export default {
       });
       return false;
     },
-    handleBeforeUpload(res) {
+    handleBeforeUpload (res) {
       const me = this;
       let data = new FormData();
       data.append("file", res);
@@ -383,7 +443,7 @@ export default {
         headers: {
           "Content-Type": "multipart/form-data"
         }
-      }).then(function(res) {
+      }).then(function (res) {
         me.imageUploading = false;
         if (res.data.success) {
           // me.formValidate.logo = res.data.results;
@@ -403,7 +463,7 @@ export default {
       });
       return false;
     },
-    submit() {
+    submit () {
       let _this = this;
       if (this.welcome.stores.length <= 0) {
         _this.$Message.error("请至少选择一个店铺");
diff --git a/src/pages/shop/IncreaseWelcomeList.vue b/src/pages/shop/IncreaseWelcomeList.vue
index 7141655..ca09543 100644
--- a/src/pages/shop/IncreaseWelcomeList.vue
+++ b/src/pages/shop/IncreaseWelcomeList.vue
@@ -17,12 +17,16 @@
            size="small">
       <template slot-scope="{ row, index }"
                 slot="action">
-        <Button type="primary"
-                size="small"
-                @click="handleEdit(row, index)">修改</Button>
-        <Button type="error"
-                size="small"
-                @click="handleDelete(row, index)">删除</Button>
+        <i-col span="12">
+          <Button ghost
+                  class="router-btn"
+                  @click="() => {handleEdit(row, index)}">修改</Button>
+        </i-col>
+        <i-col span="12">
+          <Button ghost
+                  class="router-btn"
+                  @click="() => {handleDelete(row, index)}">删除</Button>
+        </i-col>
       </template>
     </Table>
     <Page :total="total"
@@ -187,4 +191,19 @@ export default {
 };
 </script>
 
-<style scoped></style>
+<style scoped>
+.router-btn {
+  border: none;
+  color: #3496eb !important;
+  margin-left: -15px;
+}
+.table-img-qr-code {
+  margin-left: 5px;
+  margin-top: 5px;
+  width: 30px;
+  height: 30px;
+}
+button:hover {
+  background: inherit !important;
+}
+</style>