feat: 增加素材上传

24ed2f90 · 无尘 · b44b0198 · 24ed2f90 · 24ed2f90 · 24ed2f90
Commit 24ed2f90 authored Dec 10, 2019 by 无尘
31 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.f9ede39b0ad235b71c7c8c929e2ea657.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.12dc8344f67a5d452ef0.js></script><script type=text/javascript src=./static/js/vendor.329cb88147b5a2d6f4c1.js></script><script type=text/javascript src=./static/js/app.7796b5a13d0460a03675.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>好办管理平台</title><link href=./static/css/app.e7807ea338533a175a4b6f8e2fea9c12.css rel=stylesheet></head><body style="min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script>// Raven.config('https://3715a345910d4c768e7a1ec14619c2d5@sentry.io/1413672').install();</script><script type=text/javascript src=./static/js/manifest.615b9b51024864df2853.js></script><script type=text/javascript src=./static/js/vendor.329cb88147b5a2d6f4c1.js></script><script type=text/javascript src=./static/js/app.4f02bca39a92dd513051.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.f9ede39b0ad235b71c7c8c929e2ea657.css
+++ b/dist/static/css/app.f9ede39b0ad235b71c7c8c929e2ea657.css
--- a/dist/static/css/public.css
+++ b/dist/static/css/public.css
@@ -344,6 +344,10 @@ input:focus {
  border-radius: 18px;
 }
+.cursor-pointer {
+  cursor: pointer;
+}
 .t-rt {
  text-align: right;
 }

