update: 欢迎语

src/App.vue

@@ -14,4 +14,13 @@ export default {
   }
 };
 </script>
-<style></style>
+<style>
+@import '../static/font/iconfont.css';
+.svg-iconfont {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
+</style>

src/components/common/svg-icon.vue

+<template>
+  <svg class="icon svg-icon svg-iconfont" aria-hidden="true" :style="ClassStyle">
+    <use :xlink:href="IconName"></use>
+  </svg>
+</template>
+
+<script>
+export default {
+  props: {
+    size: {
+      type: [Number, String],
+      default: 20
+    },
+    iconname: {
+      type: String,
+      default: ''
+    }
+  },
+  computed: {
+    ClassStyle() {
+      return `width:${parseInt(this.size)};height:${parseInt(this.size)};`;
+    },
+    IconName() {
+      return `#${this.iconname}`;
+    }
+  }
+};
+</script>
+
+<style scoped></style>

src/components/set/app-set.vue

@@ -23,7 +23,7 @@
           <el-input show-word-limit placeholder="请输入小程序名称" type="text" v-model="ruleForm.miniprogramName" maxlength="20"></el-input>
         </el-form-item>
         <el-form-item label="AppID：" prop="appId">
-          <el-input show-word-limit placeholder="请输入AppID" type="text" v-model="ruleForm.appId" maxlength="80" :disabled="true"></el-input>
+          <el-input show-word-limit placeholder="请先选择授权商户" type="text" v-model="ruleForm.appId" maxlength="80" :disabled="true"></el-input>
         </el-form-item>
         <el-form-item label="标题：" prop="title">
           <el-input show-word-limit placeholder="请输入标题" type="text" v-model="ruleForm.title" maxlength="80"></el-input>

src/main.js

@@ -21,10 +21,14 @@ import * as types from './store/types';
 import '../static/css/index.less';
 import 'element-ui/lib/theme-chalk/index.css';
 import '../static/font/iconfont.css';
+import '../static/font//iconfont.js'
 import '../theme/index.css';
 import '../static/css/dialog.css';
 import filters from './filters/index.js';
 
+import SvgIcon from "./components/common/svg-icon"
+Vue.component("svg-icon", SvgIcon)
+
 import vueOfficeHeader from '@gic-test/vue-office-header';
 import vueOfficeAside from '@gic-test/vue-office-aside';
 import vueOfficeArea from '@gic-test/vue-office-area';

src/views/business/authMerchant-form.vue

@@ -72,7 +72,6 @@
                 </el-form-item>
                 <el-form-item label="企业类型"> <el-radio v-model="partForm.wxEnterpriseType" :label="0" :disabled="type === 'edit'">总部</el-radio> <el-radio v-model="partForm.wxEnterpriseType" :label="1" :disabled="type === 'edit'">代理</el-radio> </el-form-item>
                 <el-button type="primary" style="display:block;margin:38px 0 0 128px;" @click="addShow = true" :disabled="!(enterpriseId && partForm.storeGroup.length)">授权校验并{{ type === 'edit' ? '保存' : '新建' }}</el-button>
-                {{ partForm.storeGroup }}
               </el-form>
             </div>
           </div>
@@ -276,12 +275,10 @@ export default {
             let checkedList = [];
             resData.result.relations && resData.result.relations.map(item => checkedList.push({ relationId: item.relationId }));
             that.checkedList = checkedList;
-            that.partForm = {
-              wxEnterpriseRelatedId: resData.result.wxEnterpriseRelatedId,
-              memberOpenCardFlag: resData.result.memberOpenCardFlag,
-              wxEnterpriseType: resData.result.wxEnterpriseType,
-              searchSelect: resData.result.enterpriseName
-            };
+            that.partForm.wxEnterpriseRelatedId = resData.result.wxEnterpriseRelatedId;
+            that.partForm.memberOpenCardFlag = resData.result.memberOpenCardFlag;
+            that.partForm.wxEnterpriseType = resData.result.wxEnterpriseType;
+            that.partForm.searchSelect = resData.result.enterpriseName;
             that.querySearchAsync('edit');
           }
           errMsg.errorMsg(resData);
@@ -299,7 +296,6 @@ export default {
     this.getCompanyName();
     if (this.$route.query.enterprise) {
       this.type = 'edit';
-      this.enterpriseId = this.$route.query.enterprise;
       this.getDeatil(this.$route.query.enterprise);
     } else {
       this.type = 'add';

src/views/enterprise/salutatory.vue

@@ -15,14 +15,17 @@
       </div>
       <div class="salutatory-wrap m-t-20">
         <div class="top">
-          <p class="left">欢迎语标题</p>
-          <p class="right"><span class="date">最近编辑时间：2021-03-26 12:22:33</span><el-button type="text" @click="changeRoute">编辑</el-button></p>
+          <p class="left">欢迎语标题 {{ form.title || '【系统默认】' }}</p>
+          <p class="right">
+            <span class="date">最近编辑时间：{{ form.updateTime || '-' }}</span
+            ><el-button type="text" @click="changeRoute">编辑</el-button>
+          </p>
         </div>
         <p class="line"></p>
         <div class="bottom">
-          <el-form label-width="83px" ref="form" :model="form">
-            <el-form-item label="文本内容">文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内 容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容</el-form-item>
-            <el-form-item label="附件">【好办welldown】文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内容文本内</el-form-item>
+          <el-form label-width="70px" ref="form" :model="form">
+            <el-form-item label="文本内容"> {{ form.welcomeContent || '你好，&lt; 微信昵称 &gt;' }}</el-form-item>
+            <!-- <el-form-item label="附件"></el-form-item> -->
           </el-form>
         </div>
       </div>
@@ -52,16 +55,14 @@ export default {
     /**
      * 获取数据
      */
-    getData(val) {
+    getData() {
       const that = this;
-      let para = {
-        wxEnterpriseId: that.wxEnterpriseId
-      };
-      getRequest('/haoban-manage3-web/admin-list', para)
+
+      getRequest('/haoban-manage3-web/get-welcome', {})
         .then(res => {
           let resData = res.data;
           if (resData.errorCode == 1 && resData.result) {
-            that.form = resData.result;
+            that.form = { ...resData.result };
           }
           errMsg.errorMsg(resData);
         })

src/views/enterprise/salutatorySet.vue

@@ -2,24 +2,25 @@
   <div class="daily-set-wrap ">
     <div class="daily-set-content border-box">
       <div class="salutatory-set-wrap m-t-20">
-        <el-form label-width="100px" ref="form" :model="form">
-          <el-form-item label="欢迎语标题"><el-input show-word-limit placeholder="请输入欢迎语标题" type="text" v-model="form.appName" maxlength="20"></el-input> </el-form-item>
-          <el-form-item label="文本内容">
-            <p>建议以文本+其他类型内容组合创建欢迎语</p>
-            <el-input show-word-limit placeholder="请输入文本内容" type="textarea" v-model="form.appName2" maxlength="1000"></el-input>
-            <div class="text-bottom flex">
+        <el-form label-width="117px" ref="form" :model="form" :rules="rules" refs="form">
+          <el-form-item label="欢迎语标题" prop="title"><el-input show-word-limit placeholder="请输入欢迎语标题" type="text" v-model="form.title" maxlength="20" class="w-384"></el-input> </el-form-item>
+          <el-form-item label="欢迎语内容" prop="welcomeContent" class="welcomeContentItem">
+            <el-input show-word-limit placeholder="请输入文本内容" type="textarea" v-model="form.welcomeContent" maxlength="1000" class="w-384 welcomeContent"></el-input>
+            <div class="text-bottom flex w-384">
               <el-popover placement="top" width="388" trigger="click">
                 <ul class="flex flex-wrap">
                   <li v-for="(item, index) in emojiList" :key="index + 'emoji'">
                     <img :src="item.gifUrl" alt="" @click="selectEmoji(item)" />
                   </li>
                 </ul>
-                <img class="emoji-img cursor-pointer" slot="reference" src="https://pic01-10001430.image.myqcloud.com/b0d3c14f-69e7-4753-8fbc-3bffcff9f8ce" alt="" />
+                <p slot="reference" style="cursor:pointer;">
+                  <svg-icon iconname="iconbiaoqing" size="20"> </svg-icon>
+                </p>
               </el-popover>
-              <div class="put">插入&lt; 微信昵称 &gt;</div>
+              <div class="put" @click="putName">插入&lt; 微信昵称 &gt;</div>
             </div>
           </el-form-item>
-          <el-button type="primary">保存</el-button>
+          <el-button type="primary" style="margin-left:117px;" @click="submit">保存</el-button>
         </el-form>
       </div>
     </div>
@@ -37,8 +38,11 @@ export default {
   data() {
     return {
       form: {
-        appName: '121sdc',
-        appName2: 'zxkjhckzxjhckjxzhkc'
+        title: '系统默认',
+        welcomeContent: '你好，<微信昵称>'
+      },
+      rules: {
+        title: [{ required: true, message: '请输入欢迎语标题', trigger: 'blur' }]
       },
       emojiList: emojiArr
     };
@@ -49,18 +53,22 @@ export default {
     },
     selectEmoji(item) {
       const that = this;
-      that.form.appName2 = that.form.appName2 + item.key;
+      that.form.welcomeContent = that.form.welcomeContent + item.key;
+    },
+    putName() {
+      const that = this;
+      that.form.welcomeContent = that.form.welcomeContent + '<微信昵称>';
     },
-    getData(val) {
+    getData() {
       const that = this;
       let para = {
         wxEnterpriseId: that.wxEnterpriseId
       };
-      getRequest('/haoban-manage3-web/admin-list', para)
+      getRequest('/haoban-manage3-web/get-welcome', para)
         .then(res => {
           let resData = res.data;
           if (resData.errorCode == 1 && resData.result) {
-            // that.form = resData.result;
+            that.form = resData.result;
           }
           errMsg.errorMsg(resData);
         })
@@ -70,6 +78,43 @@ export default {
             message: error.message
           });
         });
+    },
+    submit() {
+      const that = this;
+      that.$refs.form.validate(value => {
+        console.log(value);
+        if (value) {
+          this.$confirm('是否保存此欢迎语？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+            .then(() => {
+              const para = {
+                ...that.form
+              };
+              getRequest('/haoban-manage3-web/save-welcome', para)
+                .then(res => {
+                  let resData = res.data;
+                  if (resData.errorCode == 1) {
+                    this.$message({
+                      type: 'success',
+                      message: '保存成功!'
+                    });
+                    window.location.reload();
+                  }
+                  errMsg.errorMsg(resData);
+                })
+                .catch(function(error) {
+                  that.$message.error({
+                    duration: 1000,
+                    message: error.message
+                  });
+                });
+            })
+            .catch();
+        }
+      });
     }
   },
   watch: {},
@@ -88,6 +133,25 @@ export default {
 };
 </script>
 <style type="text/scss" lang="scss" scoped>
+.w-384 {
+  width: 384px;
+  box-sizing: border-box;
+}
+.welcomeContent {
+  height: 220px;
+  border: 1px solid #dcdfe6;
+  border-radius: 2px;
+  >>> .el-textarea__inner {
+    height: 181px;
+    border: none;
+    &:focus {
+      box-shadow: none;
+    }
+  }
+  >>> .el-input__count {
+    bottom: 44px;
+  }
+}
 .daily-set-wrap {
   height: 100%;
   .daily-set-content {
@@ -98,7 +162,33 @@ export default {
   }
 }
 .salutatory-set-wrap {
-  .text-bottom {
+  >>> .el-input__inner:focus {
+    box-shadow: none;
+  }
+  .welcomeContentItem >>> .el-form-item__content {
+    position: relative;
+    width: 384px;
+    box-sizing: border-box;
+    .text-bottom {
+      position: absolute;
+      bottom: 1px;
+      left: 1px;
+      justify-content: space-between;
+      align-items: center;
+      height: 38px;
+      width: 382px;
+      box-sizing: border-box;
+      padding: 0 9px;
+      background: #f5f7fa;
+
+      .put {
+        font-size: 12px;
+        font-weight: 400;
+        color: #606266;
+        line-height: 17px;
+        cursor: pointer;
+      }
+    }
   }
 }
 </style>