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

pages/activity/newPeople.vue

@@ -75,7 +75,7 @@
 		data() {
 			return {
 				title: "新人首单礼",
-				current: 1,
+				current: 0,
 				isLoading: true,
 				background: {
 					background: 'url(https://www.royaum.com.cn/static/news/newPeople-bg.png) center top no-repeat',
@@ -237,7 +237,7 @@
 			.b {
 				padding: 20rpx;
 				overflow: hidden;
-
+				
 				white-space: nowrap;
 				display: flex;
 				justify-content: space-between;
@@ -349,9 +349,12 @@
 						font-family: PingFang SC, PingFang SC;
 						font-weight: 400;
 						color: #1E1E1E;
-						// text-overflow: ellipsis;
+						    display: -webkit-box;
-						// white-space: nowrap;
+						    -webkit-box-orient: vertical;
-						// overflow: hidden;
+						    overflow: hidden;
+						    -webkit-line-clamp: 2;
+						    height: 90rpx;
+						    line-height: 45rpx;
 
 						text {
 							background-color: #F34A40;

pages/goods/detail.vue

@@ -75,7 +75,7 @@
 						<text>{{goods.skuList[0].goods_sku_id}}</text>
 						<image :src="$picUrl+'/static/detail/copy.png'"></image>
 					</view>
-					<view v-if="goods.goods_no" class="goodsNum" @click="copyNum(goods.goods_no)" v-else>
+					<view v-if="goods.goods_no" class="goodsNum" @click="copyNum(goods.goods_no)">
 						<text>{{goods.goods_no}}</text>
 						<image :src="$picUrl+'/static/detail/copy.png'"></image>
 					</view>