购好物，8月需求开发中~

王强
1 parent 90502b38
Showing 6 changed files with 186 additions and 103 deletions
src/components/goodsItem_10/goodsItem_10.less
src/components/goodsItem_10/goodsItem_10.vue
src/components/goodsItem_7/goodsItem_7.less
src/components/goodsItem_7/goodsItem_7.vue
src/pages/discountList/discountList.vue
src/pages/optimization2/optimization2.vue
@@ -57,9 +57,32 @@
 				overflow: hidden;
 			}
 		}
+		.prices-box {
+			display: flex;
+			justify-content: center;
+			align-items: baseline;
+			height: 28px;
+			line-height: 28px;
+			.symbol {
+				color: #AAAAAA;
+				font-size: 22px;
+				font-weight: 300;
+				text-decoration: line-through;
+			}
+			.prices {
+				color: #AAAAAA;
+				font-size: 22px;
+				font-weight: 300;
+				text-decoration: line-through;
+			}
+		}
+		.prices-pl-box {
+			height: 28px;
+			line-height: 28px;
+		}
 	}
-    &.pid-2 {	// 排名样式
+    &.pid-2, &.pid-4 {	// 积分样式
 		.content-box {
 			.price-box {
 				justify-content: center;
@@ -8,22 +8,31 @@
         </div>
 		<div class="content-box" v-if="item.price || item.num">
-			<div class="price-box" v-if="pid == '1'">
+			<div class="price-box" v-if="pid == '1' || pid == '3'">
 				<div class="symbol">¥</div>
 				<div class="price">{{item.price}}</div>
-				<!-- <div class="prices" v-if="(pid == '1') && item.prices && parseFloat(item.prices) > 0 && parseFloat(item.prices) > parseFloat(item.price)">¥{{item.prices}}</div> -->
+				<!-- <div class="prices" v-if="(pid == '1' || pid == '3') && item.prices && parseFloat(item.prices) > 0 && parseFloat(item.prices) > parseFloat(item.price)">¥{{item.prices}}</div> -->
 			</div>
-			<!-- <div class="price-box" v-if="pid == '2' && item.price && parseFloat(item.price) > 0">
+			<!-- <div class="price-box" v-if="(pid == '2' || pid == '4') && item.price && parseFloat(item.price) > 0">
                 <div class="symbol">¥</div>
 				<div class="price">{{item.price}}</div>
 			</div> -->
-			<!-- <div class="price-box" v-else-if="pid == '2'"> -->
-			<div class="price-box" v-if="pid == '2'">
+			<!-- <div class="price-box" v-else-if="pid == '2' || pid == '4'"> -->
+			<div class="price-box" v-if="pid == '2' || pid == '4'">
 				<div class="price">{{item.num}}</div>
 				<div class="price-text">积分</div>
 			</div>
+
+            <!-- 划线价格 -->
+            <div class="prices-box" v-if="pid == '3' && item.prices && parseFloat(item.prices) > 0 && parseFloat(item.prices) > parseFloat(item.price)">
+                <div class="symbol">¥</div>
+				<div class="prices">{{item.prices}}</div>
+            </div>
+            
+            <!-- 划线价格高度占位 -->
+            <div class="prices-pl-box" v-else-if="pid == '4' || !item.prices || parseFloat(item.prices) <= 0"></div>
 		</div>
 	</div>
 </template>
@@ -76,11 +76,39 @@
 				text-overflow: ellipsis;
 				overflow: hidden;
 			}
-      .grey-title{
-        font-size: 36px;
-        height: 76px;
-      }
+			.tags-box {
+				// display: flex;
+				// justify-content: flex-start;
+				// align-items: center;
+				.tag {
+					margin-top: 10px;
+					margin-right: 10px;
+					float: left;
+					&.week {
+						background-color: #FA972F;
+						padding: 0 8px 4px 8px;
+						color: #fff;
+						font-size: 22px;
+						font-weight: 500;
+						border-radius: 6px;
+					}
+					&.good {
+						background-color: #FC1541;
+						padding: 0 8px 4px 8px;
+						color: #fff;
+						font-size: 22px;
+						font-weight: 500;
+						border-radius: 6px;
+					}
+				}
+			}
+			.grey-title{
+				clear: both;
+				font-size: 36px;
+				height: 76px;
+			}
 			.coupon-box {
+				clear: both;
 				display: inline;
 				margin-top: 8px;
 				padding: 1px 6px;
@@ -90,11 +118,12 @@
 				border-radius: 4px;
 			}
 			.price-box {
+				clear: both;
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
-				margin-top: 10px;
 				margin-bottom: 20px;
+				padding-top: 10px;
 				.left {
 					display: flex;
 					justify-content: flex-start;
@@ -123,6 +152,7 @@
             }
             /**积分显示*/
             .grade-box {
+				clear: both;
                 height: 50px;
                 font-size: 36px;
                 font-weight: 500;
@@ -132,14 +162,14 @@
                 align-items: center;
                  /**红色字*/
                 .num{
-                  font-size: 36px;
-                  font-weight: 500;
-                  color: #FC1541;
+					font-size: 36px;
+					font-weight: 500;
+					color: #FC1541;
                 }
                  /**健康商城商品颜色*/
                 .grey-box{
-                  color: #3EB781;
-                  font-size: 36px;
+					color: #3EB781;
+					font-size: 36px;
                 }
                 span {
                     font-size: 24px;
@@ -150,20 +180,21 @@
             }
             /**积分加现金*/
             .price-title-box{
-              height: 42px;
-              font-size: 30px;
-              font-weight: 400;
-              color: #FC1541;
-              line-height: 42px;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
+				clear: both;
+				height: 42px;
+				font-size: 30px;
+				font-weight: 400;
+				color: #FC1541;
+				line-height: 42px;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
             }
 		}
-    /*兼容积分商城样式*/
-    .integral-content-box{
-      width: 100%;
-    }
+    	/*兼容积分商城样式*/
+    	.integral-content-box{
+      		width: 100%;
+    	}
 		&.g-2 {
 			.content-box {
 				.title {
@@ -195,4 +226,4 @@
 			}
 		}
 	}
 -}
+}
 \ No newline at end of file
@@ -2,15 +2,17 @@
 	<div class="goods-item-7-box" v-if="item" @click="jump(item)">
 		<div class="item" :class="'g-' + goodType">
 			<div class="img-box">
+
+                <!-- 产品图片 -->
 				<img v-lazy="item.simg + SIGN.MIDDLE" class="img" />
-                <!-- 补货中按钮 -->
-                <div v-if="item && item.stock && item.stock == 0" class="goods_active">
+                <!-- 补货中提示 -->
+                <div v-if="item && item.stock && item.stock <= 0" class="goods_active">
                    补货中
                 </div>
                 <!-- goodType=1为积分商城定义实物商品展示tip积分+现金形式 -->
-                <div v-if="goodType == 1 && item && item.price && parseInt(item.price)>0" class="goods_tip">
+                <div v-if="goodType == 1 && item && item.price && parseInt(item.price) > 0" class="goods_tip">
                     积分+现金
                 </div>
@@ -18,20 +20,36 @@
                 <slot name="flag"></slot>
 			</div>
 			<div class="content-box" :class="{'integral-content-box':company == 1 || company == 2}">
-				<div class="title" :class="{'grey-title':company == 2}">{{item.title}}</div>
+				<div class="title" :class="{'grey-title':company == 2}">
+                    {{item.title}}
+                </div>
+
+                <!-- 运营标签 -->
+                <div class="tags-box">
+                    <div class="tag week">本周推荐</div>
+                    <div class="tag good">好物推荐</div>
+                    <div class="tag week">本周推荐</div>
+                </div>
+
 				<!-- <div class="coupon-box">
 					满180减10
 				</div> -->
-         <!-- 积分加现金 -->
-        <div v-if="goodType == 1" class="price-title-box">
-        {{parseInt(item.num)>9999?this.formatDecimal((parseInt(item.num) / 10000), 0) +"万":item.num}}<span>积分 <span v-show="parseInt(item.price)>0">+ {{item.price}}元</span></span> 
-        </div>
-        <!-- 积分 -->
-        <div v-else-if="company == 1 || company == 2" class="grade-box" >
-            <span class="num" :class="{'grey-box':company == 2}">        {{parseInt(item.num)>9999?this.formatDecimal((parseInt(item.num) / 10000), 0) +"万":item.num}}</span>
-            <span v-if="company==1">积分</span><span v-else>健康值</span>   
+         
+                <!-- 积分加现金 -->
+                <div v-if="goodType == 1" class="price-title-box">
+                    {{parseInt(item.num) > 9999 ? this.formatDecimal((parseInt(item.num) / 10000), 0) + "万" : item.num}}<span>积分 <span v-show="parseInt(item.price)>0">+ {{item.price}}元</span></span>
+                </div>
+        
+                <!-- 积分 -->
+                <div v-else-if="company == 1 || company == 2" class="grade-box" >
+                    <span class="num" :class="{'grey-box':company == 2}">
+                        {{parseInt(item.num)>9999 ? this.formatDecimal((parseInt(item.num) / 10000), 0) + "万" : item.num}}
+                    </span>
+                    <span v-if="company==1">积分</span>
+                    <span v-else>健康值</span>   
 				</div>                
-          <!-- 价格 -->
+          
+                <!-- 价格 -->
 				<div v-else class="price-box">
 					<div class="left">
 						<div class="y">¥&nbsp;</div>
@@ -49,63 +67,63 @@
 <script>
 export default {
-  data: function () {
-    return {
-
-    }
-  },
-  props: ["item", "goodType", "company"],
-  computed: {
+    data: function () {
+        return {
-    /**
-     * 获取输入数字的整数部分
-     */
-    getInteger () {
-      return (number) => {
-        return parseInt(number);
-      }
+        }
     },
+    props: ["item", "goodType", "company"],
+    computed: {
+        
+        /**
+         * 获取输入数字的整数部分
+         */
+        getInteger () {
+            return (number) => {
+                return parseInt(number);
+            }
+        },
-    /**
-     * 获取输入数字的小数部分
-     */
-    getDecimal () {
-      return (number) => {
-
-        // 拆分数字
-        let numberArr = number.toString().split(".");
-
-        // 判断是否有效数部分
-        if (numberArr.length === 2) {
-          return numberArr[1];
-        } else {
-          return "00";
+        /**
+         * 获取输入数字的小数部分
+        */
+        getDecimal () {
+            return (number) => {
+                
+                // 拆分数字
+                let numberArr = number.toString().split(".");
+                
+                // 判断是否有效数部分
+                if (numberArr.length === 2) {
+                    return numberArr[1];
+                } else {
+                    return "00";
+                }
+            }
         }
-      }
-    }
-  },
-  methods: {
-
-    /**
-     * 点击跳转
-     * @param {object} item [数据对象]
-     */
-    jump (item) {
-      this.$emit("jump", item);
     },
+    methods: {
+        
+        /**
+         * 点击跳转
+         * @param {object} item [数据对象]
+         */
+        jump (item) {
+            this.$emit("jump", item);
+        },
-    /**
-     * 主按钮点击事件
-     * @param {object} item [数据对象]
-     */
-    primary (item) {
-      this.$emit("primary", item);
+        /**
+         * 主按钮点击事件
+         * @param {object} item [数据对象]
+         */
+        primary (item) {
+            this.$emit("primary", item);
+        }
     }
-  }
 }
 </script>
 <!-- Add "scoped" attribute to limit CSS to this component only -->
 <style rel="stylesheet/less" lang="less" scoped>
-@import './goodsItem_7';
-</style>
+    @import './goodsItem_7';
+</style>
 \ No newline at end of file
@@ -343,7 +343,8 @@
                 // 获取证书请求接口
                 this.http("/Api/" + (this.getApiVersion().good) + "/discountGoods", {
-                    uid: this.getStore("uid") || 0
+                    uid: this.getStore("uid") || 0,
+                    goods_id: (this.$route.query && this.$route.query.user_selected_goods_id ? this.$route.query.user_selected_goods_id : '0')
                 }, this.discountGoodsCallback, {
                     method: "POST"
                 });
@@ -49,7 +49,7 @@
                 <div class="section-2 shop-list" v-if="discountLists && discountLists.length">
                     <!-- 标题 -->
-                    <text-bg-title-com @more="toDiscountList"
+                    <text-bg-title-com
                         :titles="{
                             bg: 'static/img/text_bg_title_bg_3.png'
                         }">
@@ -75,7 +75,7 @@
                                 <!-- 商品展示样式 10 -->
                                 <goods-item-10 class="item" :class="'list-0'" @jump="toDiscountList(discountData.now[0])"
                                     :item="discountData.now[0]"
-                                    pid="1">
+                                    pid="3">
                                     <!-- 折扣角标 -->
                                     <div class="discount-flag" slot="flag" v-if="parseFloat(discountData.now[0].price) < parseFloat(discountData.now[0].prices)">
@@ -94,7 +94,7 @@
                                 <!-- 商品展示样式 10 -->
                                 <goods-item-10 class="item" :class="'list-1'" @jump="toDiscountList(discountData.now[1])"
                                     :item="discountData.now[1]"
-                                    pid="1">
+                                    pid="3">
                                     <!-- 折扣角标 -->
                                     <div class="discount-flag" slot="flag" v-if="parseFloat(discountData.now[1].price) < parseFloat(discountData.now[1].prices)">
@@ -126,9 +126,9 @@
                             <div class="list" v-if="pointsData.now && pointsData.now.length && pointsData.now[0].id">
                                 <!-- 商品展示样式 10 -->
-                                <goods-item-10 class="item" @jump="pointsMore"
+                                <goods-item-10 class="item" @jump="pointsMore(pointsData.now[0])"
                                     :item="pointsData.now[0]"
-                                    pid="2">
+                                    pid="4">
                                 </goods-item-10>
                             </div>
                         </transition>
@@ -140,9 +140,9 @@
                             <div class="list" v-if="pointsData.now && pointsData.now.length && pointsData.now[1].id">
                                 <!-- 商品展示样式 10 -->
-                                <goods-item-10 class="item" @jump="pointsMore"
+                                <goods-item-10 class="item" @jump="pointsMore(pointsData.now[1])"
                                     :item="pointsData.now[1]"
-                                    pid="2">
+                                    pid="4">
                                 </goods-item-10>
                             </div>
                         </transition>
@@ -251,7 +251,7 @@
             </div> -->
             <!-- 热销排行 -->
-            <div class="section hot-box" ref="hotBox" v-if="sales && sales.length" @click="toHotSaleList">
+            <div class="section hot-box" ref="hotBox" v-if="sales && sales.length">
                 <!-- 商品样式 10 滑动 -->
                 <!-- <horiz-list class="components-box"
@@ -269,12 +269,12 @@
                 </horiz-list> -->
                 <!-- 热销商品自动滚动 -->
-                <marquee-box class="marquee-box"
+                <marquee-box class="marquee-box" @jump="toDetail"
                     :lists="sales"
                     :options="marqueeOptions">
                     <!-- 标题 -->
-                    <text-bg-title-com slot="title-box"
+                    <text-bg-title-com slot="title-box" @more="toHotSaleList"
                         :titles="{
                             bg: 'static/img/text_bg_title_bg_5.png',
                             more: true
@@ -912,10 +912,10 @@
                     // 设置跳转参数
                     let params = {
                         type: '5',
-                        to: window.location.origin + window.location.pathname + '#/discountList',
+                        to: window.location.origin + window.location.pathname + '#/discountList' + (item && item.id ? '?user_selected_goods_id=' + item.id : ''),
                         shop_type: ''
                     };
-
+                    
                     // 页面跳转
                     this.$parent.gotoDetail(params);
                 }
@@ -1022,7 +1022,7 @@
                     // 设置跳转参数
                     let params = {
                         type: '5',
-                        to: window.location.origin + window.location.pathname + '#/pointsMall',
+                        to: window.location.origin + window.location.pathname + '#/pointsMall' + (item && item.id ? '?user_selected_goods_id=' + item.id : ''),
                         shop_type: ''
                     };