feat: 增加在线沟通设置

95a1c2ae · 无尘 · 6904fc79 · 95a1c2ae · 95a1c2ae · 6904fc79
Commit 95a1c2ae authored Sep 23, 2019 by 无尘
9 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.a3eb7c138c78bfccbc9c330b13b7845a.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.95f9b859a9c3c1885bf1.js></script><script type=text/javascript src=./static/js/vendor.edfe69b49db0b6363a08.js></script><script type=text/javascript src=./static/js/app.f9924b148aa2c79df375.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.1daf92eab9d70727feae5a7ec27b3678.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.efffee7ad92581f26988.js></script><script type=text/javascript src=./static/js/vendor.edfe69b49db0b6363a08.js></script><script type=text/javascript src=./static/js/app.f9924b148aa2c79df375.js></script></body></html>
\ No newline at end of file
--- a/dist/static/css/app.1daf92eab9d70727feae5a7ec27b3678.css
+++ b/dist/static/css/app.1daf92eab9d70727feae5a7ec27b3678.css
--- a/dist/static/css/app.a3eb7c138c78bfccbc9c330b13b7845a.css
+++ b/dist/static/css/app.a3eb7c138c78bfccbc9c330b13b7845a.css
--- a/dist/static/js/0.789e3e4e69984304d503.js
+++ b/dist/static/js/0.789e3e4e69984304d503.js
--- a/dist/static/js/0.d0306e3d6c75d198af66.js
+++ b/dist/static/js/0.d0306e3d6c75d198af66.js
--- a/dist/static/js/manifest.95f9b859a9c3c1885bf1.js
+++ b/dist/static/js/manifest.95f9b859a9c3c1885bf1.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={82: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:"d0306e3d6c75d198af66",1:"0ebe3ead93207dc78a78",2:"d3c62c00c91d9891f916",3:"a43577b9e52a5719a124",4:"1acc2c4a7bb860e0e47d",5:"baa22d481d8bbd83425c",6:"68b70097e620726a4efe",7:"8f462a353a2ce9c0c116",8:"02a56d5a1c19341c7206",9:"860dbe8cf83334f9e3c0",10:"a2aa031ae677b8acbf17",11:"e34a64dea1b7a059dcfd",12:"bdcf26a1bcccf7e0239b",13:"6c87f5cefdf77374932d",14:"8a2d85b6cc3b95b868d9",15:"8426665237a3b321c3e0",16:"c4ebe5ae46670e5c0754",17:"43a28ed857836d70649f",18:"da89c6419effe11ad50c",19:"b45ae6f6b4be06fd6e34",20:"75e0997b94e5d6294ec8",21:"1f2f9b53312cba8a436c",22:"fe877033796208a0f1a6",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"a579fe9e82eab9ece806",26:"8f0bb144b5e757399727",27:"b5f0e5bd5920771b58af",28:"140ad99228544036c969",29:"36261093da9264fa5f33",30:"0d4999d53befa8fd9eaa",31:"8baa6bca929d1c9a38f6",32:"836f4d0e323c721473e9",33:"7b62b2ff369669fe322c",34:"f9d53c31059aaff9b360",35:"c75699cc6fe47597f200",36:"031f3a5aae4656aba067",37:"8016d3ac07df8acaf73d",38:"23b83bd7920693bc35c6",39:"d17e2c61f3cc8d6972fa",40:"56797b378549955e7f19",41:"78d64ae1581e8ea232cc",42:"61ae052e4f4fc3284000",43:"9d05f4d2f06b9c6bba0e",44:"96d0b6e88fc87f60bac7",45:"9ed8480e1b598c7a098d",46:"98fb716c1e5a99ebdcf8",47:"de0e290ed4c878d0c8c3",48:"6d564387f233c08c800d",49:"057719749403ae33178b",50:"331006123edd2049b7d9",51:"244dc6f576a64b7c174b",52:"43d3ca00e0c9087e4956",53:"9dce74b07cc47cdf56db",54:"1503b643475934e2b5e1",55:"c423570fcbf037d349d9",56:"94bbfa32e0086c5f0bbc",57:"a5308ec502fd9436e4d8",58:"78fea9e14de750887bf1",59:"e232c753f68c56d9e59c",60:"2a9bebb0261ef9a7a939",61:"8833a156f1e38036fb28",62:"44d1241f8d57451d0c10",63:"25cb3ac91e9616a47dde",64:"ebc341a9017c4b2c1112",65:"afcb60484e7a9ec39f28",66:"0c2656f4decfecb59972",67:"d7e3675c4b4931db738d",68:"13404d9aa7a460952885",69:"ff1445c96fd757245229",70:"3720d31e136a7f99a873",71:"458af30d30795059cdbe",72:"cba3aa56f0a846445e33",73:"dc84bab89c2090b47673",74:"a9dae9c87c825ba65aa1",75:"29e0d3d537fd9fa5eabc",76:"e24f155e1168c927ee44",77:"9f7ea81c191a5e1bbaa2",78:"51dbc832d510b2a1c0a3",81:"b70a353b3c794793e525"}[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],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={82: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:"789e3e4e69984304d503",1:"0ebe3ead93207dc78a78",2:"d3c62c00c91d9891f916",3:"a43577b9e52a5719a124",4:"1acc2c4a7bb860e0e47d",5:"baa22d481d8bbd83425c",6:"68b70097e620726a4efe",7:"8f462a353a2ce9c0c116",8:"02a56d5a1c19341c7206",9:"860dbe8cf83334f9e3c0",10:"a2aa031ae677b8acbf17",11:"e34a64dea1b7a059dcfd",12:"bdcf26a1bcccf7e0239b",13:"6c87f5cefdf77374932d",14:"8a2d85b6cc3b95b868d9",15:"8426665237a3b321c3e0",16:"c4ebe5ae46670e5c0754",17:"43a28ed857836d70649f",18:"da89c6419effe11ad50c",19:"b45ae6f6b4be06fd6e34",20:"75e0997b94e5d6294ec8",21:"1f2f9b53312cba8a436c",22:"fe877033796208a0f1a6",23:"9efbbc6dd315a676ce09",24:"4637a4566383d6e864cf",25:"a579fe9e82eab9ece806",26:"8f0bb144b5e757399727",27:"b5f0e5bd5920771b58af",28:"140ad99228544036c969",29:"36261093da9264fa5f33",30:"0d4999d53befa8fd9eaa",31:"8baa6bca929d1c9a38f6",32:"836f4d0e323c721473e9",33:"7b62b2ff369669fe322c",34:"f9d53c31059aaff9b360",35:"c75699cc6fe47597f200",36:"031f3a5aae4656aba067",37:"8016d3ac07df8acaf73d",38:"23b83bd7920693bc35c6",39:"d17e2c61f3cc8d6972fa",40:"56797b378549955e7f19",41:"78d64ae1581e8ea232cc",42:"61ae052e4f4fc3284000",43:"9d05f4d2f06b9c6bba0e",44:"96d0b6e88fc87f60bac7",45:"9ed8480e1b598c7a098d",46:"98fb716c1e5a99ebdcf8",47:"de0e290ed4c878d0c8c3",48:"6d564387f233c08c800d",49:"057719749403ae33178b",50:"331006123edd2049b7d9",51:"244dc6f576a64b7c174b",52:"43d3ca00e0c9087e4956",53:"9dce74b07cc47cdf56db",54:"1503b643475934e2b5e1",55:"c423570fcbf037d349d9",56:"94bbfa32e0086c5f0bbc",57:"a5308ec502fd9436e4d8",58:"78fea9e14de750887bf1",59:"e232c753f68c56d9e59c",60:"2a9bebb0261ef9a7a939",61:"8833a156f1e38036fb28",62:"44d1241f8d57451d0c10",63:"25cb3ac91e9616a47dde",64:"ebc341a9017c4b2c1112",65:"afcb60484e7a9ec39f28",66:"0c2656f4decfecb59972",67:"d7e3675c4b4931db738d",68:"13404d9aa7a460952885",69:"ff1445c96fd757245229",70:"3720d31e136a7f99a873",71:"458af30d30795059cdbe",72:"cba3aa56f0a846445e33",73:"dc84bab89c2090b47673",74:"a9dae9c87c825ba65aa1",75:"29e0d3d537fd9fa5eabc",76:"e24f155e1168c927ee44",77:"9f7ea81c191a5e1bbaa2",78:"51dbc832d510b2a1c0a3",81:"b70a353b3c794793e525"}[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}}([]);
\ No newline at end of file
--- a/src/components/app/app-detail.vue
+++ b/src/components/app/app-detail.vue
@@ -67,7 +67,7 @@
          <div class="switch-wrap m-t-20">
            <el-switch v-model="overTimeSeeFlag" active-text="" inactive-text="" @change="saveGroupSet"> </el-switch>
            <el-tooltip class="item" effect="dark" content="开启后，GIC中设置的好办端会员分组到期后，好办移动端将不再展示该条分组" placement="top-start">
