专柜维护修改

wx_application/package.json

@@ -17,7 +17,7 @@
     "jssdk": "^0.0.1",
     "vant": "^2.5.9",
     "vconsole": "^3.3.4",
-    "vee-validate": "^3.2.5",
+    "vee-validate": "^2.0.0-rc.25",
     "vue": "^2.6.10",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.1.6",

wx_application/public/counterPageHome/index.html

@@ -5,6 +5,7 @@
   <meta charset="UTF-8">
   <title>专柜首页</title>
   <link rel="stylesheet" href="../css/swiper.css" />
+  <link rel="stylesheet" href="../css/quill.snow.css" />
   <link rel="stylesheet" href="../css/iconfont.css">
   <script src="../js/jquery-3.4.1.min.js"></script>
   <script src="../js/swiper.min.js" type="text/javascript" charset="utf-8"></script>
@@ -70,7 +71,7 @@
       color: rgba(45, 71, 106, 0.8);
     }
     .fwb {
-      width: 100%;
+      /* width: 100%; */
       padding: 30px !important;
     }
   </style>
@@ -98,11 +99,15 @@
         </div>
       </div>
     </div>
-    <div id="fwb" style="padding: 40px;" >
-    </div>
+    <!-- <div class="ql-container ql-snow">
+      <div class="fwb ql-editor">
+      </div>
+    </div> -->
+    <div id="fwb"></div>
   </div>
-  
+  <script src="../js/quill.min.js"></script>
   <script>
+    var options = [];
     // 获取店铺code
     function GetQueryString(name) {
       var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
@@ -146,17 +151,18 @@
             $("#logo").attr('src',info.logo)            
             let content = info.summary.replace(/<img/g,'<img style="width:100%;"')            
             $("#address").text(info.location)
-            $("#fwb").html(content)
+            $("#phone").text(info.phone)
+             var html = content  //这个是通过quill获取到的html
+            var quill = new Quill('#fwb', {
+              modules: {
+                toolbar: options
+              },
+            })
+            quill.container.firstChild.innerHTML = html
+            quill.enable(false)
           }
        })
     }
-        
-    /*鼠标移入停止轮播，鼠标离开 继续轮播*/
-    // $('.swiper-container').mouseenter(function () {
-    //   swiper.stopAutoplay();
-    // }).mouseleave(function () {
-    //   swiper.startAutoplay();
-    // })
 
     
   </script>

wx_application/public/css/quill.snow.css

