Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/EditTemplate.vue

@@ -193,7 +193,7 @@
           </select>
         </span>
         <span class="ql-formats" v-if="toolbar.fontColor||toolbar.fontBackgroundColor">
-          <span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor">
+          <span class="ql-color ql-picker ql-color-picker" v-if="toolbar.fontColor" style="display:none">
             <span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-35">
               <svg viewbox="0 0 18 18">
                 <line class="ql-color-label ql-stroke ql-transparent" x1="3" x2="15" y1="15" y2="15"></line>
@@ -237,7 +237,7 @@
                 tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
                 tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
           </span>
-          <select class="ql-color" style="display: none;" v-if="toolbar.fontColor">
+          <select class="ql-color" v-if="toolbar.fontColor">
             <option selected="selected"></option>
             <option value="#e60000"></option>
             <option value="#ff9900"></option>
@@ -274,7 +274,7 @@
             <option value="#002966"></option>
             <option value="#3d1466"></option>
           </select> 
-          <span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor">
+          <span class="ql-background ql-picker ql-color-picker" v-if="toolbar.fontBackgroundColor" style="display:none;">
             <span class="ql-picker-label" tabindex="0" role="button" aria-expanded="false" aria-controls="ql-picker-options-36">
               <svg viewbox="0 0 18 18">
                 <g class="ql-fill ql-color-label">
@@ -365,7 +365,7 @@
                 tabindex="0" role="button" class="ql-picker-item" data-value="#002966" style="background-color: rgb(0, 41, 102);"></span><span
                 tabindex="0" role="button" class="ql-picker-item" data-value="#3d1466" style="background-color: rgb(61, 20, 102);"></span></span>
           </span>
-          <select class="ql-background" style="display: none;" v-if="toolbar.fontBackgroundColor">
+          <select class="ql-background" v-if="toolbar.fontBackgroundColor">
             <option value="#000000"></option>
             <option value="#e60000"></option>
             <option value="#ff9900"></option>

src/components/activity/IntegralMall.vue

@@ -54,6 +54,7 @@
       <tr>
         <th width='80'>商品编号</th>
         <th>商品名称</th>
+        <th>商品数量</th>
         <th>购买等级要求</th>
         <th>价格</th>
         <th>市场价</th>
@@ -66,6 +67,7 @@
       <tr v-for="item in dataList">
          <td>{{item.id}}</td>
          <td>{{item.name}}</td>
+         <td>{{item.storeNum}}</td>
          <td>{{item.isReqRate === -1 ? '不限' : `${item.isReqRate}级`}}</td>
          <td>{{item.price}}{{item.priceUnit === 1 ? '人民币' : '积分'}}</td>
          <td>{{item.marketPrice}}</td>

src/components/activity/addIntegralMall.vue

@@ -323,7 +323,7 @@
         <my-edit v-on:edit-value="addMsg.description = arguments[0]" v-bind:editValue="addMsg.description"
           v-bind:toolbarShow="toolbar" v-bind:placeholder="placeholder"></my-edit>
           
-        <span class="resource-lititle resource-lititle2">图片介绍</span>
+        <!-- <span class="resource-lititle resource-lititle2">图片介绍</span>
         <div class="resource-imglist clearfix">
           <div class="re-img re-img2" v-for="(item,index) in DiningImageArray2" :key="index">
             <img v-if="!item" src="../../assets/img/bg_c3@3x.png">
@@ -370,7 +370,7 @@
               </div>
             </div>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="bottom_sub">
         <button
@@ -392,16 +392,16 @@ export default {
   data() {
     return {
       toolbar: {
-        clean: true, //加粗
-        font: true, //字体
+        clean: true, 
+        font: false, //字体
         narrative: false, //叙述,
         image:true,
-        // bold: true, //加粗
-        // underline: true, //下划线
-        // header1: true, //H1
-        // header2: true, //H2
-        //fontColor: true, //字体颜色
-        // fontBackgroundColor: true, //背景颜色
+        bold: true, //加粗
+        underline: true, //下划线
+        header1: true, //H1
+        header2: true, //H2
+        fontColor: true, //字体颜色
+        fontBackgroundColor: true, //背景颜色
       },
       placeholder: "请输入内容",
       editorOption: {