From 35cbf6f8682265f6ebf39c2283680afe079aac74 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Mon, 20 Oct 2025 16:59:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E9=94=AE=E9=A2=86=E5=8F=96?=
 =?UTF-8?q?=E3=80=81=E6=9C=80=E5=A4=A7=E4=BC=98=E6=83=A0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/activity/dzxConSeason.vue | 48 +++++++++++++++++++++++++--
 subPackages/techan/order.vue          | 21 ++++++------
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/subPackages/activity/dzxConSeason.vue b/subPackages/activity/dzxConSeason.vue
index d717bd1..b48d34a 100644
--- a/subPackages/activity/dzxConSeason.vue
+++ b/subPackages/activity/dzxConSeason.vue
@@ -6,10 +6,14 @@
 		<view class="main-container">
 			<view class="coupon-box" v-for="(prize,prizeIndex) in prizeList" :key="prizeIndex"
 			:style="{'background-image':`url(${prize.backgroundImg})`}">
-				<view class="flex-between" style="flex-wrap: wrap;" v-if="prize.isCoupon">
-					<image :class="['coupon-img','coupon-img'+i]" v-for="(item,i) in couponList" :key="i"
-					:src="item.img" @click="getCoupon(item)" mode="widthFix"></image>
+				<view v-if="prize.isCoupon">
+					<view class="flex-between" style="flex-wrap: wrap;" >
+						<image :class="['coupon-img','coupon-img'+i]" v-for="(item,i) in couponList" :key="i"
+						:src="item.img" @click="getCoupon(item)" mode="widthFix"></image>
+					</view>
+					<view class="getAllCoupon" @click="getAllCoupon()">一键领取</view>
 				</view>
+				
 				<view class="w-full" v-else @click="gotoPath(prize.path)">
 					<image style="width: 100%;height: 262rpx;" :src="prize.img" mode="widthFix"></image>
 				</view>
@@ -195,6 +199,30 @@
 				})
 			},
 			
