From 663d8f06fb86f64bde65ef3b19124e9bcbffdedc Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Fri, 24 Jul 2026 16:55:13 +0800
Subject: [PATCH 01/60] =?UTF-8?q?Conf:=E5=A2=9E=E5=8A=A0Fix=E7=8E=AF?=
=?UTF-8?q?=E5=A2=83=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/index.js | 8 ++++++++
package.json | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/config/index.js b/config/index.js
index f386c48..c6467b1 100644
--- a/config/index.js
+++ b/config/index.js
@@ -10,6 +10,14 @@ if (NODE_ENV === 'development' || NODE_ENV === 'test') {
enableDebug: false
})
}
+if (NODE_ENV === 'fix') {
+ BASE_URL = 'https://shop-pre.xdd618.com/api'
+ SERVICE_URL = 'https://service-pre.xdd618.com/api'
+ SERVICE_WS_URL = 'wss://service-pre.xdd618.com/ws'
+ wx.setEnableDebug({
+ enableDebug: false
+ })
+}
if (NODE_ENV === 'prod') {
BASE_URL = 'https://wxapp.xdd618.com/api'
SERVICE_URL = 'https://service.xdd618.com/api'
diff --git a/package.json b/package.json
index 858a590..d8db073 100644
--- a/package.json
+++ b/package.json
@@ -133,6 +133,17 @@
"CUSTOM-CONST": true
}
},
+ "mp-weixin-fix": {
+ "title": "微信小程序（Fix环境)",
+ "env": {
+ "UNI_PLATFORM": "mp-weixin",
+ "VUE_APP_ENV": "fix",
+ "UNI_OUTPUT_DIR": "dist"
+ },
+ "define": {
+ "CUSTOM-CONST": true
+ }
+ },
"mp-weixin": {
"title": "微信小程序（生产环境)",
"env": {
From 23f3d8b9941501354cca69b1e121546fd314fe68 Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Wed, 29 Jul 2026 14:39:21 +0800
Subject: [PATCH 02/60] =?UTF-8?q?Refactor(=E5=8D=83=E5=8E=BF):=E5=9B=BE?=
=?UTF-8?q?=E7=89=87=E5=A2=9E=E5=8A=A0=E6=87=92=E5=8A=A0=E8=BD=BD=EF=BC=8C?=
=?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B2=E6=9F=93=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/famousList.vue | 11 +++++++++++
pkg_product/views/famousQianxianShop.vue | 14 +++++++++++++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/pkg_product/views/famousList.vue b/pkg_product/views/famousList.vue
index 2a63000..9ffdff5 100644
--- a/pkg_product/views/famousList.vue
+++ b/pkg_product/views/famousList.vue
@@ -24,6 +24,7 @@
:src="countyFamousTopImage"
class="img"
mode="widthFix"
+ :lazy-load="true"
/>
{{ item.provinceName }}
@@ -61,6 +63,7 @@
@@ -95,11 +98,13 @@
{{ county.countyName }}
@@ -118,11 +123,13 @@
{{ county.countyName }}
@@ -140,11 +147,13 @@
{{ county.countyName }}
@@ -160,6 +169,7 @@
:src="webUrl + '/home/no-data-bg.png'"
mode="widthFix"
class="loadend"
+ :lazy-load="true"
/>
-
+
@@ -245,6 +245,7 @@
{{ $formatCount(item.pv) }}
@@ -253,12 +254,14 @@
v-if="!item.hasZan"
:src="webUrl + '/page/hotel/zan-off-2.png'"
class="zan-off-icon"
+ :lazy-load="true"
@click="likeInfoItemHandle(item, index, item.zan + 1, true)"
/>
@@ -413,6 +417,7 @@
:src="item.image"
mode="widthFix"
class="img"
+ :lazy-load="true"
/>
@@ -470,6 +475,7 @@
重点项目
@@ -486,6 +492,7 @@
@@ -503,6 +510,7 @@
招商政策
@@ -525,6 +533,7 @@
@@ -605,11 +614,13 @@
{{ shop.address }}
@@ -624,6 +635,7 @@
{{ shop.name }}
From d7aecbe7559857b1f8ced118487de0652cc51e59 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Fri, 31 Jul 2026 10:59:56 +0800
Subject: [PATCH 03/60] =?UTF-8?q?Feat=EF=BC=9A=E9=9B=86=E9=87=87=E4=B8=AD?=
=?UTF-8?q?=E5=BF=83=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/MyOrder/index.vue | 527 ++++++++++++++++++++----
pagesOrder/order/OrderDetails/index.vue | 120 +++++-
2 files changed, 544 insertions(+), 103 deletions(-)
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 79a070d..0981754 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -12,7 +12,7 @@
v-model="keyword"
:inputStyle="inputStyle"
:showAction="false"
- placeholder="请输入商品名/订单号/团购名称"
+ :placeholder="searchPlaceholder"
shape="round"
bgColor="#FFF"
@search="changeType"
@@ -76,28 +76,28 @@
- {{ order.merName }}
+ {{ getOrderStoreName(order) }}
-
+
- {{ order.merCityName }}
+ {{ getOrderCityName(order) }}
@@ -131,7 +131,7 @@
{{ (order.isGiftCardSend || order.isGiftCardReceive) ? '礼包' : (getStatus(order) || (order._status && order._status._title) || '已完成') }}
+ >{{ getOrderStatusTagText(order) }}
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ ￥
+ {{ force2Decimal(item.price) }}
+
+ x{{ item.qty }}
+
+
+
+
+ {{ item.sku }}
+
+
+
+
+
@@ -300,8 +331,8 @@
{{ order.createTime }}
- 共{{ order.totalNum || 0 }}件商品
-
+ 共{{ getOrderTotalNum(order) }}件商品
+
，总金额
@@ -309,7 +340,7 @@
￥
- {{ force2Decimal(order.payPrice) }}
+ {{ force2Decimal(getOrderPayPrice(order)) }}
@@ -351,63 +382,101 @@
v-if="!order.isGiftCardSend && !order.experienceOrderInfo"
class="bottom flex jc-between ai-center"
>
-
-
- 更多
-
- 联系商家
- 申请退款
-
-
-
+
- 联系客服
-
联系商家
-
+
修改地址
+ 查看详情
申请退款
+ 确认收货
+ 删除订单
-
-
+
+
+ 更多
+
+ 联系商家
+ 申请退款
+
+
+
+
+ 联系客服
+
+
+ 联系商家
+
+
+ 查看详情
+ 删除订单
+
+
+
+
+
this.normalizeCollectiveDisplayItem(item, true))
+ }
+ if (this.isCollectiveWholesalerOrder(order)) {
+ return this.getCollectiveProductList(order).map(item => this.normalizeCollectiveDisplayItem(item))
+ }
+ return []
+ },
+ getCollectiveTotalNum(order) {
+ const totalNum = Number(order && order.totalNum)
+ if (totalNum > 0) {
+ return totalNum
+ }
+ return this.getCollectiveDisplayItems(order).reduce((sum, item) => sum + Number(item.qty || 0), 0)
+ },
+ getCollectiveProductImage(cart) {
+ const productInfo = (cart && cart.productInfo) || {}
+ const attrInfo = productInfo.attrInfo || {}
+ return productInfo.image || attrInfo.image || ''
+ },
+ getCollectiveProductName(cart) {
+ const productInfo = (cart && cart.productInfo) || {}
+ return productInfo.storeName || cart.storeName || '商品信息'
+ },
+ getCollectiveProductSku(cart) {
+ const productInfo = (cart && cart.productInfo) || {}
+ const attrInfo = productInfo.attrInfo || {}
+ return attrInfo.sku || cart.sku || ''
+ },
+ showCollectiveContact(order) {
+ const statusType = this.getCollectiveStatusType(order)
+ if (!this.isCollectiveWholesalerOrder(order)) {
+ return false
+ }
+ return Boolean(
+ (order.merName || order.storeName || order.merPhone || order.merId) &&
+ [1, 2, 4, -1, -2, -3].includes(statusType)
+ )
+ },
+ showCollectiveModifyAddress(order) {
+ const statusType = this.getCollectiveStatusType(order)
+ if (statusType !== 1) {
+ return false
+ }
+ if (!(this.isCollectiveWholesalerOrder(order) || this.isCollectiveCustomGiftOrder(order))) {
+ return false
+ }
+ return this.canShowModifyAddress(order)
+ },
+ showCollectiveDelete(order) {
+ return Number(order._status && order._status._type) === 9
+ },
+ showCollectiveTakeOrder(order) {
+ return this.getCollectiveStatusType(order) === 2
+ },
+ showCollectiveDetail(order) {
+ const statusType = this.getCollectiveStatusType(order)
+ if (this.isCollectiveCustomGiftOrder(order)) {
+ return [1, 4].includes(statusType)
+ }
+ if (this.isCollectiveWholesalerOrder(order)) {
+ return [1, 4, -1, -2, -3].includes(statusType)
+ }
+ return false
+ },
+ showCollectiveRefund(order) {
+ const statusType = this.getCollectiveStatusType(order)
+ if (!this.isCollectiveWholesalerOrder(order)) {
+ return false
+ }
+ return statusType === 2
+ },
isRefundFlow(order) {
if (!order) {
return false
@@ -1016,6 +1382,13 @@ export default {
}
return orderOrIndex
},
+ handleOrderStoreClick(orderOrIndex) {
+ const order = this.getOrderByIndex(orderOrIndex)
+ if (!order || this.isCollectiveCenterMode) {
+ return
+ }
+ this.goStore(order)
+ },
delOrder(orderOrIndex) {
const order = this.getOrderByIndex(orderOrIndex)
if (!order) {
@@ -1416,37 +1789,23 @@ export default {
},
tabChange(item) {
this.type = item.index
- this.$yroute.query.type = this.type
+ const query = this.getPageQuery()
+ query.type = this.type
this.changeType()
},
orderTypeTabChange(item) {
this.orderTypeTabIndex = item.index
this.orderType = item.orderType
+ const query = this.getPageQuery()
+ query.tabIndex = this.orderTypeTabIndex
this.updateTabListByOrderType()
+ if (this.type > this.tabList.length - 1) {
+ this.type = 0
+ }
this.changeType(this.type)
},
updateTabListByOrderType() {
- if (this.orderType === 'travel') {
- this.tabList = [
- { name: '全部' },
- { name: '待付款' },
- { name: '待确认' },
- { name: '待使用' },
- { name: '退款/售后' },
- { name: '待评价' },
- { name: '已完成' }
- ]
- } else {
- this.tabList = [
- { name: '全部' },
- { name: '待付款' },
- { name: '待发货' },
- { name: '待收货/待核销' },
- { name: '退款/售后' },
- { name: '待评价' },
- { name: '已完成' }
- ]
- }
+ this.tabList = this.getDefaultTabListByOrderType()
},
goUserCenter() {
this.$yrouter.switchTab({
@@ -1468,16 +1827,8 @@ export default {
uni.showLoading({
mask: true,
})
- const types = {
- 0: 0,
- 1: 1,
- 2: 2,
- 3: 3,
- 4: -3,
- 5: 4,
- 6: 5,
- }
- const type = types[this.type]
+ const typeMap = this.getRequestTypeMapByOrderType()
+ const type = typeMap[this.type]
const {
page,
limit,
diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue
index 4b427ed..364e4f1 100644
--- a/pagesOrder/order/OrderDetails/index.vue
+++ b/pagesOrder/order/OrderDetails/index.vue
@@ -203,31 +203,31 @@
-
+
-
+
- {{ cart.productInfo.storeName }}
+ {{ cart.name }}
-
- {{ cart.productInfo.attrInfo.sku || '' }}
+
+ {{ cart.sku }}
{{ orderInfo.drawOrderInfo.prizeAttrName || '' }}
-
+
￥
- {{ cart.truePrice }}
+ {{ force2Decimal(cart.price) }}
- x{{ cart.cartNum }}
+ x{{ cart.qty }}
@@ -244,7 +244,7 @@
-
+
商品总价
@@ -500,7 +500,14 @@
-
+
+ 修改地址
+
+
联系客服
联系商家
@@ -515,7 +522,10 @@
-
+
+ 确认收货
+
+
联系客服
@@ -549,7 +559,11 @@
再买一单
- 立即评价
+ 立即评价
@@ -572,7 +586,7 @@
再买一单
立即评价
@@ -850,9 +864,10 @@ export default {
}
})
},
- goGoodsCon(item, isGiftCardReceiveBlind, isDrawOrder) {
+ goGoodsCon(item, isGiftCardReceiveBlind, isDrawOrder, scenarioCode) {
if(isGiftCardReceiveBlind) return
if(isDrawOrder) return
+ if (Number(scenarioCode) === 24) return
const activityId = Number(
item.drawActivityId ||
(item.productInfo && item.productInfo.drawActivityId) ||
@@ -1029,6 +1044,75 @@ export default {
}
return status;
},
+ getOrderScenarioCode(order = this.orderInfo) {
+ return Number(order && order.scenarioCode)
+ },
+ isWholesalerOrder(order = this.orderInfo) {
+ return this.getOrderScenarioCode(order) === 22
+ },
+ isCustomGiftOrder(order = this.orderInfo) {
+ return this.getOrderScenarioCode(order) === 24
+ },
+ isCollectiveOrder(order = this.orderInfo) {
+ return this.isWholesalerOrder(order) || this.isCustomGiftOrder(order)
+ },
+ canShowOrderEvaluate(order = this.orderInfo) {
+ return !this.isGiftOrder(order) && !this.isCollectiveOrder(order)
+ },
+ formatOrderDetailImage(image) {
+ const imageUrl = String(image || '').trim()
+ if (!imageUrl) {
+ return ''
+ }
+ if (/^https?:\/\//i.test(imageUrl)) {
+ return imageUrl
+ }
+ if (imageUrl.startsWith('//')) {
+ return `https:${imageUrl}`
+ }
+ if (imageUrl.startsWith('/')) {
+ const apiBaseUrl = String(this.$VUE_APP_API_URL || '').replace(/\/api\/?$/, '')
+ return `${apiBaseUrl}${imageUrl}`
+ }
+ return imageUrl
+ },
+ normalizeOrderDetailItem(item = {}, isCustomGift = false) {
+ if (isCustomGift) {
+ return {
+ image: this.formatOrderDetailImage(item.giftImage),
+ name: item.giftName || '商品信息',
+ sku: item.specName || '',
+ qty: Number(item.giftNum) || 1,
+ price: 0,
+ showPrice: false,
+ productId: '',
+ productInfo: {}
+ }
+ }
+ const productInfo = item.productInfo || {}
+ const attrInfo = productInfo.attrInfo || {}
+ return {
+ ...item,
+ image: this.formatOrderDetailImage(item.image || productInfo.image || attrInfo.image || ''),
+ name: productInfo.storeName || item.storeName || item.productName || '商品信息',
+ sku: attrInfo.sku || item.sku || item.specName || '',
+ qty: Number(item.cartNum || item.num || item.quantity || 1) || 1,
+ price: Number(item.truePrice || item.price || attrInfo.price || productInfo.price || 0) || 0,
+ showPrice: true,
+ productId: item.productId || productInfo.id || ''
+ }
+ },
+ getOrderDetailDisplayItems(order = this.orderInfo) {
+ if (this.isCustomGiftOrder(order)) {
+ const customGiftInfo = order && order.customGiftInfo
+ if (!customGiftInfo || typeof customGiftInfo !== 'object' || Array.isArray(customGiftInfo)) {
+ return []
+ }
+ return [this.normalizeOrderDetailItem(customGiftInfo, true)]
+ }
+ const cartList = Array.isArray(order && order.cartInfo) ? order.cartInfo : []
+ return cartList.map(item => this.normalizeOrderDetailItem(item))
+ },
getStatusImg(order) {
const type = parseInt(order._status._type);
let imgUrl = "";
@@ -1280,7 +1364,13 @@ export default {
this.orderInfo = res.data
this.orderInfo._status._type = parseInt(this.orderInfo._status._type)
this.getOrderStatus()
- if (this.orderInfo.combinationId > 0) {
+ if (this.isWholesalerOrder(this.orderInfo)) {
+ this.orderTypeName = "采购批发订单"
+ this.orderTypeNameStatus = false
+ } else if (this.isCustomGiftOrder(this.orderInfo)) {
+ this.orderTypeName = "自建礼品订单"
+ this.orderTypeNameStatus = false
+ } else if (this.orderInfo.combinationId > 0) {
this.orderTypeName = "拼团订单"
this.orderTypeNameStatus = false
} else if (this.orderInfo.bargainId > 0) {
From eb3db99cb8282a472bd7719d6ce2beb4ca0d1c09 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 2 Aug 2026 11:02:10 +0800
Subject: [PATCH 04/60] =?UTF-8?q?Fix=EF=BC=9A5595=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E7=A4=BC=E5=93=81?=
=?UTF-8?q?=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E6=94=B6=E5=88=B0=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=EF=BC=8C=E5=9C=A8=E5=95=86=E5=9F=8E=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F-=E6=88=91=E7=9A=84=E7=A4=BC=E5=93=81=E5=8D=A1-?=
=?UTF-8?q?=E6=94=B6=E5=88=B0=E7=9A=84=EF=BC=8C=E6=9C=AA=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/giftList.vue | 62 ++++++++++++++++++++++++++++++++-----
1 file changed, 54 insertions(+), 8 deletions(-)
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index 6e2f5e3..180ca54 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -138,7 +138,7 @@
class="gift-item"
>
- {{ cart.productInfo.storeName }}
+ {{ cart._displayName }}
-
- {{ cart.productInfo.attrInfo.sku }}
+
+ {{ cart._displaySku }}
-
+
- ￥{{ cart.productInfo.attrInfo.price }}
+ ￥{{ cart._displayPrice }}
@@ -442,7 +442,8 @@ export default {
const { success, data } = res
if (success) {
const { list, hasMore } = this.getListResult(data, page)
- this.receiveList = page === 1 ? list : this.receiveList.concat(list)
+ const formatList = list.map(item => this.normalizeReceiveGiftItem(item))
+ this.receiveList = page === 1 ? formatList : this.receiveList.concat(formatList)
this.receiveHasMore = hasMore
this.receivePage = page + 1
this.receiveInited = true
@@ -526,6 +527,51 @@ export default {
}
return status
},
+ normalizeReceiveGiftItem(item = {}) {
+ return {
+ ...item,
+ _renderGiftInfos: this.getReceiveGiftInfos(item)
+ }
+ },
+ getReceiveGiftInfos(item = {}) {
+ if (item.customGiftInfo && typeof item.customGiftInfo === 'object') {
+ const customGift = this.formatCustomGiftInfo(item.customGiftInfo)
+ if (customGift) {
+ return [customGift]
+ }
+ }
+ const giftInfos = Array.isArray(item.giftInfos) ? item.giftInfos : []
+ return giftInfos.map(gift => this.formatDefaultGiftInfo(gift))
+ },
+ formatCustomGiftInfo(customGiftInfo = {}) {
+ const giftImage = typeof customGiftInfo.giftImage === 'string'
+ ? customGiftInfo.giftImage.trim()
+ : ''
+ const giftValue = customGiftInfo.giftValue
+ const hasGiftValue = giftValue !== '' && giftValue !== null && giftValue !== undefined
+ return {
+ ...customGiftInfo,
+ _isCustomGift: true,
+ _displayImage: giftImage,
+ _displayName: customGiftInfo.giftName || '',
+ _displaySku: customGiftInfo.specName || '',
+ _displayPrice: hasGiftValue ? giftValue : '',
+ _showPrice: Number(customGiftInfo.isShowValue) === 1 && hasGiftValue
+ }
+ },
+ formatDefaultGiftInfo(gift = {}) {
+ const productInfo = gift.productInfo || {}
+ const attrInfo = productInfo.attrInfo || {}
+ const price = attrInfo.price
+ return {
+ ...gift,
+ _displayImage: productInfo.image || '',
+ _displayName: productInfo.storeName || '',
+ _displaySku: attrInfo.sku || '',
+ _displayPrice: price,
+ _showPrice: price !== '' && price !== null && price !== undefined
+ }
+ },
showTips() {
this.$refs.giftTips.showTips = true
},
From 50fe0e78c8aa0c39eb73a6f848f062685cc2f662 Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 2 Aug 2026 11:12:53 +0800
Subject: [PATCH 05/60] =?UTF-8?q?Feat=EF=BC=9A=E7=A4=BC=E5=8C=85=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=A7=92=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_user/views/giftList.vue | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/pkg_user/views/giftList.vue b/pkg_user/views/giftList.vue
index 180ca54..981afd7 100644
--- a/pkg_user/views/giftList.vue
+++ b/pkg_user/views/giftList.vue
@@ -23,6 +23,12 @@
:key="index"
class="gift-item"
>
+
+ {{ item.badgeText }}
+
+
+ {{ item.badgeText }}
+
Date: Sun, 2 Aug 2026 11:17:59 +0800
Subject: [PATCH 06/60] =?UTF-8?q?Fix=EF=BC=9A5590=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E8=BF=9B=E5=85=A5?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=97=B6=EF=BC=8C?=
=?UTF-8?q?=E5=BA=94=E9=BB=98=E8=AE=A4=E4=B8=BA=E5=85=A8=E9=83=A8=E5=88=86?=
=?UTF-8?q?=E7=B1=BB=EF=BC=8C=E7=8E=B0=E5=9C=A8=E9=BB=98=E8=AE=A4=E8=BF=9B?=
=?UTF-8?q?=E5=85=A5=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=98=AF?=
=?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E5=88=86=E7=B1=BB=EF=BC=8C3?=
=?UTF-8?q?=E4=B8=AA=E5=95=86=E5=93=81=E8=AE=A2=E5=8D=95=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E9=83=BD=E6=98=AF=E5=90=8C=E6=A0=B7=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/MyOrder/index.vue | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 0981754..e513295 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -867,7 +867,7 @@ export default {
this.orderTypeTabChange({
...currentOrderTypeTab,
index: this.orderTypeTabList[this.orderTypeTabIndex] ? this.orderTypeTabIndex : 0
- })
+ }, { resetFilters: false })
},
onShareAppMessage() {
uni.updateShareMenu({
@@ -884,6 +884,12 @@ export default {
getPageQuery() {
return (this.$yroute && this.$yroute.query) || {}
},
+ resetFilterConditions({ resetType = false } = {}) {
+ this.keyword = ''
+ if (resetType) {
+ this.type = 0
+ }
+ },
getDefaultTabListByOrderType(orderType = this.orderType) {
if (orderType === 'travel') {
return [
@@ -1793,15 +1799,20 @@ export default {
query.type = this.type
this.changeType()
},
- orderTypeTabChange(item) {
+ orderTypeTabChange(item, options = {}) {
+ const { resetFilters = true } = options
this.orderTypeTabIndex = item.index
this.orderType = item.orderType
const query = this.getPageQuery()
query.tabIndex = this.orderTypeTabIndex
this.updateTabListByOrderType()
- if (this.type > this.tabList.length - 1) {
+ if (resetFilters) {
+ this.type = 0
+ this.resetFilterConditions()
+ } else if (this.type > this.tabList.length - 1) {
this.type = 0
}
+ query.type = this.type
this.changeType(this.type)
},
updateTabListByOrderType() {
From 63bebfdb94a53a5e66e7b4a626e8c76a219f7ddc Mon Sep 17 00:00:00 2001
From: LinCyJang
Date: Sun, 2 Aug 2026 11:23:29 +0800
Subject: [PATCH 07/60] =?UTF-8?q?Fix=EF=BC=9A5564=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E3=80=90=E6=97=85?=
=?UTF-8?q?=E5=B1=85=E5=9B=A2=E8=B4=AD-=E9=80=80=E6=AC=BE=E3=80=91?=
=?UTF-8?q?=E9=80=80=E6=AC=BE=E8=A2=AB=E9=A9=B3=E5=9B=9E=E5=90=8E=E5=86=8D?=
=?UTF-8?q?=E6=AC=A1=E8=BF=9B=E5=85=A5=E9=80=80=E6=AC=BE=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=EF=BC=8C=E9=87=91=E9=A2=9D=E4=BB=85=E6=98=BE=E7=A4=BA=E2=80=9C?=
=?UTF-8?q?=EF=BF=A5=E2=80=9D=E4=B8=94=E2=80=9C=E7=A1=AE=E8=AE=A4=E9=80=80?=
=?UTF-8?q?=E6=AC=BE=E2=80=9D=E6=8C=89=E9=92=AE=E5=8F=AF=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E2=80=9C=E5=8A=A0=E8=BD=BD=E4=B8=AD=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_product/views/sojoumOrderRefund.vue | 135 +++++++++++++++++-------
1 file changed, 98 insertions(+), 37 deletions(-)
diff --git a/pkg_product/views/sojoumOrderRefund.vue b/pkg_product/views/sojoumOrderRefund.vue
index ec83d6c..8681a71 100644
--- a/pkg_product/views/sojoumOrderRefund.vue
+++ b/pkg_product/views/sojoumOrderRefund.vue
@@ -7,16 +7,16 @@
退款金额
退回原支付方
- ¥{{refundAmount}}
+ ¥{{ displayRefundAmount }}
订单支付金额
- ¥{{orderAmount}}
+ ¥{{ displayOrderAmount }}
退款违约金
- ¥{{deductionAmount}}
+ ¥{{ displayDeductionAmount }}
@@ -49,19 +49,26 @@
-
+
From b636cd905b96a075513735c91110c0dba702c375 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 12 Aug 2026 10:28:07 +0800
Subject: [PATCH 13/60] =?UTF-8?q?Fix=EF=BC=9A5707=20=E3=80=90=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E3=80=91=E3=80=90=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?-=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E3=80=91=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E6=9C=89=E3=80=90=E5=86=8D=E4=B9=B0?=
=?UTF-8?q?=E4=B8=80=E5=8D=95=E3=80=91=E6=8C=89=E9=92=AE=EF=BC=8C=E9=9C=80?=
=?UTF-8?q?=E8=A6=81=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pagesOrder/order/OrderDetails/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue
index 3dc260d..9762f0b 100644
--- a/pagesOrder/order/OrderDetails/index.vue
+++ b/pagesOrder/order/OrderDetails/index.vue
@@ -564,7 +564,7 @@
申请退款
- 再买一单
+ 再买一单
联系商家
- 再买一单
+ 再买一单
联系商家
-
- 再买一单
+
+ 再买一单
Date: Wed, 12 Aug 2026 10:42:57 +0800
Subject: [PATCH 14/60] =?UTF-8?q?Refactor(=E4=BA=91=E7=81=B5AI):ws?=
=?UTF-8?q?=E8=BF=9E=E6=8E=A5=E4=BD=BF=E7=94=A8uid=E6=8B=BC=E6=8E=A5?=
=?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9APP=E7=99=BB=E5=BD=95=E6=B2=A1?=
=?UTF-8?q?=E6=9C=89=E8=8E=B7=E5=8F=96=E5=88=B0unionId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
aiChat/mixins/chatMixins.js | 2 +-
aiChat/mixins/chatMixinsV2.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/aiChat/mixins/chatMixins.js b/aiChat/mixins/chatMixins.js
index 5b59f6b..601d99a 100644
--- a/aiChat/mixins/chatMixins.js
+++ b/aiChat/mixins/chatMixins.js
@@ -372,7 +372,7 @@ export const chatMixins = {
const _this = this
console.log('------------------创建连接')
uni.connectSocket({
- url: VUE_APP_API_URL.replace('https', 'wss') + settings.sysPrefix + `v1/chat/websocket/${_this.userInfo.unionId}-${conversationId}`,
+ url: VUE_APP_API_URL.replace('https', 'wss') + settings.sysPrefix + `v1/chat/websocket/${_this.userInfo.uid}-${conversationId}`,
header: {
'content-type': 'application/json'
},
diff --git a/aiChat/mixins/chatMixinsV2.js b/aiChat/mixins/chatMixinsV2.js
index a854680..10ac0c8 100644
--- a/aiChat/mixins/chatMixinsV2.js
+++ b/aiChat/mixins/chatMixinsV2.js
@@ -334,7 +334,7 @@ export const chatMixinsV2 = {
const _this = this
console.log('------------------创建连接')
uni.connectSocket({
- url: VUE_APP_API_URL.replace('https', 'wss') + settings.sysPrefix + `v1/chat/websocket/${_this.userInfo.unionId}-${conversationId}`,
+ url: VUE_APP_API_URL.replace('https', 'wss') + settings.sysPrefix + `v1/chat/websocket/${_this.userInfo.uid}-${conversationId}`,
header: {
'content-type': 'application/json'
},
From c6ef03434ecf5335d23d544edf76d3cc1c6a63a5 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Wed, 12 Aug 2026 10:50:10 +0800
Subject: [PATCH 15/60] =?UTF-8?q?Fix=EF=BC=9A5689=20=E3=80=90=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E3=80=91=E3=80=90=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95?=
=?UTF-8?q?-=E8=81=94=E7=B3=BB=E5=95=86=E5=AE=B6=E3=80=91=E5=90=91?=
=?UTF-8?q?=E5=95=86=E5=AE=B6=E5=8F=91=E9=80=81=E5=9B=BE=E7=89=87=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E4=B8=BA=E7=BA=AF=E7=99=BD=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/shop/GoodsCon/index.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index b2bd15f..afb8657 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -900,14 +900,14 @@ export default {
handleLoginFailure()
return
}
- console.log(this.storeInfo);
+ console.log(this.attr);
const params = {
goodsId: this.id,
goodsName: this.attr.productSelect.store_name,
skuStr: this.attrValue,
price: this.attr.productSelect.price,
seckillId: this.activityId,
- cover: this.attr.productSelect.image,
+ cover: this.attr.productSelect.image || this.storeInfo.image,
goodsData: '',
seckillData: '',
isNegotiable: this.storeInfo.isNegotiable
@@ -1276,7 +1276,7 @@ export default {
'store_name',
this.storeInfo.storeName
)
- this.$set(this.attr.productSelect, 'image', productSelect.image)
+ this.$set(this.attr.productSelect, 'image', productSelect.image || this.storeInfo.image)
this.$set(this.attr.productSelect, 'price', productSelect.price)
this.$set(this.attr.productSelect, 'otPrice', productSelect.otPrice)
this.$set(this.attr.productSelect, 'stock', productSelect.stock)
@@ -1403,7 +1403,7 @@ export default {
subItem.check = true
}
})
- this.$set(this.attr.productSelect, 'image', productSelect.image)
+ this.$set(this.attr.productSelect, 'image', productSelect.image || this.storeInfo.image)
this.$set(this.attr.productSelect, 'price', productSelect.price)
this.$set(this.attr.productSelect, 'otPrice', productSelect.otPrice)
this.$set(this.attr.productSelect, 'stock', productSelect.stock)
From 4670b51a5aae8f0a7d1e799ade275654c50ba16a Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Aug 2026 14:39:22 +0800
Subject: [PATCH 16/60] =?UTF-8?q?Feat=EF=BC=9A=E5=BC=80=E5=B1=8F=E9=A1=B5?=
=?UTF-8?q?=E8=B0=83=E6=95=B4=E8=87=B35s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/Loading/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 33a3b90..101844b 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -49,7 +49,7 @@ export default {
// 注释下面一行，会停留在启动页
setTimeout(() => {
this.toLaunch();
- }, 2000)
+ }, 5000)
return;
}
cookie.get("spread");
From 6b09cf8a903faf77ee0e02a0a4f417ccff790940 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Aug 2026 14:39:29 +0800
Subject: [PATCH 17/60] =?UTF-8?q?Fix=EF=BC=9A5761=20=E3=80=90=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83PC=E7=AB=AF?=
=?UTF-8?q?=E3=80=91=E3=80=90=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB-?=
=?UTF-8?q?=E7=A4=BC=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E3=80=91?=
=?UTF-8?q?=E5=A4=B4=E5=83=8F=E3=80=81=E8=B5=84=E8=B4=A8=E5=86=85=E5=AE=B9?=
=?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E5=9B=BE=E7=89=87=E5=8F=AF=E9=87=8D?=
=?UTF-8?q?=E6=96=B0=E4=B8=8A=E4=BC=A0=EF=BC=8C=E6=97=A0=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=8C=89=E9=94=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_join/views/wholesaler.vue | 63 ++++++++++++++++++++++++++++++-----
1 file changed, 54 insertions(+), 9 deletions(-)
diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue
index ce8e1ed..bac3623 100644
--- a/pkg_join/views/wholesaler.vue
+++ b/pkg_join/views/wholesaler.vue
@@ -44,11 +44,19 @@
v-if="!form.avatar"
class="btn-upload"
>上传图片
-
+
+
+
+ x
+
+
@@ -139,12 +147,23 @@
>上传图片
-
+ class="img-wrap"
+ >
+
+
+ x
+
+
@@ -433,6 +452,15 @@ export default {
}
})
},
+ // 删除图片
+ deleteImg(target, index) {
+ if (target === 'avatar') {
+ this.form.avatar = ''
+ } else if (target === 'qualification') {
+ this.qualificationArr.splice(index, 1)
+ this.form.qualification = this.qualificationArr.join(',')
+ }
+ },
// 省市区
result(values) {
this.address = {
@@ -526,6 +554,23 @@ export default {
.font-color-red{
font-size: 24rpx;
}
+.img-wrap {
+ position: relative;
+ display: inline-block;
+
+ .delete-badge {
+ position: absolute;
+ top: 0;
+ right: 20rpx;
+ background: #000;
+ color: #fff;
+ padding: 2rpx 8rpx;
+ border-radius: 0 0 0 200rpx;
+ font-size: 22rpx;
+ z-index: 10;
+ text-align: center;
+ }
+}
.captcha-wrap {
display: flex;
align-items: center;
From 57fc90b0308e7c61e806da9993174e2da07a90aa Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Aug 2026 15:36:56 +0800
Subject: [PATCH 18/60] =?UTF-8?q?Fix=EF=BC=9A5759=20=E3=80=90=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E3=80=91=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95-?=
=?UTF-8?q?=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=EF=BC=8C=E9=A2=86=E5=8F=96?=
=?UTF-8?q?=E9=87=87=E8=B4=AD=E6=89=B9=E5=8F=91=E7=A4=BC=E5=93=81=E7=9A=84?=
=?UTF-8?q?=E7=9B=B2=E7=9B=92=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E6=95=88?=
=?UTF-8?q?=E6=9E=9C=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/order/MyOrder/index.vue | 2 +-
pagesOrder/order/OrderDetails/index.vue | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 7e5d0be..b06992d 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -282,7 +282,7 @@
-
+
-
+
@@ -1059,6 +1059,9 @@ export default {
isCustomGiftOrder(order = this.orderInfo) {
return this.getOrderScenarioCode(order) === 24
},
+ isBlindBoxOrder(order = this.orderInfo) {
+ return Number(order && order.isGiftCardReceiveBlind) === 1
+ },
isCollectiveOrder(order = this.orderInfo) {
return this.isWholesalerOrder(order) || this.isCustomGiftOrder(order)
},
@@ -1117,6 +1120,10 @@ export default {
return [this.normalizeOrderDetailItem(customGiftInfo, true)]
}
const cartList = Array.isArray(order && order.cartInfo) ? order.cartInfo : []
+ // 盲盒订单隐藏商品信息，固定展示一个盲盒礼包行（cartInfo 为空时也要展示）
+ if (this.isBlindBoxOrder(order)) {
+ return [this.normalizeOrderDetailItem(cartList[0] || {})]
+ }
return cartList.map(item => this.normalizeOrderDetailItem(item))
},
getStatusImg(order) {
From f20e73e859ad1e4dc1a4f79e43a3a3aa685d3d6d Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Aug 2026 16:08:23 +0800
Subject: [PATCH 19/60] =?UTF-8?q?Fix=EF=BC=9A5777=20=E3=80=90=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E3=80=91=E3=80=90=E5=95=86=E6=88=B7=E5=85=A5=E9=A9=BB?=
=?UTF-8?q?-=E7=A4=BC=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83?=
=?UTF-8?q?=E3=80=91=E5=85=A5=E9=A9=BB=E8=AF=A6=E6=83=85=E9=A1=B5=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E2=80=9C=E8=90=A5=E4=B8=9A=E6=89=A7=E7=85=A7=E5=90=8D?=
=?UTF-8?q?=E7=A7=B0=E2=80=9D=E5=A1=AB=E5=86=99=E6=A0=8F=EF=BC=8C=E5=BF=85?=
=?UTF-8?q?=E5=A1=AB=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_join/views/wholesaler.vue | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue
index bac3623..415bce6 100644
--- a/pkg_join/views/wholesaler.vue
+++ b/pkg_join/views/wholesaler.vue
@@ -35,6 +35,21 @@
+
+
+
+ *
+
+
+
+
+
+
@@ -269,6 +284,7 @@ export default {
tips: '获取验证码',
form: {
name: '',
+ businessLicense: '',
avatar: '',
contact: '',
phone: '',
From f4539ccf4a139cbbc34d50425deecb051087bd89 Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 17 Aug 2026 16:18:47 +0800
Subject: [PATCH 20/60] =?UTF-8?q?Fix=EF=BC=9A5778=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E3=80=90=E5=95=86?=
=?UTF-8?q?=E6=88=B7=E5=85=A5=E9=A9=BB-=E5=85=A5=E9=A9=BB=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E9=A1=BB=E7=9F=A5=E3=80=91=E9=A6=99=E9=81=93=E6=BB=87?=
=?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=B1=95=E7=A4=BA=E7=9A=84=E2=80=9C?=
=?UTF-8?q?=E5=85=A5=E9=A9=BB=E7=94=B3=E8=AF=B7=E9=A1=BB=E7=9F=A5=E2=80=9D?=
=?UTF-8?q?=E6=AE=B5=E8=90=BD=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=B8=8E=E9=A6=99?=
=?UTF-8?q?=E9=81=93=E6=BB=87=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86=E7=B3=BB?=
=?UTF-8?q?=E7=BB=9F=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=9A=84=E5=86=85=E5=AE=B9?=
=?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
assets/css/pkg_join.less | 19 +++++++++++++++++++
pkg_join/views/experienceStore.vue | 23 +++++++++++++++++++++--
pkg_join/views/shop.vue | 5 +++--
pkg_join/views/supplier.vue | 5 +++--
pkg_join/views/travelResidence.vue | 24 ++++++++++++++++++++++--
pkg_join/views/wholesaler.vue | 4 ++--
utils/index.js | 9 +++++++++
7 files changed, 79 insertions(+), 10 deletions(-)
diff --git a/assets/css/pkg_join.less b/assets/css/pkg_join.less
index 9c468fc..3ab1dcc 100644
--- a/assets/css/pkg_join.less
+++ b/assets/css/pkg_join.less
@@ -127,6 +127,25 @@
height: 52vh;
overflow-y: auto;
margin: 30rpx 0;
+
+ // 小程序rich-text内块级标签无默认段间距，补充与后台富文本编辑器一致的段落格式
+ rich-text {
+ display: block;
+ width: 100%;
+
+ p, div, ul, ol {
+ display: block;
+ margin: 0 0 16rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+ }
+
+ li {
+ margin: 0 0 8rpx;
+ }
+ }
}
.agree-box {
diff --git a/pkg_join/views/experienceStore.vue b/pkg_join/views/experienceStore.vue
index e31a8dc..00df38e 100644
--- a/pkg_join/views/experienceStore.vue
+++ b/pkg_join/views/experienceStore.vue
@@ -451,7 +451,7 @@
-
From 007e80bebbfdbda1217048646ac78193c08798db Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Aug 2026 11:54:01 +0800
Subject: [PATCH 49/60] =?UTF-8?q?Fix=EF=BC=9A5850=20=E3=80=90=E7=A4=BC?=
=?UTF-8?q?=E5=93=81=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=E5=B0=8F=E7=A8=8B?=
=?UTF-8?q?=E5=BA=8F=E3=80=91=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95-?=
=?UTF-8?q?=E9=9B=86=E9=87=87=E4=B8=AD=E5=BF=83=EF=BC=8C=E5=95=86=E5=9F=8E?=
=?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=87=AA=E5=BB=BA=E7=A4=BC=E5=93=81?=
=?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E8=87=AA?=
=?UTF-8?q?=E5=BB=BA=E7=A4=BC=E5=93=81=E5=85=B3=E9=97=AD=E7=A4=BC=E5=93=81?=
=?UTF-8?q?=E4=BB=B7=E5=80=BC=E6=97=B6=E9=9A=90=E8=97=8F=E7=A4=BC=E5=93=81?=
=?UTF-8?q?=E4=BB=B7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pagesOrder/order/OrderDetails/index.vue | 33 +++++++++++++++----------
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/pagesOrder/order/OrderDetails/index.vue b/pagesOrder/order/OrderDetails/index.vue
index 973ce76..b71d041 100644
--- a/pagesOrder/order/OrderDetails/index.vue
+++ b/pagesOrder/order/OrderDetails/index.vue
@@ -246,20 +246,27 @@
-
- {{ isCustomGiftOrder(orderInfo) ? '礼品价值' : '商品总价' }}
+
+
+ {{ '礼品价值' }}
+
+
+ ￥
+
+ {{ force2Decimal(orderInfo.customGiftInfo.giftValue) }}
+
+
-
- ￥
-
- {{ force2Decimal(orderInfo.totalPrice) }}
-
-
- {{ force2Decimal(orderInfo.totalPrice) }}
-
-
- {{ force2Decimal(orderInfo.customGiftInfo.giftValue) }}
-
+
+
+ {{ '商品总价' }}
+
+
+ ￥
+
+ {{ force2Decimal(orderInfo.totalPrice) }}
+
+
From 1845171a1e3d42026b1cfff022724d683c03572c Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 24 Aug 2026 12:14:18 +0800
Subject: [PATCH 50/60] =?UTF-8?q?Fix=EF=BC=9A5852=20=E3=80=90=E5=95=86?=
=?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E7=A0=81=E8=BE=93=E5=85=A5=E6=A1=86=E6=97=81=E7=9A=84=E2=80=9C?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E2=80=9D=E6=96=87=E6=A1=88=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE=E9=94=99=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkg_join/views/wholesaler.vue | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/pkg_join/views/wholesaler.vue b/pkg_join/views/wholesaler.vue
index 381fd8e..8210bf5 100644
--- a/pkg_join/views/wholesaler.vue
+++ b/pkg_join/views/wholesaler.vue
@@ -7,7 +7,6 @@
>
@@ -576,9 +575,17 @@ export default {
}
+
+