From 209295c581386735d6283e1dc4519373ddd1c3e5 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 29 Mar 2024 18:43:29 +0800 Subject: [PATCH 01/82] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):[#1022]=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=B1=9E=E6=80=A7=E6=94=B9=E4=B8=BA=E8=A7=84?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/OrderGoods.vue | 2 +- pages/order/MyOrder/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/OrderGoods.vue b/components/OrderGoods.vue index aa7d37b..c6ef5a7 100644 --- a/components/OrderGoods.vue +++ b/components/OrderGoods.vue @@ -27,7 +27,7 @@ class="attr" style="height: 38rpx;line-height:38rpx;background-color: #FFF3F2;border-radius: 19rpx;padding: 4rpx 20rpx;" v-if="cart.productInfo.attrInfo" - >属性：{{ cart.productInfo.attrInfo.sku }} + >规格：{{ cart.productInfo.attrInfo.sku }} 评价 diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 14827b8..d2193de 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -58,7 +58,7 @@ {{ cart.productInfo.storeName }} - 属性：{{ cart.productInfo.attrInfo.sku }} + 规格：{{ cart.productInfo.attrInfo.sku }} From 6eedbfd240479575914ac9be547afb8f9018b7fd Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 29 Mar 2024 22:33:01 +0800 Subject: [PATCH 02/82] =?UTF-8?q?Fix(=E5=95=86=E5=93=81):[#1015]=E5=95=86?= =?UTF-8?q?=E5=93=81=E8=A7=84=E6=A0=BC=E4=B8=AD=E5=90=AB=E6=9C=89=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E7=82=B9=E7=9A=84=E5=AD=97=E7=AC=A6=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=80=89=E4=B8=AD=E8=B4=AD=E4=B9=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ProductWindow.vue | 47 ++++++++++++++++------------------- pages/shop/GoodsCon/index.vue | 2 +- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue index 4d7f731..acee08f 100644 --- a/components/ProductWindow.vue +++ b/components/ProductWindow.vue @@ -66,18 +66,16 @@ export default { type: Object, default: () => {} }, - productValue: { - type: Object, - default: () => {} + // 使用字符串再转成对象的原因是，当key='2.5g'时，会变成key='2'，导致数据丢失 + productValueStr: { + type: String, + default: '{}' }, cartNum: { type: Number, default: () => 1 } }, - data: function() { - return {}; - }, methods: { previewImg:function(imgUrl){ uni.previewImage({ @@ -85,50 +83,49 @@ export default { }) }, closeAttr: function() { - this.$emit("changeFun", { action: "changeattr", value: false }); + this.$emit("changeFun", { action: "changeattr", value: false }) }, CartNumDes: function() { - this.$emit("changeFun", { action: "ChangeCartNum", value: false }); + this.$emit("changeFun", { action: "ChangeCartNum", value: false }) }, CartNumAdd: function() { - this.$emit("changeFun", { action: "ChangeCartNum", value: 1 }); + this.$emit("changeFun", { action: "ChangeCartNum", value: 1 }) }, tapAttr: function(indexw, indexn, itemn) { - if (this.productValue[itemn.attr].stock === 0) { - return + const productValue = JSON.parse(this.productValueStr || '{}') + if (productValue[itemn.attr]) { + if (productValue[itemn.attr].stock === 0) { + return + } } // 修改商品规格不生效的原因： // H5端下面写法，attr更新，但是除H5外其他端不支持， // 尽量避免下面的骚写法，不要在子组件内更新props // 这里修改是为了能获取到被选中的属性 - this.attr.productAttr[indexw].index = indexn; - let that = this; - let value = that - .getCheckedValue() - .sort() - .join(","); - that.$emit("changeFun", { + this.attr.productAttr[indexw].index = indexn + const value = this.getCheckedValue().sort().join(",") + this.$emit("changeFun", { action: "ChangeAttr", value: { value, indexw, indexn } - }); + }) }, - //获取被选中属性； + // 获取被选中属性 getCheckedValue: function() { - let productAttr = this.attr.productAttr; - let value = []; + const productAttr = this.attr.productAttr + const value = [] for (let i = 0; i < productAttr.length; i++) { for (let j = 0; j < productAttr[i].attrValueArr.length; j++) { if (productAttr[i].index === j) { - value.push(productAttr[i].attrValueArr[j]); + value.push(productAttr[i].attrValueArr[j]) } } } - return value; + return value } } -}; +} diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 4656fe4..d68156a 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -475,7 +475,7 @@ Date: Fri, 29 Mar 2024 23:23:39 +0800 Subject: [PATCH 03/82] =?UTF-8?q?Fix(=E5=95=86=E5=93=81/=E8=AE=A2=E5=8D=95?= =?UTF-8?q?):[#1021]=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E9=A1=B5=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E6=97=B6=E9=80=89=E6=8B=A9=E4=BC=98=E6=83=A0=E5=88=B8?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E2=80=9C=E7=AB=8B=E5=8D=B3=E8=B4=AD?= =?UTF-8?q?=E4=B9=B0=E2=80=9D=E5=90=8E=E5=B7=B2=E6=98=BE=E7=A4=BA=E6=89=A3?= =?UTF-8?q?=E9=99=A4=E4=BC=98=E6=83=A0=E9=87=91=E9=A2=9D=EF=BC=8C=E4=BD=86?= =?UTF-8?q?=E7=82=B9=E5=BC=80=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=9C=AA=E5=8B=BE=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Coupons.vue | 37 +++++++++--- components/CouponsPopup.vue | 85 +++++++++++++++------------ pages/order/OrderSubmission/index.vue | 74 ++++++++++++++--------- pages/shop/GoodsCon/index.vue | 2 +- 4 files changed, 122 insertions(+), 76 deletions(-) diff --git a/components/Coupons.vue b/components/Coupons.vue index bd82d9e..63a3b68 100644 --- a/components/Coupons.vue +++ b/components/Coupons.vue @@ -1,18 +1,32 @@ @@ -26,16 +47,26 @@ import Coupons from '@/components/Coupons.vue' export default { name: 'CouponsPopup', - components: {SubSection, Coupons}, + components: { SubSection, Coupons }, props: { twoList: { type: Object, - default: {} + default: { + usable: [], + unusable: [] + } + } + }, + data() { + return { + webUrl: this.$VUE_APP_RESOURCES_URL, + current: 0, + couponId: uni.getStorageSync('couponId') || 0 } }, computed: { list() { - let temp = this.current === 0 ? this.twoList['usable'] : this.twoList['unusable'] + const temp = this.current === 0 ? this.twoList['usable'] : this.twoList['unusable'] return this.$global.deepClone(temp) }, canUse() { @@ -45,44 +76,20 @@ export default { return this.twoList['unusable'].length } }, - watch: { - current() { - this.selectCoupon(this.couponId) - } - }, - data() { - return { - webUrl: this.$VUE_APP_RESOURCES_URL, - current: 0, - couponId: 0 - } - }, - mounted() { - this.couponId = uni.getStorageSync('couponId') || 0 - this.selectCoupon(this.couponId) - }, methods: { changeNav(index) { this.current = index }, selectCoupon(id) { - const isCancel = this.couponId === id - this.couponId = isCancel ? 0 : id - - this.list?.forEach(item => { - if (!isCancel) { - item.checked = id === item.id - } else { - item.checked = false - } + this.couponId = id + this.list.map(item => { + item.checked = id === item.id }) }, setCoupon() { if (this.current === 1) return - // if (this.couponId !== 0) { - uni.setStorageSync('couponId', this.couponId) - // } - this.$emit('close') + uni.setStorageSync('couponId', this.couponId) + this.$emit('change') } } } diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 4fc7ac2..9c2a6a8 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -185,8 +185,18 @@ - - + + @@ -272,8 +282,11 @@ export default { lotteryRecordId:'', payPassword: null, // v9-2 - couponList: {}, - couponId: 0, + couponList: { + unusable: [], + usable: [] + }, + couponId: uni.getStorageSync('couponId') || 0, couponIndex: -1, show: false }; @@ -354,35 +367,42 @@ export default { }); }, getCartInfo() { - var that = this; - // const cartIds = this.$yroute.query.id; - if (!that.cartid && !that.lotteryRecordId) { + const _this = this + if (!_this.cartid && !_this.lotteryRecordId) { uni.showToast({ title: "参数有误", icon: "none", duration: 2000 - }); - return this.$yrouter.back(); + }) + return this.$yrouter.back() } - postOrderConfirm(that.cartid,that.lotteryRecordId) - .then(res => { - that.offlinePayStatus = res.data.offline_pay_status; - that.orderGroupInfo = res.data; - that.deduction = res.data.deduction; - that.couponList = res.data.couponList - that.addressInfo = res.data.addressInfo || {}; - that.systemStore = res.data.systemStore || {}; - that.storeSelfMention = res.data.storeSelfMention; - that.couponId = uni.getStorageSync('couponId') || 0 - that.computedPrice() + postOrderConfirm(_this.cartid,_this.lotteryRecordId).then(res => { + const { data } = res + _this.offlinePayStatus = data.offline_pay_status + _this.orderGroupInfo = data + _this.deduction = data.deduction + _this.couponList = data.couponList + if (_this.couponId > 0) { + _this.couponList['usable'].map((item, index) => { + if (item.id === _this.couponId) { + item.checked = true + _this.couponIndex = index + } else { + item.checked = false + } }) - .catch(err => { - uni.showToast({ - title: err.msg, - icon: "none", - duration: 2000 - }); - }); + } + _this.addressInfo = data.addressInfo || {} + _this.systemStore = data.systemStore || {} + _this.storeSelfMention = data.storeSelfMention + _this.computedPrice() + }).catch(err => { + uni.showToast({ + title: err.msg, + icon: "none", + duration: 2000 + }) + }) }, addressTap: function () { //改用跳转页面方式 diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index d68156a..be348da 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -202,7 +202,7 @@ - + From c49d686719c07314469e24340bd136279383e666 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 29 Mar 2024 23:29:47 +0800 Subject: [PATCH 04/82] =?UTF-8?q?Fix(=E4=BD=A3=E9=87=91=E6=98=8E=E7=BB=86)?= =?UTF-8?q?:[#1013]=E8=8B=B9=E6=9E=9C=E6=89=8B=E6=9C=BA=E4=BD=A3=E9=87=91?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BB=8D=E7=84=B6?= =?UTF-8?q?=E8=83=BD=E5=B7=A6=E5=8F=B3=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/user/promotion/CommissionDetails/index.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pages/user/promotion/CommissionDetails/index.vue b/pages/user/promotion/CommissionDetails/index.vue index f7539c2..1bcaa48 100644 --- a/pages/user/promotion/CommissionDetails/index.vue +++ b/pages/user/promotion/CommissionDetails/index.vue @@ -111,3 +111,10 @@ export default { } }; + From bc64e2a7374780d4d98187b31feca67861471b7d Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 29 Mar 2024 23:39:59 +0800 Subject: [PATCH 05/82] =?UTF-8?q?Fix(=E5=A4=A9=E5=A4=A9=E7=A7=92=E6=9D=80)?= =?UTF-8?q?:[#1017]=E5=B7=B2=E6=8A=A2=E6=95=B0=E9=87=8F=EF=BC=8C=E6=96=87?= =?UTF-8?q?=E5=AD=97=E6=95=B0=E9=87=8F=E8=BF=87=E5=A4=9A=E4=BC=9A=E8=A2=AB?= =?UTF-8?q?=E6=8C=A4=E5=88=B0=E7=AC=AC=E4=BA=8C=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_product/views/seckill.vue | 45 +++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/pkg_product/views/seckill.vue b/pkg_product/views/seckill.vue index b80672b..c13205a 100644 --- a/pkg_product/views/seckill.vue +++ b/pkg_product/views/seckill.vue @@ -126,11 +126,13 @@ 已抢{{ item.sales }}件 立即抢购 --> - - - 已抢{{ item.sales }} + + + + 已抢{{ item.sales }} + + 件 - 件 @@ -612,23 +614,26 @@ export default { } } .line-price { - .number { - width: 82px; - height: 24px; - border-radius: 12px; - line-height: 24px; - color: #fff; - font-size: 12px; - font-weight: bold; - background: rgba(250,181,176,0.39); - box-shadow: 1px 1px 1px rgba(0,0,0,0.16); - .bg { - z-index: 1; - height: 100%; - padding: 0 4px 0 12px; - margin: 0 2px 0 0; + .number-wrap { + display: flex; + .number { + height: 24px; + padding: 0 20rpx 0 0; border-radius: 12px; - background-color: #E92727; + line-height: 24px; + color: #fff; + font-size: 12px; + font-weight: bold; + background: rgba(250,181,176,0.39); + box-shadow: 1px 1px 1px rgba(0,0,0,0.16); + .bg { + z-index: 1; + height: 100%; + padding: 0 4px 0 12px; + margin: 0 2px 0 0; + border-radius: 12px; + background-color: #E92727; + } } } .price-wrap { From 96a439a8dfa3b3d7ed973147c9671225e28f712c Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sat, 30 Mar 2024 13:02:38 +0800 Subject: [PATCH 06/82] =?UTF-8?q?Fix(=E5=95=86=E5=93=81):[#1015]=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E6=94=B9=E4=B8=BA=E5=8C=85=E5=90=AB=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E7=82=B9=E7=9A=84=E5=90=8D=E7=A7=B0=E5=90=8E=EF=BC=8C=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/ProductWindow.vue | 26 ++- pages/shop/GoodsCon/index.vue | 364 ++++++++++------------------------ 2 files changed, 123 insertions(+), 267 deletions(-) diff --git a/components/ProductWindow.vue b/components/ProductWindow.vue index acee08f..d339fc4 100644 --- a/components/ProductWindow.vue +++ b/components/ProductWindow.vue @@ -24,14 +24,14 @@ :key="indexn" :class="{ 'on': item.index == indexn, - 'disabled': productValue[itemn.attr].stock === 0 + 'disabled': getAttrItemData(itemn.attr).stock === 0 }" class="itemn" @click="tapAttr(indexw, indexn, itemn)" > {{ itemn.attr }} 缺货 @@ -71,6 +71,12 @@ export default { type: String, default: '{}' }, + productValueArr: { + type: Array, + default: () => { + return [] + } + }, cartNum: { type: Number, default: () => 1 @@ -91,12 +97,18 @@ export default { CartNumAdd: function() { this.$emit("changeFun", { action: "ChangeCartNum", value: 1 }) }, - tapAttr: function(indexw, indexn, itemn) { - const productValue = JSON.parse(this.productValueStr || '{}') - if (productValue[itemn.attr]) { - if (productValue[itemn.attr].stock === 0) { - return + getAttrItemData(attr) { + let result = {} + this.productValueArr.map(item => { + if (item.attrItemkey === attr) { + result = item } + }) + return result + }, + tapAttr: function(indexw, indexn, itemn) { + if (this.getAttrItemData(itemn.attr).stock === 0) { + return } // 修改商品规格不生效的原因： // H5端下面写法，attr更新，但是除H5外其他端不支持， diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index be348da..7907444 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -23,41 +23,12 @@ {{ attr.productSelect.otPrice }} - - - - - - - - - - - - - - - - - - - - - - - 已享受会员价格 - - - - - - @@ -76,31 +47,6 @@ {{ attr.productSelect.otPrice }} - - - - - - - - - - - - - - - - - - - - - - - - - {{ storeInfo.origin }} @@ -266,32 +212,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -357,48 +277,8 @@ - - - - - - @@ -475,7 +355,7 @@ { + getPreSale(this.activityId).then(({ data }) => { var now = new Date().getTime(); var nowStr = formatDateTime(now, 'yyyy-MM-dd'); data.surplus = diffDay(nowStr, data.stopTime.substring(0, 10)) @@ -850,9 +728,7 @@ export default { }, // v4 秒杀 getKillInfo() { - getYxStoreSeckill(this.activityId).then(({ - data - }) => { + getYxStoreSeckill(this.activityId).then(({ data }) => { let stopTime = data.storeInfo.stopTime; let stopDate = new Date(stopTime.replace(/-/g, "/")); data.stop = Math.floor(stopDate.getTime() / 1000); @@ -862,9 +738,7 @@ export default { }, // v4 每日特价 getDayInfo() { - getDailyGoods(this.activityId).then(({ - data - }) => { + getDailyGoods(this.activityId).then(({ data }) => { let stopTime = data.stopTime; let stopDate = new Date(stopTime.replace(/-/g, "/")); data.stop = Math.floor(stopDate.getTime() / 1000); @@ -874,40 +748,15 @@ export default { }, // 关联商品规格 handleAttr(data) { - this.$set(this.attr, "productAttr", data.productAttr); - this.$set(this, "productValue", data.productValue); - this.DefaultSelect(); - }, - - priceRangeStr: function (prices) { - var ret = ''; - var maxPrice = 0; - var minPrice = Object.values(prices)[0].price; - - Object.values(prices).forEach((item) => { - minPrice = Math.min(minPrice, item.price); - maxPrice = Math.max(maxPrice, item.price); - }) - if (maxPrice >= 0 && minPrice >= 0) { - if (maxPrice > minPrice) { - ret = minPrice + '-' + maxPrice; - } else if (maxPrice == minPrice) { - ret = minPrice; - } - } - return ret; - }, - minMaxOtPrice: function (prices) { - var maxPrice = Object.values(prices)[0].otPrice; - var minPrice = Object.values(prices)[0].otPrice; - Object.values(prices).forEach((item) => { - minPrice = Math.min(minPrice, item.otPrice); - maxPrice = Math.max(maxPrice, item.otPrice); - }) - return { - min: minPrice, - max: maxPrice + this.$set(this.attr, "productAttr", data.productAttr) + this.productValueArr = [] + for (const key in data.productValue) { + this.productValueArr.push({ + attrItemkey: key, + ...data.productValue[key] + }) } + this.DefaultSelect() }, fetchCompanyDatea: function () { var that = this; @@ -921,17 +770,9 @@ export default { force2Decimal(v) { return this.$force2Decimal(v); }, - toggleProductInfo() { - this.isProductInfoExpand = !this.isProductInfoExpand; - }, goShoppingCart() { this.$yrouter.switchTab("/pages/cart"); }, - goCustomerList() { - this.$yrouter.push({ - path: "/pages/user/CustomerList/index" - }); - }, goStoreList() { this.$yrouter.push({ path: "/pages/shop/StoreList/index" @@ -977,105 +818,108 @@ export default { }, //产品详情接口； productCon: function () { - let that = this; - let from = this.location; - if (this.$deviceType == "app") { - from.from = "app"; + const from = this.location + if (this.$deviceType == 'app') { + from.from = 'app' } - if (that.source === 'kill') { - from.seckillId = that.activityId + if (this.source === 'kill') { + from.seckillId = this.activityId } - uni.showLoading({ - title: "加载中", + title: '加载中', mask: true - }); - getProductDetail(that.id, from) - .then(res => { - // 会造成两个style属性，并且生效的是后一个 - // res.data.storeInfo.description = res.data.storeInfo.description.replace( - // /\ { + const { data } = res + this.$set(this, 'storeInfo', data.storeInfo) + this.isWenwan = data.isWenwan + // 给 attr 赋值，将请求回来的规格赋值给 attr + if (this.source === '' || this.source === 'famous') { + this.$set(this.attr, 'productAttr', data.productAttr) + this.productValueArr = [] + for (const key in data.productValue) { + this.productValueArr.push({ + attrItemkey: key, + ...data.productValue[key] + }) + } + } + this.attr.defaultSku = data.defaultSku + this.attr.defaultSkuIndex = data.defaultSkuIndex - // 给 attr 赋值，将请求回来的规格赋值给 attr - if (this.source === "" || this.source === 'famous') { - that.$set(that.attr, "productAttr", res.data.productAttr); - that.$set(that, "productValue", res.data.productValue); - } - that.attr.defaultSku = res.data.defaultSku - that.attr.defaultSkuIndex = res.data.defaultSkuIndex + data.couponList['unusable']?.map(item => item.status = 2) + this.$set(this, 'couponList', data.couponList) + this.$set(this, 'replyCount', data.replyCount) + this.$set(this, 'replyChance', data.replyChance) + this.reply = data.reply ? [data.reply] : [] + this.$set(this, 'reply', this.reply) + this.$set(this, 'priceName', data.priceName) + this.$set(this, 'tempName', data.tempName) + this.$set(this, 'merBestProducts', data.merBestProducts) + this.posterData.image = this.storeInfo.image + if (this.storeInfo.storeName.length > 30) { + this.posterData.title = this.storeInfo.storeName.substring(0, 30) + '...' + } else { + this.posterData.title = this.storeInfo.storeName + } + this.posterData.price = this.storeInfo.price + this.posterData.code = this.storeInfo.codeBase + this.systemStore = data.systemStore + const good_list = data.goodList || [] + const goodArray = [] + const count = Math.ceil(good_list.length / 6) + for (let i = 0; i < count; i++) { + const list = good_list.slice(i * 6, 6) + if (list.length) { + goodArray.push({ + list: list + }) + } + } + this.mapKay = data.mapKay + this.$set(this, 'goodList', goodArray) + this.DefaultSelect() + this.getCartCount() - res.data.couponList['unusable']?.map(item => item.status = 2) - that.$set(that, 'couponList', res.data.couponList) - that.$set(that, "replyCount", res.data.replyCount); - that.$set(that, "replyChance", res.data.replyChance); - that.reply = res.data.reply ? [res.data.reply] : []; - that.$set(that, "reply", that.reply); - that.$set(that, "priceName", res.data.priceName); - that.$set(that, "tempName", res.data.tempName); - that.$set(that, "merBestProducts", res.data.merBestProducts); - that.posterData.image = that.storeInfo.image; - if (that.storeInfo.storeName.length > 30) { - that.posterData.title = - that.storeInfo.storeName.substring(0, 30) + "..."; - } else { - that.posterData.title = that.storeInfo.storeName; - } - that.posterData.price = that.storeInfo.price; - that.posterData.code = that.storeInfo.codeBase; - that.systemStore = res.data.systemStore; - let good_list = res.data.goodList || []; - let goodArray = []; - let count = Math.ceil(good_list.length / 6); - for (let i = 0; i < count; i++) { - var list = good_list.slice(i * 6, 6); - if (list.length) - goodArray.push({ - list: list - }); - } - that.mapKay = res.data.mapKay; - that.$set(that, "goodList", goodArray); - that.DefaultSelect(); - that.getCartCount(); - - //动态配置share - that.$set(that, "share", { - title: that.storeInfo.storeName, - path: '/pages/shop/GoodsCon/index?id=' + that.id, - imageUrl: that.storeInfo.image, - desc: '', - content: '' - }); - - }) - .catch(err => { - uni.showToast({ - title: err.msg || err.response.data.msg || err.response.data.message, - icon: "none", - duration: 2000 - }); - }) - .finally(() => { - uni.hideLoading(); - }); + // 动态配置share + this.$set(this, 'share', { + title: this.storeInfo.storeName, + path: '/pages/shop/GoodsCon/index?id=' + this.id, + imageUrl: this.storeInfo.image, + desc: '', + content: '' + }) + }).catch(err => { + uni.showToast({ + title: err.msg || err.response.data.msg || err.response.data.message, + icon: 'none', + duration: 2000 + }) + }).finally(() => { + uni.hideLoading() + }) + }, + getAttrItemData(attr) { + let result = {} + this.productValueArr.map(item => { + if (item.attrItemkey === attr) { + result = item + } + }) + return result }, //默认选中属性； DefaultSelect: function () { - let productAttr = this.attr.productAttr; - let value = []; + const productAttr = this.attr.productAttr for (let i = 0; i < productAttr.length; i++) { this.$set(productAttr[i], "index", this.attr.defaultSkuIndex[i]); - value.push(productAttr[i].attrValueArr[1]); } - //sort();排序函数:数字-英文-汉字； - // let productSelect = this.productValue[value.sort().join(",")]; const skuKey = this.attr.defaultSku?.join(',') - let productSelect = this.productValue[skuKey] + if (!skuKey) { + return + } + const productSelect = this.getAttrItemData(skuKey) if (productSelect && productAttr.length) { this.$set( this.attr.productSelect, @@ -1129,7 +973,7 @@ export default { ChangeCartNum: function (changeValue) { //changeValue:是否 加|减 //获取当前变动属性 - let productSelect = this.productValue[this.attrValue]; + const productSelect = this.getAttrItemData(this.attrValue); //如果没有属性,赋值给商品默认库存 if (productSelect === undefined && !this.attr.productAttr.length) { productSelect = this.attr.productSelect; @@ -1180,7 +1024,7 @@ export default { //选择属性； ChangeAttr: function (res) { // 修改了规格 - let productSelect = this.productValue[res.value]; + let productSelect = this.getAttrItemData(res.value) if (productSelect) { this.attr.productAttr[res.indexw].index = res.indexn; this.$set(this.attr.productSelect, "image", productSelect.image); @@ -1217,7 +1061,7 @@ export default { // 加入购物车； goCat: function (news) { let that = this, - productSelect = that.productValue[this.attrValue]; + productSelect = this.getAttrItemData(this.attrValue) //打开属性 if (that.attrValue) { //默认选中了属性，但是没有打开过属性弹窗还是自动打开让用户查看默认选中的属性 From f897ed8ae711b81d114661d164892de2d94684c5 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sat, 30 Mar 2024 13:30:45 +0800 Subject: [PATCH 07/82] =?UTF-8?q?Style(=E8=AE=A2=E5=8D=95):=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/style.less | 1 + pages/order/MyOrder/index.vue | 29 ++++++++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/assets/css/style.less b/assets/css/style.less index c093901..c9a21dc 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -3254,6 +3254,7 @@ page { .my-order .list .item .item-info .text .money { text-align: right; + color: #333; } .my-order .list .item .totalPrice { diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index d2193de..04f95cb 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -54,15 +54,20 @@ }) " v-else-if="cart.seckillId > 0"/> - - - {{ cart.productInfo.storeName }} - - 规格：{{ cart.productInfo.attrInfo.sku }} + + + {{ cart.productInfo.storeName }} + + ￥{{ force2Decimal(cart.truePrice) }} - - ￥{{ force2Decimal(cart.truePrice) }} + + + 规格：{{ cart.productInfo.attrInfo.sku }} + x{{ cart.cartNum }} @@ -503,4 +508,14 @@ page { } } } +.my-order .list .item .item-info .name-wrap, +.my-order .list .item .item-info .attr-wrap { + justify-content: space-between; +} +.my-order .list .item .item-info .attr-wrap { + margin: 10rpx 0 0 0; +} +.my-order .list .item .item-info .text .name { + width: calc(100% - 160rpx); +} From 195035f7ba29fc58628475e8406d459b67c7e70e Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sat, 30 Mar 2024 13:32:16 +0800 Subject: [PATCH 08/82] =?UTF-8?q?Chore:=E5=88=A0=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E6=97=A0=E7=94=A8=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 90 --- pages/activity/BargainRecord/index.vue | 131 ---- pages/activity/DargainDetails/index.vue | 617 ------------------- pages/activity/GoodsBargain/index.vue | 84 --- pages/activity/GoodsGroup/index.vue | 91 --- pages/activity/GoodsSeckill/index.vue | 261 -------- pages/activity/GroupDetails/index.vue | 375 ----------- pages/activity/GroupRule/index.vue | 248 -------- pages/activity/Poster/index.vue | 79 --- pages/activity/SeckillDetails/index.vue | 235 ------- pages/orderAdmin/AdminOrder/index.vue | 354 ----------- pages/orderAdmin/AdminOrderList/index.vue | 330 ---------- pages/orderAdmin/GoodsDeliver/index.vue | 231 ------- pages/orderAdmin/OrderCancellation/index.vue | 184 ------ pages/orderAdmin/OrderIndex/index.vue | 167 ----- pages/orderAdmin/Statistics/index.vue | 446 -------------- 16 files changed, 3923 deletions(-) delete mode 100644 pages/activity/BargainRecord/index.vue delete mode 100644 pages/activity/DargainDetails/index.vue delete mode 100644 pages/activity/GoodsBargain/index.vue delete mode 100644 pages/activity/GoodsGroup/index.vue delete mode 100644 pages/activity/GoodsSeckill/index.vue delete mode 100644 pages/activity/GroupDetails/index.vue delete mode 100644 pages/activity/GroupRule/index.vue delete mode 100644 pages/activity/Poster/index.vue delete mode 100644 pages/activity/SeckillDetails/index.vue delete mode 100644 pages/orderAdmin/AdminOrder/index.vue delete mode 100644 pages/orderAdmin/AdminOrderList/index.vue delete mode 100644 pages/orderAdmin/GoodsDeliver/index.vue delete mode 100644 pages/orderAdmin/OrderCancellation/index.vue delete mode 100644 pages/orderAdmin/OrderIndex/index.vue delete mode 100644 pages/orderAdmin/Statistics/index.vue diff --git a/pages.json b/pages.json index c62bafb..17c2787 100644 --- a/pages.json +++ b/pages.json @@ -287,96 +287,6 @@ "navigationBarTitleText": "退货列表" } }, - { - "path": "pages/orderAdmin/OrderIndex/index", - "style": { - "navigationBarTitleText": "商家订单统计" - } - }, - { - "path": "pages/orderAdmin/AdminOrderList/index", - "style": { - "navigationBarTitleText": "订单" - } - }, - { - "path": "pages/orderAdmin/GoodsDeliver/index", - "style": { - "navigationBarTitleText": "发货" - } - }, - { - "path": "pages/orderAdmin/AdminOrder/index", - "style": { - "navigationBarTitleText": "商家订单列表" - } - }, - { - "path": "pages/orderAdmin/Statistics/index", - "style": { - "navigationBarTitleText": "商家统计数据" - } - }, - { - "path": "pages/orderAdmin/OrderCancellation/index", - "style": { - "navigationBarTitleText": "商家取消订单" - } - }, - { - "path": "pages/activity/Poster/index", - "style": { - "navigationBarTitleText": "推广海报" - } - }, - { - "path": "pages/activity/DargainDetails/index", - "style": { - "navigationBarTitleText": "帮砍价" - } - }, - { - "path": "pages/activity/GoodsBargain/index", - "style": { - "navigationBarTitleText": "砍价列表" - } - }, - { - "path": "pages/activity/BargainRecord/index", - "style": { - "navigationBarTitleText": "砍价记录" - } - }, - { - "path": "pages/activity/GoodsGroup/index", - "style": { - "navigationBarTitleText": "团购商品列表" - } - }, - { - "path": "pages/activity/GroupDetails/index", - "style": { - "navigationBarTitleText": "团购商品详情" - } - }, - { - "path": "pages/activity/GroupRule/index", - "style": { - "navigationBarTitleText": "团购规则" - } - }, - { - "path": "pages/activity/GoodsSeckill/index", - "style": { - "navigationBarTitleText": "秒杀" - } - }, - { - "path": "pages/activity/SeckillDetails/index", - "style": { - "navigationBarTitleText": "秒杀详情" - } - }, { "path": "pages/map/index", "style": { diff --git a/pages/activity/BargainRecord/index.vue b/pages/activity/BargainRecord/index.vue deleted file mode 100644 index d90ece3..0000000 --- a/pages/activity/BargainRecord/index.vue +++ /dev/null @@ -1,131 +0,0 @@ - - diff --git a/pages/activity/DargainDetails/index.vue b/pages/activity/DargainDetails/index.vue deleted file mode 100644 index 65f6343..0000000 --- a/pages/activity/DargainDetails/index.vue +++ /dev/null @@ -1,617 +0,0 @@ - - - - diff --git a/pages/activity/GoodsBargain/index.vue b/pages/activity/GoodsBargain/index.vue deleted file mode 100644 index 8a7bf1c..0000000 --- a/pages/activity/GoodsBargain/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - diff --git a/pages/activity/GoodsGroup/index.vue b/pages/activity/GoodsGroup/index.vue deleted file mode 100644 index 191b4ea..0000000 --- a/pages/activity/GoodsGroup/index.vue +++ /dev/null @@ -1,91 +0,0 @@ - - diff --git a/pages/activity/GoodsSeckill/index.vue b/pages/activity/GoodsSeckill/index.vue deleted file mode 100644 index beb0950..0000000 --- a/pages/activity/GoodsSeckill/index.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - diff --git a/pages/activity/GroupDetails/index.vue b/pages/activity/GroupDetails/index.vue deleted file mode 100644 index 03e9788..0000000 --- a/pages/activity/GroupDetails/index.vue +++ /dev/null @@ -1,375 +0,0 @@ - - - - diff --git a/pages/activity/GroupRule/index.vue b/pages/activity/GroupRule/index.vue deleted file mode 100644 index 58ddb8f..0000000 --- a/pages/activity/GroupRule/index.vue +++ /dev/null @@ -1,248 +0,0 @@ - - - - diff --git a/pages/activity/Poster/index.vue b/pages/activity/Poster/index.vue deleted file mode 100644 index d1e01cb..0000000 --- a/pages/activity/Poster/index.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - - diff --git a/pages/activity/SeckillDetails/index.vue b/pages/activity/SeckillDetails/index.vue deleted file mode 100644 index 10e84f4..0000000 --- a/pages/activity/SeckillDetails/index.vue +++ /dev/null @@ -1,235 +0,0 @@ - - - - diff --git a/pages/orderAdmin/AdminOrder/index.vue b/pages/orderAdmin/AdminOrder/index.vue deleted file mode 100644 index f0f2c0d..0000000 --- a/pages/orderAdmin/AdminOrder/index.vue +++ /dev/null @@ -1,354 +0,0 @@ - - diff --git a/pages/orderAdmin/AdminOrderList/index.vue b/pages/orderAdmin/AdminOrderList/index.vue deleted file mode 100644 index f069b1a..0000000 --- a/pages/orderAdmin/AdminOrderList/index.vue +++ /dev/null @@ -1,330 +0,0 @@ - - - - diff --git a/pages/orderAdmin/GoodsDeliver/index.vue b/pages/orderAdmin/GoodsDeliver/index.vue deleted file mode 100644 index 8b65932..0000000 --- a/pages/orderAdmin/GoodsDeliver/index.vue +++ /dev/null @@ -1,231 +0,0 @@ - - diff --git a/pages/orderAdmin/OrderCancellation/index.vue b/pages/orderAdmin/OrderCancellation/index.vue deleted file mode 100644 index 5cd553e..0000000 --- a/pages/orderAdmin/OrderCancellation/index.vue +++ /dev/null @@ -1,184 +0,0 @@ - - - - - diff --git a/pages/orderAdmin/OrderIndex/index.vue b/pages/orderAdmin/OrderIndex/index.vue deleted file mode 100644 index be5faaa..0000000 --- a/pages/orderAdmin/OrderIndex/index.vue +++ /dev/null @@ -1,167 +0,0 @@ - - diff --git a/pages/orderAdmin/Statistics/index.vue b/pages/orderAdmin/Statistics/index.vue deleted file mode 100644 index c51f9fe..0000000 --- a/pages/orderAdmin/Statistics/index.vue +++ /dev/null @@ -1,446 +0,0 @@ - - - From 624c7f17a220c3bc731a776ec5cb41bc5812bf40 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 1 Apr 2024 21:54:45 +0800 Subject: [PATCH 09/82] =?UTF-8?q?Fix(=E8=B4=AD=E7=89=A9=E8=BD=A6):[#1016]?= =?UTF-8?q?=E5=95=86=E5=93=81=E8=B4=AD=E4=B9=B0=E9=99=90=E5=88=B6=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 4 +- pages/cart.vue | 318 +++++++++++------- .../components/u-number-box/u-number-box.vue | 4 + 3 files changed, 208 insertions(+), 118 deletions(-) diff --git a/main.js b/main.js index 3805ca1..1c18df1 100644 --- a/main.js +++ b/main.js @@ -15,8 +15,10 @@ import { WX_LIVE_APPID } from "@/config"; import uView from "uview-ui"; +import GooSkeleton from '@/components/GooSkeleton/index.vue' -Vue.use(uView); +Vue.use(uView) +Vue.component('GooSkeleton', GooSkeleton) Vue.mixin(mixin) // 注册全局组件 diff --git a/pages/cart.vue b/pages/cart.vue index 5d85340..e7ae925 100644 --- a/pages/cart.vue +++ b/pages/cart.vue @@ -1,95 +1,166 @@ - + + diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue index faaed09..25c4a51 100644 --- a/pages/user/User/index.vue +++ b/pages/user/User/index.vue @@ -57,7 +57,7 @@ 余额 - + {{ userInfo.integral || 0 }} From b02bba911d9b76534b4a3439d3ef455b262ea958 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 8 Apr 2024 13:07:01 +0800 Subject: [PATCH 18/82] =?UTF-8?q?Fix(=E6=8A=BD=E5=A5=96):=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=8A=BD=E5=A5=96=E9=A2=86=E5=8F=96=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg-video/views/lottery-log.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg-video/views/lottery-log.vue b/pkg-video/views/lottery-log.vue index 57363ef..c1da413 100644 --- a/pkg-video/views/lottery-log.vue +++ b/pkg-video/views/lottery-log.vue @@ -80,7 +80,7 @@ export default { this.page++ this.fetchList() }, - async takeItem(item) { + async takeItem(item, index) { // 领取商品 if (item['prizeType'] === 1 && item['status'] === 1) { uni.navigateTo({ From 22cd5160bf1a75d63e760a6397301056930eac9a Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 8 Apr 2024 17:35:39 +0800 Subject: [PATCH 19/82] =?UTF-8?q?Feat(=E8=B4=AD=E7=89=A9=E8=BD=A6):?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=87=E6=8D=A2=E8=A7=84=E6=A0=BC=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/store.js | 14 +++ pages/cart.vue | 297 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 308 insertions(+), 3 deletions(-) diff --git a/api/store.js b/api/store.js index 85721a5..4cf9f04 100644 --- a/api/store.js +++ b/api/store.js @@ -144,6 +144,20 @@ export function changeCartNum(id, number) { }); } +/* + * 购物车 获取商品规格 + * */ +export function getCartGoodAttr(id, uniqueId) { + return request.get(`/product/attr/${id}?uniqueId=${uniqueId}`) +} + +/* + * 购物车 商品规格修改 + * */ +export function cartGoodChangeAttr(data) { + return request.post('/cart/changeAttr', data) +} + /** * 搜索推荐关键字 */ diff --git a/pages/cart.vue b/pages/cart.vue index 7d73c9c..518428a 100644 --- a/pages/cart.vue +++ b/pages/cart.vue @@ -84,7 +84,7 @@ >{{ good['productInfo']['storeName'] }} 规格：{{ good['productInfo']['attrInfo']['sku'] }} @@ -144,6 +144,61 @@ 结算 + + + + + + + + + + + + {{ currGood.productInfo.storeName }} + + + ￥{{ currGoodAttr.price }} + + + + + + + {{ item.attrName }} + + + {{ attr.attr }} + + + + + + + 确认 + + + + + diff --git a/pagesInn/inn/innApply.vue b/pagesInn/inn/innApply.vue index af35022..c91e1f9 100644 --- a/pagesInn/inn/innApply.vue +++ b/pagesInn/inn/innApply.vue @@ -216,7 +216,7 @@ diff --git a/pages/user/Points/index.vue b/pages/user/Points/index.vue index 0202c56..2fd67ba 100644 --- a/pages/user/Points/index.vue +++ b/pages/user/Points/index.vue @@ -68,6 +68,7 @@ + {{ item.title }} @@ -312,9 +313,16 @@ export default { } .lottery { display: flex; + align-items: center; padding: 20rpx; + .img { + display: block; + width: 62rpx; + height: 62rpx; + margin: 0 20rpx 0 0; + } .title { - width: calc(100% - 160rpx); + flex: 1; } } .number { From a0c540d4749a0d0754f0601e9990bdfa02ec9cb1 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 22 Apr 2024 16:30:41 +0800 Subject: [PATCH 43/82] =?UTF-8?q?Feat(=E8=AE=A2=E5=8D=95):=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=A7=AF=E5=88=86=E9=80=BB=E8=BE=91=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/OrderSubmission/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 9c18d30..56e8cb2 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -171,7 +171,7 @@ -￥{{ force2Decimal(orderPrice.deductionPrice) }} - + 积分抵扣： From 79ddcd69cebf6c0ad787043bd8cb860e00d0019d Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 22 Apr 2024 22:48:04 +0800 Subject: [PATCH 44/82] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):[#1221]=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E7=95=8C=E9=9D=A2=E9=80=89=E6=8B=A9=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E5=90=8E=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E5=8B=BE?= =?UTF-8?q?=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Coupons.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/Coupons.vue b/components/Coupons.vue index 63a3b68..69b4bb2 100644 --- a/components/Coupons.vue +++ b/components/Coupons.vue @@ -76,7 +76,8 @@ export default { }, selectCoupon() { if (!this.radioModel) return - this.$emit('change', this.data.id) + // 已选中则可以取消选中 + this.$emit('change', this.data.checked ? '' : this.data.id) } } } From 93f82ea55b77e11356efffe6f0b24123263b0568 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 22 Apr 2024 22:48:49 +0800 Subject: [PATCH 45/82] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):[#1193]=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E5=B7=B2=E5=8F=96=E6=B6=88=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E8=AE=A2=E5=8D=95=E7=9A=84=E6=A0=87=E8=AF=86?= =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E2=80=9C=E5=B7=B2=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E2=80=9D=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/MyOrder/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue index 04f95cb..fdb4f32 100644 --- a/pages/order/MyOrder/index.vue +++ b/pages/order/MyOrder/index.vue @@ -323,6 +323,11 @@ export default { case -3: status = "已驳回"; break; + case 9: + status = "已取消"; + break; + default: + break; } return status; }, From c65bb0e312e7b8e0531dce8ead162fa2374281fb Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 22 Apr 2024 22:54:19 +0800 Subject: [PATCH 46/82] =?UTF-8?q?Style(=E8=AE=A2=E5=8D=95):=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=AE=A2=E5=8D=95=E7=95=8C=E9=9D=A2=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=92=8C=E4=BC=98=E6=83=A0=E5=88=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=AF=A6=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/OrderSubmission/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue index 56e8cb2..c219739 100644 --- a/pages/order/OrderSubmission/index.vue +++ b/pages/order/OrderSubmission/index.vue @@ -162,14 +162,14 @@ 运费： ￥{{ force2Decimal(orderPrice.payPostage) }} - + From 8b813d1682f7e73f30d4f389b229d20b475f1723 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Wed, 24 Apr 2024 14:35:22 +0800 Subject: [PATCH 47/82] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95):=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tm-upload/tm-upload.vue | 22 ++++++++++++++++------ pages/shop/GoodsEvaluate/index.vue | 2 -- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/components/tm-upload/tm-upload.vue b/components/tm-upload/tm-upload.vue index 296d708..93957cc 100644 --- a/components/tm-upload/tm-upload.vue +++ b/components/tm-upload/tm-upload.vue @@ -107,18 +107,28 @@ export default { default: true } }, + watch: { + dataList: { + handler(val) { + this.upload_before_list = val + this.upload_cache_list = [] + if (val.length > 0) { + val.map(item => { + debugger + item && this.upload_cache_list.push(item.path) + }) + } + this.emit() + }, + immediate: true + } + }, onReady(res) { this.$nextTick(() => { for (let i = 0; i < 10; i++) { this.videoContext[i] = uni.createVideoContext(`myVideo_${i}`); } }); - }, - created() { - - }, - mounted() { - }, methods: { videoPlay(e) { diff --git a/pages/shop/GoodsEvaluate/index.vue b/pages/shop/GoodsEvaluate/index.vue index 824c0e2..d8ccee0 100644 --- a/pages/shop/GoodsEvaluate/index.vue +++ b/pages/shop/GoodsEvaluate/index.vue @@ -47,7 +47,6 @@ Date: Wed, 24 Apr 2024 14:36:06 +0800 Subject: [PATCH 48/82] =?UTF-8?q?Fix(=E5=BA=97=E9=93=BA):[#1263]=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E5=BA=97=E9=93=BA=E4=B8=BB=E9=A1=B5-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=97=E9=93=BA=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=96=87=E5=8C=96=E5=9B=BE=E7=89=87=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesInn/inn/innProfileEdit.vue | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/pagesInn/inn/innProfileEdit.vue b/pagesInn/inn/innProfileEdit.vue index f63b543..6ec6333 100644 --- a/pagesInn/inn/innProfileEdit.vue +++ b/pagesInn/inn/innProfileEdit.vue @@ -34,6 +34,30 @@ + + + 封面类型 + + + + + + + + + 封面照片 @@ -112,7 +136,7 @@ --> - + { return { path: item, upload_percent: 100 } }) + this.uploadedFilesArray = hotel.pics || [] } }, methods: { From 8bc9558828951843af6822d2fb4875f76249f01b Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Wed, 24 Apr 2024 14:36:24 +0800 Subject: [PATCH 49/82] =?UTF-8?q?Style:=E7=95=8C=E9=9D=A2=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/css/goods.less | 2 +- assets/css/style.less | 3 +- components/OrderGoods.vue | 115 +++++++++++++++++++++---------- pkg_product/views/healthList.vue | 2 +- pkg_product/views/season.vue | 1 + 5 files changed, 82 insertions(+), 41 deletions(-) diff --git a/assets/css/goods.less b/assets/css/goods.less index c1f45f9..6fb714b 100644 --- a/assets/css/goods.less +++ b/assets/css/goods.less @@ -183,7 +183,6 @@ .title { width: 160rpx; padding: 16rpx; - border-right: 2rpx solid #D2D2D2; color: #ADADAD; } } @@ -195,6 +194,7 @@ .value { width: 100%; padding: 16rpx; + border-left: 2rpx solid #D2D2D2; } } } \ No newline at end of file diff --git a/assets/css/style.less b/assets/css/style.less index 049e4eb..78275cd 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -843,6 +843,8 @@ page { } .goodWrapper .item .text { + display: flex; + flex-flow: column; width: 5.37*100rpx; position: relative; } @@ -866,7 +868,6 @@ page { .goodWrapper .item .text .money { font-size: 0.26*100rpx; - margin-top: 0.17*100rpx; } .goodWrapper .item .text .evaluate { diff --git a/components/OrderGoods.vue b/components/OrderGoods.vue index c6ef5a7..7c018a9 100644 --- a/components/OrderGoods.vue +++ b/components/OrderGoods.vue @@ -1,39 +1,57 @@ From f7302a3eebb31d38cd3cc668be4e0f5963c41ee3 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 26 Apr 2024 22:33:59 +0800 Subject: [PATCH 56/82] =?UTF-8?q?Fix(=E6=96=87=E7=8E=A9):[#1115]=E6=96=87?= =?UTF-8?q?=E7=8E=A9=E8=89=BA=E6=9C=AF=E7=89=88=E5=9D=97=EF=BC=8C=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=20=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=95=B0=E9=87=8F=E5=B0=91=E4=BA=8E5=E4=B8=AA?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E7=9B=AE=E9=A1=B5=E9=9D=A2=E5=BA=95=E9=83=A8?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E2=80=9C--=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E5=A4=9A=E4=BA=86--=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wenwan/views/goodsClass.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/wenwan/views/goodsClass.vue b/wenwan/views/goodsClass.vue index a8c3212..1801127 100644 --- a/wenwan/views/goodsClass.vue +++ b/wenwan/views/goodsClass.vue @@ -16,9 +16,19 @@ - - + @@ -129,7 +139,7 @@ export default { tabName: "", // 跳转初始分类名 lock: false, upOption: { - noMoreSize: 5, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5 + noMoreSize: 1, //如果列表已无数据,可设置列表的总数量要大于半页才显示无更多数据;避免列表数据过少(比如只有一条数据),显示无更多数据会不好看; 默认5 auto: false, empty: { tip: '暂无商品' // 提示 From 320ba71ca38b68e68f4865a4cb6b63672b2fcb70 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 26 Apr 2024 22:51:11 +0800 Subject: [PATCH 57/82] =?UTF-8?q?Fix(=E5=BA=97=E9=93=BA=E5=85=A5=E9=A9=BB)?= =?UTF-8?q?:[#1309]=E8=8B=B9=E6=9E=9C=E6=89=8B=E6=9C=BA=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_join/views/shop.vue | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue index f87ede7..dc69e7d 100644 --- a/pkg_join/views/shop.vue +++ b/pkg_join/views/shop.vue @@ -191,22 +191,25 @@ * @@ -736,4 +739,11 @@ export default { width: 80px; height: 80px; } +.captcha-wrap { + display: flex; + align-items: center; + .captcha-wrap-input { + flex: 1; + } +} From dee76a740790d217bbfd93a6aa908eb056eb280a Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 26 Apr 2024 23:01:45 +0800 Subject: [PATCH 58/82] =?UTF-8?q?Fix(=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95)?= =?UTF-8?q?:[#1319]=E6=8F=90=E7=8E=B0=E8=AE=B0=E5=BD=95=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=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 --- pkg_user/views/withdrawalLog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg_user/views/withdrawalLog.vue b/pkg_user/views/withdrawalLog.vue index 29b8308..451a8be 100644 --- a/pkg_user/views/withdrawalLog.vue +++ b/pkg_user/views/withdrawalLog.vue @@ -19,7 +19,7 @@ ({{ item['status'] === -1 ? '提现失败' : item['status'] === 1 ? '已提现' : '提现中' }}) - 2023-08-21 16:10:10 + {{ item.createTime }} From 3fb32211b20f82ed4c7984a7f2b3c162117c8336 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Fri, 26 Apr 2024 23:06:38 +0800 Subject: [PATCH 59/82] =?UTF-8?q?Fix(=E5=BA=97=E9=93=BA):[#1317]=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E5=BA=97=E9=93=BA=E4=B8=BB=E9=A1=B5-=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=B5=84=E6=96=99-=E4=B8=8A=E4=BC=A0=E6=96=B0?= =?UTF-8?q?=E7=9A=84=E5=B0=81=E9=9D=A2=E8=A7=86=E9=A2=91=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=BA=E5=8E=9F=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/tm-upload/tm-upload.vue | 1 - pagesInn/inn/innProfileEdit.vue | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/components/tm-upload/tm-upload.vue b/components/tm-upload/tm-upload.vue index 93957cc..67be4a0 100644 --- a/components/tm-upload/tm-upload.vue +++ b/components/tm-upload/tm-upload.vue @@ -114,7 +114,6 @@ export default { this.upload_cache_list = [] if (val.length > 0) { val.map(item => { - debugger item && this.upload_cache_list.push(item.path) }) } diff --git a/pagesInn/inn/innProfileEdit.vue b/pagesInn/inn/innProfileEdit.vue index 668f229..16d4072 100644 --- a/pagesInn/inn/innProfileEdit.vue +++ b/pagesInn/inn/innProfileEdit.vue @@ -274,6 +274,7 @@ export default { chooseLogoVideo() { chooseVideoToUpload(path => { this.$set(this.innApplyInfo, 'coverVideo', path) + this.$forceUpdate() }) }, chooseCoverImg() { From 40af0a58e62e232185a85f160150acd423df0537 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sat, 27 Apr 2024 20:21:41 +0800 Subject: [PATCH 60/82] =?UTF-8?q?Feat(=E6=90=9C=E7=B4=A2):=E9=94=AE?= =?UTF-8?q?=E7=9B=98=E7=9A=84=E5=9B=9E=E8=BD=A6/=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodSearch/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/shop/GoodSearch/index.vue b/pages/shop/GoodSearch/index.vue index 9fa7f13..e024bae 100644 --- a/pages/shop/GoodSearch/index.vue +++ b/pages/shop/GoodSearch/index.vue @@ -7,6 +7,7 @@ type="text" placeholder="请输入" placeholder-style="color:#999" + @confirm="submit" /> From 4c41c9813d9d96610d5a763cd792e4e9a5e9656b Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 13:53:28 +0800 Subject: [PATCH 61/82] =?UTF-8?q?Fix(=E5=BA=97=E9=93=BA):[#1348,=20#1011]?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesInn/inn/innHome.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pagesInn/inn/innHome.vue b/pagesInn/inn/innHome.vue index 25f5907..6416926 100644 --- a/pagesInn/inn/innHome.vue +++ b/pagesInn/inn/innHome.vue @@ -117,7 +117,7 @@ - + {{ inn.address }} @@ -217,10 +217,10 @@ class="info-item-header" @click="infoClick(item)" > - + {{ item.name }} - + {{ item.intro }} From 5ca669de015e7e316c1918e65d54611ee1d57cb6 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 13:55:09 +0800 Subject: [PATCH 62/82] =?UTF-8?q?Fix(=E8=B4=AD=E7=89=A9=E8=BD=A6):?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=B6=88=E6=81=AF=E6=9C=AA=E5=88=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=B0=B1=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/cart.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pages/cart.vue b/pages/cart.vue index 48b2cd2..f81faf3 100644 --- a/pages/cart.vue +++ b/pages/cart.vue @@ -350,7 +350,9 @@ export default { this.$set(this.list[index].carts[gIndex], 'cartNum', value) } }).catch(() => { - uni.hideLoading() + setTimeout(() => { + uni.hideLoading() + }, 3000) }) }, handleIds() { From b367938b7aca4e8866244d4b76b8506d604ae38f Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 14:03:36 +0800 Subject: [PATCH 63/82] =?UTF-8?q?Fix(=E5=95=86=E5=93=81):[#1306]=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=85=B7=E4=BD=93=E6=9F=90?= =?UTF-8?q?=E4=B8=80=E8=A7=84=E6=A0=BC=E7=9A=84=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsCon/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue index 07b1dfa..b86bf8b 100644 --- a/pages/shop/GoodsCon/index.vue +++ b/pages/shop/GoodsCon/index.vue @@ -176,7 +176,7 @@ 规格 {{ attrValue }} - 库存：{{ storeInfo.stock }} + 库存：{{ attr.productSelect.stock }} From dc50adf98d5d1ec8d45d2ee19a24a063e2b5e459 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 17:37:18 +0800 Subject: [PATCH 64/82] =?UTF-8?q?Fix(=E5=95=86=E5=93=81):[#1344,=20#1117]?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=8A=B6=E6=80=81=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Coupons.vue | 1 + pages/shop/GoodsCon/index.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/Coupons.vue b/components/Coupons.vue index 69b4bb2..6c037b7 100644 --- a/components/Coupons.vue +++ b/components/Coupons.vue @@ -9,6 +9,7 @@ 有效期至： {{ data.endTime }} + item.status = 2) + // data.couponList['unusable']?.map(item => item.status = 2) this.$set(this, 'couponList', data.couponList) this.$set(this, 'replyCount', data.replyCount) this.$set(this, 'replyChance', data.replyChance) From 46314b4260622ea5fa4c42540e5dafb01e8742a8 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 17:53:33 +0800 Subject: [PATCH 65/82] =?UTF-8?q?Fix(=E5=95=86=E5=93=81):[#1344,=20#1117]?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=8A=B6=E6=80=81=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Coupons.vue | 8 ++++++-- components/CouponsPopup.vue | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/components/Coupons.vue b/components/Coupons.vue index 6c037b7..a5d76e0 100644 --- a/components/Coupons.vue +++ b/components/Coupons.vue @@ -11,11 +11,15 @@ 已到期 未使用 + 去使用 @@ -30,7 +34,7 @@ 使用规则 - + From ae93b92daeb078a2c61ea61d524a55e9bc8b2df5 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 18:06:35 +0800 Subject: [PATCH 66/82] =?UTF-8?q?Fix(=E6=90=9C=E7=B4=A2/=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=97=E8=A1=A8):[#1352]=E6=97=A0=E5=95=86=E5=93=81=E6=97=B6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E6=98=BE=E7=A4=BA=E6=8E=A8=E8=8D=90=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsList/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue index 0039123..94b7cbf 100644 --- a/pages/shop/GoodsList/index.vue +++ b/pages/shop/GoodsList/index.vue @@ -156,6 +156,9 @@ class="no-data-wrap" > + @@ -165,15 +168,18 @@ import { getProducts, getHotels } from '@/api/store' import { mapGetters } from 'vuex' import NP from 'number-precision' import NoGoodData from '@/components/good/NoData' +import Recommend from '@/components/Recommend' export default { name: 'GoodsList', components: { - NoGoodData + NoGoodData, + Recommend }, data: function () { return { webUrl: this.$VUE_APP_RESOURCES_URL, + list: [], query: { page: 1, From 2f333832511e891680071be3fa15c358d5eeb008 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 18:07:03 +0800 Subject: [PATCH 67/82] =?UTF-8?q?Fix(=E8=AE=A2=E5=8D=95/=E8=AF=84=E4=BB=B7?= =?UTF-8?q?):[#1354]=E8=AE=A2=E5=8D=95=E8=AF=84=E4=BB=B7=E5=85=88=E4=B8=8A?= =?UTF-8?q?=E4=BC=A09=E5=BC=A0=E7=85=A7=E7=89=87=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BB=8D=E5=8F=AF=E4=BB=A5=E4=B8=8A=E4=BC=A0=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsEvaluate/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/shop/GoodsEvaluate/index.vue b/pages/shop/GoodsEvaluate/index.vue index d8ccee0..3b9858c 100644 --- a/pages/shop/GoodsEvaluate/index.vue +++ b/pages/shop/GoodsEvaluate/index.vue @@ -45,7 +45,7 @@ - + From 160fc7a65d181891b7421f2d934481f18377cc59 Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Sun, 28 Apr 2024 19:41:59 +0800 Subject: [PATCH 68/82] =?UTF-8?q?Fix(=E5=85=A5=E9=A9=BB):[#1355,=20#1357]1?= =?UTF-8?q?=E3=80=81=E9=9A=90=E8=97=8F=E7=AE=80=E4=BB=8B=EF=BC=9B2?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E8=A7=86=E9=A2=91=E5=B0=81=E9=9D=A2?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_join/views/shop.vue | 4 +- pkg_join/views/supplier.vue | 90 ++++++++++++++++++++++++++++++++++--- 2 files changed, 85 insertions(+), 9 deletions(-) diff --git a/pkg_join/views/shop.vue b/pkg_join/views/shop.vue index dc69e7d..1c7df64 100644 --- a/pkg_join/views/shop.vue +++ b/pkg_join/views/shop.vue @@ -268,7 +268,7 @@ - + 撤销申请 diff --git a/pkg_join/views/supplier.vue b/pkg_join/views/supplier.vue index fd9f37d..a418584 100644 --- a/pkg_join/views/supplier.vue +++ b/pkg_join/views/supplier.vue @@ -189,8 +189,32 @@ - - + + + + + + + + + + + + + + + @@ -328,7 +377,7 @@ - + 撤销申请 @@ -373,7 +422,12 @@ import CitySelect from "@/components/CitySelect"; import {getShopData, getShopInfo, removeApply, saveSupplier, saveWenwanSupplier} from "@/api/join"; import {getCity, registerVerify} from "@/api/user"; -import {chooseImage, moreImage, uploadImage} from "@/utils"; +import { + chooseImage, + moreImage, + uploadImage, + chooseVideoToUpload +} from "@/utils" export default { name: "pkgJoinSupplier", @@ -403,6 +457,8 @@ export default { form: { name: "", cover: "", + coverVideo: '', + coverType: 1, // coverType: 1-图片,2-视频 logo: "", type: 0, typeText: "", @@ -481,6 +537,12 @@ export default { message: '请上传店铺封面图', trigger: ['blur', 'change'] }, + 'coverVideo': { + type: 'string', + required: true, + message: '请上传店铺视频方面', + trigger: ['blur', 'change'] + }, 'logo': { type: 'string', required: true, @@ -648,6 +710,10 @@ export default { this.form.typeText = this.columnsType[0][this.indexType].name; this.form.position = this.$forceToDecimal(this.form.longitude, 6) + ',' + this.$forceToDecimal(this.form.latitude, 6); this.form.area = `${this.form.provinceName} ${this.form.cityName} ${this.form.areaName}`; + if (data.hotelInfo.coverType === 2) { + this.form.coverVideo = data.hotelInfo.cover + this.form.cover = '' + } } if (data.supplierInfo) { @@ -681,6 +747,12 @@ export default { } }); }, + chooseLogoVideo() { + chooseVideoToUpload(path => { + this.form.coverVideo = path + this.$forceUpdate() + }) + }, chooseShopImg() { let that = this; @@ -839,9 +911,13 @@ export default { this.quaPics.map(item => { this.formSupplier.qualification += (item.url + ","); }) + const postData = Object.assign({}, this.form) + if (postData.coverType === 2) { + postData.cover = postData.coverVideo + } if (this.infoTitle === "特产") { - saveSupplier(this.form, this.formSupplier, this.partnerId).then(res => { + saveSupplier(postData, this.formSupplier, this.partnerId).then(res => { if (res.status === 200) { uni.showToast({ title: "您的入驻申请已提交成功，请耐心等待审核", @@ -862,7 +938,7 @@ export default { }) }) } else { - saveWenwanSupplier(this.form, this.formSupplier, this.partnerId).then(res => { + saveWenwanSupplier(postData, this.formSupplier, this.partnerId).then(res => { if (res.status === 200) { uni.showToast({ title: "您的入驻申请已提交成功，请耐心等待审核", From 19662f97befd06af2cdf5af32afbd5292bacbbde Mon Sep 17 00:00:00 2001 From: lifizer <913626195@qq.com> Date: Mon, 29 Apr 2024 14:01:35 +0800 Subject: [PATCH 69/82] =?UTF-8?q?Fix(=E6=90=9C=E7=B4=A2):[#1360]=E5=95=86?= =?UTF-8?q?=E5=9F=8E=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=BA=97=E9=93=BA=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E5=95=86=E5=93=81=E6=90=9C=E7=B4=A2=E5=88=B0?= =?UTF-8?q?=E5=BA=95=E4=BA=86=E7=9B=B4=E6=8E=A5=E5=88=A0=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/shop/GoodsList/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pages/shop/GoodsList/index.vue b/pages/shop/GoodsList/index.vue index 94b7cbf..711d728 100644 --- a/pages/shop/GoodsList/index.vue +++ b/pages/shop/GoodsList/index.vue @@ -85,12 +85,12 @@ v-if="loading" :show-avatar="false" /> - + /> --> - + /> --> Date: Mon, 29 Apr 2024 14:03:11 +0800 Subject: [PATCH 70/82] =?UTF-8?q?Fix(=E6=8F=90=E7=8E=B0):[#1202]=E6=8F=90?= =?UTF-8?q?=E7=8E=B0=E9=87=91=E9=A2=9D=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=87=8F?= =?UTF-8?q?=E6=8E=89=E6=89=8B=E7=BB=AD=E8=B4=B9=EF=BC=8C=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=88=B0=E6=89=8B=E7=9A=84=E9=87=91=E9=A2=9D=E7=94=B1=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=AE=A1=E7=AE=97=E5=8D=B3=E5=8F=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg_user/views/withdrawal.vue | 86 +++++++++++++++++------------------ 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/pkg_user/views/withdrawal.vue b/pkg_user/views/withdrawal.vue index d8cccb3..6b96855 100644 --- a/pkg_user/views/withdrawal.vue +++ b/pkg_user/views/withdrawal.vue @@ -21,15 +21,18 @@ ￥ - 全部提现 @@ -52,7 +55,8 @@ - 请输入支付密码 + 请输入支付密码 + 手续费：{{ totalFee }} @@ -66,7 +70,7 @@