+			getAllCoupon() {
+				if (!this.isReceive) {
+					uni.showToast({
+						title: "短时间内请勿重复点击！",
+						icon: 'none'
+					})
+					return;
+				}
+				this.isReceive = false
+				setTimeout(() => {this.isReceive = true}, 3000)
+				let ids = this.couponList.map(x=>x.id).join(',')
+				this.Post({
+					ids: ids,
+					is_all: 1,
+				},"/api/coupon/getNewCouponsByActivitiesIds").then(res => {
+					if (res) {
+						uni.showToast({
+							title: res.data,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			
 
 			viewDetail(item) {
 				this.gotoDetailByType(item)
@@ -452,4 +480,18 @@
 		bottom: 66rpx;
 		right: 26rpx;
 	}
+	
+	.getAllCoupon{
+		width: 347rpx;
+		height: 67rpx;
+		background: linear-gradient( 92deg, #FFB86C 0%, #FE9D09 100%);
+		border-radius: 13rpx 13rpx 13rpx 13rpx;
+		font-family: Alibaba PuHuiTi, Alibaba PuHuiTi;
+		font-weight: 500;
+		font-size: 32rpx;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 67rpx;
+		margin: 24rpx auto 30rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/subPackages/techan/order.vue b/subPackages/techan/order.vue
index bb7dc93..f67e030 100644
--- a/subPackages/techan/order.vue
+++ b/subPackages/techan/order.vue
@@ -243,11 +243,11 @@ export default {
 		uni.$off("updateDataByConnect",this.getDataByConnect)
 	},
 	onReady () {
-		// this.$nextTick(()=>{
-		// 	setTimeout(()=>{
-		// 		this.getMaxCouponData()
-		// 	},1000)
-		// })
+		this.$nextTick(()=>{
+			setTimeout(()=>{
+				this.getMaxCouponData()
+			},1000)
+		})
 	},
 	methods: {
 		submitAgreeAdress (val) {
@@ -639,13 +639,14 @@ export default {
 		
 		// 获取最大优惠券
 		async getMaxCouponData () {
+			console.log("enter")
 			let allPrice =0
 			let skuIds = []
-			if (this.info && Array.isArray(this.info.goods)) {
-				this.info.goods.forEach(v=>{
-					allPrice += v.skuInfo.money*v.skuInfo.buyNum
-					if (v.skuInfo.buyNum>0) {
-						skuIds.push(v.skuInfo.id)
+			if (this.orderList && Array.isArray(this.orderList)) {
+				this.orderList.forEach(v=>{
+					allPrice += v.sInfo.price*v.sInfo.buyNum
+					if (v.sInfo.buyNum>0) {
+						skuIds.push(v.sInfo.id)
 					}
 				})
 			}

From 92d78f5778a4c02a52f92b14fde6f74a837dbfc3 Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 22 Oct 2025 17:03:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E7=96=86=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                        |   6 +
 static/css/base.css               |  22 ++-
 static/js/CommonFunction.js       |  13 ++
 subPackages/activity/xinjiang.vue | 271 ++++++++++++++++++++++++++++++
 4 files changed, 311 insertions(+), 1 deletion(-)
 create mode 100644 subPackages/activity/xinjiang.vue

diff --git a/pages.json b/pages.json
index 4705ad1..04cb2df 100644
--- a/pages.json
+++ b/pages.json
@@ -399,6 +399,12 @@
 					"navigationBarTitleText" : "进群抽奖"
 				}
 			},
+			{
+				"path": "activity/xinjiang",
+				"style": {
+					"navigationBarTitleText" : "新疆馆"
+				}
+			},
 			{
 				"path": "user/comment",
 				"style": {
diff --git a/static/css/base.css b/static/css/base.css
index 5f10854..a642c13 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -107,4 +107,24 @@ view {
 	.no-data-zhanwei image{
 		width: 347.33rpx;
 		height: 320.67rpx;
-	}
\ No newline at end of file
+	}
+	.header-left-line{
+		width: 8rpx;
+		height: 27rpx;
+		background: #363636;
+		border-radius: 13rpx 13rpx 13rpx 13rpx;
+		margin-right: 8rpx;
+	}
+	
+.fixPrice{
+	font-weight: 500;
+	font-size: 32rpx;
+	color: #FA0005;
+}
+.fixPrice .fixNum{
+	font-size: 24rpx;
+}
+.fixPrice:before{
+	content: "￥";
+	font-size: 24rpx;
+}
\ No newline at end of file
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index 32d9456..c60eb74 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -20,6 +20,19 @@ Vue.prototype.formateRichText = str => {
 	return str;
 }
 
+// 格式化价格
+Vue.prototype.formatePrice = str => {
+	try {
+		str = str.toFixed(2)
+		let priceObj = {allPrice: str, iNum: str.split('.')[0], fNum: str.split('.')[1]}
+		 
+		return `<div class="fixPrice">${priceObj.iNum}<span class="fixNum">.${priceObj.fNum}</span></div>` 
+	} catch(e) {
+		console.log(e)
+		return str
+	}
+}
+
 // 获取路径参数
 Vue.prototype.getUrlPara = url => {
 	let arrUrl = url.split("?");
diff --git a/subPackages/activity/xinjiang.vue b/subPackages/activity/xinjiang.vue
new file mode 100644
index 0000000..fe6a4af
--- /dev/null
+++ b/subPackages/activity/xinjiang.vue
@@ -0,0 +1,271 @@
+<template>
+	<view class="bg">
+		<image v-if="headImg" :src="showImg(headImg)" class="topImg" mode="widthFix"></image>
+		<view class="main-container">
+			<view class="flex flex-between">
+				<view class="main-title">
+					<view class="header-left-line" style="width: 6rpx;height: 20rpx;"></view>
+					商品列表
+				</view>
+				<view class="sort-area">
+					<view :class="['sort-item',search==0?'active':'']" @click="changeSearch(0)">综合</view>
+					<view :class="['sort-item',search==2?'active':'']" @click="changeSearch(2)">销量</view>
+					<view :class="['sort-item',(search==3||search==4)?'active':'']" class="sort-item" @click="changeSearch(search==3?4:3)">
+						<text>价格{{search==3?"从低到高":search==4?"从高到低":""}}</text>
+						<view class="search-item">
+							<view class="rotate-90">
+								<uni-icons type="left" size="11" :color="search==3?'#71873D':'#A0A0A0'"></uni-icons>
+							</view>
+							<view class="rotate-90">
+								<uni-icons type="right" size="11" :color="search==4?'#71873D':'#A0A0A0'"></uni-icons>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<view class="product-container flex-between" style="align-items: flex-start;">
+				<view v-for="(column, indexs) in 2" :key="indexs">
+					<view class="column-product" v-if="index % 2 == indexs"  @click="gotoDetailByType(item)" :key="index"
+						v-for="(item,index) in list">
+						<image class="img" :src="showImg(item.headimg)" mode="aspectFill"></image>
+						<view class="content flex-column">
+							<view class="title">{{item.title}}</view>
+							<view class="tags no-scrollbar" v-if="item.display_tags">
+								<view class="tag-item" v-for="(tag,tagIndex) in item.display_tags.split(',')">{{tag}}</view>
+							</view>
+							<view class="flex-between" style="margin-top: 17rpx;">
+								<view v-html="formatePrice(item.price/100)"></view>
+								<view class="btn">已售{{item.sales_number}}件</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				</view>
+<!-- 			<image @click="returnTop" v-show="showGoTop" class="back-img" 
+			src="https://static.ticket.sz-trip.com/uploads/20251015/82d48498bdf14ded3061bec9defa5138.png"></image> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				headImg: '',
+				finish:false, 
+				list: [],
+				showGoTop: false,
+				
+				search: 0,
+				
+			}
+		},
+		onLoad(option) {
+			this.getHeadImg(2406)
+			this.getGoods()
+		},
+		onReady() {
+		},
+		methods: {
+			productInit () {
+				let _this = this
+				let typeList = [650,651,647,649,653,654,656]
+				// 获取所有农产品子类目 pid_type 20
+				Promise.all(
+					typeList.map(x=>_this.Post({pid:x},'/api/product/tag_list'))
+				).then(typeRes => {
+					typeRes.forEach(type => {
+						if (type.data.length>0) {
+							typeList = typeList.concat(type.data.map(x=>x.id))
+						}
+					})
+					this.typeList = typeList
+					this.getGoods()
+				})
+			},
+
+			getHeadImg (id) {
+				this.Post({id},'/api/multimedia/detail').then(res => {
+					this.headImg = res.data.head_img
+					uni.setNavigationBarTitle({
+						title:res.data.title
+					})
+				});	
+			},
+			// 产品列表
+			getGoods() {
+				let param = {}
+				// if (search == 1) { param = {order: 'asc',sort:'sales_number'} }
+				if (this.search == 2) { param = {order: 'desc',sort:'p.sales_number'} }
+				if (this.search == 3) { param = {order: 'asc',sort:'p.price'} }
+				if (this.search == 4) { param = {order: 'desc',sort:'p.price'} }
+				
+				this.Post({
+					// tag_id: 119,
+					tag_id: 120,
+					offset: this.list.length,
+				    limit: 4,
+					...param,
+				},'/api/product/get_product_by_tag_subject').then(res => {
+					if (res.data.list.length < 4) {
+						this.finish = true
+					}
+					this.list = this.list.concat(res.data.list||[])
+				})
+			},
+			
+			changeSearch (value) {
+				this.search = value
+				this.list = []
+				this.getGoods()
+			},
+			
+			returnTop(){
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 200,
+				})
+			},
+		},
+		onPageScroll(res) {
+			this.showGoTop = res.scrollTop > 200 ? true : false;
+		},
+		onReachBottom() {
+			setTimeout(()=>{
+				if(!this.finish) this.getGoods()
+			},500)
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		width: 750rpx;
+		min-height: 100vh;
+		overflow-x: hidden;
+	}
+	
+	.topImg {
+		width: 100%;
+	}
+
+	.main-container{
+		width: 100%;
+		margin-top: -100rpx;
+		padding: 0 26rpx 60rpx;
+		position: relative;
+		.main-title{
+			font-weight: 500;
+			font-size: 29rpx;
+			color: #363636;
+			display: flex;
+			align-items: center;
+		}
+		.sort-area{
+			display: flex;
+			font-weight: 400;
+			font-size: 25rpx;
+			color: #A0A0A0;
+			.sort-item{
+				padding-left: 32rpx;
+				display: flex;
+				align-items: center;
+			}
+			.sort-item.active{
+				color: #71873D;
+			}
+			
+			.search-item{
+				padding-left: 9rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				line-height: 0.6;
+			}
+		}
+	}
+
+
+	.product-container{
+		padding:18rpx 0  0;
+	}
+	
+	.column-product{
+		width: 339rpx;
+		background: #FFFFFF;
+		border-radius: 21rpx;
+		overflow: hidden;
+		margin-bottom: 21rpx;
+		.img{
+			width: 339rpx;
+			height: 339rpx;
+			border-radius: 21rpx 21rpx 0rpx 0rpx;
+		}
+		.title{
+			font-weight: 400;
+			font-size: 27rpx;
+			color: #393939;
+		}
+		.content{
+			width: 100%;
+			flex: 1;
+			height: fit-content;
+			padding: 0rpx 15rpx 15rpx;
+		}
+		.price{
+			font-weight: 500;
+			font-size: 34rpx;
+			color: #FF0000;
+			&::before{
+				content: "￥";
+				font-size: 24rpx;
+			}
+		}
+		
+		.btn{
+			font-weight: 400;
+			font-size: 21rpx;
+			color: #A0A0A0;
+			.sale-num{
+				
+			}
+		}
+	}
+	
+	.tags{
+		display: flex;
+		margin-top: 17rpx;
+		overflow-x: auto;
+		overflow-y: hidden;
+		.tag-item{
+			border-radius: 3rpx 3rpx 3rpx 3rpx;
+			border: 1rpx solid #798B41;
+			font-weight: 400;
+			font-size: 21rpx;
+			color: #798B41;
+			padding: 4rpx 10rpx;
+			margin-right: 8rpx;
+			flex-shrink: 0;
+		}
+	}
+	
+	.bottom-img{
+		width: 123.95rpx;
+		height: 103.06rpx;
+		margin: 74rpx auto 0;
+		display: block;
+	}
+	.back-img{
+		position: fixed;
+		width: 66rpx;
+		height: 66rpx;
+		bottom: 66rpx;
+		right: 26rpx;
+	}
+	.rotate-90 {
+		transform: rotate(90deg);
+	}
+
+</style>
\ No newline at end of file