+/*!
+ * Quill Editor v1.3.7
+ * https://quilljs.com/
+ * Copyright (c) 2014, Jason Chen
+ * Copyright (c) 2013, salesforce.com
+ */
+.ql-container {
+  box-sizing: border-box;
+  font-family: Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  height: 100%;
+  margin: 0px;
+  position: relative;
+}
+.ql-container.ql-disabled .ql-tooltip {
+  visibility: hidden;
+}
+.ql-container.ql-disabled .ql-editor ul[data-checked] > li::before {
+  pointer-events: none;
+}
+.ql-clipboard {
+  left: -100000px;
+  height: 1px;
+  overflow-y: hidden;
+  position: absolute;
+  top: 50%;
+}
+.ql-clipboard p {
+  margin: 0;
+  padding: 0;
+}
+.ql-editor {
+  box-sizing: border-box;
+  line-height: 1.42;
+  height: 100%;
+  outline: none;
+  overflow-y: auto;
+  padding: 12px 15px;
+  tab-size: 4;
+  -moz-tab-size: 4;
+  text-align: left;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+.ql-editor > * {
+  cursor: text;
+}
+.ql-editor p,
+.ql-editor ol,
+.ql-editor ul,
+.ql-editor pre,
+.ql-editor blockquote,
+.ql-editor h1,
+.ql-editor h2,
+.ql-editor h3,
+.ql-editor h4,
+.ql-editor h5,
+.ql-editor h6 {
+  margin: 0;
+  padding: 0;
+  counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol,
+.ql-editor ul {
+  padding-left: 1.5em;
+}
+.ql-editor ol > li,
+.ql-editor ul > li {
+  list-style-type: none;
+}
+.ql-editor ul > li::before {
+  content: '\2022';
+}
+.ql-editor ul[data-checked=true],
+.ql-editor ul[data-checked=false] {
+  pointer-events: none;
+}
+.ql-editor ul[data-checked=true] > li *,
+.ql-editor ul[data-checked=false] > li * {
+  pointer-events: all;
+}
+.ql-editor ul[data-checked=true] > li::before,
+.ql-editor ul[data-checked=false] > li::before {
+  color: #777;
+  cursor: pointer;
+  pointer-events: all;
+}
+.ql-editor ul[data-checked=true] > li::before {
+  content: '\2611';
+}
+.ql-editor ul[data-checked=false] > li::before {
+  content: '\2610';
+}
+.ql-editor li::before {
+  display: inline-block;
+  white-space: nowrap;
+  width: 1.2em;
+}
+.ql-editor li:not(.ql-direction-rtl)::before {
+  margin-left: -1.5em;
+  margin-right: 0.3em;
+  text-align: right;
+}
+.ql-editor li.ql-direction-rtl::before {
+  margin-left: 0.3em;
+  margin-right: -1.5em;
+}
+.ql-editor ol li:not(.ql-direction-rtl),
+.ql-editor ul li:not(.ql-direction-rtl) {
+  padding-left: 1.5em;
+}
+.ql-editor ol li.ql-direction-rtl,
+.ql-editor ul li.ql-direction-rtl {
+  padding-right: 1.5em;
+}
+.ql-editor ol li {
+  counter-reset: list-1 list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+  counter-increment: list-0;
+}
+.ql-editor ol li:before {
+  content: counter(list-0, decimal) '. ';
+}
+.ql-editor ol li.ql-indent-1 {
+  counter-increment: list-1;
+}
+.ql-editor ol li.ql-indent-1:before {
+  content: counter(list-1, lower-alpha) '. ';
+}
+.ql-editor ol li.ql-indent-1 {
+  counter-reset: list-2 list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-2 {
+  counter-increment: list-2;
+}
+.ql-editor ol li.ql-indent-2:before {
+  content: counter(list-2, lower-roman) '. ';
+}
+.ql-editor ol li.ql-indent-2 {
+  counter-reset: list-3 list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-3 {
+  counter-increment: list-3;
+}
+.ql-editor ol li.ql-indent-3:before {
+  content: counter(list-3, decimal) '. ';
+}
+.ql-editor ol li.ql-indent-3 {
+  counter-reset: list-4 list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-4 {
+  counter-increment: list-4;
+}
+.ql-editor ol li.ql-indent-4:before {
+  content: counter(list-4, lower-alpha) '. ';
+}
+.ql-editor ol li.ql-indent-4 {
+  counter-reset: list-5 list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-5 {
+  counter-increment: list-5;
+}
+.ql-editor ol li.ql-indent-5:before {
+  content: counter(list-5, lower-roman) '. ';
+}
+.ql-editor ol li.ql-indent-5 {
+  counter-reset: list-6 list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-6 {
+  counter-increment: list-6;
+}
+.ql-editor ol li.ql-indent-6:before {
+  content: counter(list-6, decimal) '. ';
+}
+.ql-editor ol li.ql-indent-6 {
+  counter-reset: list-7 list-8 list-9;
+}
+.ql-editor ol li.ql-indent-7 {
+  counter-increment: list-7;
+}
+.ql-editor ol li.ql-indent-7:before {
+  content: counter(list-7, lower-alpha) '. ';
+}
+.ql-editor ol li.ql-indent-7 {
+  counter-reset: list-8 list-9;
+}
+.ql-editor ol li.ql-indent-8 {
+  counter-increment: list-8;
+}
+.ql-editor ol li.ql-indent-8:before {
+  content: counter(list-8, lower-roman) '. ';
+}
+.ql-editor ol li.ql-indent-8 {
+  counter-reset: list-9;
+}
+.ql-editor ol li.ql-indent-9 {
+  counter-increment: list-9;
+}
+.ql-editor ol li.ql-indent-9:before {
+  content: counter(list-9, decimal) '. ';
+}
+.ql-editor .ql-indent-1:not(.ql-direction-rtl) {
+  padding-left: 3em;
+}
+.ql-editor li.ql-indent-1:not(.ql-direction-rtl) {
+  padding-left: 4.5em;
+}
+.ql-editor .ql-indent-1.ql-direction-rtl.ql-align-right {
+  padding-right: 3em;
+}
+.ql-editor li.ql-indent-1.ql-direction-rtl.ql-align-right {
+  padding-right: 4.5em;
+}
+.ql-editor .ql-indent-2:not(.ql-direction-rtl) {
+  padding-left: 6em;
+}
+.ql-editor li.ql-indent-2:not(.ql-direction-rtl) {
+  padding-left: 7.5em;
+}
+.ql-editor .ql-indent-2.ql-direction-rtl.ql-align-right {
+  padding-right: 6em;
+}
+.ql-editor li.ql-indent-2.ql-direction-rtl.ql-align-right {
+  padding-right: 7.5em;
+}
+.ql-editor .ql-indent-3:not(.ql-direction-rtl) {
+  padding-left: 9em;
+}
+.ql-editor li.ql-indent-3:not(.ql-direction-rtl) {
+  padding-left: 10.5em;
+}
+.ql-editor .ql-indent-3.ql-direction-rtl.ql-align-right {
+  padding-right: 9em;
+}
+.ql-editor li.ql-indent-3.ql-direction-rtl.ql-align-right {
+  padding-right: 10.5em;
+}
+.ql-editor .ql-indent-4:not(.ql-direction-rtl) {
+  padding-left: 12em;
+}
+.ql-editor li.ql-indent-4:not(.ql-direction-rtl) {
+  padding-left: 13.5em;
+}
+.ql-editor .ql-indent-4.ql-direction-rtl.ql-align-right {
+  padding-right: 12em;
+}
+.ql-editor li.ql-indent-4.ql-direction-rtl.ql-align-right {
+  padding-right: 13.5em;
+}
+.ql-editor .ql-indent-5:not(.ql-direction-rtl) {
+  padding-left: 15em;
+}
+.ql-editor li.ql-indent-5:not(.ql-direction-rtl) {
+  padding-left: 16.5em;
+}
+.ql-editor .ql-indent-5.ql-direction-rtl.ql-align-right {
+  padding-right: 15em;
+}
+.ql-editor li.ql-indent-5.ql-direction-rtl.ql-align-right {
+  padding-right: 16.5em;
+}
+.ql-editor .ql-indent-6:not(.ql-direction-rtl) {
+  padding-left: 18em;
+}
+.ql-editor li.ql-indent-6:not(.ql-direction-rtl) {
+  padding-left: 19.5em;
+}
+.ql-editor .ql-indent-6.ql-direction-rtl.ql-align-right {
+  padding-right: 18em;
+}
+.ql-editor li.ql-indent-6.ql-direction-rtl.ql-align-right {
+  padding-right: 19.5em;
+}
+.ql-editor .ql-indent-7:not(.ql-direction-rtl) {
+  padding-left: 21em;
+}
+.ql-editor li.ql-indent-7:not(.ql-direction-rtl) {
+  padding-left: 22.5em;
+}
+.ql-editor .ql-indent-7.ql-direction-rtl.ql-align-right {
+  padding-right: 21em;
+}
+.ql-editor li.ql-indent-7.ql-direction-rtl.ql-align-right {
+  padding-right: 22.5em;
+}
+.ql-editor .ql-indent-8:not(.ql-direction-rtl) {
+  padding-left: 24em;
+}
+.ql-editor li.ql-indent-8:not(.ql-direction-rtl) {
+  padding-left: 25.5em;
+}
+.ql-editor .ql-indent-8.ql-direction-rtl.ql-align-right {
+  padding-right: 24em;
+}
+.ql-editor li.ql-indent-8.ql-direction-rtl.ql-align-right {
+  padding-right: 25.5em;
+}
+.ql-editor .ql-indent-9:not(.ql-direction-rtl) {
+  padding-left: 27em;
+}
+.ql-editor li.ql-indent-9:not(.ql-direction-rtl) {
+  padding-left: 28.5em;
+}
+.ql-editor .ql-indent-9.ql-direction-rtl.ql-align-right {
+  padding-right: 27em;
+}
+.ql-editor li.ql-indent-9.ql-direction-rtl.ql-align-right {
+  padding-right: 28.5em;
+}
+.ql-editor .ql-video {
+  display: block;
+  max-width: 100%;
+}
+.ql-editor .ql-video.ql-align-center {
+  margin: 0 auto;
+}
+.ql-editor .ql-video.ql-align-right {
+  margin: 0 0 0 auto;
+}
+.ql-editor .ql-bg-black {
+  background-color: #000;
+}
+.ql-editor .ql-bg-red {
+  background-color: #e60000;
+}
+.ql-editor .ql-bg-orange {
+  background-color: #f90;
+}
+.ql-editor .ql-bg-yellow {
+  background-color: #ff0;
+}
+.ql-editor .ql-bg-green {
+  background-color: #008a00;
+}
+.ql-editor .ql-bg-blue {
+  background-color: #06c;
+}
+.ql-editor .ql-bg-purple {
+  background-color: #93f;
+}
+.ql-editor .ql-color-white {
+  color: #fff;
+}
+.ql-editor .ql-color-red {
+  color: #e60000;
+}
+.ql-editor .ql-color-orange {
+  color: #f90;
+}
+.ql-editor .ql-color-yellow {
+  color: #ff0;
+}
+.ql-editor .ql-color-green {
+  color: #008a00;
+}
+.ql-editor .ql-color-blue {
+  color: #06c;
+}
+.ql-editor .ql-color-purple {
+  color: #93f;
+}
+.ql-editor .ql-font-serif {
+  font-family: Georgia, Times New Roman, serif;
+}
+.ql-editor .ql-font-monospace {
+  font-family: Monaco, Courier New, monospace;
+}
+.ql-editor .ql-size-small {
+  font-size: 0.75em;
+}
+.ql-editor .ql-size-large {
+  font-size: 1.5em;
+}
+.ql-editor .ql-size-huge {
+  font-size: 2.5em;
+}
+.ql-editor .ql-direction-rtl {
+  direction: rtl;
+  text-align: inherit;
+}
+.ql-editor .ql-align-center {
+  text-align: center;
+}
+.ql-editor .ql-align-justify {
+  text-align: justify;
+}
+.ql-editor .ql-align-right {
+  text-align: right;
+}
+.ql-editor.ql-blank::before {
+  color: rgba(0,0,0,0.6);
+  content: attr(data-placeholder);
+  font-style: italic;
+  left: 15px;
+  pointer-events: none;
+  position: absolute;
+  right: 15px;
+}
+.ql-snow.ql-toolbar:after,
+.ql-snow .ql-toolbar:after {
+  clear: both;
+  content: '';
+  display: table;
+}
+.ql-snow.ql-toolbar button,
+.ql-snow .ql-toolbar button {
+  background: none;
+  border: none;
+  cursor: pointer;
+  display: inline-block;
+  float: left;
+  height: 24px;
+  padding: 3px 5px;
+  width: 28px;
+}
+.ql-snow.ql-toolbar button svg,
+.ql-snow .ql-toolbar button svg {
+  float: left;
+  height: 100%;
+}
+.ql-snow.ql-toolbar button:active:hover,
+.ql-snow .ql-toolbar button:active:hover {
+  outline: none;
+}
+.ql-snow.ql-toolbar input.ql-image[type=file],
+.ql-snow .ql-toolbar input.ql-image[type=file] {
+  display: none;
+}
+.ql-snow.ql-toolbar button:hover,
+.ql-snow .ql-toolbar button:hover,
+.ql-snow.ql-toolbar button:focus,
+.ql-snow .ql-toolbar button:focus,
+.ql-snow.ql-toolbar button.ql-active,
+.ql-snow .ql-toolbar button.ql-active,
+.ql-snow.ql-toolbar .ql-picker-label:hover,
+.ql-snow .ql-toolbar .ql-picker-label:hover,
+.ql-snow.ql-toolbar .ql-picker-label.ql-active,
+.ql-snow .ql-toolbar .ql-picker-label.ql-active,
+.ql-snow.ql-toolbar .ql-picker-item:hover,
+.ql-snow .ql-toolbar .ql-picker-item:hover,
+.ql-snow.ql-toolbar .ql-picker-item.ql-selected,
+.ql-snow .ql-toolbar .ql-picker-item.ql-selected {
+  color: #06c;
+}
+.ql-snow.ql-toolbar button:hover .ql-fill,
+.ql-snow .ql-toolbar button:hover .ql-fill,
+.ql-snow.ql-toolbar button:focus .ql-fill,
+.ql-snow .ql-toolbar button:focus .ql-fill,
+.ql-snow.ql-toolbar button.ql-active .ql-fill,
+.ql-snow .ql-toolbar button.ql-active .ql-fill,
+.ql-snow.ql-toolbar .ql-picker-label:hover .ql-fill,
+.ql-snow .ql-toolbar .ql-picker-label:hover .ql-fill,
+.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-fill,
+.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-fill,
+.ql-snow.ql-toolbar .ql-picker-item:hover .ql-fill,
+.ql-snow .ql-toolbar .ql-picker-item:hover .ql-fill,
+.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-fill,
+.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-fill,
+.ql-snow.ql-toolbar button:hover .ql-stroke.ql-fill,
+.ql-snow .ql-toolbar button:hover .ql-stroke.ql-fill,
+.ql-snow.ql-toolbar button:focus .ql-stroke.ql-fill,
+.ql-snow .ql-toolbar button:focus .ql-stroke.ql-fill,
+.ql-snow.ql-toolbar button.ql-active .ql-stroke.ql-fill,
+.ql-snow .ql-toolbar button.ql-active .ql-stroke.ql-fill,
+.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
+.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke.ql-fill,
+.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
+.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke.ql-fill,
+.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
+.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke.ql-fill,
+.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill,
+.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke.ql-fill {
+  fill: #06c;
+}
+.ql-snow.ql-toolbar button:hover .ql-stroke,
+.ql-snow .ql-toolbar button:hover .ql-stroke,
+.ql-snow.ql-toolbar button:focus .ql-stroke,
+.ql-snow .ql-toolbar button:focus .ql-stroke,
+.ql-snow.ql-toolbar button.ql-active .ql-stroke,
+.ql-snow .ql-toolbar button.ql-active .ql-stroke,
+.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke,
+.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke,
+.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke,
+.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke,
+.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke,
+.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke,
+.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
+.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke,
+.ql-snow.ql-toolbar button:hover .ql-stroke-miter,
+.ql-snow .ql-toolbar button:hover .ql-stroke-miter,
+.ql-snow.ql-toolbar button:focus .ql-stroke-miter,
+.ql-snow .ql-toolbar button:focus .ql-stroke-miter,
+.ql-snow.ql-toolbar button.ql-active .ql-stroke-miter,
+.ql-snow .ql-toolbar button.ql-active .ql-stroke-miter,
+.ql-snow.ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
+.ql-snow .ql-toolbar .ql-picker-label:hover .ql-stroke-miter,
+.ql-snow.ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
+.ql-snow .ql-toolbar .ql-picker-label.ql-active .ql-stroke-miter,
+.ql-snow.ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
+.ql-snow .ql-toolbar .ql-picker-item:hover .ql-stroke-miter,
+.ql-snow.ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter,
+.ql-snow .ql-toolbar .ql-picker-item.ql-selected .ql-stroke-miter {
+  stroke: #06c;
+}
+@media (pointer: coarse) {
+  .ql-snow.ql-toolbar button:hover:not(.ql-active),
+  .ql-snow .ql-toolbar button:hover:not(.ql-active) {
+    color: #444;
+  }
+  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-fill,
+  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-fill,
+  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill,
+  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke.ql-fill {
+    fill: #444;
+  }
+  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke,
+  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke,
+  .ql-snow.ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter,
+  .ql-snow .ql-toolbar button:hover:not(.ql-active) .ql-stroke-miter {
+    stroke: #444;
+  }
+}
+.ql-snow {
+  box-sizing: border-box;
+}
+.ql-snow * {
+  box-sizing: border-box;
+}
+.ql-snow .ql-hidden {
+  display: none;
+}
+.ql-snow .ql-out-bottom,
+.ql-snow .ql-out-top {
+  visibility: hidden;
+}
+.ql-snow .ql-tooltip {
+  position: absolute;
+  transform: translateY(10px);
+}
+.ql-snow .ql-tooltip a {
+  cursor: pointer;
+  text-decoration: none;
+}
+.ql-snow .ql-tooltip.ql-flip {
+  transform: translateY(-10px);
+}
+.ql-snow .ql-formats {
+  display: inline-block;
+  vertical-align: middle;
+}
+.ql-snow .ql-formats:after {
+  clear: both;
+  content: '';
+  display: table;
+}
+.ql-snow .ql-stroke {
+  fill: none;
+  stroke: #444;
+  stroke-linecap: round;
+  stroke-linejoin: round;
+  stroke-width: 2;
+}
+.ql-snow .ql-stroke-miter {
+  fill: none;
+  stroke: #444;
+  stroke-miterlimit: 10;
+  stroke-width: 2;
+}
+.ql-snow .ql-fill,
+.ql-snow .ql-stroke.ql-fill {
+  fill: #444;
+}
+.ql-snow .ql-empty {
+  fill: none;
+}
+.ql-snow .ql-even {
+  fill-rule: evenodd;
+}
+.ql-snow .ql-thin,
+.ql-snow .ql-stroke.ql-thin {
+  stroke-width: 1;
+}
+.ql-snow .ql-transparent {
+  opacity: 0.4;
+}
+.ql-snow .ql-direction svg:last-child {
+  display: none;
+}
+.ql-snow .ql-direction.ql-active svg:last-child {
+  display: inline;
+}
+.ql-snow .ql-direction.ql-active svg:first-child {
+  display: none;
+}
+.ql-snow .ql-editor h1 {
+  font-size: 2em;
+}
+.ql-snow .ql-editor h2 {
+  font-size: 1.5em;
+}
+.ql-snow .ql-editor h3 {
+  font-size: 1.17em;
+}
+.ql-snow .ql-editor h4 {
+  font-size: 1em;
+}
+.ql-snow .ql-editor h5 {
+  font-size: 0.83em;
+}
+.ql-snow .ql-editor h6 {
+  font-size: 0.67em;
+}
+.ql-snow .ql-editor a {
+  text-decoration: underline;
+}
+.ql-snow .ql-editor blockquote {
+  border-left: 4px solid #ccc;
+  margin-bottom: 5px;
+  margin-top: 5px;
+  padding-left: 16px;
+}
+.ql-snow .ql-editor code,
+.ql-snow .ql-editor pre {
+  background-color: #f0f0f0;
+  border-radius: 3px;
+}
+.ql-snow .ql-editor pre {
+  white-space: pre-wrap;
+  margin-bottom: 5px;
+  margin-top: 5px;
+  padding: 5px 10px;
+}
+.ql-snow .ql-editor code {
+  font-size: 85%;
+  padding: 2px 4px;
+}
+.ql-snow .ql-editor pre.ql-syntax {
+  background-color: #23241f;
+  color: #f8f8f2;
+  overflow: visible;
+}
+.ql-snow .ql-editor img {
+  max-width: 100%;
+}
+.ql-snow .ql-picker {
+  color: #444;
+  display: inline-block;
+  float: left;
+  font-size: 14px;
+  font-weight: 500;
+  height: 24px;
+  position: relative;
+  vertical-align: middle;
+}
+.ql-snow .ql-picker-label {
+  cursor: pointer;
+  display: inline-block;
+  height: 100%;
+  padding-left: 8px;
+  padding-right: 2px;
+  position: relative;
+  width: 100%;
+}
+.ql-snow .ql-picker-label::before {
+  display: inline-block;
+  line-height: 22px;
+}
+.ql-snow .ql-picker-options {
+  background-color: #fff;
+  display: none;
+  min-width: 100%;
+  padding: 4px 8px;
+  position: absolute;
+  white-space: nowrap;
+}
+.ql-snow .ql-picker-options .ql-picker-item {
+  cursor: pointer;
+  display: block;
+  padding-bottom: 5px;
+  padding-top: 5px;
+}
+.ql-snow .ql-picker.ql-expanded .ql-picker-label {
+  color: #ccc;
+  z-index: 2;
+}
+.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-fill {
+  fill: #ccc;
+}
+.ql-snow .ql-picker.ql-expanded .ql-picker-label .ql-stroke {
+  stroke: #ccc;
+}
+.ql-snow .ql-picker.ql-expanded .ql-picker-options {
+  display: block;
+  margin-top: -1px;
+  top: 100%;
+  z-index: 1;
+}
+.ql-snow .ql-color-picker,
+.ql-snow .ql-icon-picker {
+  width: 28px;
+}
+.ql-snow .ql-color-picker .ql-picker-label,
+.ql-snow .ql-icon-picker .ql-picker-label {
+  padding: 2px 4px;
+}
+.ql-snow .ql-color-picker .ql-picker-label svg,
+.ql-snow .ql-icon-picker .ql-picker-label svg {
+  right: 4px;
+}
+.ql-snow .ql-icon-picker .ql-picker-options {
+  padding: 4px 0px;
+}
+.ql-snow .ql-icon-picker .ql-picker-item {
+  height: 24px;
+  width: 24px;
+  padding: 2px 4px;
+}
+.ql-snow .ql-color-picker .ql-picker-options {
+  padding: 3px 5px;
+  width: 152px;
+}
+.ql-snow .ql-color-picker .ql-picker-item {
+  border: 1px solid transparent;
+  float: left;
+  height: 16px;
+  margin: 2px;
+  padding: 0px;
+  width: 16px;
+}
+.ql-snow .ql-picker:not(.ql-color-picker):not(.ql-icon-picker) svg {
+  position: absolute;
+  margin-top: -9px;
+  right: 0;
+  top: 50%;
+  width: 18px;
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-label]:not([data-label=''])::before,
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-label]:not([data-label=''])::before,
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-label]:not([data-label=''])::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-label]:not([data-label=''])::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-label]:not([data-label=''])::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-label]:not([data-label=''])::before {
+  content: attr(data-label);
+}
+.ql-snow .ql-picker.ql-header {
+  width: 98px;
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item::before {
+  content: 'Normal';
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="1"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
+  content: 'Heading 1';
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="2"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
+  content: 'Heading 2';
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="3"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
+  content: 'Heading 3';
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="4"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
+  content: 'Heading 4';
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="5"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
+  content: 'Heading 5';
+}
+.ql-snow .ql-picker.ql-header .ql-picker-label[data-value="6"]::before,
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
+  content: 'Heading 6';
+}
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="1"]::before {
+  font-size: 2em;
+}
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="2"]::before {
+  font-size: 1.5em;
+}
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="3"]::before {
+  font-size: 1.17em;
+}
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="4"]::before {
+  font-size: 1em;
+}
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="5"]::before {
+  font-size: 0.83em;
+}
+.ql-snow .ql-picker.ql-header .ql-picker-item[data-value="6"]::before {
+  font-size: 0.67em;
+}
+.ql-snow .ql-picker.ql-font {
+  width: 108px;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item::before {
+  content: 'Sans Serif';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=serif]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
+  content: 'Serif';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-label[data-value=monospace]::before,
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
+  content: 'Monospace';
+}
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=serif]::before {
+  font-family: Georgia, Times New Roman, serif;
+}
+.ql-snow .ql-picker.ql-font .ql-picker-item[data-value=monospace]::before {
+  font-family: Monaco, Courier New, monospace;
+}
+.ql-snow .ql-picker.ql-size {
+  width: 98px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item::before {
+  content: 'Normal';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=small]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
+  content: 'Small';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=large]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
+  content: 'Large';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-label[data-value=huge]::before,
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
+  content: 'Huge';
+}
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=small]::before {
+  font-size: 10px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=large]::before {
+  font-size: 18px;
+}
+.ql-snow .ql-picker.ql-size .ql-picker-item[data-value=huge]::before {
+  font-size: 32px;
+}
+.ql-snow .ql-color-picker.ql-background .ql-picker-item {
+  background-color: #fff;
+}
+.ql-snow .ql-color-picker.ql-color .ql-picker-item {
+  background-color: #000;
+}
+.ql-toolbar.ql-snow {
+  border: 1px solid #ccc;
+  box-sizing: border-box;
+  font-family: 'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+  padding: 8px;
+}
+.ql-toolbar.ql-snow .ql-formats {
+  margin-right: 15px;
+}
+.ql-toolbar.ql-snow .ql-picker-label {
+  border: 1px solid transparent;
+}
+.ql-toolbar.ql-snow .ql-picker-options {
+  border: 1px solid transparent;
+  box-shadow: rgba(0,0,0,0.2) 0 2px 8px;
+}
+.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-label {
+  border-color: #ccc;
+}
+.ql-toolbar.ql-snow .ql-picker.ql-expanded .ql-picker-options {
+  border-color: #ccc;
+}
+.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item.ql-selected,
+.ql-toolbar.ql-snow .ql-color-picker .ql-picker-item:hover {
+  border-color: #000;
+}
+.ql-toolbar.ql-snow + .ql-container.ql-snow {
+  border-top: 0px;
+}
+.ql-snow .ql-tooltip {
+  background-color: #fff;
+  border: 1px solid #ccc;
+  box-shadow: 0px 0px 5px #ddd;
+  color: #444;
+  padding: 5px 12px;
+  white-space: nowrap;
+}
+.ql-snow .ql-tooltip::before {
+  content: "Visit URL:";
+  line-height: 26px;
+  margin-right: 8px;
+}
+.ql-snow .ql-tooltip input[type=text] {
+  display: none;
+  border: 1px solid #ccc;
+  font-size: 13px;
+  height: 26px;
+  margin: 0px;
+  padding: 3px 5px;
+  width: 170px;
+}
+.ql-snow .ql-tooltip a.ql-preview {
+  display: inline-block;
+  max-width: 200px;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  vertical-align: top;
+}
+.ql-snow .ql-tooltip a.ql-action::after {
+  border-right: 1px solid #ccc;
+  content: 'Edit';
+  margin-left: 16px;
+  padding-right: 8px;
+}
+.ql-snow .ql-tooltip a.ql-remove::before {
+  content: 'Remove';
+  margin-left: 8px;
+}
+.ql-snow .ql-tooltip a {
+  line-height: 26px;
+}
+.ql-snow .ql-tooltip.ql-editing a.ql-preview,
+.ql-snow .ql-tooltip.ql-editing a.ql-remove {
+  display: none;
+}
+.ql-snow .ql-tooltip.ql-editing input[type=text] {
+  display: inline-block;
+}
+.ql-snow .ql-tooltip.ql-editing a.ql-action::after {
+  border-right: 0px;
+  content: 'Save';
+  padding-right: 0px;
+}
+.ql-snow .ql-tooltip[data-mode=link]::before {
+  content: "Enter link:";
+}
+.ql-snow .ql-tooltip[data-mode=formula]::before {
+  content: "Enter formula:";
+}
+.ql-snow .ql-tooltip[data-mode=video]::before {
+  content: "Enter video:";
+}
+.ql-snow a {
+  color: #06c;
+}
+.ql-container.ql-snow {
+  border: 1px solid #ccc;
+}

