Merge branch 'nativehome_tst' of http://code.mayi888.com/chengmo/mayi-mp-shop into nativehome_tst

build/webpack.dev.conf.js

@@ -82,6 +82,6 @@ module.exports = merge(baseWebpackConfig, {
     //   inject: true
     // }),
     new FriendlyErrorsPlugin(),
-    new UglifyJsPlugin({ sourceMap: true })
+    // new UglifyJsPlugin({ sourceMap: true })
   ]
 })

project.config.json

@@ -2,13 +2,13 @@
 	"description": "项目配置文件。",
 	"setting": {
 		"urlCheck": false,
-    "es6": false,
+		"es6": true,
 		"enhance": true,
 		"postcss": true,
 		"minified": true,
 		"newFeature": true,
 		"coverView": true,
-    "nodeModules": false,
+		"nodeModules": true,
 		"autoAudits": true,
 		"showShadowRootInWxmlPanel": true,
 		"scopeDataCheck": false,
@@ -16,22 +16,14 @@
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
 		"uploadWithSourceMap": true,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
 		},
-    "bundle": false,
-    "useIsolateContext": true,
+		"bundle": true,
 		"useCompilerModule": true,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"miniprogramRoot": "dist/wx/",
 	"compileType": "miniprogram",
@@ -39,15 +31,18 @@
 	"projectname": "mayi-mp-shop",
 	"simulatorType": "wechat",
 	"simulatorPluginLibVersion": {},
