修改bug

src/component/personCenter/personCenter.wxml

@@ -6,8 +6,7 @@
 		wx:if="{{currentHasUserInfo}}"
 		src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}"
 		class="no-active-img"
-		mode="widthFix"
-		/>
+		mode="widthFix"/>
 		<button
 		wx:if="{{!currentHasUserInfo}}"
 		bindgetuserinfo="_getUserInfo"
@@ -15,8 +14,7 @@
 		open-type='getUserInfo'
 		class='btn df'
 		hover-class="btn-hover"
-		style="height:100%"
-		>
+		style="height:100%">
 			<image src="{{utils.formateUrl(personCenter.noactiveBackgroundImageUrl,baseImgUrl)}}" class="no-active-img" mode="widthFix" />
 		</button>
 	</view>

src/component/productListStyleOne/productListStyleOne.wxml

@@ -16,9 +16,8 @@
 <template name="water-list">
     <navigator hover-class="none" url="/pages/productDetail/productDetail?id={{productId}}">
       <view class="item">
-
+        <view class="product-cover-imgs">
           <image wx:if="{{isFlashSale}}" class="limited-icon" src="https://img3.bigaka.com/prd/3001/202005/20200508/3001a6dcdf69-369a-4f43-8757-60f071946ea8.png" />
-
           <!-- 图片主图时 -->
           <image class="item-img" 
           src="{{indexUrl}}" 
@@ -26,31 +25,35 @@
           wx:if="{{!utils.isVideo(indexUrl)}}"
           binderror="imgLoadError" 
           data-index="{{index}}"></image>
-
           <video id="myVideo" 
           class="item-img video-cover"
           src="{{indexUrl}}"
           muted="{{true}}"
           wx:if="{{utils.isVideo(indexUrl)}}"></video>
-
+          <!-- 营销标签 -->
+          <view class="promotion-tag" wx:if="{{hasPromotionTag}}">
+            <view class="promotion-item">
+              <image src="{{tagPic}}" mode="widthFix" lazy-load></image>
+              <view class="promotion-price" wx:if="{{tagType != 1}}">
+                ￥<label>{{tagPrice}}</label>
+              </view>
+            </view>
+          </view>
+        </view>
         <view class="item-title-box">
           <view class="item-title">{{productName}}</view> 
         </view>
         <view class="pro-price-wrap">
-
           <view class="pro-plus-price" wx:if="{{falshSaleActivityPrice}}">
             <text>￥</text>
             <text class="plus-price">{{utils.numberFormat(falshSaleActivityPrice / 100)}}</text>
-
             <text class="sale-price">￥{{utils.numberFormat(minSalePrice / 100)}}</text>
           </view>
-
           <view class="pro-plus-price" wx:if="{{!falshSaleActivityPrice}}">
             <text>￥</text>
             <text class="plus-price">{{memberPrice ? utils.numberFormat(memberPrice / 100) : utils.numberFormat(minSalePrice / 100)}}</text>
             <image wx:if="{{memberPrice}}" mode="widthFix" src="/assets/imgs/7_1_0/member-icon.png"></image>
           </view>
-
           <view class="pro-member-price" wx:if="{{plusPrice}}">
             <text>￥</text>
             <text class="member-price">{{utils.numberFormat(plusPrice / 100)}}</text>

src/component/productListStyleOne/productListStyleOne.wxss

@@ -83,13 +83,14 @@
 }
 .pro-plus-price{
   color: #cb3c3c;
-  font-size: 24rpx;
+  font-size: 26rpx;
   display: flex;
   align-items: center;
+  font-weight: bold;
 }
 .pro-member-price{
   color: #333333;
-  font-size: 24rpx;
+  font-size: 26rpx;
   margin-top: 10rpx;
 }
 .plus-price,.member-price{
@@ -103,3 +104,64 @@
   width: 51rpx;
   margin-left: 13rpx;
 }