wx_application/public/js/quill.js

+import Quill from './core';
+
+import { AlignClass, AlignStyle } from './formats/align';
+import { DirectionAttribute, DirectionClass, DirectionStyle } from './formats/direction';
+import { IndentClass as Indent } from './formats/indent';
+
+import Blockquote from './formats/blockquote';
+import Header from './formats/header';
+import List, { ListItem } from './formats/list';
+
+import { BackgroundClass, BackgroundStyle } from './formats/background';
+import { ColorClass, ColorStyle } from './formats/color';
+import { FontClass, FontStyle } from './formats/font';
+import { SizeClass, SizeStyle } from './formats/size';
+
+import Bold from './formats/bold';
+import Italic from './formats/italic';
+import Link from './formats/link';
+import Script from './formats/script';
+import Strike from './formats/strike';
+import Underline from './formats/underline';
+
+import Image from './formats/image';
+import Video from './formats/video';
+
+import CodeBlock, { Code as InlineCode } from './formats/code';
+
+import Formula from './modules/formula';
+import Syntax from './modules/syntax';
+import Toolbar from './modules/toolbar';
+
+import Icons from './ui/icons';
+import Picker from './ui/picker';
+import ColorPicker from './ui/color-picker';
+import IconPicker from './ui/icon-picker';
+import Tooltip from './ui/tooltip';
+
+import BubbleTheme from './themes/bubble';
+import SnowTheme from './themes/snow';
+
+
+Quill.register({
+  'attributors/attribute/direction': DirectionAttribute,
+
+  'attributors/class/align': AlignClass,
+  'attributors/class/background': BackgroundClass,
+  'attributors/class/color': ColorClass,
+  'attributors/class/direction': DirectionClass,
+  'attributors/class/font': FontClass,
+  'attributors/class/size': SizeClass,
+
+  'attributors/style/align': AlignStyle,
+  'attributors/style/background': BackgroundStyle,
+  'attributors/style/color': ColorStyle,
+  'attributors/style/direction': DirectionStyle,
+  'attributors/style/font': FontStyle,
+  'attributors/style/size': SizeStyle
+}, true);
+
+
+Quill.register({
+  'formats/align': AlignClass,
+  'formats/direction': DirectionClass,
+  'formats/indent': Indent,
+
+  'formats/background': BackgroundStyle,
+  'formats/color': ColorStyle,
+  'formats/font': FontClass,
+  'formats/size': SizeClass,
+
+  'formats/blockquote': Blockquote,
+  'formats/code-block': CodeBlock,
+  'formats/header': Header,
+  'formats/list': List,
+
+  'formats/bold': Bold,
+  'formats/code': InlineCode,
+  'formats/italic': Italic,
+  'formats/link': Link,
+  'formats/script': Script,
+  'formats/strike': Strike,
+  'formats/underline': Underline,
+
+  'formats/image': Image,
+  'formats/video': Video,
+
+  'formats/list/item': ListItem,
+
+  'modules/formula': Formula,
+  'modules/syntax': Syntax,
+  'modules/toolbar': Toolbar,
+
+  'themes/bubble': BubbleTheme,
+  'themes/snow': SnowTheme,
+
+  'ui/icons': Icons,
+  'ui/picker': Picker,
+  'ui/icon-picker': IconPicker,
+  'ui/color-picker': ColorPicker,
+  'ui/tooltip': Tooltip
+}, true);
+
+
+export default Quill;