--- a/dist/static/js/13.72a3eaee988294af1a6d.js
+++ b/dist/static/js/13.72a3eaee988294af1a6d.js
--- a/dist/static/js/13.7a1209cee702b94497bd.js
+++ b/dist/static/js/13.7a1209cee702b94497bd.js
--- a/dist/static/js/16.f133569d245b8d6ddc46.js
+++ b/dist/static/js/16.f133569d245b8d6ddc46.js
--- a/dist/static/js/17.805637f359bdf9f8e775.js
+++ b/dist/static/js/17.805637f359bdf9f8e775.js
--- a/dist/static/js/16.2ee1cd09e02cae2867cf.js
+++ b/dist/static/js/16.2ee1cd09e02cae2867cf.js
--- a/dist/static/js/17.78c6d10043e3245cbd2a.js
+++ b/dist/static/js/17.78c6d10043e3245cbd2a.js
--- a/dist/static/js/19.f513b1bad38e058aad9a.js
+++ b/dist/static/js/19.f513b1bad38e058aad9a.js
--- a/dist/static/js/18.4b5e4ee96f2607285a8a.js
+++ b/dist/static/js/18.4b5e4ee96f2607285a8a.js
--- a/dist/static/js/20.1b54392e7af3a5224220.js
+++ b/dist/static/js/20.1b54392e7af3a5224220.js
--- a/dist/static/js/22.1c7008ee04fe6b121232.js
+++ b/dist/static/js/22.1c7008ee04fe6b121232.js
--- a/dist/static/js/21.6a4f413720f3f3c7b17c.js
+++ b/dist/static/js/21.6a4f413720f3f3c7b17c.js
--- a/dist/static/js/25.0af7295ba7b1c6c894de.js
+++ b/dist/static/js/25.0af7295ba7b1c6c894de.js
--- a/dist/static/js/25.9c6f7109a005bdb494e5.js
+++ b/dist/static/js/25.9c6f7109a005bdb494e5.js
--- a/dist/static/js/26.0c495188ef1f3b114a8e.js
+++ b/dist/static/js/26.0c495188ef1f3b114a8e.js
--- a/dist/static/js/27.57f367dff6dc03b81aee.js
+++ b/dist/static/js/27.57f367dff6dc03b81aee.js
--- a/dist/static/js/26.13962bf105070352b110.js
+++ b/dist/static/js/26.13962bf105070352b110.js
--- a/dist/static/js/app.7796b5a13d0460a03675.js
+++ b/dist/static/js/app.7796b5a13d0460a03675.js
--- a/dist/static/js/manifest.12dc8344f67a5d452ef0.js
+++ b/dist/static/js/manifest.12dc8344f67a5d452ef0.js
-!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],f[t]&&u.push(f[t][0]),f[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=d(d.s=n[i]);return o};var a={},f={99:0};function d(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,d),f.l=!0,f.exports}d.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,d){c=f[e]=[a,d]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,d.nc&&n.setAttribute("nonce",d.nc),n.src=d.p+"static/js/"+e+"."+{0:"0c92ca6a177308e38600",1:"fe9dec1f31b04053fd7e",2:"54aabab28c7735d34c10",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"2784801807ecd1469c27",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"879536ae7ce46f0c54ec",13:"72a3eaee988294af1a6d",14:"906484db655680062129",15:"dc1ca8ebc6cc47b86e2d",16:"2ee1cd09e02cae2867cf",17:"78c6d10043e3245cbd2a",18:"4b5e4ee96f2607285a8a",19:"f513b1bad38e058aad9a",20:"1b54392e7af3a5224220",21:"6a4f413720f3f3c7b17c",22:"1c7008ee04fe6b121232",23:"6586d8dbbc88ff9e7868",24:"ae973093bb8dd3a5b495",25:"0af7295ba7b1c6c894de",26:"13962bf105070352b110",27:"57f367dff6dc03b81aee",28:"4967b74d6bbb9e6cc702",29:"28ccae4d06ea6b595ca9",30:"fd04453caecf77de05a2",31:"320f1a0aa86ca13e4306",32:"5e1383bc5cac66f2999a",33:"61635e97ee430e22a19b",34:"50c83d54c676bdfa7dd4",35:"ac9cb6aa5dc9b6fc2b6f",36:"7674738e3017ed5fcc1c",37:"e223c4067dc6c2fd38ab",38:"eaa34f0904ef970709a7",39:"f4a6c4a1b3881e31a92c",40:"655877fc2e44168b8c1c",41:"89560c4643dfa5754a23",42:"5c09b508b0a58d47c09c",43:"7c7427290d655f79f005",44:"8c27aaae1582618d2ab0",45:"235e93346fe2b95897cb",46:"cc4d205e90682c5b93c0",47:"26a5ded2bad54156ad19",48:"67316f92922aa44a4689",49:"a8a17bd4a62cf533f17e",50:"1892aba5601ac79c8a77",51:"3b64bf9b851ae6715634",52:"600a530c5d3ecac3db2c",53:"f93433cfdb48cb98bb84",54:"e9011eb58ee8fb0165ad",55:"3aff1a161f4b3876181c",56:"bd1d8ffdf7749d7d6e7a",57:"77278d614a1fc68d5681",58:"f8d434e5d4758ae8626c",59:"b3e479223a01f87d8337",60:"c05387a974f25645ee7b",61:"b93d3f6b5ec653e5c4c6",62:"12ee3896f6851cd2cb4c",63:"ab6bd438d590a7aa1e85",64:"8f377047299728a7c625",65:"b9df0942284c0dbfdc27",66:"5433d9783d667005811b",67:"0f6d447133b1acbc532b",68:"7830c5679af6f8b2cb9d",69:"61cee4c7c7a26b880f84",70:"6f28138a852985cde574",71:"4cf18546d28a67295cf8",72:"fe9d1bbd12f4274225e1",73:"88e613d232847cb90be2",74:"ab208d1118bb1a9aa540",75:"b14512ee0a369c73d41f",76:"6143595e7025663becbc",77:"98f5d41a602eec297e70",78:"bd75ce697ff5a3211d53",79:"7ede10f0ba3b16700fc9",80:"4d61def8e6694657ea56",81:"e7670320995684cfa512",82:"4194ad3d53ad440bfb80",83:"44fd11f0fbdad5fdfe01",84:"1823d3e667816d0f2259",85:"779373ab4595fb2a48f9",86:"72fd057b1111acefbe95",87:"f616874d7e40fcf1caa1",88:"5e52821a3ece9ccdeb3f",89:"85a2bbd9554df0f81300",90:"6d7f539733951e52b9e1",91:"44545722d2e68c8f5b69",92:"b5b46350bd10a723b0b2",93:"0cf2ca11a7d3aa4b1ef3",94:"4eb1775c97e0c0097641",95:"d14fcdfe817ed45c25db",98:"4afc4e966f02914d8565"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},d.m=e,d.c=a,d.d=function(e,c,a){d.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},d.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return d.d(c,"a",c),c},d.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},d.p="./",d.oe=function(e){throw console.error(e),e}}([]);
+!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,b,n){for(var r,t,o,i=0,u=[];i<a.length;i++)t=a[i],d[t]&&u.push(d[t][0]),d[t]=0;for(r in b)Object.prototype.hasOwnProperty.call(b,r)&&(e[r]=b[r]);for(c&&c(a,b,n);u.length;)u.shift()();if(n)for(i=0;i<n.length;i++)o=f(f.s=n[i]);return o};var a={},d={99:0};function f(c){if(a[c])return a[c].exports;var d=a[c]={i:c,l:!1,exports:{}};return e[c].call(d.exports,d,d.exports,f),d.l=!0,d.exports}f.e=function(e){var c=d[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,f){c=d[e]=[a,f]});c[2]=a;var b=document.getElementsByTagName("head")[0],n=document.createElement("script");n.type="text/javascript",n.charset="utf-8",n.async=!0,n.timeout=12e4,f.nc&&n.setAttribute("nonce",f.nc),n.src=f.p+"static/js/"+e+"."+{0:"0c92ca6a177308e38600",1:"fe9dec1f31b04053fd7e",2:"54aabab28c7735d34c10",3:"b7e6d57d97174b75b050",4:"11254d7e3a102121b8ec",5:"2784801807ecd1469c27",6:"124ad8222f7b043b44ae",7:"ebad93a8c5bffffd9e98",8:"f1c9fb5c9212483138d8",9:"b5aae16b3951516573ad",10:"ebbed2d956a1376f014a",11:"59c7813cc972f62b1d18",12:"879536ae7ce46f0c54ec",13:"7a1209cee702b94497bd",14:"906484db655680062129",15:"dc1ca8ebc6cc47b86e2d",16:"f133569d245b8d6ddc46",17:"805637f359bdf9f8e775",18:"f7633d51986d0c6798f1",19:"60cda7a1997f26103e8b",20:"9978a0294be1004d697d",21:"ed8d46095e29b1e8d098",22:"537abc52bc237952c65a",23:"6586d8dbbc88ff9e7868",24:"ae973093bb8dd3a5b495",25:"9c6f7109a005bdb494e5",26:"0c495188ef1f3b114a8e",27:"c3f7fb68797f235ad906",28:"4967b74d6bbb9e6cc702",29:"28ccae4d06ea6b595ca9",30:"fd04453caecf77de05a2",31:"320f1a0aa86ca13e4306",32:"5e1383bc5cac66f2999a",33:"61635e97ee430e22a19b",34:"50c83d54c676bdfa7dd4",35:"ac9cb6aa5dc9b6fc2b6f",36:"7674738e3017ed5fcc1c",37:"e223c4067dc6c2fd38ab",38:"eaa34f0904ef970709a7",39:"f4a6c4a1b3881e31a92c",40:"655877fc2e44168b8c1c",41:"89560c4643dfa5754a23",42:"5c09b508b0a58d47c09c",43:"7c7427290d655f79f005",44:"8c27aaae1582618d2ab0",45:"235e93346fe2b95897cb",46:"cc4d205e90682c5b93c0",47:"26a5ded2bad54156ad19",48:"67316f92922aa44a4689",49:"a8a17bd4a62cf533f17e",50:"1892aba5601ac79c8a77",51:"3b64bf9b851ae6715634",52:"600a530c5d3ecac3db2c",53:"f93433cfdb48cb98bb84",54:"e9011eb58ee8fb0165ad",55:"3aff1a161f4b3876181c",56:"bd1d8ffdf7749d7d6e7a",57:"77278d614a1fc68d5681",58:"f8d434e5d4758ae8626c",59:"b3e479223a01f87d8337",60:"c05387a974f25645ee7b",61:"b93d3f6b5ec653e5c4c6",62:"12ee3896f6851cd2cb4c",63:"ab6bd438d590a7aa1e85",64:"8f377047299728a7c625",65:"b9df0942284c0dbfdc27",66:"5433d9783d667005811b",67:"0f6d447133b1acbc532b",68:"7830c5679af6f8b2cb9d",69:"61cee4c7c7a26b880f84",70:"6f28138a852985cde574",71:"4cf18546d28a67295cf8",72:"fe9d1bbd12f4274225e1",73:"88e613d232847cb90be2",74:"ab208d1118bb1a9aa540",75:"b14512ee0a369c73d41f",76:"6143595e7025663becbc",77:"98f5d41a602eec297e70",78:"bd75ce697ff5a3211d53",79:"7ede10f0ba3b16700fc9",80:"4d61def8e6694657ea56",81:"e7670320995684cfa512",82:"4194ad3d53ad440bfb80",83:"44fd11f0fbdad5fdfe01",84:"1823d3e667816d0f2259",85:"779373ab4595fb2a48f9",86:"72fd057b1111acefbe95",87:"f616874d7e40fcf1caa1",88:"5e52821a3ece9ccdeb3f",89:"85a2bbd9554df0f81300",90:"6d7f539733951e52b9e1",91:"44545722d2e68c8f5b69",92:"b5b46350bd10a723b0b2",93:"0cf2ca11a7d3aa4b1ef3",94:"4eb1775c97e0c0097641",95:"d14fcdfe817ed45c25db",98:"4afc4e966f02914d8565"}[e]+".js";var r=setTimeout(t,12e4);function t(){n.onerror=n.onload=null,clearTimeout(r);var c=d[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),d[e]=void 0)}return n.onerror=n.onload=t,b.appendChild(n),a},f.m=e,f.c=a,f.d=function(e,c,a){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
--- a/src/components/app/material/material-preview.vue
+++ b/src/components/app/material/material-preview.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-10-22 15:12:41
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-09 15:53:39
+ * @LastEditTime: 2019-12-10 15:16:12
 -->
 <!--
@@ -22,12 +22,12 @@ previewVisible: false,
    <div class="qr-mask" @click.stop="closeDialog"></div>
    <div class="qr-dialog border-box">
      <div class="qr-dialog-body border-box">
-        <h2 class="font-20 color-222 text-left">{{ materialData.title }}</h2>
+        <h2 class="font-20 color-222 text-left">{{ materialData.materialTitle }}</h2>
        <div class="notice-date m-t-10 flex flex-space-between">
-          <div class="notice-date-left font-10 color-88949C">{{ materialData.announcementId ? materialData.sendTime : new Date().getTime() | formatTimeYmdHms }}</div>
+          <div class="notice-date-left font-10 color-88949C">{{ materialData.materialId ? materialData.createTime : new Date().getTime() | formatTimeYmdHms }}</div>
          <div class="notice-date-right font-10 color-4d7fd0"></div>
        </div>
-        <div class="notice-body border-box color-222" v-htmlContent="materialData.content"></div>
+        <div class="notice-body border-box color-222" v-htmlContent="materialData.materialContent"></div>
      </div>
    </div>
    <!-- 关闭 -->
@@ -50,22 +50,14 @@ export default {
      type: Object,
      default() {
        return {
-          announcementId: '',
+          materialId: '',
-          sendTime: '',
+          imageTextWechatId: '', // 选择的参数
-          sendCount: 0,
+          imageTextGicId: '', // 选择的参数
-          readCount: 0,
+          rangeList: [],
-          adminCheck: false,
+          imgUrlList: [],
-          stroreCheck: false,
+          materialTitle: '', // 标题
-          adminStructor: [],
+          materialContent: '', // 发送内容
-          storeStructor: [],
+          topFlag: false // 置顶
-          receiveType: '0',
-          labelId: '',
-          title: '',
-          img: '',
-          content: '',
-          sendType: '0',
-          attachment: [],
-          pageTop: false
        };
      }
    }
@@ -84,11 +76,14 @@ export default {
  data() {
    return {
      materialData: {
-        announcementId: '',
+        materialId: '',
-        sendCount: 0,
+        imageTextWechatId: '', // 选择的参数
-        readCount: 0,
+        imageTextGicId: '', // 选择的参数
-        title: '',
+        rangeList: [],
-        content: ''
+        imgUrlList: [],
+        materialTitle: '', // 标题
+        materialContent: '', // 发送内容
+        topFlag: false // 置顶
      }
    };
  },
@@ -104,12 +99,12 @@ export default {
  watch: {
    materialPreviewData(newData, oldData) {
      const that = this;
-      that.materialData = newData;
+      that.materialData = JSON.parse(JSON.stringify(newData));
    }
  },
  mounted() {
    const that = this;
-    that.materialData = that.materialPreviewData;
+    that.materialData = JSON.parse(JSON.stringify(that.materialPreviewData));
  }
 };
 </script>

--- a/src/components/app/material/material-record.vue
+++ b/src/components/app/material/material-record.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-10-21 14:27:29
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-09 15:56:55
+ * @LastEditTime: 2019-12-10 16:10:13
 -->
 <!--
@@ -22,7 +22,7 @@ import materialRecord from '@/components/app/material/material-record.vue'
        <el-tabs v-model="activeName" type="card" @tab-click="handleTab">
          <el-tab-pane label="点赞记录" name="first">
            <div class="m-b-20 flex">
-              <el-input placeholder="请输入姓名/手机号/code" prefix-icon="el-icon-search" v-model="conditionObj.searchInput" class="w-203" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"> </el-input>
+              <el-input placeholder="请输入姓名/手机号/code" prefix-icon="el-icon-search" v-model="conditionObj.searchInput" class="w-223" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"> </el-input>
              <span class="p-l-10 l-h-32">共{{ total }}条点赞记录</span>
            </div>
            <el-table :data="tableData" style="width: 100%" height="332">
@@ -55,7 +55,7 @@ import materialRecord from '@/components/app/material/material-record.vue'
          </el-tab-pane>
          <el-tab-pane label="转发记录" name="second">
            <div class="m-b-20 flex">
-              <el-input placeholder="请输入姓名/手机号/code" prefix-icon="el-icon-search" v-model="conditionObj.searchInput" class="w-203" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"> </el-input>
+              <el-input placeholder="请输入姓名/手机号/code" prefix-icon="el-icon-search" v-model="conditionObj.searchInput" class="w-223" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"> </el-input>
              <span class="p-l-10 l-h-32">共{{ total }}条转发记录</span>
            </div>
            <el-table :data="tableData" style="width: 100%" height="332">
@@ -104,6 +104,10 @@ export default {
    detailShow: {
      type: Boolean,
      default: false
+    },
+    materialId: {
+      type: String,
+      default: ''
    }
  },
  data() {
@@ -112,7 +116,8 @@ export default {
      activeName: 'first',
      tableData: [],
      conditionObj: {
-        searchInput: ''
+        searchInput: '',
+        materialId: this.materialId
      },
      // 分页参数
      currentPage: 1,
@@ -188,7 +193,8 @@ export default {
    getTableList(val) {
      const that = this;
      let para = {
-        materialTitle: that.conditionObj.searchInput || '', // 搜索字段
+        materialId: that.conditionObj.materialId,
+        imgTextTitle: that.conditionObj.searchInput || '', // 搜索字段
        relatedType: that.activeName == 'first' ? 2 : 1,
        pageNum: that.currentPage, // 当前页
        pageSize: that.pageSize, // 一页显示个数
@@ -199,7 +205,7 @@ export default {
          let resData = res.data;
          if (resData.errorCode == 1) {
            that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.total;
            return false;
          }
          errMsg.errorMsg(resData);
@@ -234,8 +240,8 @@ export default {
  background: #82c5ff;
 }
-.w-203 {
+.w-223 {
-  width: 203px;
+  width: 223px;
 }
 .l-h-32 {
  line-height: 32px;

--- a/src/components/app/material/use-record.vue
+++ b/src/components/app/material/use-record.vue
@@ -4,16 +4,16 @@
 * @Author: 无尘
 * @Date: 2019-10-21 14:27:29
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-09 15:56:15
+ * @LastEditTime: 2019-12-10 16:08:48
 -->
 <!--
-<material-record
+<use-record
  :detailShow="detailShow"
  @hideDetailDialog="hideDetailDialog">
-</material-record>
+</use-record>
-import materialRecord from '@/components/app/material/material-record.vue'
+import useRecord from '@/components/app/material/use-record.vue'
 -->
 <template>
  <div v-show="customDialog">
@@ -21,7 +21,7 @@ import materialRecord from '@/components/app/material/material-record.vue'
      <div class="edit-dialog-body">
        <div class="m-b-20 flex">
          <el-input placeholder="请输入标题" prefix-icon="el-icon-search" v-model="conditionObj.searchInput" class="w-203" @keyup.native="value => toInput(value, conditionObj.searchInput)" clearable @clear="clearInput"> </el-input>
-          <span class="p-l-10 l-h-32">共{{ total }}条点赞记录</span>
+          <!-- <span class="p-l-10 l-h-32">共{{ total }}条点赞记录</span> -->
        </div>
        <el-table :data="tableData" style="width: 100%" height="332">
          <el-table-column label="发布人" width="150" show-overflow-tooltip>
@@ -53,11 +53,15 @@ import { getRequest } from '@/api/api';
 import errMsg from '@/common/js/error';
 import { _debounce } from '@/common/js/public';
 export default {
-  name: 'material-record',
+  name: 'use-record',
  props: {
    detailShow: {
      type: Boolean,
      default: false
+    },
+    materialId: {
+      type: String,
+      default: ''
    }
  },
  data() {
@@ -66,7 +70,8 @@ export default {
      activeName: 'first',
      tableData: [],
      conditionObj: {
-        searchInput: ''
+        searchInput: '',
+        materialId: this.materialId
      },
      // 分页参数
      currentPage: 1,
@@ -76,14 +81,6 @@ export default {
  },
  methods: {
    /**
-     *   切换tab
-     */
-    handleTab() {
-      const that = this;
-      that.currentPage = 1;
-      that.getTableList();
-    },
-    /**
     * 输入
     */
    toInput: _debounce(function(e, value) {
@@ -142,8 +139,9 @@ export default {
    getTableList(val) {
      const that = this;
      let para = {
-        materialTitle: that.conditionObj.searchInput || '', // 搜索字段
+        materialId: that.conditionObj.materialId,
-        relatedType: that.activeName == 'first' ? 2 : 1,
+        imgTextTitle: that.conditionObj.searchInput || '', // 搜索字段
+        relatedType: 4,
        pageNum: that.currentPage, // 当前页
        pageSize: that.pageSize, // 一页显示个数
        brandId: that.activeBrand
@@ -153,7 +151,7 @@ export default {
          let resData = res.data;
          if (resData.errorCode == 1) {
            that.tableData = resData.result.list || [];
-            that.total = resData.result.pageInfo.total;
+            that.total = resData.result.total;
            return false;
          }
          errMsg.errorMsg(resData);

--- a/src/components/mult-upload-img.vue
+++ b/src/components/mult-upload-img.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2018-12-06 13:44:22
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-10 14:29:33
+ * @LastEditTime: 2019-12-10 14:37:15
 -->
 <!--
  多个上传组件
@@ -48,7 +48,7 @@
    <el-dialog title="图片预览" :visible.sync="isEnlargeImage" :modal-append-to-body="false" :before-close="handleClose" width="520px">
      <el-carousel v-if="isEnlargeImage" trigger="click" :initial-index="initialImg" :autoplay="false" height="500px">
        <el-carousel-item v-for="(img, index) in imageList" :key="index" style="display: flex;align-items: center;justify-content: center;">
-          <img @click="isEnlargeImage = false" style="max-width: 480px;max-height: 500px;" :src="img.url" />
+          <img @click="isEnlargeImage = false" style="max-width: 480px;max-height: 500px;" :src="img.imgUrl" />
        </el-carousel-item>
      </el-carousel>
    </el-dialog>

--- a/src/views/enterpriseApp/marketingMaterial/enjoyMaterial.vue
+++ b/src/views/enterpriseApp/marketingMaterial/enjoyMaterial.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-09-18 15:25:12
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-10 10:53:09
+ * @LastEditTime: 2019-12-10 16:03:21
 -->
 <!--
@@ -64,6 +64,7 @@ components: {
        </div>
      </div>
    </div>
+    <material-record :materialId="materialId" :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </material-record>
  </div>
 </template>
 <script>
@@ -164,7 +165,8 @@ export default {
      currentPage: 1,
      pageSize: 20,
      total: 0,
-      detailShow: false
+      detailShow: false,
+      materialId: ''
    };
  },
  methods: {
@@ -265,18 +267,16 @@ export default {
     */
    showDetail(index, row) {
      const that = this;
-      that.showFlag = true;
+      that.$router.push(`/newEnjoy?materialId=${row.materialId}`);
-      let rowObj = JSON.parse(JSON.stringify(row));
-      rowObj.userMessageId = '';
-      that.itemRow = rowObj;
    },
    /**
     * 显示记录
     */
-    showRecord() {
+    showRecord(index, row) {
      const that = this;
      that.detailShow = true;
+      that.materialId = row.materialId;
    },
    /**
     * 关闭记录弹层
@@ -284,6 +284,7 @@ export default {
    hideDetailDialog() {
      const that = this;
      that.detailShow = false;
+      that.materialId = '';
    },
    /**
     * 删除

--- a/src/views/enterpriseApp/marketingMaterial/imageText.vue
+++ b/src/views/enterpriseApp/marketingMaterial/imageText.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-09-18 15:25:12
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-10 10:53:02
+ * @LastEditTime: 2019-12-10 16:01:56
 -->
 <!--
@@ -71,7 +71,7 @@ components: {
        </div>
      </div>
    </div>
-    <material-record :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </material-record>
+    <material-record :materialId="materialId" :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </material-record>
  </div>
 </template>
 <script>
@@ -171,7 +171,8 @@ export default {
      currentPage: 1,
      pageSize: 20,
      total: 0,
-      detailShow: false
+      detailShow: false,
+      materialId: ''
    };
  },
  methods: {
@@ -318,9 +319,10 @@ export default {
    /**
     * 显示记录
     */
-    showRecord() {
+    showRecord(index, row) {
      const that = this;
      that.detailShow = true;
+      that.materialId = row.materialId;
    },
    /**
     * 关闭记录弹层
@@ -328,6 +330,7 @@ export default {
    hideDetailDialog() {
      const that = this;
      that.detailShow = false;
+      that.materialId = '';
    },
    /**

--- a/src/views/enterpriseApp/marketingMaterial/newEnjoy.vue
+++ b/src/views/enterpriseApp/marketingMaterial/newEnjoy.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-09-18 15:25:12
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-10 13:57:32
+ * @LastEditTime: 2019-12-10 16:22:58
 -->
 <!--
@@ -217,7 +217,7 @@ export default {
      const that = this;
      that.formData.imgUrlList = list;
      /* eslint-disable */
-      console.log('list:',list);
+      console.log('上传list:',list);
    },
    /**
     * 上传图片删除
@@ -226,7 +226,7 @@ export default {
      const that = this;
      that.formData.imgUrlList.splice(index,1);
      /* eslint-disable */
-      console.log('list2:',that.formData.imgUrlList);
+      console.log('删除list2:',that.formData.imgUrlList);
    },
    /**
     * 确认新建
@@ -271,7 +271,7 @@ export default {
            } else {
              that.formData = {
                materialId: '',
+                imgUrlList: [],
                materialTitle: '', // 标题
                materialContent: '', // 发送内容
                topFlag: false // 置顶
@@ -294,9 +294,10 @@ export default {
     */
    previewData(formName) {
      const that = this;
+      that.formData.rangeList = [...that.defaultStoreList, ...that.defaultSelection];
      that.$refs[formName].validate(valid => {
        if (valid) {
-          that.materialPreviewData = that.ruleFormData;
+          that.materialPreviewData = that.formData;
          that.previewVisible = true;
        }
      });
@@ -392,8 +393,11 @@ export default {
          if (resData.errorCode == 1) {
            let defaultStoreList = []; // 门店架构
            let defaultSelection = []; // 行政架构
-            if (resData.result.rangeList) {
+            if (resData.result.rangeVOList) {
-              resData.result.rangeList.forEach(ele => {
+              resData.result.rangeVOList.forEach(ele => {
+                ele.groupId = ele.type == 2 ? ele.id : '';
+                ele.storeId = ele.type == 3 ? ele.id : '';
+                ele.isStoreGroup = ele.storeFlag;
                if (ele.storeFlag == 1) {
                  // 1门店架构0行政架构
                  defaultStoreList.push(ele);
@@ -408,7 +412,8 @@ export default {
              materialTitle: resData.result.materialTitle,
              materialContent: resData.result.materialContent,
              topFlag: resData.result.topFlag == 1 ? true : false,
-              rangeList: resData.result.rangeList
+              imgUrlList: resData.result.imgUrlList,
+              rangeList: resData.result.rangeVOList
            };
            that.defaultStoreList = defaultStoreList || [];
@@ -442,7 +447,7 @@ export default {
  },
  mounted() {
    const that = this;
-    that.$emit('showTab', '1');
+    that.$emit('showTab', '2');
    if (that.brandId && !!that.$route.query.materialId) {
      that.getData();
    }

--- a/src/views/enterpriseApp/marketingMaterial/newImageText.vue
+++ b/src/views/enterpriseApp/marketingMaterial/newImageText.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-09-18 15:25:12
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-10 10:54:06
+ * @LastEditTime: 2019-12-10 16:29:11
 -->
 <!--
@@ -32,7 +32,16 @@ components: {
                    <el-radio :disabled="$route.query.materialId ? true : false" v-model="formData.imageTextWechatId" :label="scope.row.imageTextWechatId" @change="changeId($event, scope.row)">{{ '' }}</el-radio>
                  </template>
                </el-table-column>
-                <el-table-column prop="titleName" label="图文标题" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="imageUrl" label="图片" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <div class="cell"><img class="img-40" :src="scope.row.imageUrl" alt="" /></div>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="titleName" label="图文标题" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    <div class="cell color-1890ff cursor-pointer" @click="showPreviewDetail(scope.row)">{{ scope.row.titleName || '--' }}</div>
+                  </template>
+                </el-table-column>
                <el-table-column label="作者" show-overflow-tooltip>
                  <template slot-scope="scope">
                    {{ scope.row.authorName || '--' }}
@@ -40,7 +49,7 @@ components: {
                </el-table-column>
                <el-table-column prop="storeMode" label="使用记录" show-overflow-tooltip>
                  <template slot-scope="scope">
-                    <div class="cell">{{ scope.row.useCount || '--' }}</div>
+                    <div class="cell color-1890ff cursor-pointer" @click="showRecord(scope.row)">{{ scope.row.useCount || '--' }}</div>
                  </template>
                </el-table-column>
              </el-table>
@@ -49,6 +58,9 @@ components: {
              </div>
            </div>
          </el-form-item>
+          <el-form-item label="图文链接：" prop="imageTextUrl">
+            <limitInput :disflag="$route.query.materialId ? true : false" :inputWidth="320" :inputValue.sync="formData.imageTextUrl" :holder="'请输入图文链接'" :getByType="'char'" :maxLength="300"> </limitInput>
+          </el-form-item>
          <el-form-item label="发送范围：" class="input-item is-required" prop="rangeList">
            <div class="form-item-tip fonr-14 color-909399">下面两项可二选一，非全选。可选择行政架构或门店架构</div>
            <div class="flex">
@@ -94,7 +106,7 @@ components: {
            <limitInput :disflag="$route.query.materialId ? true : false" :inputWidth="320" :inputValue.sync="formData.materialTitle" :holder="'请输入素材标题'" :getByType="'word'" :maxLength="15"> </limitInput>
          </el-form-item>
          <el-form-item label="发送内容：" prop="materialContent">
-            <limitTextarea :inputWidth="320" :inputValue.sync="formData.materialContent" :holder="'请输入素材内容'" :maxLength="1500"> </limitTextarea>
+            <limitTextarea :disInput="$route.query.materialId ? true : false" :inputWidth="320" :inputValue.sync="formData.materialContent" :holder="'请输入素材内容'" :maxLength="1500"> </limitTextarea>
          </el-form-item>
          <el-form-item label="更多设置：" prop="">
            <div>
@@ -116,6 +128,7 @@ components: {
    <vue-select-employee :appScene="appScene" :defaultSelection="defaultSelection" :onlyPerson="onlyPerson" :treeSet="treeSet" :changed="changed" @handleSelectedList="handleSelectedList"> </vue-select-employee>
    <vue-select-store ref="storeSelector" :currentBrand="activeGroup" :appScene="appScene" :treeSet="storeTreeSet" selectType="group-store" :defaultList="defaultStoreList" @handleSelectedList="handleSelectedList"> </vue-select-store>
    <material-preview ref="materialPreview" :materialPreviewData="materialPreviewData" v-model="previewVisible"></material-preview>
+    <use-record :materialId="imageTextWechatId" :detailShow="detailShow" @hideDetailDialog="hideDetailDialog"> </use-record>
  </div>
 </template>
 <script>
@@ -123,6 +136,7 @@ import commonDetailTop from '@/components/app/common-detail-top.vue';
 import vueSelectStore from 'components/common/vueSelectStore';
 import vueSelectEmployee from '@/components/common/vueSelectEmployee.vue';
 import materialPreview from '@/components/app/material/material-preview.vue';
+import useRecord from '@/components/app/material/use-record.vue';
 import limitInput from '@/components/limit-input.vue';
 import limitTextarea from '@/components/limit-textarea.vue';
 import { getRequest, postRequest } from '@/api/api';
@@ -150,6 +164,7 @@ export default {
    vueSelectStore,
    vueSelectEmployee,
    materialPreview,
+    useRecord,
    limitInput,
    limitTextarea
  },
@@ -209,6 +224,7 @@ export default {
        materialId: '',
        imageTextWechatId: '', // 选择的参数
        imageTextGicId: '', // 选择的参数
+        imageTextUrl: '',
        rangeList: [],
        materialTitle: '', // 标题
        materialContent: '', // 发送内容
@@ -218,15 +234,47 @@ export default {
        imageTextWechatId: [{ required: true, message: '请选择图文', trigger: 'change' }],
        materialTitle: [{ required: true, message: '请请输入素材标题', trigger: 'blur' }],
        materialContent: [{ required: true, message: '请请输入发送内容', trigger: 'blur' }],
+        imageTextUrl: [{ required: true, message: '请请输入图文链接', trigger: 'blur' }],
        rangeList: [{ validator: validRange, trigger: 'change' }]
      },
      // 预览
      previewVisible: false,
-      materialPreviewData: {}
+      materialPreviewData: {},
+      // 记录
+      detailShow: false,
+      imageTextWechatId: ''
    };
  },
  methods: {
    /**
+     * 使用记录
+     */
+    showRecord(row) {
+      const that = this;
+      if (!row.useCount) {
+        return false;
+      }
+      that.detailShow = true;
+      that.imageTextWechatId = row.imageTextWechatId;
+    },
+    hideDetailDialog() {
+      const that = this;
+      that.detailShow = false;
+      that.imageTextWechatId = '';
+    },
+    /**
+     * 预览
+     */
+    showPreviewDetail(row) {
+      const that = this;
+      that.materialPreviewData = {
+        materialTitle: row.titleName, // 标题
+        materialContent: '' // 发送内容
+      };
+      that.previewVisible = true;
+    },
+    /**
     * 确认新建
     */
    submitForm(formName, flag) {
@@ -272,6 +320,7 @@ export default {
                materialId: '',
                imageTextWechatId: '', // 选择的参数
                imageTextGicId: '', // 选择的参数
+                imageTextUrl: '',
                rangeList: [],
                materialTitle: '', // 标题
                materialContent: '', // 发送内容
@@ -295,9 +344,10 @@ export default {
     */
    previewData(formName) {
      const that = this;
+      that.formData.rangeList = [...that.defaultStoreList, ...that.defaultSelection];
      that.$refs[formName].validate(valid => {
        if (valid) {
-          that.materialPreviewData = that.ruleFormData;
+          that.materialPreviewData = that.formData;
          that.previewVisible = true;
        }
      });
@@ -413,8 +463,11 @@ export default {
          if (resData.errorCode == 1) {
            let defaultStoreList = []; // 门店架构
            let defaultSelection = []; // 行政架构
-            if (resData.result.rangeList) {
+            if (resData.result.rangeVOList) {
-              resData.result.rangeList.forEach(ele => {
+              resData.result.rangeVOList.forEach(ele => {
+                ele.groupId = ele.type == 2 ? ele.id : '';
+                ele.storeId = ele.type == 3 ? ele.id : '';
+                ele.isStoreGroup = ele.storeFlag;
                if (ele.storeFlag == 1) {
                  // 1门店架构0行政架构
                  defaultStoreList.push(ele);
@@ -426,10 +479,11 @@ export default {
            that.formData = {
              materialId: resData.result.materialId,
              imageTextWechatId: resData.result.imageTextWechatId,
+              imageTextUrl: resData.result.imageTextUrl,
              materialTitle: resData.result.materialTitle,
              materialContent: resData.result.materialContent,
              topFlag: resData.result.topFlag == 1 ? true : false,
-              rangeList: resData.result.rangeList
+              rangeList: resData.result.rangeVOList
            };
            that.defaultStoreList = defaultStoreList || [];
@@ -513,6 +567,10 @@ export default {
 .m-l-40 {
  margin-left: 40px;
 }
+.img-40 {
+  width: 40px;
+  height: 40px;
+}
 .depart-item-content {
  width: 213px;
  height: 32px;

--- a/src/views/enterpriseApp/notice/noticeList.vue
+++ b/src/views/enterpriseApp/notice/noticeList.vue
@@ -4,7 +4,7 @@
 * @Author: 无尘
 * @Date: 2019-04-12 17:56:45
 * @LastEditors: 无尘
- * @LastEditTime: 2019-12-10 14:04:45
+ * @LastEditTime: 2019-12-10 14:43:22
 -->
 <template>
  <div class="notice-list-wrap">
@@ -557,9 +557,9 @@ export default {
          getRequest('/haoban-app-announcement-web/announcement-set-new-see-flag', para).then(res => {
            let data = res.data;
            if (data.errorCode == 1) {
              that.$message.success('设置成功');
            } else {
+              row.newSeeFlag = false;
              that.$message.error(data.message);
            }
          });

--- a/static/css/public.css
+++ b/static/css/public.css
@@ -344,6 +344,10 @@ input:focus {
  border-radius: 18px;
 }
+.cursor-pointer {
+  cursor: pointer;
+}
 .t-rt {
  text-align: right;
 }