feat: 增加类目频道样式选择器

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

+<template>
+  <div class="snapUpActivityContainer">
+    <span class="option" @click="select(item.id)" v-for="(item, index) in options" :key="index" :class="{selected: item.id == selected}">
+      {{item.label}} 
+    </span>
+    <!-- <Button type="primary" @click="save">保存</Button> -->
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    value: {
+      type: String,
+      default: "1"
+    }
+  },
+  watch: {
+    selected(val) {
+      this.$emit('input', val);  
+    }
+  },
+  methods: {
+    select(id) {
+      this.selected = id;
+    }
+  },
+  data() {
+    return {
+      options: [
+        {id: '1', label: '基础款'},
+        {id: '2', label: '无logo'},
+        {id: '3', label: '无利益点'},
+      ],
+      selected: 0
+    }
+  },
+  created() {
+    this.selected = this.value;
+  }
+}
+</script>
+<style scoped lang="less">
+.option{
+  cursor: pointer;
+  border-radius: 4px;
+  line-height:normal;
+  display: inline-block;
+  padding: 3px 5px;
+  border: 1px solid #dddee1;
+  margin: 0 2px;
+  &.selected{
+    border-color: #57a3f3;
+    box-shadow: 0px 0px 0px 2px rgb(45 140 240 / 20%)
+  }
+}
+</style>

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

@@ -7,6 +7,7 @@ import Upload from './component/Upload/index.vue';
 import ColorSelector from './component/ColorSelector/index.vue';
 import DiscountGoodsSelector from './component/DiscountGoodsSelector/index.vue';
 import SnapUpActivitySelector from './component/SnapUpActivitySelector/index.vue';
+import CategoryTypeSelector from './component/CategoryTypeSelector/index.vue';
 import BaseSelect from './component/BaseSelect/index.vue';
 import ComponentSelect from './component/ComponentSelect/index.vue';
 import FormList from './component/FormList/index.vue';
@@ -20,7 +21,7 @@ import { getAllScheme } from '../../../store/modules/editor/scheme';
 import EventBus from '@service/eventBus.service';
 
 const allComponentsMap = getAllScheme();
-@Component({ components: { Upload, ColorSelector, BaseSelect, FormList, Textarea, Number, ComponentSelect, GoodsTableModal, CouponTableModal, ColumnSelector, DiscountGoodsSelector, SnapUpActivitySelector }, name: 'DynamicForm' })
+@Component({ components: { Upload, ColorSelector, BaseSelect, FormList, Textarea, Number, ComponentSelect, GoodsTableModal, CouponTableModal, ColumnSelector, DiscountGoodsSelector, SnapUpActivitySelector, CategoryTypeSelector }, name: 'DynamicForm' })
 export default class DynamicForm extends Mixins(ContextMenuMixin, DynamicFormMixin) {
   @State(state => state.editor.curEleIndex) curEleIndex;
   @State(state => state.editor.curChildIndex) curChildIndex;

app/web/page/editor/mixins/goodsTabs.mixin.ts

@@ -13,6 +13,9 @@ export default class GoodsTabsMixin extends Vue {
   get hasFloorNavCom() {
     return this.pageData.elements.some(item => item.name === 'cs-floor-nav');
   }
+  get hasSnapUpCom() {
+    return this.pageData.elements.some(item => item.name === 'cs-snap-up');
+  }
   get hasGoodsNavCom() {
     return this.pageData.elements.some(item => item.name === 'cs-goods-tabs');
   }

app/web/page/editor/view/dashboard/index.ts

@@ -249,6 +249,14 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
         });
       }
     }
+    if (el.data.name === 'cs-snap-up') {
+      if (this.hasSnapUpCom) {
+        this.$Notice.warning({
+          title: '抢购组件目前只支持添加一个'
+        });
+        return;
+      }
+    }
     // 添加多个goods-tabs会取消锚点滚动
     if (el.data.name === 'cs-goods-tabs') {
       if (this.hasGoodsNavCom) {

package-lock.json

@@ -2176,9 +2176,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.39-beta1",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.39-beta1.tgz",
-      "integrity": "sha512-e+u2Tw7NcoAxx6IJR0kOHy1/hi6UzMIW7GRpKNIvXtyJ+8gM6PwKS4uqD36yXN2uF8E4fCCC9rFKukjNbBCFPw==",
+      "version": "0.3.39-beta3",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.39-beta3.tgz",
+      "integrity": "sha512-YGmD5gPuyE9XXlsADFgZLSKmIv3bDRiprhib/FYespcYrQFOwqwq3u5Q9cP90Hwp9t42DT5/HrBsVKzub3w+hw==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -8,7 +8,7 @@
     "test": "cross-env NODE_ENV=production EGG_SERVER_ENV=sit egg-scripts start --port 80 --workers 1",
     "stop": "egg-scripts stop",
     "backend": "nohup egg-scripts start --port 7001 --workers 4",
-    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=qa npm run apollo && egg-bin dev -r egg-ts-helper/register --port 7002",
+    "dev": "cross-env NODE_ENV=test APOLLO_CLUSTER=k8s NAMESPACE=test1 npm run apollo && egg-bin dev -r egg-ts-helper/register --port 7002",
     "debug": "egg-bin debug -r egg-ts-helper/register",
     "apollo": "node bin/apollo.js",
     "build": "cross-env NODE_ENV=production APOLLO_CLUSTER=3C npm run apollo && cross-env COS_ENV=production easy build --devtool",
@@ -30,7 +30,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.39-beta1",
+    "@qg/citrus-ui": "0.3.39-beta3",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",