wx_application/src/main.js

@@ -8,13 +8,55 @@ import Vant from 'vant';
 import { Toast } from 'vant';
 import 'vant/lib/index.css';
 import vConsole from 'vconsole'
+import VeeValidate, { Validator } from 'vee-validate'
+import cn from 'vee-validate/dist/locale/zh_CN';
 
+Validator.addLocale(cn)
+Vue.use(VeeValidate, {
+  locale: 'zh_CN'
+})
+
+const dictionary = {
+  zh_CN: {
+    messages: {
+      required: (val) => {
+        let msg = ''
+        switch (val) {
+          case 'logo':
+            msg = 'logo'
+            break
+          case 'name':
+            msg = '专柜名称'
+            break
+          case 'location':
+            msg = '专柜地址'
+          break
+          case 'number':
+            msg = '电话号码'
+          break
+          case 'summaryTitle':
+            msg = '摘要信息'
+          break
+          case 'summary':
+            msg = '正文内容'
+          break
+          case 'banner':
+            msg = '轮播图'
+            break
+          default:;
+        }
+        msg = msg + '不能为空'
+        return msg
+      }
+    }
+  }
+}
+Validator.updateDictionary(dictionary)
 
 Vue.prototype.$vConsole= new vConsole()
 Vue.config.productionTip = false