+
+.product-cover-imgs{
+  position: relative;
+  
+}
+
+.product-cover-imgs .promotion-tag{
+  position: absolute;
+  width: 100%;
+  height: auto;
+  left: 0;
+  bottom: 0;
+}
+
+.product-cover-imgs .promotion-tag .promotion-item{
+  width: 100%;
+  position: relative;
+}
+
+.product-cover-imgs .promotion-tag .promotion-item .promotion-price{
+  position: absolute;
+  left: 0rpx;
+  bottom: 0rpx;
+  color: #ffffff;
+  font-size: 18rpx;
+  width: 125rpx;
+  height: 100%;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  padding-bottom: 15rpx;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+
+.product-cover-imgs .promotion-tag .promotion-item .promotion-price label{
+  font-size: 24rpx;
+  font-weight: bold;
+}
+
+/* .product-cover-imgs .promotion-tag .promotion-item .promotion-price label{
+
+} */
+
+/* .product-cover-imgs .promotion-tag .promotion-item label{
+  position: absolute;
+  left: 10rpx;
+  bottom: 10rpx;
+  color: #ffffff;
+  font-size: 18rpx;
+}
+
+.product-cover-imgs .promotion-tag .promotion-item label text{
+  font-size: 24rpx;
+  font-weight: bold;
+} */
+
+.product-cover-imgs .promotion-tag .promotion-item image{
+  width: 100%;
+}
+

src/component/productListStyleTwo/productListStyleTwo.wxml

@@ -7,23 +7,26 @@
                 <image wx:if="{{item.isFlashSale}}" class="limited-icon" src="https://img3.bigaka.com/prd/3001/202005/20200508/3001a6dcdf69-369a-4f43-8757-60f071946ea8.png" />
                 <image class="hot-img" src="{{item.indexUrl}}" mode="aspectFit" lazy-load wx:if="{{!utils.isVideo(item.indexUrl)}}" />
                 <video id="myVideo" class="hot-img" src="{{item.indexUrl}}" muted wx:if="{{utils.isVideo(item.indexUrl)}}"></video>
+
+                <view class="promotion-tag" wx:if="{{item.hasPromotionTag}}">
+                    <view class="promotion-item">
+                        <image src="{{item.tagPic}}" lazy-load mode="widthFix"></image>
+                        <label wx:if="{{item.tagType != 1}}">￥<text>{{item.tagPrice}}</text></label>
+                    </view>
+                </view>
             </view>
             <view class="hot-item-desc border_box">
                 <view class="item-name">{{item.productName}}</view>
-                <!-- <view class="item-desc">{{item.productStatusDesc}}</view> -->
+                <view class="item-desc">{{item.subtitle}}</view>
                 <view class="item-vip-price weui-flex">
-
-                    
-                    <text class="vip-sale-price border_box" wx:if="{{item.falshSaleActivityPrice}}">
+                    <text class="vip-sale-price border_box product-price-red" wx:if="{{item.falshSaleActivityPrice}}">
                         ￥{{utils.numberFormat(item.falshSaleActivityPrice / 100)}}<text class="sale-price">￥{{utils.numberFormat(item.minSalePrice / 100)}}</text>
                     </text>
-                    
-
-                    <text class="vip-sale-price border_box" wx:if="{{!item.falshSaleActivityPrice}}">
+                    <text class="vip-sale-price border_box product-price-red" wx:if="{{!item.falshSaleActivityPrice}}">
                         ￥{{item.memberPrice ? utils.numberFormat(item.memberPrice / 100) : utils.numberFormat(item.minSalePrice / 100)}}
                     </text>
-                    <view class="">
-                        <image class="item-vip" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001918ef881-b117-44da-8cfe-72e26f051e29.png" mode="widthFix" wx:if="{{item.memberPrice}}" />
+                    <view class="" wx:if="{{item.memberPrice}}">
+                        <image class="item-vip" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001918ef881-b117-44da-8cfe-72e26f051e29.png" mode="widthFix"  />
                     </view>
                     <!-- <text class="vip-original-price">￥189</text> -->
                 </view>
@@ -35,7 +38,6 @@
                         <image class="item-plus" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001fce746fd-c6f9-4016-bc0a-9aee0ac93f7a.png" mode="widthFix" lazy-load="false" />
                     </view>
                 </view>
-                <view />
             </view>
         </view>
     </navigator>

src/component/productListStyleTwo/productListStyleTwo.wxss

@@ -23,9 +23,51 @@
 	margin-left: 12rpx;
 	text-decoration: line-through;
 }
