Merge branch 'master' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong_qianduan

pages/cart/index.vue

@@ -84,7 +84,7 @@
 						</view>
 						<view class="goodsInfo">
 							<view class="title">
-								<text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
+								<!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
 								<text class="name">{{item.goods_name}}</text>
 							</view>
 						</view>

pages/goods/components/setPrice.vue

@@ -6,6 +6,9 @@
 					请设置秒杀价
 				</view>
 				<view class="priceContainer">
+					<view class="priceCon">
+						<text>成本价：</text>{{Number(cost_price_min)}}
+					</view>
 					<view class="priceCon">
 						<text>秒杀价：</text><input type="text" v-model="secondPrice" class="input"
 							placeholder="秒杀价格可低于成本价" />
@@ -58,6 +61,7 @@
 				startTime: '',
 				sec_hour: '',
 				secondPrice: '',
+				cost_price_min:'',
 				secondQuota: false,
 				quotaNum: '',
 				fontColor: '#262626',

pages/goods/detail.vue

@@ -728,7 +728,8 @@
 					this.$refs.setRange.sec_hour = item.sec_hour
 					this.$refs.setRange.secondPrice = item.seckill_price
 					this.$refs.setRange.secondQuota = item.is_limit == 1 ? true : false
-					this.$refs.setRange.quotaNum = item.limit_times
+					this.$refs.setRange.quotaNum = item.limit_times;
+					this.$refs.setRange.cost_price_min=this.goods.cost_price_min
 				}
 				this.$refs.setRange.afterSale = true;
 

pages/goods/seckillDetail.vue

@@ -632,7 +632,8 @@
 					this.$refs.setRange.sec_hour = item.sec_hour
 					this.$refs.setRange.secondPrice = item.seckill_price
 					this.$refs.setRange.secondQuota = item.is_limit == 1 ? true : false
-					this.$refs.setRange.quotaNum = item.limit_times
+					this.$refs.setRange.quotaNum = item.limit_times;
+					this.$refs.setRange.cost_price_min=this.goods.cost_price_min
 				}
 				this.$refs.setRange.afterSale = true;
 

pages/invite/index.vue

@@ -511,7 +511,7 @@
 				font-size: 28rpx;
 				border-radius: 45rpx;
 				&.btn2 {
-					bottom: 112rpx;
+					bottom: 28rpx;
 				}
 			}
 		}

pages/invite/style.scss

@@ -1,5 +1,6 @@
 #invite1 {
 	background-image: url(https://www.royaum.com.cn/static/news/invite1-bg.png);
+	background-position: center top;
 	.uni-page-head {
 		background-color: #FFC6CF!important;
 	}
@@ -7,6 +8,7 @@
 
 #invite2 {
 	background-image: url(https://www.royaum.com.cn/static/news/invite2-bg.png);
+	background-position: center top;
 	.uni-page-head {
 		background-color: #FFC6CF!important;
 	}
@@ -14,6 +16,7 @@
 
 #invite3 {
 	background-image: url(https://www.royaum.com.cn/static/news/invite3-bg.png);
+	background-position: center top;
 	.uni-page-head {
 		background-color: #FFC6CF!important;
 	}
@@ -21,6 +24,7 @@
 
 #invite4 {
 	background-image: url(https://www.royaum.com.cn/static/news/invite4-bg.png);
+	background-position: center top;
 	.uni-page-head {
 		background-color: #FFC6CF!important;
 	}
@@ -28,6 +32,7 @@
 
 #invite5 {
 	background-image: url(https://www.royaum.com.cn/static/news/invite5-bg.png);
+	background-position: center top;
 	.uni-page-head {
 		background-color: #FFC6CF!important;
 	}

pages/user/index.vue

@@ -532,7 +532,7 @@
 							</view>
 							<view class="goodsInfo">
 								<view class="title">
-									<text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text>
+									<!-- <text v-if="item.selling_point" class="ziying">{{item.selling_point}}</text> -->
 									<text class="name">{{item.goods_name}}</text>
 								</view>
 								<view class="price" style="margin-top: 12rpx;">