修改增加新的分组控件

components/canvasShow/basics/productGroupList.vue

@@ -0,0 +1,116 @@
+<template>
+  <div class="productGroup-list warp" :class="'terminal' + terminal">
+    <h2 class="hom-title" :style="{textAlign:componentContent.textAlign}" v-if="componentContent.title">{{componentContent.title}}</h2>
+    <div class="content-warp" v-if="componentContent.showType == 1">
+      <div class="item" @click="jumpProductGroup(item)" v-for="(item) of componentContent.productGroupData" :key="item.id">
+        <div class="imgBox">
+            <img ref="getHeight" :src="item.img" v-show="item.img" :alt="item.data.groupName">
+        </div>
+      </div>
+    </div>
+    <div class="content-parent-warp" v-if="componentContent.showType == 2">
+      <div class="content-list-warp">
+        <div class="item" @click="jumpProductGroup(item)" v-for="(item) of componentContent.productGroupData" :key="item.id">
+          <div class="imgBox">
+              <img ref="getHeight" :src="item.img" v-show="item.img" :alt="item.data.groupName">
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {funMixin} from '../config/mixin'
+  export default {
+    name: 'productGroupList',
+    mixins: [funMixin],
+    props: {
+      terminal: {
+        type: Number,
+        default: 4
+      },
+      componentContent: {
+        type: Object
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  .productGroup-list{
+    padding: 20upx 0;
+    .hom-title{
+      font-size: 22upx;
+      color: #333;
+      line-height: 1em;
+      margin-bottom: 23upx;
+      font-weight: bold;
+      text-align: center;
+    }
+    .content-warp{
+      display: flex;
+      flex-wrap: wrap;
+      margin: 0upx 40upx 0upx 30upx;
+      -webkit-box-orient: horizontal;
+      -webkit-box-direction: normal;
+      -ms-flex-direction: row;
+      flex-direction: row;
+      -ms-flex-line-pack: center;
+      align-content: center;
+      -webkit-box-pack: center;
+      -ms-flex-pack: center;
+      justify-content: center;
+      -webkit-box-align: center;
+      -ms-flex-align: center;
+      align-items: center;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+
+      .item{
+        width: 25%;
+        height: auto;
+        padding-left: 10upx;
+            
+        .imgBox {
+          position: relative;
+        }
+        img {
+          width: 100%;
+        }
+      }
+    }
+    .content-parent-warp{
+
+      display: -webkit-box;
+      -webkit-box-orient: horizontal;
+      -webkit-box-direction: normal;
+      -webkit-box-pack: center;
+      -webkit-box-align: center;
+      -webkit-box-sizing: border-box;
+      box-sizing: border-box;
+      overflow-x: auto;
+      .content-list-warp{
+        width: auto;
+        display: flex;
+        flex-direction: row;
+        flex-wrap: nowrap;
+        align-content: center;
+        justify-content: center;
+        align-items: center;
+
+        .item{
+          width: 300upx;
+          height: auto;
+          padding-left: 10upx;
+          
+          .imgBox {
+            position: relative;
+          }
+          img {
+            width: 100%;
+          }
+        }
+      }
+    }
+  }
+</style>

components/canvasShow/canvasShowPage.vue

@@ -39,6 +39,11 @@
                          :terminal="terminal"
                          :typeId="typeId"
                          :shopId="shopId"></com-category-list>
+	 <com-product-group-list v-if="item.type==='productGroupList'"
+						:componentContent="item.componentContent"
+						:terminal="terminal"
+						:typeId="typeId"
+						:shopId="shopId"></com-product-group-list>
       <com-image-text-list v-if="item.type==='imageTextList'"
                            :componentContent="item.componentContent"
                            :terminal="terminal"
@@ -133,6 +138,7 @@ import comText from '@/components/canvasShow/basics/text'
 import comImageText from '@/components/canvasShow/basics/imageText'
 import comBrandList from '@/components/canvasShow/basics/brandList'
 import comCategoryList from '@/components/canvasShow/basics/categoryList'
+import comProductGroupList from '@/components/canvasShow/basics/productGroupList'
 import comImageTextList from '@/components/canvasShow/basics/imageTextList'
 import comAssistDiv from '@/components/canvasShow/basics/assistDiv'
 import comImageTextNav from '@/components/canvasShow/basics/imageTextNav'
@@ -171,6 +177,7 @@ export default {
     comImageText,
     comBrandList,
     comCategoryList,
+	comProductGroupList,
     comImageTextList,
     comAssistDiv,
     comImageTextNav,

locale/en.json

@@ -573,7 +573,6 @@
 	"common.productinfo":"Product Info",
 	"common.product":"Product",
 	"common.quantity":"Quantity",
-	"common.total":"Total",
 	"common.total_small":"Total",
 	"common.producttotalprice":"Product Amount",
 	"common.freightamount":"Freight Amount",
@@ -606,6 +605,27 @@
 	"common.after-salestatus_info":"After-sale Info",
 	"common.own":"All",
 	"common.more":"More",
+	"product.addproductgroup":"新增分组",
+	"product.editproductgroup":"编辑分组",
+	"product.productgroupimage":"分组封面",
+	"product.productgroupname":"分组名称",
+	"product.productgroupdesc":"分组描述",
+	"common.product_number":"商品数量",
+	"common.edittime":"修改时间",
+	"product.productgroupname_hint":"请输入分组名称",
+	"product.productgroupname_zh":"分组中文名称",
+	"product.productgroupdesc_zh":"分组中文描述",
+	"product.productgroupname_en":"分组英文名称",
+	"product.productgroupdesc_en":"分组英文描述",
+	"product.productgroupdesc_hint":"请输入分组描述",
+	"product.productgroupproduct":"分组商品",
+	"product.productgroupproductmanualadd":"手动添加",
+	"product.productgroupproductintelligentadd":"智能添加",
+	"product.productgroupproductintelligent":"智能添加已选条件",
+	"common.gt":"大于",
+	"common.eq":"等于",
+	"common.lt":"小于",
+	"product.productgroupname_empty":"分组名称不能为空",
 	"user.myserver": "My Service",
 	"user.otherserver": "Other Service",
 	"user.growthvalue": "Growth Value"

locale/zh-Hans.json

@@ -573,7 +573,6 @@
 	"common.productinfo":"商品信息",
 	"common.product":"商品",
 	"common.quantity":"数量",
-	"common.total":"合计",
 	"common.total_small":"小计",
 	"common.producttotalprice":"商品总价",
 	"common.freightamount":"运费金额",
@@ -606,6 +605,27 @@
 	"common.after-salestatus_info":"售后信息",
 	"common.own":"所有",
 	"common.more":"更多",
+	"product.addproductgroup":"新增分组",
+	"product.editproductgroup":"编辑分组",
+	"product.productgroupimage":"分组封面",
+	"product.productgroupname":"分组名称",
+	"product.productgroupdesc":"分组描述",
+	"common.product_number":"商品数量",
+	"common.edittime":"修改时间",
+	"product.productgroupname_hint":"请输入分组名称",
+	"product.productgroupname_zh":"分组中文名称",
+	"product.productgroupdesc_zh":"分组中文描述",
+	"product.productgroupname_en":"分组英文名称",
+	"product.productgroupdesc_en":"分组英文描述",
+	"product.productgroupdesc_hint":"请输入分组描述",
+	"product.productgroupproduct":"分组商品",
+	"product.productgroupproductmanualadd":"手动添加",
+	"product.productgroupproductintelligentadd":"智能添加",
+	"product.productgroupproductintelligent":"智能添加已选条件",
+	"common.gt":"大于",
+	"common.eq":"等于",
+	"common.lt":"小于",
+	"product.productgroupname_empty":"分组名称不能为空",
 	"user.myserver": "我的服务",
 	"user.otherserver": "其他服务",
 	"user.growthvalue": "成长值"

unpackage/dist/build/h5/index.html

@@ -0,0 +1,2 @@
+<!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>Thee</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/h5/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/h5/static/js/chunk-vendors.91bbf592.js></script><script src=/h5/static/js/index.dbb5a204.js></script></body></html>

unpackage/dist/build/h5/static/js/pages_category_page1-linkOthers-index.9395e642.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages_category_page1-linkOthers-index"],{"3af7":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return r})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement,t=this._self._c||n;return t("v-uni-view",[t("v-uni-web-view",{attrs:{src:this.url}})],1)},r=[]},"70ba":function(n,t,e){"use strict";e("7a82"),Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0,e("99af");var u={data:function(){return{url:""}},onLoad:function(n){this.url="".concat(n.url,"/#/?&username=").concat(n.username,"&user=").concat(n.user,"&t=1"),console.log(this.url)}};t.default=u},"80b6":function(n,t,e){"use strict";e.r(t);var u=e("3af7"),r=e("a8f9");for(var a in r)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return r[n]}))}(a);var i=e("f0c5"),c=Object(i["a"])(r["default"],u["b"],u["c"],!1,null,null,null,!1,u["a"],void 0);t["default"]=c.exports},a8f9:function(n,t,e){"use strict";e.r(t);var u=e("70ba"),r=e.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(a);t["default"]=r.a}}]);