-              <span>会员分组到期后不展示<span class="el-icon-info font-12 color-909399"></span> </span
+              <span style="cursor: pointer;">会员分组到期后不展示<span class="el-icon-info font-12 color-909399"></span> </span
            ></el-tooltip>
          </div>
        </div>
@@ -120,13 +120,6 @@
    </div>
    <!--在线沟通-->
    <div v-if="tabType == 2">
-      <!--<common-detail-top :topMenuData="topMenuData" :activeId="activeId"></common-detail-top>
-      <div class="app-detail-pane border-box p-20">
-        <el-checkbox v-model="myCustomData.chatFlag">在线沟通设置</el-checkbox>
-        <div class="m-t-46">
-          <el-button type="primary" @click="submit('chatFlag')">保 存</el-button>
-        </div>
-      </div>-->
      <online-chat :brandId="brandId"></online-chat>
    </div>
    <!--聊天记录-->
@@ -584,38 +577,11 @@ export default {
            message: error.message
          });
        });
-    },
-    /**
-     * 获取在线沟通设置数据
-     */
-    getChatSet(brandId) {
-      const that = this;
-      let para = {
-        brandId: brandId
-      };
-      postRequest('/haoban-app-member-web/customer/find-online-chat-setting', para)
-        .then(res => {
-          let resData = res.data;
-          if (resData.errorCode == 1) {
-            if (!!resData.result) {
-              that.myCustomData.chatFlag = !!resData.result.chatFlag ? true : false;
-            }
-            return;
-          }
-          errMsg.errorMsg(resData);
-        })
-        .catch(function(error) {
-          that.$message.error({
-            duration: 1000,
-            message: error.message
-          });
-        });
    }
  },
  watch: {
    brandId: function(newData, oldData) {
      const that = this;
-      that.getChatSet(newData);
      that.getCustomerSet(newData);
      that.getShowSet(newData);
      that.getGroupClassify(newData);
@@ -631,6 +597,7 @@ export default {
    tabType: function(newData, oldData) {
      const that = this;
      if (newData == 1) {
+        that.getShowSet(that.brandId);
        that.topMenuData = [
          {
            id: '1',
@@ -649,9 +616,16 @@ export default {
      }
    }
  },
-  /*  mounted() {
+   mounted() {
    const that = this;
-  },*/
+    if(that.brandId) {
+      that.getCustomerSet(that.brandId);
+      that.getShowSet(that.brandId);
+      that.getGroupClassify(that.brandId);
+      that.getGroupList(that.brandId);
+      that.getGroupClassSet(that.brandId);
+    }
+  },
  components: {
    commonDetailTop,
    vueSelectStore,

--- a/src/components/app/chat-log-list.vue
+++ b/src/components/app/chat-log-list.vue
@@ -130,7 +130,7 @@ export default {
      const that = this;
      if (!!newData) {
        that.activeBrand = newData;
-        // that.getData();
+        that.getData();
      }
    },
    activeGroupId: function(newData, oldData) {
@@ -142,7 +142,7 @@ export default {
    showFlag: function(newData, oldData) {
      const that = this;
      if (!!newData) {
-        // that.getData();
+        that.getData();
      }
    }
  }

--- a/src/components/app/online-chat.vue
+++ b/src/components/app/online-chat.vue
@@ -65,7 +65,7 @@ components: {
                        <div class="img-wrap border-box">
                          <img v-if="scope.row.img" :src="scope.row.img" alt="" />
                        </div>
-                        <div class="article-title font-14 color-606266">{{ scope.row.title }}</div>
+                        <div class="article-title font-14 color-606266 p-l-10">{{ scope.row.title }}</div>
                      </div>
                    </template>
                  </el-table-column>
@@ -107,13 +107,13 @@ components: {
                            </div>
                            <div class="article-title flex flex-column">
                              <p class="font-14 color-606266">{{ scope.row.goodName }}</p>
-                              <p class="font-14 color-909399">{{ scope.row.goodName }}</p>
+                              <p class="font-12 color-909399">{{ scope.row.goodName }}</p>
                            </div>
                          </div>
                        </template>
                      </el-table-column>
                      <el-table-column prop="" label="单价（元）">
-                        <template slot-scope="scope">{{ scope.row.goodsPrice }}</template>
+                        <template slot-scope="scope">{{ scope.row.goodPrice }}</template>
                      </el-table-column>
                      <el-table-column prop="" label="库存">
                        <template slot-scope="scope">{{ scope.row.stock }}</template>
@@ -123,8 +123,8 @@ components: {
                      </el-table-column>
                      <el-table-column prop="" label="发布时间">
                        <template slot-scope="scope">
-                          <div v-if="activeName == 'first'">{{ scope.row.publishTime | formatTimeYmd }}</div>
+                          <div>{{ scope.row.publishTime | timeStampToYmd }}</div>
-                          <div v-if="activeName == 'first'">{{ scope.row.publishTime | formatTimeHms }}</div>
+                          <div>{{ scope.row.publishTime | timeStampToHms }}</div>
                        </template>
                      </el-table-column>
                      <el-table-column>
@@ -140,30 +140,30 @@ components: {
                    </el-table>
                  </el-tab-pane>
                  <el-tab-pane v-if="chatData.isIntegralGoodMessage" label="积分商城" name="second">
-                    <el-table class="select-table" ref="multipleTable" :data="goodsList" tooltip-effect="dark" :style="{ width: '100%' }">
+                    <el-table class="select-table" ref="multipleTable" :data="pointList" tooltip-effect="dark" :style="{ width: '100%' }">
                      <el-table-column prop="" label="商品信息">
-                        <template slot-scope="scope">
+                        <template slot-scope="scope" show-overflow-tooltip>
                          <div class="flex">
                            <div class="img-wrap border-box">
                              <img :src="scope.row.goodImg" alt="" />
                            </div>
                            <div class="article-title flex flex-column">
                              <p class="font-14 color-606266">{{ scope.row.goodName }}</p>
-                              <p class="font-14 color-909399">{{ scope.row.goodName }}</p>
+                              <p class="font-12 color-909399">{{ scope.row.goodName }}</p>
                            </div>
                          </div>
                        </template>
                      </el-table-column>
                      <el-table-column prop="" label="积分费用">
-                        <template slot-scope="scope">{{ scope.row.price }}</template>
+                        <template slot-scope="scope">{{ scope.row.goodPrice }}</template>
                      </el-table-column>
                      <el-table-column prop="" label="现金费用">
                        <template slot-scope="scope">{{ scope.row.integal }}</template>
                      </el-table-column>
                      <el-table-column prop="" label="创建时间">
                        <template slot-scope="scope">
-                          <div v-if="activeName == 'second'">{{ scope.row.createTime | formatTimeYmd }}</div>
+                          <div>{{ scope.row.publishTime | timeStampToYmd }}</div>
-                          <div v-if="activeName == 'second'">{{ scope.row.createTime | formatTimeHms }}</div>
+                          <div>{{ scope.row.publishTime | timeStampToHms }}</div>
                        </template>
                      </el-table-column>
                      <el-table-column>
@@ -356,13 +356,16 @@ export default {
    getGoodsList(brandId) {
      const that = this;
      let para = {
+        pageSize: that.pageSize,
+        pageNum: that.pageNum,
        brandId: brandId
      };
-      postRequest('/haoban-app-member-web/customer/find_goods_list', para)
+      postRequest('/haoban-app-member-web/customer/find_good_list', para)
        .then(res => {
          let resData = res.data;
          if (resData.errorCode == 1) {
            that.goodsList = resData.result.list || [];
+            that.total = resData.result.total;
            return;
          }
          errMsg.errorMsg(resData);
@@ -384,11 +387,12 @@ export default {
        pageSize: that.pageSize,
        pageNum: that.pageNum
      };
-      postRequest('/haoban-app-member-web/customer/find_integal_goods_list', para)
+      postRequest('/haoban-app-member-web/customer/find_integal_good_list', para)
        .then(res => {
          let resData = res.data;
          if (resData.errorCode == 1) {
-            that.goodsList = resData.result.list || [];
+            that.pointList = resData.result.list || [];
+            that.total = resData.result.total;
            return;
          }
          errMsg.errorMsg(resData);
@@ -415,6 +419,7 @@ export default {
          let resData = res.data;
          if (resData.errorCode == 1) {
            that.articleList = resData.result.list || [];
+            that.total = resData.result.total;
            return;
          }
          errMsg.errorMsg(resData);
@@ -451,6 +456,7 @@ export default {
                that.getArticleList(brandId);
              }
              if (that.activeTab == 4) {
+                that.pageSize = 3;
                resData.result.isGoodMessage ? that.getGoodsList(brandId) : '';
                resData.result.isIntegralGoodMessage ? that.getPointList(brandId) : '';
                if (resData.result.isIntegralGoodMessage && !resData.result.isGoodMessage) {
@@ -513,6 +519,8 @@ export default {
 .img-wrap {
  width: 40px;
+  min-width: 40px;
+  max-width: 40px;
  height: 40px;
  border: 1px dashed #606266;
  background: #ecf1f5;
@@ -533,13 +541,13 @@ export default {
  }
  .online-chat-body {
    width: 100%;
-    height: 492px;
+    height: 522px;
    border: 1px solid #dcdfe6;
    .online-chat-left {
      width: 172px;
      min-width: 172px;
      max-width: 172px;
-      height: 492px;
+      height: 522px;
      background: #f5f7fa;
      .online-chat-left_li {
        height: 40px;
@@ -560,19 +568,45 @@ export default {
    }
    .online-chat-right {
      width: calc(100% - 172px);
-      height: 492px;
+      height: 522px;
-      padding: 40px 20px 0 40px;
+      // padding: 40px 20px 0 40px;
      overflow: hidden;
      .online-chat-right_body {
        height: 100%;
        overflow-y: auto;
        .online-chat-message {
+          padding: 40px 20px 0 40px;
        }
        .online-chat-template {
+          padding: 40px 20px 0 40px;
        }
        .online-chat-article {
+          padding: 40px 20px 0 40px;
+          .article-title {
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            align-self: center;
+          }
        }
        .online-chat-goods {
+          padding: 40px 20px 0 40px;
+          .article-title {
+            white-space: nowrap;
+            text-overflow: ellipsis;
+            overflow: hidden;
+            align-self: center;
+            padding-left: 10px;
+            p {
+              line-height: 14px;
+              white-space: nowrap;
+              text-overflow: ellipsis;
+              overflow: hidden;
+              & + p {
+                margin-top: 4px;
+              }
+            }
+          }
        }
      }
    }