fix: 调整逻辑

app/web/page/editor/component/DynamicForm/component/FormList/index.vue

@@ -19,10 +19,12 @@
 <script>
   import ComponentSelect from '../ComponentSelect/index.vue';
   import Upload from '../Upload/index.vue';
+  import ColorSelector from '../ColorSelector/index.vue';
   export default {
     components: {
       ComponentSelect,
-      Upload
+      Upload,
+      ColorSelector
     },
     props: {
       value: {
@@ -88,8 +90,17 @@
     /deep/ .ivu-card {
       margin-bottom: 16px;
       .ivu-form {
+        .ivu-form-item {
+          display: flex;
+          margin-bottom: 12px;
+        }
         .ivu-form-item-label {
           text-align: left;
+          width: 60px !important;
+          font-size: 12px;
+        }
+        .ivu-form-item-content {
+          flex: 1 !important;
         }
       }
 

app/web/page/editor/component/DynamicForm/component/GoodsTableModal/index.ts

@@ -25,14 +25,6 @@ export default class GoodsTableModal extends Vue {
       columns: goodsColumn.call(this),
       query: this.query
     },
-    {
-      title: '选择商品专题',
-      type: 'goodsGroup',
-      key: 'id',
-      multiple: false,
-      columns: goodsSpecialColumn.call(this),
-      query: this.querySpecial
-    },
     {
       title: '选择商品标签',
       type: 'goodsLabel',
@@ -40,6 +32,14 @@ export default class GoodsTableModal extends Vue {
       multiple: false,
       columns: goodsLabelColumn.call(this),
       query: this.queryLabel
+    },
+    {
+      title: '选择商品专题',
+      type: 'goodsGroup',
+      key: 'id',
+      multiple: false,
+      columns: goodsSpecialColumn.call(this),
+      query: this.querySpecial
     }
   ];
 

app/web/page/editor/component/DynamicPageForm/index.ts

@@ -7,9 +7,10 @@ import ColorSelector from '../DynamicForm/component/ColorSelector/index.vue';
 import BaseSelect from '../DynamicForm/component/BaseSelect/index.vue';
 import Textarea from '../DynamicForm/component/Textarea/index.vue';
 import Number from '../DynamicForm/component/Number/index.vue';
+import FormList from '../DynamicForm/component/FormList/index.vue';
 import { resizeDiv, getStyle } from '@/service/utils.service';
 
-@Component({ components: { Upload, ColorSelector, BaseSelect, Textarea, Number }, name: 'DynamicForm' })
+@Component({ components: { Upload, ColorSelector, BaseSelect, Textarea, Number, FormList }, name: 'DynamicForm' })
 export default class DynamicPageForm extends Mixins(ContextMenuMixin) {
   @Getter('pageData') pageData;
 
@@ -30,16 +31,6 @@ export default class DynamicPageForm extends Mixins(ContextMenuMixin) {
   ];
 
   propsSchame: object[] = [
-    {
-      key: 'showBackTop',
-      name: '返回顶部',
-      type: 'checkbox'
-    },
-    {
-      key: 'showShopCart',
-      name: '购物车',
-      type: 'checkbox'
-    },
     {
       key: 'showPageBottomTip',
       name: '底部提示',
@@ -54,7 +45,45 @@ export default class DynamicPageForm extends Mixins(ContextMenuMixin) {
       key: 'pageBottomColor',
       name: '提示颜色',
       type: 'ColorSelector'
-    }
+    },
+    {
+      key: 'showBackTop',
+      name: '返回顶部',
+      type: 'checkbox'
+    },
+    {
+      key: 'btAttachVal',
+      name: '添加按钮',
+      desc: '添加按钮',
+      type: 'FormList',
+      formControl: [
+        {
+          key: 'name',
+          name: '名称',
+          type: 'text'
+        },
+        {
+          key: 'url',
+          name: '链接',
+          type: 'text'
+        },
+        {
+          key: 'icon',
+          name: '图片',
+          type: 'Upload'
+        },
+        {
+          key: 'color',
+          name: '文字颜色',
+          type: 'ColorSelector'
+        },
+        {
+          key: 'background',
+          name: '背景颜色',
+          type: 'ColorSelector'
+        }
+      ]
+    },
   ];
 
   @Watch('pageData', { immediate: true, deep: true })

app/web/page/editor/component/DynamicPageForm/index.vue

@@ -5,7 +5,7 @@
       <h3>基础属性</h3>
       <template v-for="(item, index) in propsSchame">
         <FormItem class="Df-component-formitem" :label="item.name" >
-          <component :is="item.type" :options="item.options"  v-model="propsForm[item.key]" />
+          <component :is="item.type" :options="item.options"  v-model="propsForm[item.key]"  :formControl="item.formControl" />
         </FormItem>
       </template>
     </Form>

app/web/page/store/modules/editor/state.ts

@@ -82,17 +82,19 @@ export const defaultState = {
         backgroundImage: ''
       },
       props: {
+        showPageBottomTip: true,
+        pageBottomTxt: '没有更多啦～',
+        pageBottomColor: '#fff',
         showBackTop: true,
-        showShopCart: true,
-        backTopAttachInfo: [
+        btAttachVal: [
           {
+            name: '购物车',
             icon: 'shopping-cart-o',
-            url: 'xyqb://shoppingCartTab'
+            url: 'xyqb://shoppingCartTab',
+            color: '#333',
+            background: '#fff'
           }
         ],
-        showPageBottomTip: true,
-        pageBottomTxt: '没有更多啦～',
-        pageBottomColor: '#fff'
       },
       elements: [],
     }

package-lock.json

@@ -1491,9 +1491,9 @@
       "integrity": "sha512-uOCUKu5mvX3PWee+7ZFXQSNIR1V5SN2JVE2yANmW9/wQOgpEct291gXGok8VMw0009HlTWB4JATURPwyOP2DFg=="
     },
     "@qg/cherry-ui": {
-      "version": "2.21.1-beta9",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta9.tgz",
-      "integrity": "sha512-evaqcwGPrg/RqgHZW3pFU2QpvmIlNZMA83QdGV7U58XrkTuQ4C4wE6FgB0M7kGTZzf/IpfjOZL5ZuGfSaOlGUw==",
+      "version": "2.21.1-beta10",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta10.tgz",
+      "integrity": "sha512-AP6XHWzqJmsfU8veNwtfQbDpjVtDG0yTJZDsetWGV+XBKJU0d7jrJRaoeAqsRvJ/YaAZwtsAs1LfRSd+k7a6xA==",
       "requires": {
         "@popperjs/core": "^2.5.4",
         "vue-lazyload": "^1.3.3",
@@ -1501,9 +1501,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.1.15-beta6",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta6.tgz",
-      "integrity": "sha512-SjzMlXC5L3ca+/BL0KfACju7njTO0hdU9OiHx+fIZEh1Z45ft59XUHWl5HY2+qMlGWlDxK7eVvJydtmBvNYVcA==",
+      "version": "0.1.15-beta7",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.1.15-beta7.tgz",
+      "integrity": "sha512-o0n726pSjG5b2Xgd9A5pE0ApM2KN0oo5nlaEeZPr18hYmBfNdVeHdMkonllkoUcHHvC3bf6Cgzp9qcLOGsN/hA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.21.1-beta5",
@@ -1515,6 +1515,18 @@
         "swiper": "^4.5.1",
         "vuex": "^3.6.0",
         "weixin-js-sdk": "^1.6.0"
+      },
+      "dependencies": {
+        "@qg/cherry-ui": {
+          "version": "2.21.1-beta9",
+          "resolved": "http://npmprivate.quantgroups.com/@qg%2fcherry-ui/-/cherry-ui-2.21.1-beta9.tgz",
+          "integrity": "sha512-evaqcwGPrg/RqgHZW3pFU2QpvmIlNZMA83QdGV7U58XrkTuQ4C4wE6FgB0M7kGTZzf/IpfjOZL5ZuGfSaOlGUw==",
+          "requires": {
+            "@popperjs/core": "^2.5.4",
+            "vue-lazyload": "^1.3.3",
+            "vue-video-player": "^5.0.2"
+          }
+        }
       }
     },
     "@qg/js-bridge": {
@@ -20135,9 +20147,9 @@
       "integrity": "sha1-8z/pz7Urv9UgqhgyO8ZdsRCht2w="
     },
     "rollup": {
-      "version": "2.52.2",
-      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.52.2.tgz",
-      "integrity": "sha512-4RlFC3k2BIHlUsJ9mGd8OO+9Lm2eDF5P7+6DNQOp5sx+7N/1tFM01kELfbxlMX3MxT6owvLB1ln4S3QvvQlbUA==",
+      "version": "2.52.3",
+      "resolved": "http://npmprivate.quantgroups.com/rollup/-/rollup-2.52.3.tgz",
+      "integrity": "sha512-QF3Sju8Kl2z0osI4unyOLyUudyhOMK6G0AeqJWgfiyigqLAlnNrfBcDWDx+f1cqn+JU2iIYVkDrgQ6/KtwEfrg==",
       "requires": {
         "fsevents": "~2.3.2"
       }

package.json

@@ -26,8 +26,8 @@
     "@easy-team/easywebpack-vue": "^4.0.0",
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
-    "@qg/cherry-ui": "2.21.1-beta9",
-    "@qg/citrus-ui": "0.1.15-beta6",
+    "@qg/cherry-ui": "2.21.1-beta10",
+    "@qg/citrus-ui": "0.1.15-beta7",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",