-
-Vue.use(Vant);
-Vue.use(Toast);
+Vue.use(Vant)
+Vue.use(Toast)
 
 const originalPush = Router.prototype.push
 Router.prototype.push = function push(location) {

wx_application/src/views/counter/changeCounter.vue

@@ -106,6 +106,7 @@ export default {
 }
 .left img {
   width: 100%;
+  height: 80px;
 }
 .right {
   width: 76%;

wx_application/src/views/counter/counterEdit.vue

@@ -3,7 +3,7 @@
     <div class="flex-start top" >
       <div class="flex-start">
         <van-cell-group class="gn">
-          <van-cell title="专柜LOGO"  >
+          <van-cell title="专柜LOGO" class="logo" >
             <template slot="default">
               <van-uploader v-model="logoList" :max-count="1" class="input" :after-read="afterRead" :before-read="beforeRead" @delete="deleteLogo" >
                 <div>
@@ -19,7 +19,7 @@
           </van-cell>
           <van-cell title="专柜地址">
             <template slot="default">
-              <van-field v-model="addForm.location" placeholder="输入地址" class="input" />
+              <van-field v-model="addForm.location" placeholder="输入地址"  class="input" />
             </template>
           </van-cell>
           <van-cell title="电话">
@@ -123,7 +123,7 @@ export default {
   methods: {
     getDetail() {
       let params = {
-        oyStallCode: this.addForm.oyStallCode
+        oyStallCode: this.addForm.oyStallCode     
       }
       getStoreDetail(params).then(res => {
         if(res.data.stallInfo != null) {
@@ -149,7 +149,7 @@ export default {
     },
     beforeRead (file) {	//上传之前校验
   	  if (file.type !== 'image/jpeg' && file.type !== 'image/png') {
-  	  	Toast('只允许上传jpg/png格式的图片！')
+  	  	this.$toast("只允许上传img或png格式的图片")
   	  	return false
   	  }
   	  return true
@@ -182,7 +182,32 @@ export default {
     },
     handleSave() {
       const carousel = this.list.join(';')  
-      delete this.addForm.id        
+      // this.addForm.oyStallCode = 1
+      delete this.addForm.id  
+       if(!this.addForm.logo){
+          this.$toast("请上传logo")
+          return false
+        }
+        if(!this.addForm.name){
+          this.$toast("请输入专柜名称")
+          return false
+        }   
+        if(!this.addForm.location){
+          this.$toast("请输入专柜地址")
+          return false
+        }    
+        if(!this.addForm.phone){
+          this.$toast("请输入电话号码")
+          return false
+        } 
+        if(!this.addForm.summaryTitle){
+          this.$toast("请输入摘要信息")
+          return false
+        } 
+        if(!this.addForm.summary){
+          this.$toast("请输入正文")
+          return false
+        } 
       editStore(Object.assign(this.addForm,{ carousel })).then( res => {
         if(res.result == 'success') {
           this.$router.go(-1)
@@ -195,6 +220,9 @@ export default {
 <style >
 </style>
 <style scoped>
+.logo >>> .van-cell__value {
+  padding: 10px 0 0 0;
+}
 .pic {
   border-bottom: 2px solid #ebedf0;
 }
@@ -276,7 +304,6 @@ export default {
   color: rgba(45, 71, 106, 1);
 }
 .gn {
-  margin-top: 12px;
   width: 100%;
   padding-bottom: 12px;
 }

wx_application/src/views/counter/counterHomePage.vue

@@ -2,46 +2,64 @@
   <div class="container">
     <div class="flex-start">
       <div class="img">
-        <van-swipe :autoplay="3000">
-          <van-swipe-item>
-            <img src="../../../public/img/cswiper.png" />
-          </van-swipe-item>
-          <van-swipe-item>
-            <img src="../../../public/img/cswiper.png" />
-          </van-swipe-item>
-          <van-swipe-item>
-            <img src="../../../public/img/cswiper.png" />
-          </van-swipe-item>
-          <van-swipe-item>
-            <img src="../../../public/img/cswiper.png" />
+        <van-swipe :autoplay="3000" >
+          <van-swipe-item v-for="(item,index) in  carousel" :key="index">
+            <img :src="item"  />
           </van-swipe-item>
         </van-swipe>
-    </div>
-    <div class="list">
-      <div class="left flex">
-        <img src="../../../public/img/counter.png" alt="" />
       </div>
-      <div class="right">
-        <h3>欧亚一号专柜</h3>
-        <div class="txt">
-          <van-icon name="phone-o" size="16" style="vertical-align: middle;" />
-          <span>18888888888</span>
-        </div>        
-        <div class="txt">
-          <van-icon name="location-o" size="16" style="vertical-align: middle;"  />
-          <span>欧亚商场一楼181号</span>
-        </div> 
+      <div class="list">
+        <div class="left">
+          <img :src="storeInfo.logo" alt="" />
+        </div>
+        <div class="right">
+          <h3>{{storeInfo.name}}</h3>
+          <p>{{storeInfo.summaryTitle}}</p>
+        </div>
       </div>
+      <!-- <div class="ql-container ql-snow">
+        <div class="ql-editor fwb" v-html="storeInfo.summary">
+        </div>
+      </div> -->
+      <div v-html="storeInfo.summary" class="fwb ql-editor"></div>
     </div>
-    </div>
+    
   </div>
 </template>
 
 <script>
+  import axios from "axios"
+  import { getStoreDetail } from "@/api/sidebar/voucher";
 export default {
   data() {
     return {
-
+      oyStallCode: '',
+      storeInfo: {
+        logo: './img/counter.png',
+        name: 'only专柜',
+        summaryTitle: 'ONLY是丹麦著名的国际时装公司BESTSELLER拥有的众多著名品牌之一', 
+        summary: '<p>ONLY在1996年来到中国，1996年9月28日，品牌诞生之初便富有远见地来到中国</p>'
+      },
+      carousel:['./img/cswiper.png','./img/cswiper.png','./img/cswiper.png','./img/cswiper.png']
+    }
+  },
+  mounted() {
+    this.oyStallCode = sessionStorage.getItem('oyStallCode')
+    this.getStore()
+  },
+  methods: {
+    // 获取店铺信息
+    getStore() {
+      let params = {
+         oyStallCode: this.oyStallCode
+      }
+      getStoreDetail(params).then(res => {
+        if(res.data.stallInfo != null) {
+          console.log(res,'res');
+          this.carousel = res.data.carousel
+          this.storeInfo = res.data.stallInfo
+        }
+      })
     }
   }
 }
@@ -60,42 +78,64 @@ export default {
 .img {
   width: 100%;
   height: 200px;
-  /* background-color: pink; */
+  background-color: #fff;
 }
 .img img {
   width: 100%;
+  height: 200px;
+}
+.img >>> .van-swipe {
+  height: 200px;
 }
 .list {
-  height: auto;
+  height: 80px;
   width: 100%;
   background-color: #fff;
   display: flex;
-  justify-content: flex-start;
+  justify-content: space-between;
   border-bottom: 1px solid rgba(238, 238, 238, 1);
   box-shadow: 0px 2px 4px 0px rgba(221, 221, 221, 1);
   border-radius: 2px;
   z-index: 100;
 }
+.list3 {
+  border-bottom: none;
+  margin-bottom: 0;
+}
+.left,
+.right {
+  height: 80px;
+}
 .left {
   width: 30%;
+  display: flex;
+  justify-content: center;
 }
 .left img {
-  width: 80px;
+  height: 80px;
 }
 .right {
-  width: 76%;
-  padding: 10px;
+  width: 70%;
+  padding: 16px 0 0 10px;
   background-color: #fff;
-  height: auto;
 }
 h3 {
   font-size: 14px;
   font-weight: bold;
   color: rgba(45, 71, 106, 1);
 }
-.txt {
+p {
   margin-top: 10px;
   font-size: 12px;
   color: rgba(45, 71, 106, 0.8);
 }
+.fwb {
+  padding:30px;
+}
+.fwb >>> p {
+  font-size: 14px;
+}
+.fwb >>> img {
+  width: 100%;
+}
 </style>

wx_application/src/views/counter/counterInfo.vue

@@ -3,7 +3,7 @@
     <div class="img">
       <van-swipe :autoplay="3000" >
         <van-swipe-item v-for="(item,index) in  carousel" :key="index">
-          <img :src="item" />
+          <img :src="item"  />
         </van-swipe-item>
       </van-swipe>
     </div>
@@ -131,6 +131,10 @@ export default {
 }
 .img img {
   width: 100%;
+  height: 200px;
+}
+.img >>> .van-swipe {
+  height: 200px;
 }
 .list {
   height: 80px;
@@ -152,20 +156,18 @@ export default {
   height: 80px;
 }
 .left {
-  width: 80px;
-  background: rgba(248, 248, 248, 1);
-  position: absolute;
-  top: 188px;
-  left: 10px;
+    width: 30%;
+    display: flex;
+    justify-content: center;
 }
 .left img {
-  width: 100%;
+  width: 80px;
 }
 .right {
-  width: 76%;
-  padding: 10px;
+  width: 70%;
+  padding: 16px 0 0 10px;
   background-color: #fff;
-  margin-left: 94px;
+
 }
 h3 {
   font-size: 14px;

wx_application/src/views/mainSale/active/main/index.vue

@@ -197,10 +197,10 @@ export default {
     };
   },
   created() {
-    this.checkNowMenuBar()
-    this.getUserInfo()
+    this.checkNowMenuBar()    
     this.oyStallCode = sessionStorage.getItem('oyStallCode')
     this.userId = sessionStorage.getItem('userId')
+    this.getUserInfo()
     this.getStore()
     this.getFans()
   },
@@ -213,7 +213,7 @@ export default {
       };
 
       axios({
-        url: "http://139.155.48.151:8085/workWx/auth/user/get?userId=" +this.userId,
+        url: "http://139.155.48.151:8085/workWx/auth/user/get?userId=" + this.userId,
         method: "get",
         headers: headerData
       })
@@ -222,7 +222,7 @@ export default {
           this.test.manInfo.logoUrl = res.data.data.avatar
         })
         .catch(err => {
-          console.log(err);
+          console.log(err)
         });
     },
     getFans() {

wx_application/src/views/mainSale/me/main/index.vue

@@ -25,10 +25,10 @@
       </div>
     </div>
     <div class="lists">
-      <div class="list">
+      <!-- <div class="list">
         <div class="list-title">我的客户</div>
         <img class="list-icon" :src="cache.icon.arrowRightDark" />
-      </div>
+      </div> -->
       <div class="list" @click="listTaskClick">
         <div class="list-title">任务列表</div>
         <img class="list-icon" :src="cache.icon.arrowRightDark" />
@@ -131,7 +131,7 @@
   },
   mounted() {
     this.checkNowMenuBar()
-    // this.zReadyUserId()
+    this.zReadyUserId()
     this.zTestGetNowUrlInfo()
 
   },