提交

common/common.js

@@ -4,6 +4,7 @@
  * @Description: content
  */
 import Vue from 'vue'
+import config from '@/common/config.js'
 
 // 防止处理多次点击
 function noMultipleClicks(methods, info) {
@@ -49,6 +50,10 @@ export default {
 		if (!obj) {
 			return ''
 		}
+		let goods_info = config.getGoodTypeFind(obj.type);
+		if(goods_info!=null){
+			return goods_info.name;
+		}
 
 		const types = {
 			1: '一番赏',

components/detail-list-item/detail-list-item.vue

@@ -10,10 +10,10 @@
         </view>
         <view class="num center" v-if="item.stock != null">{{ item.surplus_stock }}/{{ item.stock }}</view>
         <!-- 预售标签 -->
-        <view v-if="item.goods_type == 2" class="yu-tag ziti">预售</view>
-        <view v-if="item.doubling != null && item.doubling > 1" class="yu-tag ziti"
-          style="top:75%;right: 15rpx; font-size:40rpx;color: #FF5722;font-style: italic;transform: skewX(-10deg);">x{{
+        <view v-if="item.goods_type == 2" class="presale-tag"></view>
+        <view v-if="item.doubling != null && item.doubling > 1" class="multiple-tag" >x{{
             item.doubling }}</view>
+        <view v-if="item.goods_type == 4" class="baoxiang-tag"></view>
         <!-- 售罄遮罩 -->
         <view class="sold-out-mask center" v-if="item.surplus_stock != null && item.surplus_stock <= 0">
           <text>售罄</text>
@@ -203,6 +203,57 @@ export default {
     border-radius: 25rpx;
   }
 
+  .presale-tag {
+    position: absolute;
+    right: 15rpx;
+    top: 15rpx;
+    z-index: 5;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #333;
+    border-radius: 30rpx;
+    background-image: url($iconurl + "yushou.png");
+    background-size: 100% 100%;
+    height: 32rpx;
+    width: 68rpx;
+  }
+
+  .baoxiang-tag {
+    position: absolute;
+    left: 15rpx;
+    top: 15rpx;
+    z-index: 5;
+    font-weight: 400;
+    font-size: 24rpx;
+    color: #333;
+    border-radius: 30rpx;
+    background-image: url($iconurl + "baoxiang.png");
+    background-size: 100% 100%;
+    height: 32rpx;
+    width: 68rpx;
+  }
+
+  .multiple-tag {
+    position: absolute;
+    z-index: 5;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-weight: 400;
+    // background-color: ;
+    //背景渐变
+    background: linear-gradient(to right, #8D5104, #3C0300);
+    color: #ffffff;
+    width: 48rpx;
+    height: 32rpx;
+    border-radius: 25rpx;
+    bottom:15rpx;
+    left: 15rpx;
+    font-size:24rpx;
+    line-height: 32rpx;
+  }
+
+  // 保留兼容旧版本
   .yu-tag {
     position: absolute;
     right: 10rpx;

pages/shouye/index.vue

@@ -99,7 +99,7 @@
 					<image :src="$img1('common/new1.png')" class="image1"
 						style="animation: zoom 1.2s ease-in-out infinite" mode="widthFix"
 						v-if="item.new_is == 1 && tabList[tabCur].id != 2"></image>
-					<view class="image3 common_bg"
+					<view class="image3 common_bg" style="padding: 0 10rpx;line-height: 32rpx;"
 						:style="{backgroundImage:tabList[tabCur].id != 2? `url(${$img1('common/label1.png')})`: `url(${$img1('common/label2.png')})`,}">
 						<text>
 							{{ item.type_text }}

uni.scss

@@ -14,7 +14,8 @@
  // @import 'uview-ui/theme.scss';
 /* 颜色变量 */
 
-$imgurl:'https://mh.shhuanmeng.com/static/web/static/';
+$imgurl:'https://image.zfunbox.cn/static/web/static/';
+$iconurl:'https://image.zfunbox.cn/icon/';
 //https://mh.shhuanmeng.com/static/web/static/common/box.png
 /* 行为相关颜色 */
 $uni-color-primary: #007aff;