-  "libVersion": "2.6.6",
+	"libVersion": "2.14.3",
 	"condition": {
 		"search": {
+			"current": -1,
 			"list": []
 		},
 		"conversation": {
+			"current": -1,
 			"list": []
 		},
 		"plugin": {
+			"current": -1,
 			"list": []
 		},
 		"game": {
@@ -55,9 +50,11 @@
 			"list": []
 		},
 		"gamePlugin": {
+			"current": -1,
 			"list": []
 		},
 		"miniprogram": {
+			"current": -1,
 			"list": [
 				{
 					"id": 0,

src/api/goods.js

+import { requestPOST, requestGET } from "@/utils/request.js";
+
+export default {
+  queryProductInfo(data) {
+    return requestPOST(`${process.env.OLSHOP_URL}/product/query_product_info`, data);
+  },
+  queryBriefProductInfo(data) {
+    return requestPOST(`${process.env.OLSHOP_URL}/product/query_brief_product_info`, data);
+  },
+  queryMoreProductInfo(data) {
+    return requestPOST(`${process.env.OLSHOP_URL}/product/query_more_product_info`, data);
+  }
+};

src/main.js

@@ -2,6 +2,8 @@ import Vue from 'vue'
 import App from './App'
 import Store from './store/index'
 import "../static/nicon/iconfont.css"
+import goodsApi from "./api/goods"
+import { DFSImg } from "@/utils/index";
 
 Vue.config.productionTip = false
 App.mpType = 'app'
@@ -130,3 +132,5 @@ function toPage(backPath, backParams) {
         url: `../index/main?from=home&backpath=${backPath}&params=${encodeURIComponent(backParams)}`
     });
 }
+mpApp.goodsApi = goodsApi;
+mpApp.DFSImg = DFSImg;

src/pages/home/index.vue

 <template>
   <div class="domain">
-    <div v-for="item in pageData" :key="item.id">
+    <!-- <goods-list id="goodsList"></goods-list> -->
+    <div v-for="(item,index) in pageData" :key="index">
       <div v-if="item.componentCode=='banner'">
         <banner :datas="item"></banner>
-1
       </div>
+      <div v-else-if="item.componentCode=='goods-list'">
+        <goods-list :datas="item"></goods-list>
       </div>
-    <image
+    </div>
+    <!-- <image
       src="http://cdn.mayi888.com/public/jpg/33ff0efc-96b5-4044-a65a-07799dfe98e1.jpg?x-oss-process=image/resize,limit_1,w_750"
     ></image>
     <van-button type="primary">按钮</van-button>
-    <view class="ant-bofang">1</view>
-    ----瀑布流开始----
+    <view class="ant-bofang">1</view> -->
+    <!-- ----瀑布流开始---- -->
     <!-- <waterfall-flow id="waterfallFlow"></waterfall-flow> -->
-    ----瀑布流结束----
+    <!-- ----瀑布流结束---- -->
     <!-- <banner id="banner" :datas="componentsList[0]"></banner>
     <div class="domain">abc
 
@@ -31,10 +34,10 @@ export default {
     };
   },
   onLoad() {
+    let that = this;
     if (this.mpApp.globalData.pageList) {
       that.init(this.mpApp.globalData.pageList);
     } else {
-      let that = this;
       this.mpApp.pageCallBack = function (params) {
         that.init(params);
       };

src/pages/home/main.json

 {
   "usingComponents": {
-    "banner": "../../../static/nativeComponents/Banner/index",
+    "banner": "/static/nativeComponents/Banner/index",
+    "goods-list": "/static/nativeComponents/GoodsList/index",
     "waterfall-flow": "/static/nativeComponents/module/WaterfallFlow/index",
     "van-button": "/static/vant/button/index"
   }

static/css/common.css

+.text-overflow {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.text-overflow2 {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+
+.flex {
+  display: flex;
+}

static/css/common.min.css

+.text-overflow{overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.text-overflow2{overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}.flex{display:flex}

static/css/common.scss

@@ -11,6 +11,9 @@
     -webkit-line-clamp: 2;
     -webkit-box-orient: vertical;   
 } 
+.flex{
+    display: flex;
+}
 
 @mixin btn {
     width: 148px;

static/nativeComponents/GoodsList/GoodsItem/index.js

+const componentOptions = {
+  // 组件选项
+  options: {
+    multipleSlots: true
+  },
+  behaviors: [],
+  properties: {
+    datas: {
+      type: Object
+    },
+    items: {
+      type: Object
+    },
+    indexs: {
+      type: Number
+    }
+  },
+  // 组件数据
+  data: {
+    isPageHidden: false // 页面是否处于隐藏状态
+  },
+  // 数据监听器
+  observers: {},
+  // 组件方法
+  methods: {
+    init() {},
+    getSaleTime(val) {
+      return new Date(val.replace(/-/g, "/")).getTime() - new Date().getTime();
+    },
+    showVipPrice(index) {
+      // 索引 0 显示价格 1显示名称
+      let showFlag = false;
+      let vipPrice = this.items["minPriceAfterRecommendedCardPriceTable"];
+      if (vipPrice && Number(vipPrice) < Number(this.items["minPrice"])) {
+        showFlag = true;
+      }
+      console.log(showFlag, "------------760");
+      return showFlag;
+    },
+    showVipTag(index) {
+      // 索引 0 显示价格 1显示名称
+      let showFlag = false;
+      let vipPrice = this.items["minPriceAfterRecommendedCardPriceTable"];
+      let showTag = this.items["recommendedCardMinPricePriceTableName"];
+      if (
+        vipPrice &&
+        showTag &&
+        Number(vipPrice) <= Number(this.items["minPrice"])
+      ) {
+        showFlag = true;
+      }
+      return showFlag;
+    }
+  },
+  // 组件生命周期
+  lifetimes: {
+    created() {},
+    attached() {
+      this.init();
+    },
+    ready() {},
+    moved() {},
+    detached() {}
+  },
+  definitionFilter() {},
+  // 页面生命周期
+  pageLifetimes: {
+    // 页面被展示
+    show() {
+      const { isPageHidden } = this.data;
+
+      // show事件发生前，页面不是处于隐藏状态时
+      if (!isPageHidden) {
+        return;
+      }
+
+      // 重新执行定时器等操作
+    },
+    // 页面被隐藏
+    hide() {
+      this.setData({
+        isPageHidden: true
+      });
+
+      // 清除定时器等操作
+    },
+    // 页面尺寸变化时
+    resize() {}
+  }
+};
+
+Component(componentOptions)

static/nativeComponents/GoodsList/GoodsItem/index.json

+{
+  "component": true,
+  "usingComponents": {}
+}

static/nativeComponents/GoodsList/GoodsItem/index.wxml

+<!-- 商品列表item -->
+<view class="goodsItem" style="--proGap2:{{datas.componentData.proGap*2}}rpx;">
+	<view class="goods-item-child {{datas.componentData['borderColorShow']?'goods-item-child-bd':''}}" style="border-radius:{{datas.componentData.borderRadius}}em;--border_color:{{datas.componentData['borderColor']}};box-shadow:{{datas.componentData['cardShadow']?'0rpx 0rpx 10rpx '+datas.componentData['cardShadowSize']*2+'rpx #ccc':''}};">
+		<!-- 商户入口-顶部 -->
+		<view class="merchantsEntrance flex" wx:if="{{datas.componentData['merchantsEntrance'] && datas.componentData['merchantsEntranceType'] == 0}}">
+			<view class="left flex" wx:if="{{items != null}}">
+				<view class="logo">
+					<image mode='widthFix' src="{{items.shopLogoUrl}}" />
+				</view>
+				<view class="name">{{items.orgName}}</view>
+			</view>
+		</view>
+		<!-- 商品图片 -->
+		<view class="imgBox" style="background-color:{{datas.componentData['backgroundColorShow']?datas.componentData['backgroundColor']:''}}">
+			<view
+			 class="goodsPicture"
+			 wx:if="{{items!=null}}"
+			 style="padding:{{datas.componentData.imgSize}}"
+			>
+				<!-- 开启售卖 -->
+				<view class="saleWay" wx:if="{{items.saleWay==2 &&getSaleTime(items.saleTime)>0}}">
+					<view class="saleWayBg"></view>
+					<view>
+						6545646
+					</view>
+				</view>
+				<!-- 商品角标 -->
+				<view
+				 class="angleSign"
+				 style="width:{{datas.componentData.angleSignSize}}%;height:{{datas.componentData.angleSignSize}}%;"
+				 wx:if="{{datas.componentData['angleSign'] && datas.componentData['angleSignImg']}}"
+				>
+					<image mode="widthFix" src="{{datas.componentData['angleSignImg']}}" />
+				</view>
+				<!-- 商品主图 -->
+				<image
+				 mode="widthFix"
+				 wx:if="{{datas.componentData.goodsImgType == 1}}"
+				 src="{{items.productImgUrl}}"
+				/>
+				<image
+				 mode="widthFix"
+				 wx:else
+				 src="{{items.coverImage}}"
+				/>
+				<!-- 售罄遮罩 -->
+				<view class="whiteBg" wx:if="{{items&&items.oversoldFlag==0&&items.totalQty-0<=0}}">
+					<view class="cover">
+						<image mode="aspectFit" src="http://mayi-newshop.oss-cn-shanghai.aliyuncs.com/public/png/f254fe62-6dda-46f6-a2f4-a7b2aa0474df.png" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品详情 -->
+		<view class="info" style="text-align:{{datas.componentData['initcharAlign']}};">
+			<view class="info-top flex">
+				<view class="name" wx:if="{{datas.componentData['nameShow']}}">
+					{{items!=null?items['productName']:'名称'}}
+				</view>
+				<view class="follower-wrap" wx:if="{{datas.componentData['followerShow']}}">
+					<view class="follower-num" style="color:{{datas.componentData['followerColor']?datas.componentData['followerColor']:'#ff9933'}};">
+						{{items!=null? items['totalCollectionCount']:0}}
+					</view>
+					<view class="follower-text">关注人数</view>
+				</view>
+			</view>
+			<!-- 已售 -->
+			<view class="Sold">
+				<text wx:if="{{datas.componentData['alSaleShow']}}">已售{{items!=null ? items['totalSalesCount'] :0}}件</text>
+				<text wx:if="{{datas.componentData['alSaleShow'] && datas.componentData['collectShow']}}">/</text>
+				<text wx:if="{{datas.componentData['collectShow']}}">剩余{{items!=null && items['qty']!=undefined ? (items['qty'] > 0 ? items['qty']: items.oversoldFlag==1?'数量充足':'数量不足') : ''}}</text>
+				<text wx:if="{{items!=null && (items['qty'] ? items['qty'] >= 0 : items['qty'] >= 0)}}">件</text>
+			</view>
+			<!-- 标签 -->
+			<view class="marketing flex" wx:if="{{datas.componentData['marketingTag']&&datas.componentData['marketingStyle']==0&&items.marketingTag}}">
+				<view
+				 class="item"
+				 wx:for="{{items.marketingTag}}"
+				 wx:key="index"
+				>
+					{{item.label}}
+				</view>
+			</view>
+			<!-- 底部 -->
+			<view class="bottom" wx:if="{{datas.componentData['goodsType'] !=1}}">
+				<!-- 价格 -->
+				<view class="priceItem flex">
+					<view
+					 class="price flex"
+					 style="color:{{datas.componentData['priceColor']}};font-size:{{datas.componentData['priceFontSize']}}em;"
+					 wx:if="{{datas.componentData['priceShow']}}"
+					>
+						<text>
+							￥{{items!=null ? items['minPrice']:0}}
+						</text>
+						<text style="font-size:24rpx;color:#999;text-decoration:line-through;" wx:if="{{items!=null&&datas.componentData['priceMarking']&&items['minGoodsSuggestedRetailPrice']&&(items['minPrice']-0<items['minGoodsSuggestedRetailPrice']-0)&&datas.componentData['columnNum']<3}}">
+							￥{{items['minGoodsSuggestedRetailPrice']}}
+						</text>
+					</view>
+					<view class="vipPrice2 flex">
+						<view class="left" wx:if="{{showVipPrice(index)==true}}">
+							￥{{items['minPriceAfterRecommendedCardPriceTable']}}
+						</view>
+						<view class="vipIcon line-clamp1" wx:if="{{showVipTag(index)==true}}">
+							{{items["recommendedCardMinPricePriceTableName"]}}
+						</view>
+					</view>
+				</view>
+				<!-- 收益样式一 -->
+				<block class="" wx:if="{{items!=null&&items['minProductGoodsCommission']&&items['minProductGoodsCommission']-0>0.01}}">
+					<view class="showCommission" wx:if="{{datas.componentData.commissionStyle==0}}">
+						<view class="commission-box">
+							<text>收益</text>
+							<text>￥{{items['minProductGoodsCommission']}}</text>
+						</view>
+					</view>
+				</block>
+				<!-- 立即购买按钮 -->
+				<view
+				 class="buy-now"
+				 style="background-color:#aaa;font-size:24rpx;"
+				 wx:if="{{items&&items.oversoldFlag==0&&items.totalQty-0<=0 && datas.componentData['paynow']}}"
+				>
+					已售罄
+				</view>
+				<view wx:if="{{(items&&items.totalQty-0>0||items&&items.oversoldFlag==1)&& datas.componentData['paynow']}}">
+					<text wx:if="{{datas.componentData.btnType<6}}" class="buy-now-icon iconfont-common {{datas.componentData.btnIcon}}"></text>
+					<view
+					 wx:else
+					 class="buy-now"
+					 style="background-color:{{datas.componentData.btnColor}};font-size:24rpx;"
+					>
+						{{datas.componentData.btnTest}}
+					</view>
+				</view>
+			</view>
+			<!-- 底部展示标签列表 -->
+			<block wx:if="{{items!=null}}">
+				<view class="marketing flex" wx:if="{{datas.componentData.marketingTag&&datas.componentData.marketingStyle==1&&items.marketingTag}}">
+					<view
+					 class="item"
+					 wx:for="{{items.marketingTag}}"
+					 wx:key="index"
+					>
+						{{item.label}}
+					</view>
+				</view>
+			</block>
+			<!-- 收益样式二 -->
+			<block wx:if="{{items!=null&&items['minProductGoodsCommission']&&items['minProductGoodsCommission']-0>0.01}}">
+				<view class="showCommissionTwo flex" wx:if="{{datas.componentData.commissionStyle==1}}">
+					<view class="commission-box">
+						<text class="iconfont-common common-iconfenxiang">
+								赚￥
+								<text style="font-size:32rpx;">
+									{{items['minProductGoodsCommission']}}
+								</text>
+						</text>
+					</view>
+				</view>
+			</block>
+		</view>
+		<!-- 商户入口二 -->
+		<view class="merchantsEntrance flex" wx:if="{{datas.componentData.merchantsEntrance&&datas.componentData.merchantsEntranceType==1}}">
+			<view class="left flex" wx:if="{{items!=null}}">
+				<view class="logo">
+					<image mode='widthFix' src="http://test-bucket-ant.oss-cn-shanghai.aliyuncs.com/product/ppefWK8BS6.png?x-oss-process=image/resize,limit_1,w_150,h_150" />
+				</view>
+				<view class="name">{{items.orgName}}</view>
+			</view>
+		</view>
+	</view>
+</view>
+

static/nativeComponents/GoodsList/GoodsItem/index.wxss

+.flex{
+  display: flex;
+}
+.goods-item-child-bd{
+  border: 1px solid var(--border-color);
+}
+image{
+  width: 100%;
+}
+.goodsItem{
+  margin-bottom: var(--proGap2);
+}
+.goods-item-child {
+  position: relative;
+  overflow: hidden;
+  background: #ffffff;
+}
+.merchantsEntrance{
+  padding: 8rpx 20rpx;
+}
+.merchantsEntrance .left{
+  align-items: center;
+}
+.merchantsEntrance .left .logo{
+  width: 52rpx;
+  height: 52rpx;
+  border-radius: 8rpx;
+  -webkit-border-radius: 8rpx;
+  -moz-border-radius: 8rpx;
+  -ms-border-radius: 8rpx;
+  -o-border-radius: 8rpx;
+  overflow: hidden;
+  background: #f5f5f5;
+  margin-right: 20rpx;
+}
+.imgBox{
+  position: relative;
+  overflow: hidden;
+  width: 100%;
+  margin: 0 auto 20rpx;
+}
+.goodsPicture{
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+.goodsPicture .saleWay{
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+}
+.goodsPicture .saleWay .saleWayBg{
+  background: #eee;
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  opacity: 0.5;
+}
+.goodsPicture .angleSign{
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+.whiteBg {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(#fff, 0.7);
+}
+.whiteBg .cover {
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  right: 20px;
+  bottom: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  background-size: cover;
+}
+.whiteBg .cover img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+}
+.info{
+  padding: 10rpx 20rpx 24rpx;
+  position: relative;
+  background-color: white;
+}
+.info .info-top{
+  overflow: hidden;
+  justify-content: space-between;
+}
+.info .name{
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  line-height: 1.4em;
+  position: relative;
+}
+.info .follower-wrap{
+  position: relative;
+  font-size: 0.8em;
+  color: #999;
+  text-align: center;
+  height: 70rpx;
+}
+.info .follower-wrap .follower-num{
+  text-align: center;
+  font-size: 1em;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.info .follower-wrap .follower-text{
+  color: #999;
+  font-size: 0.7em;
+  text-align: center;
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.vipPrice1{
+  align-items: flex-end;
+  margin-top: 12rpx;
+  font-size: 24rpx;
+}
+.vipPrice1 .vipIcon{
+  min-width: 64rpx;
+  padding: 2rpx 4rpx;
+  height: 28rpx;
+  background: #333;
+  font-size: 20rpx;
+  line-height: 28rpx;
+  text-align: center;
+  color: #d7c7a1;
+  border-top-left-radius: 4rpx;
+  border-bottom-left-radius: 12rpx;
+}
+.vipPrice1 .right{
+  height: 28rpx;
+  color: #333;
+  font-weight: bold;
+  background: linear-gradient(    227deg,    rgba(212, 195, 142, 1),    rgba(252, 232, 162, 1)  );
+  border-radius: 0rpx 12rpx 12rpx 0rpx;
+  font-size: 20rpx;
+  text-align: center;
+  padding: 0 8rpx 0 4rpx;
+  -webkit-border-radius: 0rpx 12rpx 12rpx 0rpx;
+  -moz-border-radius: 0rpx 12rpx 12rpx 0rpx;
+  -ms-border-radius: 0rpx 12rpx 12rpx 0rpx;
+  -o-border-radius: 0rpx 12rpx 12rpx 0rpx;
+}
+.priceItem {
+  align-items: flex-end;
+}
+.priceItem .price{
+  align-items: center;
+}
+.vipPrice2{
+  align-items: flex-end;
+  margin-top: 12rpx;
+  font-size: 24rpx;
+}
+.vipPrice2 .left{
+  color: #333;
+  font-weight: bold;
+  margin-left: 8rpx;
+}
+.vipPrice2 .vipIcon{
+  margin-left: 8rpx;
+  min-width: 64rpx;
+  padding: 2rpx 8rpx;
+  height: 28rpx;
+  background: #333;
+  font-size: 20rpx;
+  line-height: 28rpx;
+  text-align: center;
+  color: #d7c7a1;
+  border-radius: 12rpx;
+  border-top-left-radius: 2rpx;
+  -webkit-border-radius: 12rpx;
+  -moz-border-radius: 12rpx;
+  -ms-border-radius: 12rpx;
+  -o-border-radius: 12rpx;
+}
+.Sold{
+  overflow: hidden;
+  color: #999;
+}
+.Sold text{
+  font-size: 0.7em;
+}
+.buy-now {
+  color: #ffffff;
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  border-radius: 30rpx;
+  background-color: #333;
+  width: 140rpx;
+  white-space: nowrap;
+  padding: 8rpx 20rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  -webkit-border-radius: 30rpx;
+  -moz-border-radius: 30rpx;
+  -ms-border-radius: 30rpx;
+  -o-border-radius: 30rpx;
+}
+.buy-now-icon {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  font-size: 36rpx;
+}
+.showCommissionTwo {
+  align-items: center;
+  justify-content: center;
+  margin-top: 16rpx;
+  width: 100%;
+  height: 52rpx;
+  font-size: 24rpx;
+  border: 1px solid transparent;
+  border-radius: 26px;
+  overflow: hidden;
+}
+.showCommissionTwo  .commission-box {
+width: 100%;
+height: 100%;
+padding-left: 20rpx;
+display: flex;
+justify-content: center;
+align-items: center;
+}
+.showCommissionTwo i {
+font-size: 28rpx;
+margin-right: 8rpx;
+}
+.marketing {
+  align-items: center;
+  flex-wrap: wrap;
+}
+.marketing .item {
+  margin-top: 8rpx;
+  margin-right: 8rpx;
+  font-size: 20rpx;
+  padding: 0 12rpx;
+  border: 2rpx solid #ff5500;
+  color: #ff5500;
+  border-radius: 40rpx;
+  -webkit-border-radius: 40rpx;
+  -moz-border-radius: 40rpx;
+  -ms-border-radius: 40rpx;
+  -o-border-radius: 40rpx;
+}
+.bottom {
+  position: relative;
+}
+.price {
+  font-weight: 600;
+  margin-top: 12rpx;
+}
\ No newline at end of file

static/nativeComponents/GoodsList/index.js

+const app = getApp();
+const { goodsApi,DFSImg } = app;
+const componentOptions = {
+  // 组件选项
+  options: {
+    multipleSlots: true
+  },
+  behaviors: [],
+  properties: {
+    datas: {
+      type: Object
+    }
+  },
+  // 组件数据
+  data: {
+    isPageHidden: false, // 页面是否处于隐藏状态
+    titleIcon:"",
+  },
+  // 数据监听器
+  observers: {},
+  // 组件生命周期
+  lifetimes: {
+    created() {},
+    ready() {},
+    moved() {},
+    detached() {}
+  },
+  attached() {
+    this.init();
+  },
+  definitionFilter() {},
+  // 页面生命周期
+  pageLifetimes: {
+    // 页面被展示
+    show() {
+      const { isPageHidden } = this.data;
+
+      // show事件发生前，页面不是处于隐藏状态时
+      if (!isPageHidden) {
+        return;
+      }
+
+      // 重新执行定时器等操作
+    },
+    // 页面被隐藏
+    hide() {
+      this.setData({
+        isPageHidden: true
+      });
+
+      // 清除定时器等操作
+    },
+    // 页面尺寸变化时
+    resize() {}
+  },
+  // 组件方法
+  methods: {
+    init() {
+      let {
+        goodsType,
+        goodsSource,
+        angleSignImg,
+        titleIcon
+      } = this.data.datas.componentData;
+      angleSignImg = DFSImg(angleSignImg);
+      titleIcon = DFSImg(titleIcon);
+      this.setData({
+        "data.datas.componentData.angleSignImg": angleSignImg,
+        titleIcon
+      });
+      console.log(
+        this.data.titleIcon,
+        "----------------------------68"
+      );
+      if (goodsType == 0) {
+        if (goodsSource == "classify") {
+          //商品分类
+          this.getProductList(1, 1);
+        } else {
+          //指定商品
+          this.getProductList(2);
+        }
+      } else if (goodsType == 1) {
+        if (goodsSource == "classify") {
+          //商品分类
+          this.getInterList(1);
+        } else {
+          //指定商品
+          this.getInterList(2);
+        }
+      }
+    },
+    getProductList(code, type) {
+      let { goodsList, goodsSort } = this.data.datas.componentData;
+      // type 1初始化 2滚动加载
+      //分类查
+      if (code == 1) {
+        goodsApi.queryProductInfo().then(res => {});
+      } else {
+        // 商品产品详情
+        let terminalProductIds = goodsList.map(element => {
+          return element.terminalProductId;
+        });
+        if (terminalProductIds.length == 0) {
+          return;
+        }
+        let briefQuery = {
+          sortColumn: goodsSort,
+          sortType: goodsSort != 2 ? 1 : 0,
+          page: 1,
+          rows: terminalProductIds.length,
+          terminalProductIds: terminalProductIds,
+          whetherShowSoldOutGoods: this.whetherShowSoldOutGoods
+        }; // 当前页 // 一页多少条
+        this.briefProduct(briefQuery);
+      }
+    },
+    async briefProduct(query) {
+      await goodsApi.queryBriefProductInfo(query).then(res => {
+        if (res.data.code == 200) {
+          let data = res.data.data.list;
+          let ids = data.map(element => {
+            return element.terminalProductId;
+          });
+          this.moreProduct(ids);
+        }
+      });
+    },
+    async moreProduct(terminalProductIds) {
+      let {
+        vipPrice,
+        marketingTag,
+        whetherFindDistributionCommission,
+        goodsList,
+        marketingTagList
+      } = this.data.datas.componentData;
+      let moreQuery = {
+        terminalProductIds,
+        whetherQueryCollectCount: true, //查询收藏数
+        whetherUseVirtualSalesQty: true, //是否使用虚拟销售数量
+        whetherUseVirtualCollectCount: true, //是否使用虚拟收藏人数
+        whetherFindDistributionCommission: whetherFindDistributionCommission, //是否查询商品佣金（0：不查询，1：展示，为空不查佣金）
+        whetherFindRecommendedCardFlag: vipPrice ? 1 : 0, //是否查询会员价  1是  0否
+        whetherShowGoodsDefaultTagFlag: marketingTag ? 1 : 0, //是否展示营销标签  1是  0否
+        whetherFindMultiShopFlag: 1, //是否查询多商户   //商城使用
+        whetherFindMultiSonShopFlag: 1 //是否查询多商户   //多主题使用
+      };
+      goodsApi.queryMoreProductInfo(moreQuery).then(res => {
+        if (res.data.code == 200) {
+          goodsList = res.data.data;
+          goodsList.forEach(item => {
+            item.marketingTag = item.defaultTags
+              ? this.filtermark(item.defaultTags, marketingTagList)
+              : [];
+            item.shopLogoUrl = DFSImg(item.shopLogoUrl);
+            item.coverImage = DFSImg(item.coverImage);
+            item.productImgUrl = DFSImg(item.productImgUrl);
+            item.minPrice = Number(item.minPrice).toFixed(2);
+            item.qty = Number(item.qty)||0;
+            item.totalCollectionCount = Number(item.totalCollectionCount) || 0;
+            item.totalCollectionCount = Number(item.totalCollectionCount) || 0;
+            item.minPriceAfterRecommendedCardPriceTable = Number(item.minPriceAfterRecommendedCardPriceTable).toFixed(2) || 0;
+            item.minProductGoodsCommission = Number(item.minProductGoodsCommission).toFixed(2) || 0;
+            item.minGoodsSuggestedRetailPrice = Number(
+              item.minGoodsSuggestedRetailPrice
+            ).toFixed(2);
+          });
+          this.setData({
+            "datas.componentData.goodsList": goodsList
+          });
+        }
+      });
+    },
+    filtermark(newlist, marketingTagList) {
+      let list = [];
+      if (newlist.length <= 0) return;
+      if (marketingTagList.length > 0) {
+        marketingTagList.forEach((item, index) => {
+          newlist.forEach((item1, index1) => {
+            if (item1 == item.key) {
+              list.push(item);
+            }
+          });
+        });
+      }
+      return list;
+    }
+  }
+};
+
+Component(componentOptions);

static/nativeComponents/GoodsList/index.json

+{
+  "component": true,
+  "usingComponents": {
+    "goods-item":"./GoodsItem/index"
+  }
+}

static/nativeComponents/GoodsList/index.wxml

+<!-- 商品列表组件 -->
+<view class="goodsList">
+	<view class="list-wrap heap-wrap" style="background-color:{{datas.componentData['heapBgColorShow'] ? datas.componentData['heapBgColor'] : ''}};border-radius:{{datas.componentData['cardBorderRadius']*2}}rpx;">
+		<!-- 头部 -->
+		<view class="tops flex" style="padding:{{(datas.componentData['titleIcon'] || (datas.componentData['moreShow'] && datas.componentData.moreButtonSite=='top')) ?'0rpx 0rpx 0rpx 10rpx' : ''}};margin-bottom:{{datas.componentData['titleCardGap']*2}}rpx">
+			<view class="left flex">
+				<view class="img" wx:if="{{titleIcon}}">
+					<image mode="widthFix" src="{{titleIcon}}" />
+				</view>
+				<view class="title">{{datas.componentData['titles']}}</view>
+			</view>
+			<view class="moreTop" wx:if="{{datas.componentData['moreShow'] && datas.componentData.moreButtonSite=='top' && datas.componentData['goodsSource']!='assign'}}">
+				查看更多
+				<text class="jt"></text>
+			</view>
+		</view>
+		<!-- 网格布局 -->
+		<view
+		 wx:if="{{datas.componentData.style==='list'}}"
+		 class="goodsItem-list flex"
+		 style="margin-left:{{-datas.componentData.proGap*2}}rpx;"
+		>
+			<view
+			 wx:for="{{datas.componentData.goodsList}}"
+			 wx:key="index"
+			 class="item"
+			 style="width:{{100/datas.componentData.columnNum}}%;padding-left:{{datas.componentData.proGap*2}}rpx"
+			>
+				<goods-item
+				 class="goodsItem"
+				 datas="{{datas}}"
+				 items="{{datas.componentData.goodsList[index]}}"
+				 indexs="{{index}}"
+				></goods-item>
+			</view>
+		</view>
+	</view>
+</view>
+

static/nativeComponents/GoodsList/index.wxss

+.flex{
+  display: flex;
+}
+image{
+  width: 100%;
+}
+.goodsList{
+  font-size: 32rpx;
+  position: relative;
+}
+.goodsList .heap-wrap{
+  padding: 20rpx;
+}
+.tops{
+  justify-content: space-between;
+  align-items: center;
+  position: relative;
+}
+.tops .left{
+  align-items: center;
+}
+.tops .img{
+  width: 60rpx;
+  height: 60rpx;
+  margin-right: 20rpx;
+}
+.tops .title{
+  font-weight: bold;
+  color: #333;
+  font-size: 36rpx;
+}
+.moreTop{
+  position: absolute;
+  right: 10px;
+  text-align: right;
+  font-size: 13px;
+  color: #6b6b6b;
+}
+.moreTop .jt {
+  display: inline-block;
+  border-top: 1px solid;
+  border-right: 1px solid;
+  width: 10px;
+  height: 10px;
+  -webkit-transform: rotate(-135deg);
+  transform: rotate(405deg);
+  margin-left: 0px;
+}
+.goodsItem-list{
+  flex-wrap: wrap;
+}
+.goodsItem-list .item{
+  box-sizing: border-box;
+}
\ No newline at end of file