Merge branch 'development' of http://gitlab-ebiz.yiyao365.cn/newshop/newshopfront into development

debug.log

@@ -295,3 +295,4 @@
 [1217/174328.389:ERROR:process_info.cc(359)] UncheckedAllocate
 [1217/174415.247:ERROR:process_info.cc(359)] UncheckedAllocate
 [1217/174421.088:ERROR:process_info.cc(359)] UncheckedAllocate
+[1219/161906.094:ERROR:process_info.cc(359)] UncheckedAllocate

src/api/shopgoods.js

+import api from './index'
+import { axios } from '@/utils/request'
+import loginToken from './token'
+import homeUrl from './homeURL'
+
+/**
+ * login func
+ * parameter: {
+ *     username: '',
+ *     password: '',
+ *     remember_me: true,
+ *     captcha: '12345'
+ * }
+ * @param parameter
+ * @returns {*}
+ */
+
+
+
+// 商品详情页模板列表
+export function getGoodsTemplateList (parameter) {
+    if(parameter.START_TIME){
+      parameter.START_TIME=parameter.START_TIME.format('YYYY-MM-DD HH:mm:ss')
+    }
+    if(parameter.END_TIME){
+      parameter.END_TIME=parameter.END_TIME.format('YYYY-MM-DD HH:mm:ss')
+    }
+    return axios({
+        url: 'shopgoods/goods-detail-settings/setting-list',
+        method: 'get',
+        params: parameter
+    })
+}
+// 添加商品详情页模板
+export function addGoosTemplate (parameter) {
+  if(parameter.START_TIME){
+    parameter.START_TIME=parameter.START_TIME.format('YYYY-MM-DD HH:mm:ss')
+  }
+  if(parameter.END_TIME){
+    parameter.END_TIME=parameter.END_TIME.format('YYYY-MM-DD HH:mm:ss')
+  }
+  return axios({
+    url: 'shopgoods/goods-detail-settings/setting-add',
+    method: 'post',
+    data: parameter
+  })
+}
+// 删除模板
+export function deleteGoodsTemplate (id) {
+  return axios({
+    url: 'shopgoods/goods-detail-settings/setting-del?GUID='+id,
+    method: 'delete'
+  })
+}
+// 获取模板编辑详情
+export function getTemplateDetails (parameter) {
+  return axios({
+      url: 'shopgoods/goods-detail-settings/setting-details',
+      method: 'get',
+      params: parameter
+  })
+}
+// 更新模板详情
+export function modifyGoodsTemplate (parameter) {
+  if(parameter.START_TIME){
+    parameter.START_TIME=parameter.START_TIME.format('YYYY-MM-DD HH:mm:ss')
+  }
+  if(parameter.END_TIME){
+    parameter.END_TIME=parameter.END_TIME.format('YYYY-MM-DD HH:mm:ss')
+  }
+  return axios({
+    url: 'shopgoods/goods-detail-settings/setting-update',
+    method: 'put',
+    data: parameter
+  })
+}
+
+
+/**
+ * get user 2step code open?
+ * @param parameter {*}
+ */
+export function get2step (parameter) {
+    return axios({
+      url: api.twoStepCode,
+      method: 'post',
+      data: parameter
+    })
+  }
+  
\ No newline at end of file

src/components/Editor/QuillEditor.vue

@@ -39,23 +39,51 @@ export default {
   data () {
     return {
       content: null,
-      editorOption: {
-        // some quill options
+      editorOption:{
+        placeholder:'请输入',
+        modules:{
+          toolbar:{
+            container:[
+              ['bold', 'italic', 'underline', 'strike'],        // toggled buttons
+              [{'header': 1}, {'header': 2}],               // custom button values
+              [{'list': 'ordered'}, {'list': 'bullet'}],
+              [{'indent': '-1'}, {'indent': '+1'}],          // outdent/indent
+              [{'direction': 'rtl'}],                         // text direction
+              [{'size': ['small', false, 'large', 'huge']}],  // custom dropdown
+              [{'header': [1, 2, 3, 4, 5, 6, false]}],
+              [{'color': []}, {'background': []}],          // dropdown with defaults from theme
+              [{'font': []}],
+              [{'align': []}],
+              ['link', 'image'],
+              ['clean']
+            ],
+            handlers:{
+              'image':function(value){
+                console.log(666666)
+                if(value){
+                  console.log(value)
+                }else{
+                  this.quill.format('image',false)
+                }
+              }
+            }
+          }
+        }
       }
     }
   },
   methods: {
     onEditorBlur (quill) {
-      console.log('editor blur!', quill)
+      // console.log('editor blur!', quill)
     },
     onEditorFocus (quill) {
-      console.log('editor focus!', quill)
+      // console.log('editor focus!', quill)
     },
     onEditorReady (quill) {
-      console.log('editor ready!', quill)
+      // console.log('editor ready!', quill)
     },
     onEditorChange ({ quill, html, text }) {
-      console.log('editor change!', quill, html, text)
+      // console.log('editor change!', quill, html, text)
       this.$emit('change', html)
     }
   },
@@ -74,9 +102,19 @@ export default {
 .ant-editor-quill {
   /deep/ .ql-toolbar.ql-snow {
     border-radius: @border-radius-base @border-radius-base 0 0;
+    .ql-formats{
+      margin-right: 0;
+    }
   }
   /deep/ .ql-container.ql-snow {
     border-radius: 0 0 @border-radius-base @border-radius-base;
+  }
+  
+	/deep/ .ql-container.ql-snow{
+		min-height: 150px;
+  }
+  /deep/ .ql-snow .ql-picker-label{
+    display: grid;
   }
 }
 </style>

src/config/router.config.js

@@ -200,7 +200,7 @@ export const asyncRouterMap = [
           name: 'delivery',
           redirect: '/delivery/distributionPrice',
           component: PageView,
-          meta: { title: '配送管理', keepAlive: true, icon: 'dollar', permission: ['table'] },
+          meta: { title: '配送管理', keepAlive: true, icon: 'car', permission: ['table'] },
           children: [
             {
               path: '/delivery/distributionMode',
@@ -262,6 +262,22 @@ export const asyncRouterMap = [
             },
           ]
         },
+        // 商品
+        {
+          path: '/goods',
+          name: 'goods',
+          redirect: '/goods/goodsDetailsTemplate',
+          component: PageView,
+          meta: { title: '商品管理', keepAlive: true, icon: 'shopping', permission: ['table'] },
+          children: [
+            {
+              path: '/goods/goodsDetailsTemplate',
+              name: 'goodsDetailsTemplate',
+              component: () => import('@/views/goods/goodsDetailsTemplate'),
+              meta: { title: '商品详情页模板', keepAlive: false, permission: ['table'] }
+            },
+          ]
+        },
       // dashboard
       {
         path: '/dashboard',

src/views/userstaff/uList.vue

@@ -74,6 +74,7 @@
         <a-form-item
             :labelCol='labelCol'
             :wrapperCol='wrapperCol'
+            hidden
           >
             <a-input
             hidden

vue.config.js

@@ -102,7 +102,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/apis': {
-        target: 'http://localhost/hantengfei/newShopBack1/backend/web/v1/',
+        target: 'http://localhost/dengxueyun/newshopBack/backend/web/v1/',
         ws: false,
         changeOrigin: true,
         pathRewrite:{