From 7e6c749cef1a2f07191a5909191437d1c5908c88 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Tue, 17 Jun 2025 22:18:36 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A8=A1=E6=9D=BF=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E3=80=91=E6=9B=B4=E6=96=B0=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/diyComponents/c_goods.vue | 2 +- .../src/components/storeLabelList/index.vue | 2 - .../admin/src/pages/order/refund/index.vue | 2 +- .../components/MarketingSetting.vue | 4 +- .../productAdd/components/OtherSetting.vue | 2 +- .../productAdd/components/PriceCommission.vue | 64 ++++++++++++++----- .../productAdd/components/SpecStock.vue | 10 ++- .../src/pages/product/productAdd/index.vue | 30 ++++++--- template/uni-app/api/points_mall.js | 4 +- .../pages/index/components/userInfor.vue | 2 - template/uni-app/pages/index/index.vue | 18 ++++-- 11 files changed, 97 insertions(+), 43 deletions(-) diff --git a/template/admin/src/components/diyComponents/c_goods.vue b/template/admin/src/components/diyComponents/c_goods.vue index d48d1ff2a..67390da65 100644 --- a/template/admin/src/components/diyComponents/c_goods.vue +++ b/template/admin/src/components/diyComponents/c_goods.vue @@ -6,7 +6,7 @@ class="item" v-for="(goods, index) in defaults.goodsList.list" :key="index" - v-if="defaults.goodsList.list.length" + v-show="defaults.goodsList.list.length" > diff --git a/template/admin/src/components/storeLabelList/index.vue b/template/admin/src/components/storeLabelList/index.vue index bebb25e30..8e20c3c00 100644 --- a/template/admin/src/components/storeLabelList/index.vue +++ b/template/admin/src/components/storeLabelList/index.vue @@ -59,10 +59,8 @@ export default { } return false; }, - // 用户标签 storeLabel(data) { this.dataLabel = data || []; - console.log(this.dataLabel, 'datadatadata'); productLabelUseListApi() .then((res) => { res.data.map((el) => { diff --git a/template/admin/src/pages/order/refund/index.vue b/template/admin/src/pages/order/refund/index.vue index ebc4b118f..a08ea9cac 100644 --- a/template/admin/src/pages/order/refund/index.vue +++ b/template/admin/src/pages/order/refund/index.vue @@ -39,7 +39,7 @@ class="mr20" > - + diff --git a/template/admin/src/pages/product/productAdd/components/MarketingSetting.vue b/template/admin/src/pages/product/productAdd/components/MarketingSetting.vue index 35b81284c..bf3f55aba 100644 --- a/template/admin/src/pages/product/productAdd/components/MarketingSetting.vue +++ b/template/admin/src/pages/product/productAdd/components/MarketingSetting.vue @@ -45,7 +45,7 @@
- + - +
diff --git a/template/admin/src/pages/product/productAdd/components/OtherSetting.vue b/template/admin/src/pages/product/productAdd/components/OtherSetting.vue index 7fb3f3f1f..6ed1b3495 100644 --- a/template/admin/src/pages/product/productAdd/components/OtherSetting.vue +++ b/template/admin/src/pages/product/productAdd/components/OtherSetting.vue @@ -107,7 +107,7 @@ }} 添加保障 -
用户下单时需填写的保障信息，可多选
+
商品详情中显示的服务保障信息，可多选
 diff --git a/template/admin/src/pages/product/productAdd/components/PriceCommission.vue b/template/admin/src/pages/product/productAdd/components/PriceCommission.vue index 1227f018c..09afbef4c 100644 --- a/template/admin/src/pages/product/productAdd/components/PriceCommission.vue +++ b/template/admin/src/pages/product/productAdd/components/PriceCommission.vue @@ -116,7 +116,7 @@ :max="9999999999" class="priceBox input-number-unit-class" class-unit="元" - @change="changeVipPrice(scope.$index, 'oneFormValidate')" + @input="changeVipPrice(0, 'oneFormValidate')" > @@ -143,7 +143,8 @@ placeholder="请输入一级返佣" class="columnsBox input_width input-number-unit-class" class-unit="元" - v-model="manyBrokerage" + :value="manyBrokerage" + @input="(val) => $emit('update:manyBrokerage', val)" > 二级返佣： @@ -163,8 +165,9 @@ :max="9999999999" class="columnsBox input_width input-number-unit-class" class-unit="元" - v-model="manyVipPrice" - @focus="manyVipDiscount = undefined" + :value="manyVipPrice" + @input="(val) => $emit('update:manyVipPrice', val)" + @focus="$emit('update:manyVipDiscount', undefined)" > @@ -175,8 +178,9 @@ :max="9999999999" class="columnsBox input_width input-number-unit-class" class-unit="%" - v-model="manyVipDiscount" - @focus="manyVipPrice = undefined" + :value="manyVipDiscount" + @input="(val) => $emit('update:manyVipDiscount', val)" + @focus="$emit('update:manyVipPrice', undefined)" > 批量设置 @@ -258,43 +262,71 @@ @@ -356,8 +388,8 @@ export default { changeDiscount(index, type) { this.$emit('changeDiscount', index, type); }, - brokerageSetUp(val) { - this.$emit('brokerageSetUp', val); + brokerageSetUp() { + this.$emit('brokerageSetUp'); }, }, }; diff --git a/template/admin/src/pages/product/productAdd/components/SpecStock.vue b/template/admin/src/pages/product/productAdd/components/SpecStock.vue index 4d8529075..2794d7764 100644 --- a/template/admin/src/pages/product/productAdd/components/SpecStock.vue +++ b/template/admin/src/pages/product/productAdd/components/SpecStock.vue @@ -605,8 +605,8 @@ export default { modalPicTap(type, tableName, index) { this.$emit('modalPicTap', type, tableName, index); }, - handleRemove2(index) { - this.$emit('handleRemove2', index); + handleRemove2(index, type, tableName) { + this.$emit('handleRemove2', index, type, tableName); }, batchAdd() { this.$emit('batchAdd'); @@ -620,6 +620,12 @@ export default { handleFocus(e) { this.$emit('handleFocus', e); }, + attrDetailChangeValue(val, index) { + this.$emit('attrDetailChangeValue', val, index); + }, + handleBlur(e) { + this.$emit('handleBlur', e); + }, attrChangeValue(val, index) { this.$emit('attrChangeValue', val, index); }, diff --git a/template/admin/src/pages/product/productAdd/index.vue b/template/admin/src/pages/product/productAdd/index.vue index 8d186bc41..0a9cc07e4 100644 --- a/template/admin/src/pages/product/productAdd/index.vue +++ b/template/admin/src/pages/product/productAdd/index.vue @@ -107,10 +107,10 @@ :manyFormValidate="manyFormValidate" :columnsInstall="columnsInstall" :columnsInstal2="columnsInstal2" - :manyBrokerage="manyBrokerage" - :manyBrokerageTwo="manyBrokerageTwo" - :manyVipPrice="manyVipPrice" - :manyVipDiscount="manyVipDiscount" + :manyBrokerage.sync="manyBrokerage" + :manyBrokerageTwo.sync="manyBrokerageTwo" + :manyVipPrice.sync="manyVipPrice" + :manyVipDiscount.sync="manyVipDiscount" @checkAllGroupChange="checkAllGroupChange" @changeVipPrice="changeVipPrice" @changeDiscount="changeDiscount" @@ -1430,8 +1430,18 @@ export default { } // 批量设置商品规格属性 - const batchFields = ['pic', 'price', 'cost', 'ot_price', 'stock', 'weight', 'volume']; - const defaultFields = ['bar_code', 'bar_code_number']; + const batchFields = [ + 'pic', + 'price', + 'cost', + 'ot_price', + 'stock', + 'weight', + 'volume', + 'bar_code', + 'bar_code_number', + ]; + // const defaultFields = ['bar_code', 'bar_code_number']; for (let val of this.manyFormValidate) { const batch = this.oneFormBatch[0]; @@ -1439,7 +1449,7 @@ export default { if (!arr.length || this.isSubset(val.attr_arr, arr)) { // 设置有值的批量字段 batchFields.forEach((field) => { - if (batch[field] !== undefined) { + if (batch[field] && batch[field] !== undefined) { if (field === 'pic' && batch[field]) { this.$set(val, field, batch[field]); } else if (field != 'pic') { @@ -1449,9 +1459,9 @@ export default { }); // 设置默认字段 - defaultFields.forEach((field) => { - this.$set(val, field, batch[field]); - }); + // defaultFields.forEach((field) => { + // this.$set(val, field, batch[field]); + // }); } } }, diff --git a/template/uni-app/api/points_mall.js b/template/uni-app/api/points_mall.js index 2b403ae41..b79042fdf 100644 --- a/template/uni-app/api/points_mall.js +++ b/template/uni-app/api/points_mall.js @@ -14,5 +14,7 @@ import request from "@/utils/request.js"; * 积分商城 */ export function getStoreIntegral(data) { - return request.get("store_integral/index", data); + return request.get("store_integral/index", data, { + noAuth: true + }); } diff --git a/template/uni-app/pages/index/components/userInfor.vue b/template/uni-app/pages/index/components/userInfor.vue index 112dc6e51..3b9d05821 100644 --- a/template/uni-app/pages/index/components/userInfor.vue +++ b/template/uni-app/pages/index/components/userInfor.vue @@ -223,8 +223,6 @@ } }, methods: { - hello(res) { - }, getCode() { getRandCode().then(res => { let code = res.data.code; diff --git a/template/uni-app/pages/index/index.vue b/template/uni-app/pages/index/index.vue index 899b2487e..7c41dc39d 100644 --- a/template/uni-app/pages/index/index.vue +++ b/template/uni-app/pages/index/index.vue @@ -102,13 +102,16 @@ {{ configData.record_No }} - {{configData.network_security}} + {{ configData.network_security }} + + + @@ -180,6 +183,8 @@ import { HTTP_REQUEST_URL } from '@/config/app'; import pageFooter from '@/components/pageFooter/index.vue'; import Loading from '@/components/Loading/index.vue'; import Cache from '@/utils/cache'; +import appUpdate from '@/components/update/app-update.vue'; + export default { computed: { // #ifdef MP @@ -243,7 +248,10 @@ export default { hotspot, follow, waterfallsFlow, - emptyPage + emptyPage, + // #ifdef APP + appUpdate + // #endif }, data() { return { @@ -285,7 +293,7 @@ export default { homeCombData: {}, headerSerchCombData: {}, cateNavData: {}, - footerConfigData:{}, + footerConfigData: {}, bgColor: '', bgPic: '', bgTabVal: '', @@ -724,7 +732,7 @@ export default { let lastArr = this.objToArr(data.value); lastArr.forEach((item, index, arr) => { if (item.name == 'pageFoot') { - this.footerConfigData = item + this.footerConfigData = item; } if (item.name === 'homeComb' && !item.isHide) { this.showHomeComb = true; @@ -1015,7 +1023,7 @@ export default { display: flex; align-items: center; justify-content: center; - .ban{ + .ban { width: 22rpx; height: 24rpx; margin-right: 10rpx;