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": {
diff --git a/pages/chose-city/chose-city.vue b/pages/chose-city/chose-city.vue
index 189d361..3e80905 100644
--- a/pages/chose-city/chose-city.vue
+++ b/pages/chose-city/chose-city.vue
@@ -384,20 +384,17 @@ export default {
this.mescroll && this.mescroll.triggerDownScroll()
},
search() {
- if(this.keyword === '') return
- const matchIndex = this.listGroup.findIndex((group, index) => {
- let result
- group.city.forEach(item => {
- result = item.cityName.indexOf(this.keyword, 0)
- if (result !== -1) {
- this.asideTap(index);
- return null;
- }
- })
- if (result !== -1) {
- return result
- }
+ const keyword = (this.keyword || '').trim()
+ if (!keyword) return
+ const matchIndex = this.listGroup.findIndex(group => {
+ const cityList = Array.isArray(group.city) ? group.city : []
+ return cityList.some(item => item && item.cityName && item.cityName.indexOf(keyword) !== -1)
})
+ if (matchIndex !== -1) {
+ this.keyword = keyword
+ this.asideTap(matchIndex)
+ return
+ }
if (matchIndex === -1) {
uni.showToast({
title: '未找到该城市，请重新输入城市名称',
diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index 717ccf3..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 }}
+
+
+
+
+
@@ -254,22 +285,22 @@
@@ -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) {
@@ -1299,9 +1672,39 @@ export default {
}
}
},
- gotoGoodDetail(cart, type, query){
+ gotoGoodDetail(orderOrIndex, cartOrIndex) {
+ const order = this.getOrderByIndex(orderOrIndex)
+ const cartList = Array.isArray(order && order.cartInfo) ? order.cartInfo : []
+ const cart = typeof cartOrIndex === 'number' ? cartList[cartOrIndex] : cartOrIndex
+ if (!cart) {
+ uni.showToast({
+ title: '未获取到商品信息',
+ icon: 'none'
+ })
+ return
+ }
+ const productInfo = cart.productInfo || {}
+ let type = 1
+ let id = productInfo.id || cart.productId || ''
+ if (Number(cart.combinationId) > 0) {
+ type = 2
+ id = cart.combinationId
+ } else if (Number(cart.bargainId) > 0) {
+ type = 3
+ id = cart.bargainId
+ } else if (Number(cart.seckillId) > 0) {
+ type = 4
+ id = cart.seckillId
+ }
+ if (!id) {
+ uni.showToast({
+ title: '未获取到商品详情参数',
+ icon: 'none'
+ })
+ return
+ }
// isProductStillExist:0-不存在,1-存在
- const isProductStillExist = cart.isProductStillExist || 0
+ const isProductStillExist = Number(cart.isProductStillExist || 0)
if (isProductStillExist === 0) {
this.$dialog.toast({ mes: '商品已下架' })
return
@@ -1321,7 +1724,17 @@ export default {
path = '/pages/activity/SeckillDetails/index'
break
}
- this.$yrouter.push({ path, query })
+ if (!path) {
+ uni.showToast({
+ title: '未找到商品详情页',
+ icon: 'none'
+ })
+ return
+ }
+ this.$yrouter.push({
+ path,
+ query: { id }
+ })
},
getOrderData() {
getOrderData().then(res => {
@@ -1376,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({
@@ -1428,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/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index e2142d0..b2bd15f 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -732,6 +732,7 @@ export default {
console.log("getLaunchOptionsSync", uni.getLaunchOptionsSync())
console.log("getEnterOptionsSync", uni.getEnterOptionsSync())
uni.removeStorageSync('couponId')
+ const pageQuery = Object.assign({}, this.resolvePageQuery(), options || {})
const from = options.from
const id = options.id
switch (from) {
@@ -779,10 +780,10 @@ export default {
if (url && url.productId) {
this.id = url.productId
} else if (options.id) {
- this.id = options.id || null
- this.partnerId = options.partnerId || null
- this.activityId = this._route.query.activityId
- this.source = this._route.query.from || ''
+ this.id = pageQuery.id || options.id || null
+ this.partnerId = pageQuery.partnerId || options.partnerId || null
+ this.activityId = Number(pageQuery.activityId || pageQuery.drawActivityId || 0)
+ this.source = pageQuery.from || ''
} else {
const obj = uni.getEnterOptionsSync()
if (options.scene != null || obj.query.scene != null) {
@@ -847,6 +848,18 @@ export default {
}
},
methods: {
+ resolvePageQuery() {
+ if (this.$yroute && this.$yroute.query) {
+ return this.$yroute.query
+ }
+ if (this.$route && this.$route.query) {
+ return this.$route.query
+ }
+ if (this._route && this._route.query) {
+ return this._route.query
+ }
+ return {}
+ },
gift() {
this.goCat(2)
},
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) {
diff --git a/pkg_join/views/index.vue b/pkg_join/views/index.vue
index ce1a9e3..9db3c50 100644
--- a/pkg_join/views/index.vue
+++ b/pkg_join/views/index.vue
@@ -6,21 +6,21 @@
mode="scaleToFill"
/>
{{ 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 }}
diff --git a/pkg_user/views/gift/gift.vue b/pkg_user/views/gift/gift.vue
index 04568d3..dd26b6a 100644
--- a/pkg_user/views/gift/gift.vue
+++ b/pkg_user/views/gift/gift.vue
@@ -299,11 +299,12 @@ export default {
}
},
onLoad(opts) {
- this.cartId = opts.cartId
- this.isGroupBuy = opts.isGroupBuy === '1'
- this.isCountyLotteryGift = opts.from === 'countyLottery' || opts.isCountyLotteryGift === '1' || !!opts.drawActivityId
+ const pageQuery = Object.assign({}, this.resolvePageQuery(), opts || {})
+ this.cartId = pageQuery.cartId
+ this.isGroupBuy = pageQuery.isGroupBuy === '1'
+ this.isCountyLotteryGift = pageQuery.from === 'countyLottery' || pageQuery.isCountyLotteryGift === '1' || !!pageQuery.drawActivityId
// this.couponId = opts.couponId || 0
- this.discount = opts.discount
+ this.discount = pageQuery.discount
if(this.isGroupBuy) {
this.getGroupBuyInfo()
} else {
@@ -332,10 +333,39 @@ export default {
}
},
methods: {
+ resolvePageQuery() {
+ if (this.$yroute && this.$yroute.query) {
+ return this.$yroute.query
+ }
+ if (this.$route && this.$route.query) {
+ return this.$route.query
+ }
+ if (this._route && this._route.query) {
+ return this._route.query
+ }
+ return {}
+ },
getCouponId() {
if (this.isCountyLotteryGift) return 0
return this.couponId || 0
},
+ isCountyLotteryCartItem(item) {
+ return Number(
+ (item && item.drawActivityId) ||
+ (item && item.productInfo && item.productInfo.drawActivityId) ||
+ 0
+ ) > 0
+ },
+ syncCountyLotteryGiftFlag(item) {
+ if (!this.isCountyLotteryGift && this.isCountyLotteryCartItem(item)) {
+ this.isCountyLotteryGift = true
+ }
+ if (!this.isCountyLotteryGift) return
+ this.couponTitle = ''
+ if (Number(this.couponId || 0) !== 0) {
+ this.couponId = 0
+ }
+ },
adjustCoverListForProductStory(coverList, productInfo, defaultTemplate) {
if (!productInfo || !productInfo.productStory) {
return {
@@ -436,6 +466,7 @@ export default {
this.giftNotice = res.data.giftCardGiftNotice
this.orderKey = res.data.orderKey
this.goodsInfo = goodsInfo
+ this.syncCountyLotteryGiftFlag(goodsInfo)
this.templateId = template.id
this.defaultIndex = this.coverList.findIndex(item => item.id === this.templateId)
console.log(this.defaultIndex, 'defaultIndex');
@@ -522,6 +553,7 @@ export default {
this.giftNotice = res.data.giftCardGiftNotice
this.orderKey = res.data.orderKey
this.goodsInfo = goodsInfo
+ this.syncCountyLotteryGiftFlag(goodsInfo)
this.templateId = template.id
this.selectedCover = template.cover
this.giftImage = template.image