+
+.product-price-red{
+	color: #cb3c3c;
+	font-weight: bold;
+}
+
 .hot-img-box{
 	position: relative;
 }
+
+
+
+.hot-img-box .promotion-tag{
+  position: absolute;
+  width: 100%;
+  height: auto;
+  left: 0;
+  bottom: 0;
+}
+
+.hot-img-box .promotion-tag .promotion-item{
+  width: 100%;
+	position: relative;
+	display: flex;
+	align-items: flex-end;
+}
+
+.hot-img-box .promotion-tag .promotion-item label{
+  position: absolute;
+  left: 10rpx;
+  bottom: 0rpx;
+  color: #ffffff;
+  font-size: 18rpx;
+}
+
+.hot-img-box .promotion-tag .promotion-item label text{
+  font-size: 24rpx;
+  font-weight: bold;
+}
+
+.hot-img-box .promotion-tag .promotion-item image{
+  width: 100%;
+}
+
+
 .limited-icon{
 	position: absolute;
 	height: 36rpx;
@@ -40,7 +82,7 @@
 .item-name {
 	width: 338rpx;
 	color: rgba(0, 0, 0, 1);
-	font-size: 26rpx;
+	font-size: 30rpx;
 	text-align: left;
 	font-family: PingFangSC-Light;
   font-weight: bold;
@@ -51,7 +93,7 @@
   overflow: hidden;
 }
 .item-desc{
- color: #C09A74;
+ color: #999999;
  font-size: 22rpx;
  width: 378rpx;
  margin-top: 12rpx;
@@ -66,7 +108,7 @@
 .item-plus-price,
 .item-vip-price{
   display: flex;
-  height: 45rpx;
+  height: auto;
   color: rgba(51, 51, 51, 1);
   font-size: 32rpx;
   font-family: PingFangSC-Medium;
@@ -74,7 +116,7 @@
   align-items: baseline;
 }
 .item-vip-price{
-  margin-top: 12rpx;
+  /* margin-top: 12rpx; */
 }
 .vip-sale-price {
   padding: 0 10rpx 0 0;

src/config/index.js

@@ -82,6 +82,7 @@ const prod_brand_config = {
     openRefundTips : true,//是否开启退货须知显示
     refundTips : '温馨提示：退货通过审核后需将清单随包裹一起寄回或纸条备注（订单号与退货商品款号）【请务必审核通过后24小时内填写寄回运单号,拒签到付/顺丰/EMS/天天快递 不影响二次销售】',//退货须知文本 
     //wx654ce96a7324e76f 小程序微信支付券
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //泰华配置
   2006: {
@@ -107,6 +108,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/30017df01559-a34f-4106-81a6-3e2ed7e6304c.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //多多一上
   2007 : {
@@ -131,6 +133,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/30013df6a0c2-7f3f-4475-8657-5c0ac87e02de.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //雪岛书屋 
   2008 : {
@@ -155,6 +158,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //苏州邻里
   2003 : {
@@ -179,6 +183,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //拉如小程序
   2009 : {
@@ -203,6 +208,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001c17ed02e-7c2b-4b61-a81d-f8dcde3301df.jpg',//商户logo
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //热风
   2010 : {
@@ -227,6 +233,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001377a0bb9-8f7f-4b40-8966-9fc5f8a69cdd.png',
     openRefundTips : true,//是否开启退货须知显示
     refundTips : '温馨提示：退货通过审核后需将清单随包裹一起寄回或纸条备注（订单号与退货商品款号）【请务必审核通过后24小时内填写寄回运单号,拒签到付/顺丰/EMS/天天快递 不影响二次销售】',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //悦芙媞
   2012 : {
@@ -251,6 +258,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/30010a5f2325-9818-455d-a707-e8afc373701e.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //阿特里里
   2013 : {
@@ -275,6 +283,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //包鞋
   2014: {
@@ -299,6 +308,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //2015花在花园里 
   2015 : {
@@ -323,6 +333,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202004/20200410/30019e5121d1-5e2c-49b6-b807-1dbf1481b361.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //阿吉豆
   2016: {
@@ -347,6 +358,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001842823fb-2601-4b58-a648-79ad799ad425.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //【ACTREE】
   2017: {
@@ -371,6 +383,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001df8c09f7-8e9b-4901-8627-a533daf2bf8d.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //山东盛联微商城
   2992 : {
@@ -395,6 +408,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200331/3001edfaf8b7-0f9f-4d3e-8a74-73ed7398a4bc.jpg',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   },
   //2002 巴黎贝甜
   2002 : {
@@ -419,6 +433,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202003/20200318/3001c0647584-3656-45e9-ae60-c898d435113e.png',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
     //要跳转的外部小程序appid
     // "wxa006e9b0a0ee1bfe", 外卖
     // "wx39b5d8891f375d1c" 礼品卡
@@ -446,6 +461,7 @@ const prod_brand_config = {
     logo: 'https://img3.bigaka.com/prd/3001/202004/20200428/3001b3138e96-bb20-4492-916b-d9540cf072a7.jpg',
     openRefundTips : false,//是否开启退货须知显示
     refundTips : '',//退货须知文本 
+    signUrl : 'https://crm-m.bigaka.com/activity/sign.html?brandId=3001',
   }
   
 }
@@ -525,6 +541,11 @@ const token = {
   pre: 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD', //预生产
 }
 
+const CONST_SIGN_URL = {
+  dev: 'https://crm-m.bigaka.net/activity/sign.html?brandId=1002', //开发
+  test: 'https://crm-m.bigaka.net/activity/sign.html?brandId=1002', //测试
+}
+
 //获取配置信息
 let brandId = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].brandId : (PROJECT_ENV == 'dev' ? 1001 : 1002);
 let fixed_appId = PROJECT_ENV == 'prod' ? 
@@ -548,6 +569,7 @@ let touchPointStorageTime = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID]
 let openRefundTips = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].openRefundTips : true;
 let refundTips = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].refundTips : '温馨提示：退货通过审核后需将清单随包裹一起寄回或纸条备注（订单号与退货商品款号）【请务必审核通过后24小时内填写寄回运单号,拒签到付/顺丰/EMS/天天快递 不影响二次销售】';
 let hasKeFu = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].hasKeFu : true;
+let signUrl = PROJECT_ENV == 'prod' ? prod_brand_config[BRANCH_ID].signUrl : CONST_SIGN_URL[PROJECT_ENV]; 
 //配置信息导出
 const envInfo = (() => {
   return {
@@ -576,6 +598,7 @@ const envInfo = (() => {
     openRefundTips : openRefundTips,
     refundTips : refundTips,
     hasKeFu : hasKeFu,
+    signUrl : signUrl,
   }
 })()
 

src/pages/productDetail/productDetail.js

@@ -450,6 +450,31 @@ wxService.page({
           this.data.productInfo.minSalePrice = data.minSalePrice;
           this.data.productInfo.maxSalePrice = data.maxSalePrice;
           this.data.productInfo.indexUrl = data.indexUrl;
+          let markTagInfo = data.markTagInfo ;
+          this.data.productInfo.hasPromotionTag = markTagInfo ? true : false;
+          let tagPrice = this.data.productInfo.minSalePrice;
+          if(this.data.productInfo.hasPromotionTag){
+            this.data.productInfo.tagPic = this.data.productInfo.markTagInfo.tagPicUrl;
+            if(this.data.productInfo.markTagInfo.tagType == 2){
+              tagPrice = this.data.productInfo.minSalePrice;
+            }
+            else{
+              tagPrice = this.data.productInfo.markTagInfo.assignPrice;
+            }
+            this.data.productInfo.tagType = this.data.productInfo.markTagInfo.tagType;
+          }
+          
+          //判断价格是否大于1000了
+          // if(tagPrice/100 > 1000){
+          //   tagPrice = parseFloat(tagPrice/10/10).toFixed(1);
+          // }
+          // else{
+            
+          // }
+
+          tagPrice = parseFloat(tagPrice/10/10).toFixed(2);
+
+          this.data.productInfo.tagPrice = tagPrice;
 
           this.data.productInfo.productStatusDesc = data.productStatus == 1 ? '已下架' : 
           (data.productStatus == 2 ? '已上架' : '已删除');

src/pages/productDetail/productDetail.wxml

@@ -2,15 +2,8 @@
 <import src="../../wxParser/index.wxml" />
 <wxs src="../../wxs/utils.wxs" module="utils" />
 
-<view
- class="page-product-detail product-container"
- bindtouchstart="pageTouchStart"
- bindtouchmove="pageMove"
- bindtouchend="pageMoveEnd"
->
-	<view>
-		<!-- <buy-image-swiper  image-data="{{imageData}}"/>
-     -->
+<view class="page-product-detail product-container" bindtouchstart="pageTouchStart" bindtouchmove="pageMove" bindtouchend="pageMoveEnd">
+	<view class="positionRe">
 		<swiper autoplay="{{autoplay}}" style="height: 750rpx;line-height: 100rpx;" bindchange="swiperChange">
 			<block wx:for="{{productInfo.listUrls}}" wx:key="index">
 				<swiper-item>
@@ -37,6 +30,17 @@
 				<view class="dot{{index == swiperCurrent ? ' active' : ''}}" />
 			</block>
 		</view>
+		
+		<view class="promotion-tags" wx:if="{{productInfo.hasPromotionTag}}">
+			<view class="promotion-tag">
+					<view class="promotion-item-img">
+						<image src="{{productInfo.tagPic}}"	mode="widthFix" lazy-load></image>
+						<view class="promotion-price" wx:if="{{productInfo.tagType != 1}}">
+							￥ <label>{{productInfo.tagPrice}}</label>
+						</view>
+					</view>
+			</view>
+		</view>
 	</view>
 
 	<view class="product-detail-wrap">
@@ -108,7 +112,7 @@
 				<image src="/assets/imgs/arrow-right.png"></image>
 			</view>
 		</view>
-		<view class="activity-list-item clear-box" bindtap="onTapToActivityList">
+		<view class="activity-list-item clear-box" bindtap="onTapToActivityList" wx:if="{{promotionList.length > 0}}">
 			<label>促销</label>
 			<view class="right-ac-info clear-box">
 				<view class="coupon-flex">

src/pages/productDetail/productDetail.wxss

@@ -60,7 +60,7 @@ page{
   position: absolute; 
   left: 0; 
   right: 0; 
-  top: 700rpx; 
+  top: 670rpx; 
   display: flex; 
   justify-content: center; 
 } 
@@ -633,3 +633,44 @@ page{
   margin-right: 10rpx;
   background-image: url(https://img3.bigaka.com/prd/3001/202005/20200515/30015eb5843a-88a9-4ba1-86ad-74b26c15591a.png);
 }
+
+
+.promotion-tags{
+  position: absolute;
+  width: 100%;
+  height: auto;
+  left: 0;
+  bottom: 0;
+}
+
+.promotion-tags .promotion-item-img{
+  width: 100%;
+	position: relative;
+	display: flex;
+	align-items: flex-end;
+}
+
+.promotion-tags .promotion-item-img .promotion-price{
+  position: absolute;
+  left: 0rpx;
+  bottom: 0rpx;
+  color: #ffffff;
+  font-size: 28rpx;
+  width: 280rpx;
+  height: 100%;
+  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+  padding-bottom: 15rpx;
+  display: flex;
+  align-items: flex-end;
+  justify-content: center;
+}
+
+.promotion-tags .promotion-item-img .promotion-price label{
+  font-size: 48rpx;
+  font-weight: bold;
+}
+
+.promotion-tags .promotion-item-img image{
+  width: 100%;
+}
\ No newline at end of file

src/project.config.json

@@ -150,7 +150,7 @@
 					"id": 16,
 					"name": "商品详情页",
 					"pathName": "pages/productDetail/productDetail",
-					"query": "id=684461227170336768",
+					"query": "id=684047015461785600",
 					"scene": null
 				},
 				{
@@ -584,10 +584,10 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 80,
 					"name": "分类下商品列表",
 					"pathName": "subPackage/page/pages/categoryPro/categoryPro",
-					"query": "id=659088011908222976&name=盖浇饭哦",
+					"query": "id=660428669029978112&name=%E8%8D%A4%E8%8F%9C%E7%B1%BB",
 					"scene": null
 				},
 				{
@@ -701,6 +701,13 @@
 					"pathName": "subPackageA/page/pages/promotionProducts/promotionProducts",
 					"query": "id=711528674700169216&type=2",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "签到",
+					"pathName": "subPackageMarketing/page/pages/sign/sign",
+					"query": "",
+					"scene": null
 				}
 			]
 		}

src/subPackage/page/pages/categoryPro/categoryPro.js

@@ -151,13 +151,36 @@ wxService.page({
         wx.hideLoading()
         this.data.proData = this.data.pageNo == 1 ? [...data.content] : [...this.data.proData, ...data.content];
         this.data.proData.forEach(item => {
+          //营销标签类型 1固定样式 2左下角显示商品当前金额 3左下角显示指定数额
           item.indexUrl = item.indexUrl ? item.indexUrl : defaultImg;
+          //处理商品身上的营销标签数据
+          item.hasPromotionTag = item.markTagInfo ? true : false;
+          let tagPrice = item.minSalePrice;
+          if(item.hasPromotionTag){
+            item.tagPic = item.markTagInfo.tagPicUrl;
+            if(item.markTagInfo.tagType == 2){
+              tagPrice = item.minSalePrice;
+            }
+            else{
+              tagPrice = item.markTagInfo.assignPrice;
+            }
+            
+            item.tagType = item.markTagInfo.tagType;
+          }
+          //判断价格是否大于1000了
+          if(tagPrice/100 > 1000){
+            tagPrice = parseFloat(tagPrice/10/10).toFixed(1);
+          }
+          else{
+            tagPrice = parseFloat(tagPrice/10/10).toFixed(2);
+          }
+          item.tagPrice = tagPrice;
         });
         this.setData({
           proData: this.data.proData,
           totalPages: data.totalPages,
           totalElements: data.totalElements
-        })
+        });
       }
 
       if (refresh) {

src/subPackage/page/pages/categoryPro/categoryPro.wxml

@@ -13,8 +13,8 @@
 			<image mode="widthFix" src="{{!proStyle ? '/assets/imgs/7_1_0/category-style-01.png' : '/assets/imgs/7_1_0/category-style-02.png'}}" />
 		</view>
 	</view>
-	<product-list-style-one image-data="{{proData}}" wx:if="{{!proStyle}}" />
 
+	<product-list-style-one image-data="{{proData}}" wx:if="{{!proStyle}}" />
 	<product-list-style-two image-data="{{proData}}" wx:if="{{proStyle}}" />
 
 	<view class="empty" wx:if="{{proData.length < 1}}">

src/subPackageMarketing/page/pages/sign/sign.js

 // subPackageMarketing/page/pages/sign/sign.js
 const wxService = require('../../../../utils/wxService')
-const utils = require('../../../../utils/util')
+const utils = require('../../../../utils/util');
+
 wxService.page({
 
   /**
@@ -15,6 +16,11 @@ wxService.page({
    */
   onLoad: function (options) {
     wx.hideShareMenu();
+    // console.log(this.data.signUrl)
+    // this.data.webViewUrl = this.data.signUrl;
+    // this.setData({
+    //   webViewUrl : this.data.webViewUrl
+    // });
   },
 
   /**

src/subPackageMarketing/page/pages/sign/sign.wxml

 <!--subPackageMarketing/page/pages/sign/sign.wxml-->
 <view class="main-page">
-  <web-view src="{{webViewUrl}}"></web-view>
+  <web-view src="{{signUrl}}"></web-view>
 </view>
\ No newline at end of file

src/utils/wxService.js

@@ -614,7 +614,7 @@ class WXService extends Http {
     config.data.openRefundTips = envInfo.openRefundTips;
     config.data.refundTips = envInfo.refundTips;
     config.data.hasKeFu = envInfo.hasKeFu;
-
+    config.data.signUrl = envInfo.signUrl;
     //默认
     config.data.loading = true;