From 10ce6008c11b1dad28d3d604fa99212e4276e78b Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Sat, 18 May 2024 19:35:50 +0800 Subject: [PATCH] edit --- src/components/uploadImg/index.vue | 4 ++-- src/filters/commFilter.js | 4 ++-- src/styles/iconfont2/iconfont.json | 5 ++--- src/views/order/index.vue | 14 +++++++------- src/views/order/orderRefund/index.vue | 4 ++-- src/views/product/addProduct/index.vue | 4 ++-- src/views/product/productList/index.vue | 4 ++-- src/views/product/productList/proDetails.vue | 10 +++++----- .../systemForm/setSystem/modifyStoreInfo.vue | 15 ++++++++++----- 9 files changed, 34 insertions(+), 30 deletions(-) diff --git a/src/components/uploadImg/index.vue b/src/components/uploadImg/index.vue index 7168e2f..0ee4bfb 100644 --- a/src/components/uploadImg/index.vue +++ b/src/components/uploadImg/index.vue @@ -15,8 +15,8 @@ 本地上传 - 网络上传 - 扫码上传 + diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js index ddb52be..d7d7825 100644 --- a/src/filters/commFilter.js +++ b/src/filters/commFilter.js @@ -40,7 +40,7 @@ export function paidFilter(status) { */ export function payTypeFilter(status) { const statusMap = { - '0': '余额', + '0': '抵扣券', '1': '微信', '2': '微信', '3': '微信', @@ -96,7 +96,7 @@ export function cancelOrderStatusFilter(status) { export function orderPayType(type) { const typeMap = { - '0': '余额支付', + '0': '抵扣券支付', '1': '微信支付', '2': '小程序', '3': '微信支付', diff --git a/src/styles/iconfont2/iconfont.json b/src/styles/iconfont2/iconfont.json index ef68320..9425f56 100644 --- a/src/styles/iconfont2/iconfont.json +++ b/src/styles/iconfont2/iconfont.json @@ -1,11 +1,10 @@ { "id": "993865", - "name": "CRMEB 商城图标", + "name": "铸源优品 商城图标", "font_family": "iconfont", "css_prefix_text": "icon-", "description": "外包项目图标添加", - "glyphs": [ - { + "glyphs": [{ "icon_id": "5387812", "name": "购物_o", "font_class": "gouwu_o", diff --git a/src/views/order/index.vue b/src/views/order/index.vue index de5b815..6853052 100644 --- a/src/views/order/index.vue +++ b/src/views/order/index.vue @@ -17,7 +17,7 @@ - + - + + - + diff --git a/src/views/order/orderRefund/index.vue b/src/views/order/orderRefund/index.vue index b321bac..62bf6da 100644 --- a/src/views/order/orderRefund/index.vue +++ b/src/views/order/orderRefund/index.vue @@ -113,7 +113,7 @@ class="selWidth" @change="getList(1)" > - + @@ -341,7 +341,7 @@ export default { refundUserList: [ { value: 1, label: '用户' }, { value: 3, label: '商户' }, - { value: 4, label: '客服' } + { value: 4, label: '平台' } ], listLoading: true, roterPre: roterPre, diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index 69910ba..84c916b 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -2169,7 +2169,7 @@ const objTitle = { title: '占比' }, coupon:{ - title:'抵扣卷' + title:'抵扣' }, stock: { title: '库存' @@ -2700,7 +2700,7 @@ export default { return this.virStatus&&arr.includes(this.formThead[iii].title) }, isForbidden(iii){ - let arr = ['成本价','抵扣卷','成长值'] + let arr = ['成本价','抵扣券','成长值'] let forbidden = ['库存','重量（KG）','体积(m³)'] return arr.includes(this.formThead[iii].title) || (this.virStatus&&forbidden.includes(this.formThead[iii].title)) }, diff --git a/src/views/product/productList/index.vue b/src/views/product/productList/index.vue index e717175..de1be8c 100644 --- a/src/views/product/productList/index.vue +++ b/src/views/product/productList/index.vue @@ -82,11 +82,11 @@ - +
    -
  • +
  • 规格：
    {{productData.spec_type == 1 ? "多规格" : "单规格"}}
    @@ -261,10 +261,10 @@
无
-
  • +
  • 平台推荐星级：
    @@ -775,7 +775,7 @@ const objTitle = { title: '占比' }, coupon:{ - title:'抵扣卷' + title:'抵扣券' }, bar_code: { title: '商品编号' diff --git a/src/views/systemForm/setSystem/modifyStoreInfo.vue b/src/views/systemForm/setSystem/modifyStoreInfo.vue index 4e38d9c..a1dd337 100644 --- a/src/views/systemForm/setSystem/modifyStoreInfo.vue +++ b/src/views/systemForm/setSystem/modifyStoreInfo.vue @@ -48,7 +48,7 @@ - 开启，店铺即可展示在移动端 + 请先支付店铺费用!
    @@ -191,11 +191,12 @@ 申请记录： 查看记录
    - -
    + +
    + { - window.open(res.message) + if(res.status == 200){ + window.open(res.message) + } // console.log(res.message); + }).catch((res) => { + this.$message.error(res.message) }) }, handleShow(){