Merge branch 'main' of http://git.njrzwl.cn:3000/ligexing/duomendian

components/goodClass/index.vue

@@ -11,8 +11,20 @@
 					<BaseTag v-for="label in item.store_label" :key="label.id" :text="label.label_name" color="label.color" :borderColor="label.border_color" :background="label.bg_color"
 						:circle="!!label.border_color" :imgSrc="label.icon"></BaseTag>
 				</view>
+				<view class="acea-row label-wrap">
+					<text class="px-8 fs-22">¥{{item.price}}</text>
+				</view>
+				<view class="flex items-baseline">
+					<text style="background: linear-gradient(90deg, #484643 0%, #1F1B17 100%);color:#FDDAA4;border-radius: 14rpx 0 8rpx 14rpx;" class="inline-block h-26 lh-28rpx svip_rd fs-18 bg--w111-484643 text--w111-FDDAA4 px-8">SVIP</text>
+					<baseMoney :money="item.vip_price" symbolSize="24" integerSize="28"
+						decimalSize="24" weight color='#D64D22'>
+					</baseMoney>
+					
+				</view>
 				<view class="bottom acea-row row-between-wrapper">
-					<BaseMoney :money="item.price" symbolSize="24" integerSize="32" decimalSize="24" color='#D64D22'></BaseMoney>
+					<view class="acea-row label-wrap">
+						<text class="px-8 fs-22">会员特价</text>
+					</view>
 					<template v-if="item.stock>0">
 						<view class="btn-box"
 							v-if="(item.activity && (item.activity.type === '1' || item.activity.type === '2' || item.activity.type === '3')) || item.product_type!=0 || item.custom_form.length || item.is_presale_product">

pages/index/index.vue

@@ -506,7 +506,7 @@
 		methods: {
 			saoma(){
 				uni.navigateTo({
-					url:'/pages/users/lanhu/lanhu_zuoweiyuding/index', 
+					url:'/pages/store/table_code/index?store_id=1&qrcode_id=14', 
 				})
 			},
 			onInput(e){