【发版】全局：2.1.0 发版

【修复】拼团装修组件，跳转拼团商品界面的 id 不正确的问题
【完善】兼容 HBuilder 最新版本 vite5
2024-05-04 11:17:53 +08:00 · 2024-05-02 10:16:17 +08:00 · 2024-05-02 09:39:00 +08:00 · 2024-05-02 01:29:15 +00:00 · 2024-04-15 03:47:47 +00:00 · 2024-03-30 15:28:29 +08:00
27 changed files with 120 additions and 1447 deletions
@@ -1,10 +1,10 @@
 # 版本号
 SHOPRO_VERSION = v1.8.3

-# 后端接口 - 正式环境（通过 process.env.NODE_ENV = development）
+# 后端接口 - 正式环境（通过 process.env.NODE_ENV 非 development）
 SHOPRO_BASE_URL = http://api-dashboard.yudao.iocoder.cn

-# 后端接口 - 测试环境（通过 process.env.NODE_ENV 非 development）
+# 后端接口 - 测试环境（通过 process.env.NODE_ENV = development）
 SHOPRO_DEV_BASE_URL = http://127.0.0.1:48080
 ### SHOPRO_DEV_BASE_URL = http://yunai.natapp1.cc

@@ -1,8 +1,8 @@
 {
  "name": "芋道商城",
-  "appid": "__UNI__082C0BA",
+  "appid": "__UNI__460BC4C",
  "description": "基于 uni-app + Vue3 技术驱动的在线商城系统，内含诸多功能与丰富的活动，期待您的使用和反馈。",
-  "versionName": "1.8.3",
+  "versionName": "2.1.0",
  "versionCode": 183,
  "transformPx": false,
  "app-plus": {
@@ -2,7 +2,7 @@
  "id": "shopro",
  "name": "shopro",
  "displayName": "芋道商城",
-  "version": "1.0.1",
+  "version": "2.1.0",
  "description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
  "scripts": {
    "prettier": "prettier --write  \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""
@@ -629,28 +629,6 @@
 						"title": "秒杀活动",
 						"group": "营销活动"
 					}
-				},
-				{
-					"path": "bargain/list",
-					"style": {
-						"navigationBarTitleText": "砍价列表"
-					},
-					"meta": {
-						"sync": true,
-						"title": "砍价列表",
-						"group": "营销活动"
-					}
-				},
-				{
-					"path": "bargain/detail",
-					"style": {
-						"navigationBarTitleText": "砍价详情"
-					},
-					"meta": {
-						"sync": true,
-						"title": "砍价详情",
-						"group": "营销活动"
-					}
 				}
 			]
 		}
@@ -1,920 +0,0 @@
-<!-- 砍价详情 -->
-<template>
-	<!-- TODO @科举：按照项目的代码风格，调整下这个界面 -->
-	<!-- TODO @科举：挪到 bargain/detail.vue 里 -->
-	<!-- TODO @科举：尽量都迁移完；依赖数据的部分，通过直接在 state 写死状态，不用后端返回，跑通整个界面；不追求 100% 对，但是至少自己观感是 ok 的 -->
-	<s-layout title='砍价详情'>
-		<view class='bargain'>
-			<!-- :class="startBargainUid !== userInfo.uid ? 'on' : ''" -->
-			<view class="header">
-				<navigator url="/pages/activity/bargainingList" hover-class="none">
-					<view class="back" style='width: 234rpx;
-		height: 54rpx;
-		background: linear-gradient(233deg,#ffd169,#fe960f);
-		opacity: 1;
-		border-radius: 0 26rpx 26rpx 0;
-		line-height: 54rpx;
-		text-align: center;
-		color: #6e3f00;
-		font-size: 25rpx;'>
-						<text class="iconfont icon-xiangzuo"></text> 返回砍价列表
-					</view>
-				</navigator>
-			</view>
-			<view class="pad30" style="padding-bottom: 30rpx;">
-				<view class='wrapper'>
-					<view class='pictxt acea-row row-between' @tap="goProduct"
-						style='display:flex;box-sizing: border-box;'>
-						<view class='pictrue'>
-							<image :src='state.bargainInfo.picUrl' />
-						</view>
-						<view class='text acea-row row-column-around' style='margin-left: 10rpx;'>
-							<view class='line1'>{{ state.bargainInfo.name }}</view>
-							<view class="surplus">最低价：￥{{ fen2yuan(state.bargainInfo.bargainMinPrice) }}</view>
-							<view class="surplus">剩余：{{ state.bargainInfo.stock }} {{state.bargainInfo.unitName}}</view>
-							<view class='money font-color-red' style='color:red'>
-								当前: ￥ <text class='num'>{{ fen2yuan(state.buyPrice) }}</text>
-							</view>
-							<view class="acea-row" style='display:flex'
-								v-if="state.bargainInfo.endTime > new Date().getTime() && state.bargainInfo.stock > 0">
-								<s-count-down :tipText="' '" :bgColor="state.bgColor" :dayText="':'" :hourText="':'"
-									:minuteText="':'" :secondText="' '" :datatime="state.bargainInfo.endTime / 1000"
-									:isDay="true" />
-								<text style="font-size: 22rpx;margin-left: 4rpx;line-height: 36rpx;">后结束</text>
-							</view>
-							<view v-else-if="state.bargainInfo.endTime <= new Date().getTime()">
-								<view style="font-size: 22rpx;" @tap='currentBargainUser'>已结束</view>
-							</view>
-							<view v-else-if="state.bargainInfo.stock <= 0">
-								<view style="font-size: 22rpx;" @tap='currentBargainUser'>已售罄</view>
-							</view>
-						</view>
-						<text class="iconfont icon-jiantou iconfonts"></text>
-					</view>
-				</view>
-				<!-- 砍价记录 -->
-				<view class='title font-color acea-row row-center-wrapper'>
-					<view class='pictrue'>
-            <!-- TODO 芋艿：暂时不支持砍价功能，后续换到 cdn 加载图片 -->
-<!--						<image src='../static/zuo2.png'></image>-->
-					</view>
-					<view class="tits">
-						<view class='titleCon'>砍价记录</view>
-						<view class="line"></view>
-					</view>
-					<view class='pictrue on'>
-            <!-- TODO 芋艿：暂时不支持砍价功能，后续换到 cdn 加载图片 -->
-            <!--						<image src='../static/you2.png'></image>-->
-					</view>
-				</view>
-				<view class='bargainGang borRadius14'>
-					<view class='list' v-if="state.bargainUserHelpList.length > 0">
-						<block v-for="(item, index) in state.bargainUserHelpList" :key='index'
-							v-if="index < 3 || !state.couponsHidden">
-							<view class='item acea-row row-between-wrapper'>
-								<view class='pictxt acea-row row-between-wrapper'>
-									<view class='pictrue'>
-										<image :src='item.avatar' />
-									</view>
-									<view class='text'>
-										<view class='name line1'>{{item.nickname}}</view>
-										<view class='line1'>{{ formatDate(item.createTime) }}</view>
-									</view>
-								</view>
-								<view class='money'>
-									已砍 <text class="font-color-red">{{ fen2yuan(item.reducePrice) }}</text>元
-								</view>
-							</view>
-
-						</block>
-						<view class="open acea-row row-center-wrapper" @click="openTap"
-							v-if="state.bargainUserHelpList.length > 3">
-							{{state.couponsHidden?'展开更多':'关闭展开'}}
-							<text class="iconfont" :class='state.couponsHidden ? "icon-xiangxia":"icon-xiangshang"' />
-						</view>
-					</view>
-					<view v-if="state.bargainUserHelpList.length === 0" class="contentNo">
-						<text class="iconfont icon-xiaolian mr8"></text>
-						暂无助力记录
-					</view>
-				</view>
-			</view>
-		</view>
-	</s-layout>
-</template>
-
-<script setup>
-	import { reactive } from 'vue';
-	import sheep from '@/sheep';
-	import { onLoad } from '@dcloudio/uni-app';
-  import BargainApi from '@/sheep/api/promotion/bargain'
-
-	const state = reactive({
-		id: '',
-		buyPrice: '',
-		bargainInfo: {},
-		bgColor: {
-			'bgColor': '#333333',
-			'Color': '#fff',
-			'width': '44rpx',
-			'timeTxtwidth': '16rpx',
-			'isDay': true
-		},
-		bargainUserHelpList: [],
-		couponsHidden: true,
-	});
-
-
-	async function getBargainDetails() {
-		let {
-			data,
-			code
-		} = await BargainApi.getBargainActivityDetail({
-			id: state.id
-		})
-		if (code == 0) {
-			state.bargainInfo = data;
-			state.buyPrice = state.bargainInfo.bargainFirstPrice;
-		}
-
-	}
-	onLoad(function(options) {
-		if (options.hasOwnProperty('id')) {
-			options.id ? state.id = options.id : state.id = ''
-		}
-		getBargainDetails()
-	})
-	// 工具函数
-	function fen2yuan(price) {
-		return (price / 100.0).toFixed(2)
-	}
-</script>
-
-<style lang="scss">
-	page {
-		background-color: red !important;
-	}
-</style>
-<style lang="scss" scoped>
-	.userEvaluation {
-		i {
-			display: inline-block;
-		}
-	}
-
-	.go {
-		color: #E93323;
-		text-align: center;
-		font-size: 28rpx;
-		margin-top: 26rpx;
-
-		.iconfont {
-			font-size: 11px
-		}
-	}
-
-	.poster-pop {
-		width: 594rpx;
-		height: 850rpx;
-		position: fixed;
-		left: 50%;
-		transform: translateX(-50%);
-		z-index: 999;
-		top: 50%;
-		margin-top: -466rpx;
-
-		image {
-			width: 100%;
-			height: 100%;
-			display: block;
-			border-radius: 10rpx;
-		}
-
-		.close {
-			text-align: center;
-			margin-top: 55rpx;
-			color: #fff;
-			font-size: 52rpx;
-		}
-
-		.save-poster {
-			background-color: #df2d0a;
-			font-size: ：22rpx;
-			color: #fff;
-			text-align: center;
-			height: 76rpx;
-			line-height: 76rpx;
-			width: 100%;
-		}
-
-		.keep {
-			color: #fff;
-			text-align: center;
-			font-size: 25rpx;
-			margin-top: 25rpx;
-		}
-	}
-
-	.canvas {
-		position: fixed;
-		opacity: 0;
-	}
-
-	.font_hui {
-		color: #CCCCCC !important;
-	}
-
-	.bg_qian {
-		background-color: #F5F5F5 !important;
-	}
-
-	.font-color-red {
-		font-weight: 800;
-	}
-
-	.huiBtn {
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #fff;
-		width: 630rpx;
-		height: 80rpx;
-		text-align: center;
-		line-height: 80rpx;
-		margin: 0 auto;
-		background-color: #CCCCCC;
-		box-shadow: 0 7rpx 0 #AAAAAA;
-		border-radius: 40rpx;
-	}
-
-	.huifont {
-		color: #CCCCCC;
-	}
-
-	.buyBox {
-		margin-top: 40rpx;
-
-		.on {
-			width: 300rpx;
-			height: 80rpx;
-			border-radius: 40rpx;
-			font-size: 32rpx;
-			color: #fff;
-			text-align: center;
-			line-height: 80rpx;
-		}
-
-		.buyNow {
-			background: linear-gradient(180deg, #FF8831 0%, #F11B09 100%);
-			box-shadow: 0 7rpx 0 #C11100;
-		}
-
-		.buyMore {
-			background: linear-gradient(180deg, #FFCA52 0%, #FE960F 100%);
-			box-shadow: 0 7rpx 0 #D87A00;
-		}
-	}
-
-
-	.mr8 {
-		margin-right: 8rpx;
-	}
-
-	.contentNo {
-		width: 100%;
-		padding: 50rpx 15rpx;
-		text-align: center;
-		font-size: 26rpx;
-		color: #AAAAAA;
-	}
-
-	.generate-posters {
-		width: 100%;
-		height: 170rpx;
-		background-color: #fff;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 388;
-		transform: translate3d(0, 100%, 0);
-		transition: all 0.3s cubic-bezier(0.25, 0.5, 0.5, 0.9);
-		border-top: 1rpx solid #eee;
-	}
-
-	.generate-posters.on {
-		transform: translate3d(0, 0, 0);
-	}
-
-	.generate-posters .item {
-		flex: 1;
-		text-align: center;
-		font-size: 30rpx;
-	}
-
-	.generate-posters .item .iconfont {
-		font-size: 80rpx;
-		color: #5eae72;
-	}
-
-	.generate-posters .item .iconfont.icon-haibao {
-		color: #5391f1;
-	}
-
-	.bargain .bargainGang {
-		background-color: #fff;
-
-		.list {
-			padding: 50rpx 30rpx 0 30rpx;
-		}
-
-		.open {
-			font-size: 24rpx;
-			color: #999;
-			margin-top: 30rpx;
-		}
-
-		.helpNo {
-			text-align: center;
-			font-size: 26rpx;
-			color: #AAAAAA;
-		}
-	}
-
-	.bargain .bargainGang .open .iconfont {
-		font-size: 25rpx;
-		margin: 5rpx 0 0 10rpx;
-	}
-
-	.bargain .icon-xiangzuo {
-		font-size: 24rpx;
-		margin-right: 6px;
-	}
-
-	.bargain .header {
-		/* TODO 芋艿：此处原来采用base64 但是过长编辑到小程序卡死 目前采用网络地址 需解决 */
-		background-image: url('https://huizhizao-1314830814.cos.ap-shanghai.myqcloud.com/huizhizao-1314830814/7e9bea1e8bbcd8a7a865a7703d65a1d0b25ec33a4b8d443698ff2e6eccf1300f.png');
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 100%;
-		height: 340rpx;
-		margin: 0 auto;
-		padding-top: 20rpx;
-
-		.back {
-			width: 235rpx;
-			height: 54rpx;
-			background: linear-gradient(233deg, #FFD169 0%, #FE960F 100%);
-			opacity: 1;
-			border-radius: 0px 27rpx 27rpx 0px;
-			line-height: 54rpx;
-			text-align: center;
-			color: #6E3F00;
-			font-size: 28rpx;
-		}
-
-	}
-
-	.bargain .header .pictxt {
-		margin: 330rpx auto 0 auto;
-		font-size: 26rpx;
-		color: #fff;
-	}
-
-	.bargain .header .pictxt .pictrue {
-		width: 56rpx;
-		height: 56rpx;
-		margin-right: 30rpx;
-	}
-
-	.bargain .header .pictxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-		border: 2rpx solid #fff;
-	}
-
-	.bargain .header .pictxt .text {
-		margin-left: 20rpx;
-	}
-
-	.bargain .header .pictxt .text text {
-		margin-left: 20rpx;
-	}
-
-	.bargain .header .time {
-		background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAbgAAACmCAMAAACfv2reAAAAk1BMVEUAAAD/nSL/oCj/oCj/nSH/nSH/oCj/mhr/mhr/oCj/oCj/oCj/nSH/niT/mhr/mhr/oCj/mhr/oCj/oCj/mhr/niP/oCj/oCj/mhr/////oCj/mhr/nyT/w3f/rkf/rEL/pjT/tlr/xXv/uF3//vz/vmv/wXP/vWr/79r/1aD/05r/wXL/nB//5MH/+/X/t1r/5MP28hXaAAAAGXRSTlMABvndiVtUVPjkOC8Dk+DarKyQC+QH86amYv5b+wAAA6JJREFUeNrs3Nlu4kAQheEyGOywBkImcR8Sh7Avycz7P920G8l3MYtccko63wXc969GXuiS20XJ6ygF1SQdvyaRiL5kDKrZOBFtgxjID7tVRjVZ7Q45EA9EV4z5ntVqttqfEIuqBKevjGr3dUIiiqIZ9hkp2GMWiZ4Ocv5Oqljl6IieCQ4ZqThgInpG2GWkYoeR6EnBX0olK6SiB8hICSAlhjOE4YxiOKMYziiGM4rhjGI4o5TCIWA4PQhqzzcPGE4PMA9q3m0fAcPpKdfYk3o47z1gOD3Ae+A8qUfuLby/C4bTA5zXOPekHktvu11v12uG0wOc13jpybWi7ku75X6yOR43bwHD6QHegmK13U/+tF+6kZS6bVfls8RweoDPkqvS7pZ/lXTVNpvNkTtOW7nj/Gq7avFACrG7YOlt196W4fQA5zVeeu6CWLyu81rT3lP1VWWBV5WKgEVQeVX51Bu2nNcViR7890Of93EKVO7j+iFYJJ1iv/XlEj450QZ8BHJJv9hzHXn0n1M+q2ze9c8qpz7Zo7T9Z4+vdZoHyJV6Pllbin0XMVzzrg/37JO1xHl8kfoLAHIt5zHcb8FwRjGcUQxnFMMZdU84HrNq3jdSxXBjHmzUssPo9nA8Sty8Aya3h+Ph/caFw/s3h+O4jMbtMXtWDCcJTv8yqqQ/oKYMx5FQDSpHQumGGww5hK1e32EI23BwTziOPWzYOBFRDydRZ8JBo/VJR5NOJHeGI1MYziiGM4rhjGI4oxjOKIYziuGMYjijGM4ohjOK4YxiOKMYziiGM4rhjGI4oxjOKIYziuH+s0cHJAAAAACC/r9uR6AXnBI3JW5K3JS4KXFT4qbETYmbEjclbkrclLgpcVPipsRNiZsSNyVuStyUuClxU+KmxE2JmxI3JW5K3JS4KXFT4qbETYmbEjclbkrclLgpcVPipsRNiZsSNyVuStyUuClxU+KmxE2JmxI3JW5K3JS4KXFT4qbETYmbEjclbkrclLgpcVPipsRNiZsSNyVuStyUuClxtUdHJwzDUAxFZTs2xInBxLQf2n/QvrTQGSLQ+ZAGuKIcTpTDiXI4UQ4nyuFEOZwohxPlcKIcTpTDiXI4UQ4nyuFEOZwohxPlcKIcThQD3jEJJmSRzCixHSakkyyYsRdMyCA5UWPzAZNxZJIVaY/bXU7G8Q32AhpDvvqCPd7qIzM0hI0mZsPtHDQp48RPKzQZpeEv1Vky7fFymTXh9gGY1gZJcqJI8QAAAABJRU5ErkJggg==');
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 440rpx;
-		height: 166rpx;
-		margin: 0 auto;
-
-		font-size: 22rpx;
-		text-align: center;
-		padding-top: 11rpx;
-		box-sizing: border-box;
-	}
-
-	.bargain .header .time .red {
-		color: #fc4141;
-	}
-
-	.bargain .header .people {
-		text-align: center;
-		color: #fff;
-		font-size: 20rpx;
-		position: absolute;
-		width: 85%;
-		/* #ifdef MP */
-		height: 44px;
-		line-height: 44px;
-		top: 40rpx;
-		/* #endif */
-		/* #ifdef H5 */
-		top: 58rpx;
-		/* #endif */
-	}
-
-	.bargain .header .time text {
-		color: #333;
-	}
-
-	.bargain {
-		.wrapper {
-			margin-top: -100rpx;
-
-			.pictxt {
-				width: 100%;
-				height: 260rpx;
-				background-color: #FFF5E6;
-				padding: 20rpx;
-				border-radius: 14rpx;
-			}
-
-			.surplus {
-				color: #999999;
-				font-size: 22rpx;
-			}
-		}
-
-		.content {
-			width: 100%;
-			height: auto;
-			background-image: url('../static/zhuangshi.png');
-			background-size: 100% 100%;
-			background-color: #fff;
-			border-bottom-left-radius: 14rpx;
-			border-bottom-right-radius: 14rpx;
-			padding: 40rpx 0 70rpx 0;
-
-			.money {
-				color: #333333;
-				font-size: 36rpx;
-
-				.price {}
-			}
-		}
-	}
-
-
-	.bargain .wrapper,
-	{
-	// background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAArIAAAF8CAYAAAAzc1jZAAAco0lEQVR4Xu3dW4zc513H4feddWynQU1FY69zKvZuysENPqx7SFFRU4JEi+ACCVUUiQsuqYQ4VIWCchEuoAIFqRdI5QrlgkNLqQpSJA5VSWkKqKK7DkKuqIQ3RnUTe40CJRSSNDt/ZEeF1LGTmdnffuP1PLntzPf3n2fm4tMoTnrzFwECBAgQIECAAIEdKNB34DN7ZAIECBAgQIAAAQJNyPoRECBAgAABAgQI7EgBIbsjvzYPTYAAAQIECBAgIGT9BggQIECAAAECBHakgJDdkV+bhyZAgAABAgQIEBCyfgMECBAgQIAAAQI7TuD8iaX3C9kd97V5YAIECBAgQIDA/AoMrfWNlUO/2frog0J2fn8HPjkBAgQIECBAYEcJDHfdtWfj5vHvt9Z//OKDC9kd9fV5WAIECBAgQIDAfApsHN73bW3vax8eenvnNwWE7Hz+FnxqAgQIECBAgMCOETj73be/ftdr9vx57/0tL35oIbtjvkIPSoAAAQIECBCYP4GzR26/Y/euvX819PY9l396ITt/vwefmAABAgQIECCwIwS+evdtd+7ac+MjrbXlKz2wkN0RX6OHJECAAAECBAjMl8CTxw4eHC0sfKa1tnS1Ty5k5+s34dMSIECAAAECBK55gSdOLL1h1Prne2t3vtzDCtlr/qv0gAQIECBAgACB+RG4+Ae7dr9m76NX+mdiL1cQsvPzu/BJCRAgQIAAAQLXtMC5I4s39Rtu+uvW+lsneVAhO4mS1xAgQIAAAQIECGyrwNDaro2V5Ydbbz806SEhO6mU1xEgQIAAAQIECGybwMbK0u8Nvf/0NAeE7DRaXkuAAAECBAgQIFAusHFi6UND6x+edljITivm9QQIECBAgAABAmUCF1aWfmTc2p+13kfTjgrZacW8ngABAgQIECBAoERg49jSG4eF/sXW2mtnGRSys6h5DwECBAgQIECAwJYETh1uu/fduPz3Q2srsw4J2VnlvI8AAQIECBAgQGBmgfPHlx9so/aBmQdaa0J2K3reS4AAAQIECBAgMLXAuZWD9/Q++nxrfWHqN7/oDUJ2K3reS4AAAQIECBAgMJXA0FrfWFn+Yuuz/yMF3zwoZKei92ICBAgQIECAAIGtCFw4tvST44X+B1vZELIVejYIECBAgAABAgSmEji/svx3rbe3T/Wmq7zY35GtULRBgAABAgQIECAwscCFo0vfubkwvre30duH3t7cW7974je/6IVCdhY17yFAgAABAgQIECgTePL4gX297b2v99G9rbd7W+vfNcm4kJ1EyWsIECBAgAABAgRiAufvPrTYb2jfP4zakdZGR/owvHPo/XWXP4CQjX0lDhEgQIAAAQIECMwiMLQ2unD0O44Ou0b39WF039CHt7bWv13IzqLpPQQIECBAgAABAq+qwLkTB98mZF/Vr8BxAgQIECBAgACBWQX6V+6448Y7z579n1kHvI8AAQIECBAgQIDAqyHQz60sf3bh61/70X1f/renX40HcJMAAQIECBAgQIDALAL9/InloQ3DF/ozT//g/i9d+K9ZRryHAAECBAgQIECAQFrghZC9+NcwPNqfefqHxWz6K3CPAAECBAgQIEBgFoH/D9kXavbT+1fX39Nb25xlzHsIECBAgAABAgQIpAQuC9mLf2N2+MiBtfVfSD2AOwQIECBAgAABAgRmEXhJyF4cGY0337fv5JmPzTLoPQQIECBAgAABAgQSAlcM2TYMX1/4xvjNt/zTmX9OPIQbBAgQIECAAAECBKYVuHLIttb6MPzDqbX173tXa89PO+r1BAgQIECAAAECBLZb4Kohe/HwMLRfP7B2+v7tfgj7BAgQIECAAAECBKYVeNmQbW3Y3BwPP3Dbycc/N+2w1xMgQIAAAQIECBDYToFXCNlLf1/2y//5tfWjb/yX9ux2PohtAgQIECBAgAABAtMITBCyl/4ZgwcW19Z/bZphryVAgAABAgQIECCwnQKThWxr3xi15+/Zt/qva9v5MLYJECBAgAABAgQITCowache/INfq59bO/229/qvfk1q63UECBAgQIAAAQLbKDBxyF56hvHw/sWT6x/dxucxTYAAAQIECBAgQGAigelCdhj+/blnn7vrzlNnn5po3YsIECBAgAABAgQIbJPAdCH7wr9b9ncOrJ3+2W16HrMECBAgQIAAAQIEJhKYOmR7a8+P2ub33rLqP187kbAXESBAgAABAgQIbIvADCE7fGW82T504LH1P9yWJzJKgAABAgQIECBAYAKBiUK2D+2r42H8yfG4f+LWf1z/297aMMG2lxAgQIAAAQIECBDYNoGXCdnhfBvaJ/swfHzfyccfFa/b9h0YJkCAAAEC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 truncated
-	// babackground-repeat: no-repeat;
-	// background-size: 100% 100%;
-	width: 100%;
-	background-color: #fff;
-	padding: 0 24rpx 10rpx 24rpx;
-	box-sizing: border-box;
-	}
-
-	.bargain .pictxt .pictrue {
-		width: 220rpx;
-		height: 220rpx;
-		position: relative;
-	}
-
-	.bargain .pictxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 6rpx;
-	}
-
-	.bargain .pictxt .text {
-		font-size: 30rpx;
-		color: #333333;
-
-		.line1 {
-			width: 324rpx;
-		}
-	}
-
-	.bargain .pictxt .text .money {
-		font-weight: bold;
-		font-size: 24rpx;
-	}
-
-	.bargain .pictxt .text .money .num {
-		font-size: 36rpx;
-	}
-
-	.bargain .pictxt .text .successNum {
-		font-size: 22rpx;
-		color: #999;
-	}
-
-	.bargain .cu-progress {
-		overflow: hidden;
-		height: 12rpx;
-		background-color: #FDEAE8;
-		width: 560rpx;
-		height: 20rpx;
-		border-radius: 20rpx;
-		margin: 20rpx auto;
-	}
-
-	.bargain .cu-progress .bg-red {
-		width: 0;
-		height: 100%;
-		transition: width 0.6s ease;
-		border-radius: 20rpx;
-		background-image: linear-gradient(to right, #ffa363 0%, #e93323 100%);
-	}
-
-	.bargain .money {
-		// font-size: 22rpx;
-		// color: #999;
-		// margin-top: 40rpx;
-
-	}
-
-	.bargain .bargainSuccess {
-		font-size: 26rpx;
-		color: #333333;
-		text-align: center;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-bottom: 40rpx;
-
-		image {
-			width: 48rpx;
-			height: 62rpx;
-			margin-right: 18rpx;
-		}
-	}
-
-	.bargain .bargainSuccess .iconfont {
-		font-size: 45rpx;
-		color: #54c762;
-		padding-right: 18rpx;
-		vertical-align: -5rpx;
-	}
-
-	.bargain .bargainBnt {
-
-		font-size: 30rpx;
-		font-weight: bold;
-		color: #fff;
-		width: 630rpx;
-		height: 80rpx;
-		background-image: url('../static/btn.png');
-		background-size: 100% 100%;
-		// border-radius: 40rpx;
-		// background: linear-gradient(180deg, #FF8831 0%, #F11B09 100%);
-		text-align: center;
-		line-height: 80rpx;
-		margin: 0 auto;
-	}
-
-	.bargain .bargainBnt.on {
-		border: 2rpx solid red;
-		color: red;
-		background-image: linear-gradient(to right, #fff 0%, #fff 100%);
-		width: 596rpx;
-		height: 76rpx;
-	}
-
-	.bargain .bargainBnt.grey {
-		color: #fff;
-		background-image: linear-gradient(to right, #bbbbbb 0%, #bbbbbb 100%);
-	}
-
-	.bargain .tip {
-		font-size: 22rpx;
-		color: #999;
-		text-align: center;
-		margin-top: 20rpx;
-		margin-bottom: 50rpx;
-	}
-
-	.bargain .lock,
-	.bargain .bargainGang .lock,
-	.bargain .goodsDetails .lock {
-		background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAiQAAABCCAYAAABnwc0eAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQyIDc5LjE2MDkyNCwgMjAxNy8wNy8xMy0wMTowNjozOSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo4YmQzMTQ1Ny01MGY2LWFmNDMtYmY4Yi1kNWRjZTMxZDg5MTUiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6M0RCMkU3QUEzQzBCMTFFOUI2N0VEOEJBMDUwMTU2ODMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6M0RCMkU3QTkzQzBCMTFFOUI2N0VEOEJBMDUwMTU2ODMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTggKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NDRmMWQxNmItZTIxMC1lYzQwLWJmODYtYzE4OWRiYzNmOGYyIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjhiZDMxNDU3LTUwZjYtYWY0My1iZjhiLWQ1ZGNlMzFkODkxNSIv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');
-		background-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 548rpx;
-		height: 66rpx;
-		position: absolute;
-		left: 50%;
-		transform: translateX(-50%);
-		bottom: -43rpx;
-		z-index: 5;
-	}
-
-	.bargain .title {
-		font-size: 40rpx;
-		font-weight: 600;
-		// height: 80rpx;
-		// margin-top: 30rpx;
-	}
-
-	.bargain .title .pictrue {
-		width: 60rpx;
-		height: 60rpx;
-	}
-
-	.bargain .title .pictrue.on,
-	.bargain .title .pictrue.on {
-		transform: rotate(180deg);
-	}
-
-	.bargain .title .pictrue image,
-	.bargain .title .pictrue image {
-		width: 100%;
-		height: 100%;
-		display: block;
-	}
-
-	.bargain .title .tits {
-		margin: 50rpx 15rpx 40rpx 15rpx;
-	}
-
-	.bargain .title .titleCon {
-		margin: 0 10rpx -14rpx 10rpx;
-		color: #fff;
-		border: 16rpx solid linear-gradient(0deg, #FFD136 0%, rgba(255, 213, 72, 0.12) 100%);
-		;
-	}
-
-	.bargain .title .line {
-		// width: 216rpx;
-		height: 16rpx;
-		background: linear-gradient(0deg, #FFD136 0%, rgba(255, 213, 72, 0.12) 100%);
-		opacity: 0.6;
-	}
-
-	.bargain .bargainGang .list .item {
-		padding-bottom: 50rpx;
-	}
-
-	.bargain .bargainGang .list .item .pictxt {
-
-		// width: 310rpx;
-		.num {
-			width: 28rpx;
-			height: 36rpx;
-
-			// image{
-			// 	width: 100%;
-			// 	height: 100%;
-			// }
-		}
-
-		.num1 {
-			background-image: url(../static/n1.png);
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-		}
-
-		.num2 {
-			background-image: url(../static/n2.png);
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-		}
-
-		.num3 {
-			background-image: url(../static/n3.png);
-			background-repeat: no-repeat;
-			background-size: 100% 100%;
-		}
-	}
-
-	.bargain .bargainGang .list .item .pictxt .pictrue {
-		width: 70rpx;
-		height: 70rpx;
-		margin-right: 14rpx;
-	}
-
-	.bargain .bargainGang .list .item .pictxt .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 50%;
-	}
-
-	.bargain .bargainGang .list .item .pictxt .text {
-		width: 225rpx;
-		font-size: 20rpx;
-		color: #999;
-	}
-
-	.bargain .bargainGang .list .item .pictxt .text .name {
-		font-size: 25rpx;
-		color: #333333;
-		margin-bottom: 7rpx;
-	}
-
-	.bargain .bargainGang .list .item .money {
-		font-size: 25rpx;
-		color: #999999;
-	}
-
-	.bargain .bargainGang .list .item .money .iconfont {
-		font-size: 35rpx;
-		vertical-align: middle;
-		margin-right: 10rpx;
-	}
-
-	.bargain .bargainGang .load {
-		font-size: 24rpx;
-		text-align: center;
-		line-height: 80rpx;
-		height: 80rpx;
-	}
-
-	.bargain .goodsDetails {
-		width: 100%;
-		background-color: #fff;
-		//margin: 13rpx auto 0 auto;
-	}
-
-	.bargain .goodsDetails~.goodsDetails {
-		margin-bottom: 50rpx;
-	}
-
-	.bargain .goodsDetails .conter {
-		// margin-top: 20rpx;
-		overflow: hidden;
-	}
-
-	.bargain .goodsDetails .conter image {
-		width: 100% !important;
-		display: block !important;
-	}
-
-	.bargain .bargainTip {
-		position: fixed;
-		top: 50%;
-		left: 50%;
-		width: 500rpx;
-		height: 469rpx;
-		margin-left: -246rpx;
-		z-index: 111;
-		border-radius: 14rpx;
-		background-color: #fff;
-		transition: all 0.3s ease-in-out 0s;
-		opacity: 0;
-		transform: scale(0);
-		padding-bottom: 60rpx;
-		margin-top: -330rpx;
-		background: linear-gradient(180deg, #FFFFFF 0%, #FFEEEB 100%);
-
-		.cu-progress {
-			width: 410rpx;
-			margin: 0 auto;
-		}
-
-		.t1 {
-			text-align: center;
-			color: #666666;
-			font-size: 24rpx;
-			margin: 20rpx 0 54rpx 0;
-		}
-
-		.bubbleBox {
-			width: 410rpx;
-			margin: 16rpx auto;
-
-			.bubble {
-				position: relative;
-				display: inline-block;
-
-				text {
-					display: inline-block;
-					font-size: 22rpx;
-					padding: 2rpx 8rpx;
-					border-radius: 30rpx;
-					background-color: #E93323;
-					color: #fff;
-				}
-
-				text::before {
-					content: '';
-					width: 0;
-					height: 32rpx;
-					border: 14rpx solid;
-					position: absolute;
-					bottom: -54rpx;
-					left: 14rpx;
-					border-color: #E93323 transparent transparent;
-				}
-			}
-
-		}
-
-	}
-
-	.bargain .bargainTip.on {
-		opacity: 1;
-		transform: scale(1);
-	}
-
-	.bargain .bargainTip .pictrue {
-		width: 500rpx;
-		height: 200rpx;
-		margin-top: -118rpx;
-	}
-
-	.bargain .bargainTip .pictrue image {
-		width: 100%;
-		height: 100%;
-	}
-
-	.bargain .bargainTip .cutOff {
-		font-size: 32rpx;
-		color: #333;
-		text-align: center;
-		margin: 12rpx 0 0rpx 0;
-		font-weight: 600;
-
-		text {
-			font-weight: 600;
-			font-size: 44rpx;
-		}
-	}
-
-	.bargain .bargainTip .cutOff.on {
-		margin-top: 26rpx;
-	}
-
-	.bargain .bargainTip .help {
-		font-size: 32rpx;
-		font-weight: bold;
-		text-align: center;
-		margin-top: 40rpx;
-	}
-
-	.bargain .bargainTip .tipBnt {
-		font-size: 32rpx;
-		color: #fff;
-		width: 360rpx;
-		height: 82rpx;
-		border-radius: 41rpx;
-		background-image: linear-gradient(to right, #f67a38 0%, #f11b09 100%);
-		text-align: center;
-		line-height: 82rpx;
-		margin: 0 auto;
-	}
-
-	.bargain_view {
-		width: 180rpx;
-		height: 48rpx;
-		background: rgba(0, 0, 0, 0.5);
-		opacity: 1;
-		border-radius: 0 0 6rpx 6rpx;
-		position: absolute;
-		bottom: 0;
-		font-size: 22rpx;
-		color: #fff;
-		text-align: center;
-		line-height: 48rpx;
-	}
-
-	.iconfonts {
-		font-size: 22rpx !important;
-		line-height: 220rpx;
-	}
-
-	.wxParse-div {
-		width: auto !important;
-		height: auto !important;
-	}
-
-	.bargain .mask {
-		z-index: 100;
-	}
-
-	.share-box {
-		z-index: 1000;
-		position: fixed;
-		left: 0;
-		top: 0;
-		width: 100%;
-		height: 100%;
-
-		image {
-			width: 100%;
-			height: 100%;
-		}
-	}
-</style>
@@ -1,370 +0,0 @@
-<template>
-	<!-- TODO @科举：参考 groupon/list.vue 和 seckill/list.vue 界面，调整下头部，就是从 5 到 11 行的  -->
-	<s-layout navbar="inner" title='砍价列表'>
-		<view style='background-color: red;height:100vh;'>
-			<view class='bargain-list'>
-				<!-- #ifdef H5 -->
-				<view class='iconfont icon-xiangzuo' @tap='goBack' :style="'top:'+ (state.navH/2) +'rpx'"
-					v-if="state.returnShow">
-				</view>
-				<!-- #endif -->
-
-				<!-- 砍价记录的概要 -->
-				<view class='header'>
-					<view class="pic">
-						<view class='swipers'>
-							<swiper indicator-dots="true" autoplay="true" interval="2500" duration="500" vertical="true"
-								circular="true">
-								<block v-for="(item,index) in state.bargainSuccessList" :key='index'>
-									<swiper-item>
-										<view class="acea-row row-middle" style='display:flex'>
-											<image :src="item.avatar" class="mr9"></image>
-											<view class='mr9 nickName'>{{ item.nickname }}</view>
-											<text class='mr9'>拿了</text>
-											<view class='line1'>{{ item.activityName }}</view>
-										</view>
-									</swiper-item>
-								</block>
-							</swiper>
-						</view>
-					</view>
-					<view class="tit">已有{{ state.bargainTotal }}人砍成功</view>
-				</view>
-
-				<!-- 砍价活动列表 -->
-				<view class='list'>
-					<block v-for="(item,index) in state.bargainList" :key="index">
-						<view style='display:flex' class='item acea-row row-between-wrapper'
-							@tap="openSubscribe('/pages/activity/bargain/detail?id='+ item.id)">
-							<view class='pictrue'>
-								<image :src='item.picUrl'></image>
-							</view>
-							<view class='text acea-row row-column-around'>
-								<view class='name line2'>{{ item.name }}</view>
-								<view class="acea-row" style="margin-bottom: 14rpx;display:flex">
-									<s-count-down :tipText="' '" :bgColor="state.bgColor" :dayText="':'" :hourText="':'"
-										:minuteText="':'" :secondText="' '" :datatime="item.endTime / 1000"
-										:isDay="true" />
-									<text class="txt">后结束</text>
-								</view>
-								<view v-if="item.stock === 0">
-									<view style="font-size: 22rpx;"
-										@tap="openSubscribe('/pages/activity/goods_bargain_details/index?id='+ item.id +'&startBargainUid='+ uid)">
-										已售罄</view>
-								</view>
-								<view class='money font-color'>最低: ￥<text
-										class='price'>{{ fen2yuan(item.bargainMinPrice) }}</text></view>
-							</view>
-							<view v-if="item.stock > 0" class='cutBnt bg-color'>参与砍价</view>
-							<view v-if="item.stock === 0" class='cutBnt bg-color-hui'>已售罄</view>
-						</view>
-					</block>
-					<view class='loadingicon acea-row row-center-wrapper' v-if='state.bargainList.length > 0'
-						style='text-align: center;'>
-						<text class='loading iconfont icon-jiazai' :hidden='!loading'></text>{{state.loadTitle}}
-					</view>
-				</view>
-			</view>
-		</view>
-	</s-layout>
-</template>
-
-<script setup>
-	import {
-		reactive
-	} from 'vue';
-	import sheep from '@/sheep';
-	import _ from 'lodash';
-	import {
-		onLoad,
-		onReachBottom
-	} from '@dcloudio/uni-app';
-	import {
-		fen2yuan
-	} from '@/sheep/hooks/useGoods';
-	import BargainApi from '@/sheep/api/promotion/bargain'
-	const state = reactive({
-		navH: '',
-		returnShow: true,
-
-		// ========== 砍价记录概要的相关变量 ==========
-		bargainTotal: 0,
-		bargainSuccessList: [],
-
-		// ========== 砍价活动的相关变量 ==========
-		bargainList: [],
-		page: 1,
-		limit: 10,
-		loading: false,
-		loadend: false,
-		bgColor: {
-			'bgColor': '#E93323',
-			'Color': '#fff',
-			'width': '44rpx',
-			'timeTxtwidth': '16rpx',
-			'isDay': true
-		},
-		loadTitle: '加载更多',
-	});
-
-	async function getBargainHeader() {
-		let {
-			code,
-			data
-		} = await BargainApi.getBargainRecordSummary()
-		if (code == 0) {
-			state.bargainTotal = data.successUserCount;
-			state.bargainSuccessList = data.successList;
-		} else {
-			state.$util.Tips({
-				title: data
-			});
-		}
-	}
-
-	async function getBargainList() {
-		// TODO @科举：loading 和 loadTitle 改成现在这个项目的风格，包括组件使用 uni-load-more
-		if (state.loadend || state.loading) {
-			return;
-		}
-		state.loading = true;
-		state.loadTitle = '';
-		let {
-			data,
-			code
-		} = await BargainApi.getBargainActivityPage({
-			pageNo: state.page,
-			pageSize: state.limit
-		})
-		if (code == 0) {
-			const list = data.list;
-			const bargainList = _.concat(state.bargainList, list);
-			const loadend = list.length < state.limit;
-			state.loadend = loadend;
-			state.loading = false;
-			state.loadTitle = loadend ? '已全部加载' : '加载更多';
-			// this.$set(this, 'bargainList', bargainList);
-			state.bargainList = data.list
-			// this.$set(this, 'page', this.page + 1);
-			state.page = state.page + 1;
-
-		} else {
-			state.loading = false;
-			state.loadTitle = '加载更多';
-		}
-	}
-
-	function openSubscribe(e) {
-		console.log('跳转')
-		console.log(e)
-		// TODO @科举：参考 pages/pay/result.vue 页面的 subscribeMessage 方法，写订阅逻辑。
-		sheep.$router.go(e)
-		return;
-		let page = e;
-		// #ifndef MP
-		uni.navigateTo({
-			url: page
-		});
-		// #endif
-		// #ifdef MP
-		uni.showLoading({
-			title: '正在加载',
-		})
-		openBargainSubscribe().then(res => {
-			uni.hideLoading();
-
-		}).catch((err) => {
-			uni.hideLoading();
-		});
-		// #endif
-	}
-
-	onLoad(function() {
-		getBargainHeader();
-		getBargainList();
-	})
-
-	onReachBottom(() => {
-		getBargainList();
-	});
-</script>
-
-<style lang='scss' scoped>
-	page,
-	.page-app {
-		background-color: #e93323 !important;
-	}
-
-	.font-color {
-		color: red;
-	}
-
-	.mr9 {
-		margin-right: 9rpx;
-	}
-
-	.swipers {
-		height: 100%;
-		width: 76%;
-		margin: auto;
-		overflow: hidden;
-		font-size: 22rpx;
-		color: #fff;
-
-		image {
-			width: 24rpx;
-			height: 24rpx;
-			border-radius: 50%;
-			overflow: hidden;
-		}
-
-		swiper {
-			height: 100%;
-			width: 100%;
-			overflow: hidden;
-		}
-
-		.line1 {
-			width: 195rpx;
-		}
-	}
-
-	.bargain-list .icon-xiangzuo {
-		font-size: 40rpx;
-		color: #fff;
-		position: fixed;
-		left: 30rpx;
-		z-index: 99;
-		transform: translateY(-20%);
-		height: 100%
-	}
-
-	.bargain-list .header {
-		/* TODO 芋艿：此处原来采用base64 但是过长编辑到小程序卡死 目前采用网络地址 需解决 */
-		background-image: url('https://huizhizao-1314830814.cos.ap-shanghai.myqcloud.com/huizhizao-1314830814/bdc8a9210710b83bcd88a14703f440fc7091792706b5cb71b54361488a547298.png');
-		babackground-repeat: no-repeat;
-		background-size: 100% 100%;
-		width: 750rpx;
-		height: 420rpx;
-
-		.acea-row {
-			height: 50rpx;
-			line-height: 50rpx;
-			left: 50rpx;
-
-			.nickName {
-				width: 65rpx;
-				overflow: hidden;
-				white-space: nowrap;
-			}
-		}
-
-		.pic {
-			width: 478rpx;
-			height: 50rpx;
-			margin: 0 auto;
-			/* TODO 芋艿：此处原来是本地地址小程序不支持，需改为线上 */
-			background-image: url('https://huizhizao-1314830814.cos.ap-shanghai.myqcloud.com/huizhizao-1314830814/d111ac53e1390618f22fcc03e415bcd584b3f409ae52421aef95c2ab9b02aa30.png');
-			babackground-repeat: no-repeat;
-			background-size: 100% 100%;
-		}
-
-		.tit {
-			color: #FFFFFF;
-			font-size: 24rpx;
-			font-weight: 400;
-			text-align: center;
-			margin-top: 304rpx;
-		}
-	}
-
-	.bargain-list .list {
-		padding: 0 30rpx;
-	}
-
-	.bargain-list .list .item {
-		position: relative;
-		height: 250rpx;
-		background-color: #fff;
-		border-radius: 14rpx;
-		margin-bottom: 20rpx;
-		padding: 30rpx 25rpx;
-	}
-
-	.bargain-list .list .item .pictrue {
-		width: 190rpx;
-		height: 190rpx;
-	}
-
-	.bargain-list .list .item .pictrue image {
-		width: 100%;
-		height: 100%;
-		border-radius: 14rpx;
-	}
-
-	.bargain-list .list .item .text {
-		width: 432rpx;
-		font-size: 28rpx;
-		color: #333333;
-
-		.txt {
-			font-size: 22rpx;
-			margin-left: 4rpx;
-			color: #666666;
-			line-height: 36rpx;
-		}
-	}
-
-	.bargain-list .list .item .text .name {
-		width: 100%;
-		height: 68rpx;
-		line-height: 36rpx;
-		font-size: 28rpx;
-		margin-bottom: 26rpx;
-	}
-
-	.bargain-list .list .item .text .num {
-		font-size: 26rpx;
-		color: #999;
-	}
-
-	.bargain-list .list .item .text .num .iconfont {
-		font-size: 35rpx;
-		margin-right: 7rpx;
-	}
-
-	.bargain-list .list .item .text .money {
-		font-size: 24rpx;
-		font-weight: bold;
-	}
-
-	.bargain-list .list .item .text .money .price {
-		font-size: 38rpx;
-	}
-
-	.bargain-list .list .item .cutBnt {
-		position: absolute;
-		width: 162rpx;
-		height: 52rpx;
-		border-radius: 50rpx;
-		font-size: 24rpx;
-		color: #fff;
-		text-align: center;
-		line-height: 52rpx;
-		right: 24rpx;
-		bottom: 30rpx;
-		background: linear-gradient(90deg, #FF7931 0%, #E93323 100%);
-	}
-
-	.bargain-list .list .item .cutBnt .iconfont {
-		margin-right: 8rpx;
-		font-size: 30rpx;
-	}
-
-	.bargain-list .list .load {
-		font-size: 24rpx;
-		height: 85rpx;
-		text-align: center;
-		line-height: 85rpx;
-	}
-</style>
@@ -28,12 +28,11 @@
 								style="transform: scale(0.8)" @tap.stop="onSelectSingle(item.id)" />
 						</label>
 						<s-goods-item :title="item.spu.name" :img="item.spu.picUrl || item.goods.image"
-							:price="item.sku.price/100"
+							:price="item.sku.price"
 							:skuText="item.sku.properties.length>1? item.sku.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.sku.properties[0].valueName"
 							priceColor="#FF3000" :titleWidth="400">
 							<template v-if="!state.editMode" v-slot:tool>
-								<su-number-box :min="0" :max="item.sku.stock" :step="1" v-model="item.count"
-									@change="onNumberChange($event, item)"></su-number-box>
+								<su-number-box :min="0" :max="item.sku.stock" :step="1" v-model="item.count" @change="onNumberChange($event, item)" />
 							</template>
 						</s-goods-item>
 					</view>
@@ -50,7 +49,7 @@
 						</label>
 						<text>合计：</text>
 						<view class="text-price price-text">
-							{{ state.totalPriceSelected }}
+							{{ fen2yuan(state.totalPriceSelected) }}
 						</view>
 					</view>
 					<view class="footer-right">
@@ -72,11 +71,8 @@

 <script setup>
 	import sheep from '@/sheep';
-	import {
-		computed,
-		reactive,
-		unref
-	} from 'vue';
+	import { computed, reactive } from 'vue';
+  import { fen2yuan } from '../../sheep/hooks/useGoods';

 	const sys_navBar = sheep.$platform.navbar;
 	const cart = sheep.$store('cart');
@@ -89,12 +85,13 @@
 		isAllSelected: computed(() => cart.isAllSelected),
 		totalPriceSelected: computed(() => cart.totalPriceSelected),
 	});
+
 	// 单选选中
 	function onSelectSingle(id) {
-		console.log('单选')
 		cart.selectSingle(id);
 	}
-	// 全选
+
+  // 全选
 	function onSelectAll() {
 		cart.selectAll(!state.isAllSelected);
 	}
@@ -105,7 +102,6 @@
 		let goods_list = [];
 		state.selectedList = state.list.filter((item) => state.selectedIds.includes(item.id));
 		state.selectedList.map((item) => {
-			console.log(item, '便利');
 			// 此处前端做出修改
 			items.push({
 				skuId: item.sku.id,
@@ -2,7 +2,7 @@
 <template>
 	<view v-if="template">
 		<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.page"
-			:navbarStyle="template.style?.navbar" onShareAppMessage>
+			:navbarStyle="template.navigationBar" onShareAppMessage>
 			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
 				<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
 			</s-block>
@@ -26,7 +26,7 @@
    // 检测 H5 登录回调
    let returnUrl = uni.getStorageSync('returnUrl');
    if (returnUrl) {
-      uni.removeStorage('returnUrl');
+      uni.removeStorage({key:'returnUrl'});
      location.replace(returnUrl);
    } else {
      uni.switchTab({
@@ -5,7 +5,7 @@
    tabbar="/pages/index/user"
    navbar="custom"
    :bgStyle="template.page"
-    :navbarStyle="template.style?.navbar"
+    :navbarStyle="template.navigationBar"
    onShareAppMessage
  >
    <s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
@@ -49,13 +49,7 @@
 	import _ from 'lodash';
  import { formatAfterSaleStatus, formatAfterSaleStatusDescription, handleAfterSaleButtons } from '@/sheep/hooks/useGoods';
  import AfterSaleApi from '@/sheep/api/trade/afterSale';
-
-	const paginationNull = {
-		list: [],
-    total: 0,
-    pageNo: 1,
-    pageSize: 10
-	};
+  import { resetPagination } from '@/sheep/util';

 	const state = reactive({
 		currentTab: 0,
@@ -94,7 +88,7 @@

 	// 切换选项卡
 	function onTabsChange(e) {
-		state.pagination = paginationNull
+    resetPagination(state.pagination);
 		state.currentTab = e.index;
 		getOrderList();
 	}
@@ -126,7 +120,7 @@
 				}
        const { code } = await AfterSaleApi.cancelAfterSale(orderId);
        if (code === 0) {
-          state.pagination = paginationNull
+          resetPagination(state.pagination);
          await getOrderList();
        }
 			},
@@ -103,6 +103,17 @@
            <text class="_icon-forward item-icon" />
          </view>
        </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.vipPrice > 0"
+        >
+          <view class="item-title">会员优惠</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
+            </text>
+          </view>
+        </view>
      </view>
      <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
        <view class="total-num ss-m-r-20">
@@ -67,11 +67,11 @@
      class="detail-goods"
      :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
    >
-      <!-- 订单信息 TODO 芋艿： -->
+      <!-- 订单信 -->
      <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
        <view class="order-card">
          <s-goods-item
-            @tap="onGoodsDetail(item.skuId)"
+            @tap="onGoodsDetail(item.spuId)"
            :img="item.picUrl"
            :title="item.spuName"
            :skuText="item.properties.map((property) => property.valueName).join(' ')"
@@ -168,10 +168,18 @@
        <text class="detail">￥{{ fen2yuan(state.orderInfo.deliveryPrice) }}</text>
      </view>
      <!-- TODO 芋艿：优惠劵抵扣、积分抵扣 -->
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
+        <text class="title">优惠劵金额</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
+      </view>
      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
-        <text class="title">优惠金额</text>
+        <text class="title">活动优惠</text>
        <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
      </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
+        <text class="title">会员优惠</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
+      </view>
      <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
        <text class="title">{{ state.orderInfo.payStatus ? '已付款' : '需付款' }}</text>
        <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>
@@ -203,13 +211,12 @@
        >
          继续支付
        </button>
-        <!-- TODO 芋艿：拼团接入 -->
        <button
          class="ss-reset-button cancel-btn"
          v-if="state.orderInfo.buttons?.includes('combination')"
          @tap="
            sheep.$router.go('/pages/activity/groupon/detail', {
-              id: state.orderInfo.ext.groupon_id,
+              id: state.orderInfo.combinationRecordId,
            })
          "
        >
@@ -91,13 +91,7 @@
 		isEmpty
 	} from 'lodash';
  import OrderApi from '@/sheep/api/trade/order';
-
-	const paginationNull = {
-		list: [],
-    total: 0,
-		pageNo: 1,
-    pageSize: 5,
-	};
+  import { resetPagination } from '@/sheep/util';

 	// 数据
 	const state = reactive({
@@ -138,7 +132,7 @@
      return;
    }
    // 重头加载代码
-		state.pagination = paginationNull;
+		resetPagination(state.pagination);
 		state.currentTab = e.index;
 		getOrderList();
 	}
@@ -150,10 +144,10 @@
 		});
 	}

-	// 分享拼团 TODO 芋艿：待测试
+	// 跳转拼团记录的详情
 	function onOrderGroupon(order) {
 		sheep.$router.go('/pages/activity/groupon/detail', {
-			id: order.ext.groupon_id,
+			id: order.combinationRecordId,
 		});
 	}

@@ -191,8 +185,8 @@
 		// 正常的确认收货流程
 		const { code } = await OrderApi.receiveOrder(order.id);
 		if (code === 0) {
-			state.pagination = paginationNull;
-			await getOrderList();
+      resetPagination(state.pagination);
+      await getOrderList();
 		}
 	}

@@ -315,7 +309,7 @@

 	// 下拉刷新
 	onPullDownRefresh(() => {
-		state.pagination = paginationNull;
+    resetPagination(state.pagination);
 		getOrderList();
 		setTimeout(function() {
 			uni.stopPullDownRefresh();
@@ -167,20 +167,26 @@
      }
      state.model = data;
 		}
-    // 情况二：微信导入 TODO 芋艿：待接入
-		if (options.data) {
-			let data = JSON.parse(options.data);
-			const areaData = uni.getStorageSync('areaData');
-			let provinceArr = areaData.filter(item => item.name == data.province_name);
-			data.province_id = provinceArr[0].id;
-			let provinceArr2 = provinceArr[0].children.filter(item => item.name == data.city_name);
-			data.city_id = provinceArr2[0].id;
-			let provinceArr3 = provinceArr2[0].children.filter(item => item.name == data.district_name);
-			data.district_id = provinceArr3[0].id;
-			state.model = {
-				...state.model,
-				...data,
-			};
+     // 情况二：微信导入
+    if (options.data) {
+      let data = JSON.parse(options.data);
+      const areaData = uni.getStorageSync('areaData');
+      const findAreaByName = (areas, name) => areas.find(item => item.name === name);
+
+      let provinceObj = findAreaByName(areaData, data.province_name);
+      let cityObj = provinceObj ? findAreaByName(provinceObj.children, data.city_name) : undefined;
+      let districtObj = cityObj ? findAreaByName(cityObj.children, data.district_name) : undefined;
+      let areaId = (districtObj || cityObj || provinceObj).id;
+
+      state.model = {
+        ...state.model,
+        areaId,
+        areaName: [data.province_name, data.city_name, data.district_name].filter(Boolean).join(" "),
+        defaultStatus: false,
+        detailAddress: data.address,
+        mobile: data.mobile,
+        name: data.consignee,
+      };
 		}
 	});
 </script>
@@ -1,4 +1,4 @@
-const files = import.meta.globEager('./*.js');
+const files = import.meta.glob('./*.js', { eager: true });
 let api = {};
 Object.keys(files).forEach((key) => {
  api = {
@@ -1,28 +0,0 @@
-import request from '@/sheep/request';
-
-const BargainApi = {
-  // 获得砍价记录的概要信息
-  getBargainRecordSummary: () => {
-    return request({
-      url: '/promotion/bargain-record/get-summary',
-      method: 'GET',
-    });
-  },
-  // 获得砍价活动分页
-  getBargainActivityPage: () => {
-    return request({
-      url: '/promotion/bargain-activity/page',
-      method: 'GET',
-    });
-  },
-  // 获得砍价活动详情
-  getBargainActivityDetail(params) {
-    return request({
-      url: '/promotion/bargain-activity/get-detail',
-      method: 'GET',
-      params,
-    });
-  },
-};
-
-export default BargainApi;
@@ -13,7 +13,7 @@ const OrderApi = {
    if (!(data.addressId > 0)) {
      delete data2.addressId;
    }
-    if (!(data.combinationActivityId) > 0) {
+    if (!(data.combinationActivityId > 0)) {
      delete data2.combinationActivityId;
    }
    if (!(data.combinationHeadId > 0)) {
@@ -1,5 +1,7 @@
+<!-- 顶部导航栏 - 单元格 -->
 <template>
  <view class="ss-flex ss-col-center">
+    <!-- 类型一： 文字 -->
    <view
      v-if="data.type === 'text'"
      class="nav-title inline"
@@ -7,15 +9,17 @@
    >
      {{ data.text }}
    </view>
+    <!-- 类型二： 图片 -->
    <view
      v-if="data.type === 'image'"
      :style="[{ width: width }]"
      class="menu-icon-wrap ss-flex ss-row-center ss-col-center"
      @tap="sheep.$router.go(data.url)"
    >
-      <image class="nav-image" :src="sheep.$url.cdn(data.src)" mode="aspectFit"></image>
+      <image class="nav-image" :src="sheep.$url.cdn(data.imgUrl)" mode="aspectFit"></image>
    </view>
-    <view class="ss-flex-1" v-if="data.type == 'search'" :style="[{ width: width }]">
+    <!-- 类型三： 搜索框 -->
+    <view class="ss-flex-1" v-if="data.type === 'search'" :style="[{ width: width }]">
      <s-search-block
        :placeholder="data.placeholder || '搜索关键字'"
        :radius="data.borderRadius"
@@ -1,7 +1,7 @@
 <!-- 顶部导航栏 -->
 <template>
  <navbar
-    :alway="isAlway"
+    :alway="isAlways"
    :back="false"
    bg=""
    :placeholder="isPlaceholder"
@@ -12,7 +12,7 @@
    <template #item>
      <view class="nav-box">
        <view class="nav-icon" v-if="showLeftButton">
-          <view class="icon-box ss-flex" :class="{ 'inner-icon-box': data.mode == 'inner' }">
+          <view class="icon-box ss-flex" :class="{ 'inner-icon-box': data.styleType === 'inner' }">
            <view class="icon-button icon-button-left ss-flex ss-row-center" @tap="onClickLeft">
              <text class="sicon-back" v-if="hasHistory" />
              <text class="sicon-home" v-else />
@@ -43,7 +43,7 @@
   *
   *
   * @property {Number | String}  alwaysShow = [0,1]			    - 是否常驻
-   * @property {Number | String}  mode = [inner]			    	- 是否沉浸式
+   * @property {Number | String}  styleType = [inner]			   	- 是否沉浸式
   * @property {String | Number} type 		 					- 标题背景模式
   * @property {String} color 		 							- 页面背景色
   * @property {String} src 		 								- 页面背景图片
@@ -66,26 +66,27 @@
  });
  const hasHistory = sheep.$router.hasHistory();
  const sticky = computed(() => {
-    if (props.data.mode == 'inner') {
-      if (props.data.alway) {
+    if (props.data.styleType === 'inner') {
+      if (props.data.alwaysShow) {
        return false;
      }
    }
-    if (props.data.mode == 'normal') {
+    if (props.data.styleType === 'normal') {
      return false;
    }
  });
  const navList = computed(() => {
-    if (!props.data.list) return [];
    // #ifdef MP
-    return props.data.list.mp;
+    return props.data.mapCells || [];
    // #endif
-    return props.data.list.app;
+    return props.data.otherCells || [];
  });
-  // 单元格大小
+  // 页面宽度
  const windowWidth = sheep.$platform.device.windowWidth;
+  // 单元格宽度
  const cell = computed(() => {
    if (unref(navList).length) {
+      // 默认宽度为8个格子，微信公众号右上角有胶囊按钮所以是6个格子
      let cell = (windowWidth - 90) / 8;
      // #ifdef MP
      cell = (windowWidth - 80 - unref(sheep.$platform.capsule).width) / 6;
@@ -102,28 +103,26 @@
    };
    return obj;
  };
-  const isAlway = computed(() =>
-    props.data.mode === 'inner' ? Boolean(props.data.alwaysShow) : true,
+  const isAlways = computed(() =>
+    props.data.styleType === 'inner' ? Boolean(props.data.alwaysShow) : true,
  );
  const isOpacity = computed(() =>
-    props.data.mode === 'normal'
+    props.data.styleType === 'normal'
      ? false
      : props.showLeftButton
      ? false
-      : props.data.mode === 'inner',
+      : props.data.styleType === 'inner',
  );
-  const isPlaceholder = computed(() => props.data.mode === 'normal');
+  const isPlaceholder = computed(() => props.data.styleType === 'normal');
  const bgStyles = computed(() => {
-    if (props.data.type) {
-      return {
-        background:
-          props.data.type == 'color'
-            ? props.data.color
-            : `url(${sheep.$url.cdn(props.data.src)}) no-repeat top center / 100% 100%`,
-      };
-    }
+    return {
+      background:
+          props.data.bgType === 'img' && props.data.bgImg
+          ? `url(${sheep.$url.cdn(props.data.bgImg)}) no-repeat top center / 100% 100%`
+          : props.data.bgColor
+    };
  });
-
+  // 左侧按钮：返回上一页或首页
  function onClickLeft() {
    if (hasHistory) {
      sheep.$router.back();
@@ -131,6 +130,7 @@
      sheep.$router.go('/pages/index/index');
    }
  }
+  // 右侧按钮：打开快捷菜单
  function onClickRight() {
    showMenuTools();
  }
@@ -27,8 +27,7 @@
          :bottomRadius="data.borderRadiusBottom"
          @click="
            sheep.$router.go('/pages/goods/groupon', {
-              id: product.id,
-              activity_id: props.data.activityId,
+              id: props.data.activityId,
            })
          "
        ></s-goods-column>
@@ -54,8 +53,7 @@
          :bottomRadius="data.borderRadiusBottom"
          @click="
            sheep.$router.go('/pages/goods/groupon', {
-              id: product.id,
-              activity_id: props.data.activityId,
+              id: props.data.activityId,
            })
          "
        >
@@ -4,7 +4,7 @@
    :class="['theme-' + sys.mode, 'main-' + sys.theme, 'font-' + sys.fontSize]"
  >
    <view class="page-main" :style="[bgMain]">
-      <!-- 默认通用顶部导航栏 -->
+      <!-- 顶部导航栏-情况1：默认通用顶部导航栏 -->
      <su-navbar
        v-if="navbar === 'normal'"
        :title="title"
@@ -16,21 +16,21 @@
        :defaultSearch="defaultSearch"
      />

-      <!-- 装修组件导航栏-普通 -->
+      <!-- 顶部导航栏-情况2：装修组件导航栏-标准 -->
      <s-custom-navbar
        v-else-if="navbar === 'custom' && navbarMode === 'normal'"
        :data="navbarStyle"
        :showLeftButton="showLeftButton"
      />
      <view class="page-body" :style="[bgBody]">
-        <!-- 沉浸式头部 -->
+        <!-- 顶部导航栏-情况3：沉浸式头部 -->
        <su-inner-navbar v-if="navbar === 'inner'" :title="title" />
        <view
          v-if="navbar === 'inner'"
          :style="[{ paddingTop: sheep.$platform.navbar + 'px' }]"
        ></view>

-        <!-- 装修组件导航栏-沉浸式 -->
+        <!-- 顶部导航栏-情况4：装修组件导航栏-沉浸式 -->
        <s-custom-navbar v-if="navbar === 'custom' && navbarMode === 'inner'" :data="navbarStyle" :showLeftButton="showLeftButton" />

        <!-- 页面内容插槽 -->
@@ -92,7 +92,7 @@
    navbarStyle: {
      type: Object,
      default: () => ({
-        mode: '',
+        styleType: '',
        type: '',
        color: '',
        src: '',
@@ -143,7 +143,7 @@

  // 导航栏模式(因为有自定义导航栏 需要计算)
  const navbarMode = computed(() => {
-    if (props.navbar === 'normal' || props.navbarStyle.mode === 'normal') {
+    if (props.navbar === 'normal' || props.navbarStyle.styleType === 'normal') {
      return 'normal';
    }
    return 'inner';
@@ -55,8 +55,10 @@ export function formatNum(prefix, type, num) {
  // 情况三：大于 10，除第一位外，其它位都显示为0
  // 例如：100  - 199  显示为 100+
  //      9000 - 9999 显示为 9000+
-  let pow = Math.pow(10, `${num}`.length - 1);
-  return `${prefix}${(num / pow) * pow}+`;
+  const numStr = num.toString();
+  const first = numStr[0];
+  const other = '0'.repeat(numStr.length - 1);
+  return `${prefix}${first}${other}+`;
 }

 // 格式化价格
@@ -137,7 +139,7 @@ export function formatOrderStatus(order) {
 */
 export function formatOrderStatusDescription(order) {
  if (order.status === 0) {
-    return `请在 ${ formatDate(orderInfo.payExpireTime) } 前完成支付`;
+    return `请在 ${ formatDate(order.payExpireTime) } 前完成支付`;
  }
  if (order.status === 10) {
    return '商家未发货，请耐心等待';
@@ -201,4 +201,5 @@ export default {
  getInfo,
  getOpenid,
  subscribeMessage,
+  checkUpdate
 };
@@ -130,7 +130,7 @@ const decryptSpm = (spm) => {
      query = shareParamsArray[2].split(',');
      shareParams.query = {
        id: query[0],
-        activity_id: query[1],
+        activity_id: query[1], // TODO 芋艿：接入分享后，应该统一成 id 参数
      };
      break;
    case '4':
@@ -2,7 +2,7 @@ import { createPinia } from 'pinia';
 import piniaPersist from 'pinia-plugin-persist-uni';

 // 自动注入所有pinia模块
-const files = import.meta.globEager('./*.js');
+const files = import.meta.glob('./*.js', { eager: true });
 const modules = {};
 Object.keys(files).forEach((key) => {
  modules[key.replace(/(.*\/)*([^.]+).*/gi, '$2')] = files[key].default;
@@ -71,7 +71,7 @@ function append_thumbnail_params(url, params) {
      if (!gravity && gravity != 'center') {
        // 指定了裁剪区域
        mode = 'mfit';
-        crop_str = '/crop,g_' + gravityFormat('aliyun', gravity) + ',w_' + width + ',h_' + height;
+        crop_str = '/crop,g_' + gravityFormatMap('aliyun', gravity) + ',w_' + width + ',h_' + height;
      }

      // 质量压缩
@@ -91,7 +91,7 @@ function append_thumbnail_params(url, params) {
        // 指定了裁剪区域
        mode_str = 'crop';
        mode = 'fill';
-        crop_str = '/gravity/' + gravityFormat('qcloud', gravity);
+        crop_str = '/gravity/' + gravityFormatMap('qcloud', gravity);
      }

      // 质量压缩
@@ -121,7 +121,7 @@ function append_thumbnail_params(url, params) {
      if (mode == 'fill' || (!gravity && gravity != 'center')) {
        // 指定了裁剪区域,全部转为 mfit
        mode = 'mfit';
-        crop_str = '/gravity/' + gravityFormat('qiniu', gravity) + '/crop/' + size;
+        crop_str = '/gravity/' + gravityFormatMap('qiniu', gravity) + '/crop/' + size;
      }
      // 质量压缩
      if (quality > 0 && quality < 100) {
Author	SHA1	Message	Date
YunaiV	ae3cef3e19	【发版】全局：2.1.0 发版	2024-05-04 11:17:53 +08:00
YunaiV	68d2fc4c24	【修复】拼团装修组件，跳转拼团商品界面的 id 不正确的问题	2024-05-02 10:16:17 +08:00
YunaiV	c3f3c44e63	【完善】兼容 HBuilder 最新版本 vite5	2024-05-02 09:39:00 +08:00
芋道源码	97802232a2	!51 update pages/order/detail.vue. @tap="onGoodsDetail(item.skuId)" =>@tap="onGoodsDetail(item.spuId)" Merge pull request !51 from 孙正涛/N/A	2024-05-02 01:29:15 +00:00
孙正涛	73dbe70305	update pages/order/detail.vue. @tap="onGoodsDetail(item.skuId)" =>@tap="onGoodsDetail(item.spuId)" 点击查看商品详情时应该跳转的是spuId Signed-off-by: 孙正涛 <alchemy7746@163.com>	2024-04-15 03:47:47 +00:00
YunaiV	a816582206	bugfix：修复拼团详情错误传递 groupon_id 的问题	2024-03-30 15:28:29 +08:00
芋道源码	d2c4b9efc9	!50 适配顶部导航 Merge pull request !50 from 疯狂的世界/navbar	2024-03-17 01:26:39 +00:00
owen	13986f3943	适配顶部导航	2024-03-13 22:46:46 +08:00
芋道源码	b7c38be5b3	!49 update pages/index/login.vue. Merge pull request !49 from 天痕/N/A	2024-03-09 10:35:24 +00:00
芋道源码	d7eb74968a	!48 配置文件描述修改 Merge pull request !48 from 天痕/N/A	2024-03-09 10:34:03 +00:00
芋道源码	ddc54679fb	!47 完善微信导入收货地址 Merge pull request !47 from DH/N/A	2024-03-09 10:33:32 +00:00
芋道源码	7226eb8eb0	!46 fix : data.combinationActivityId Merge pull request !46 from cnyballk/fix/api/trade/order	2024-03-09 10:32:02 +00:00
芋道源码	a0deb30075	!45 fix: gravityFormat to gravityFormatMap Merge pull request !45 from cnyballk/master	2024-03-09 10:31:30 +00:00
芋道源码	e8cc7cb6c0	!44 fix: add export checkUpdate Merge pull request !44 from cnyballk/fix/wechat/checkUpdate	2024-03-09 10:28:49 +00:00
天痕	f6fefe3aef	update pages/index/login.vue. 移除回调，用法错误 Signed-off-by: 天痕 <614891294@qq.com>	2024-03-05 05:55:36 +00:00
天痕	bfdb7bd00e	配置文件描述修改描述有问题	2024-03-05 05:47:01 +00:00
DH	d1162d8552	完善微信导入收货地址 Signed-off-by: DH <ji534@outlook.com>	2024-03-04 08:48:18 +00:00
cnyballk	19ebbecb0c	fix: data.combinationActivityId Signed-off-by: cnyballk <584518260@qq.com>	2024-03-04 07:14:45 +00:00
cnyballk	e4ca6b4e68	fix: gravityFormat to gravityFormatMap Signed-off-by: cnyballk <584518260@qq.com>	2024-03-04 03:46:48 +00:00
cnyballk	f478606ae4	fix: mini export checkUpdate Signed-off-by: cnyballk <584518260@qq.com>	2024-03-01 15:24:50 +00:00
YunaiV	b10f8d3181	🎉 2.0.1 版本发布！	2024-03-01 20:53:46 +08:00
YunaiV	71b9a502f3	Merge remote-tracking branch 'origin/master'	2024-03-01 18:56:07 +08:00
YunaiV	d51ebca23b	bugfix：购物车界面，金额展示不正确	2024-03-01 18:54:36 +08:00
芋道源码	fb4220b46e	!43 fix: formatOrderStatusDescription variable error Merge pull request !43 from cnyballk/fix/hooks/formatOrderStatusDescription	2024-03-01 10:49:25 +00:00
YunaiV	d815fd5e3f	bugfix：确认订单页面，不展示会员优惠信息	2024-03-01 18:48:32 +08:00
cnyballk	c0105cc0fe	fix: formatOrderStatusDescription variable error Signed-off-by: cnyballk <584518260@qq.com>	2024-03-01 09:31:59 +00:00
YunaiV	a0e9ceb945	Merge remote-tracking branch 'origin/master'	2024-03-01 13:20:49 +08:00
YunaiV	12332f0f30	修复订单列表 tab 切换叠加问题	2024-03-01 13:20:39 +08:00
芋道源码	eea2ad446f	!39 修复了商品卡片没有正确格式化数字的问题 Merge pull request !39 from DH/master	2024-03-01 05:09:04 +00:00
YunaiV	fe76f2fc90	✨ 砍价：暂时移除，砍价在小程序中容易被封号	2024-03-01 13:06:56 +08:00
DH	87a6b962e7	修复格式化数字问题 sheep/hooks/useGoods.js格式化数字情况三时没有对数字格式 Signed-off-by: DH <ji534@outlook.com>	2024-01-29 01:34:51 +00:00
DH	829bea3861	修复商品卡片销量可能会出现余数的问题 Signed-off-by: DH <ji534@outlook.com>	2024-01-29 01:24:27 +00:00