From a38eb84f1e27a01323853e3ba231febdb5adafa2 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Sat, 11 May 2024 14:28:36 +0800
Subject: [PATCH] edit
---
src/filters/commFilter.js | 2 +-
src/views/order/index.vue | 2 +-
src/views/order/orderRefund/index.vue | 2 +-
src/views/product/addProduct/index.vue | 74 +++++++++++---------
src/views/product/productList/proDetails.vue | 13 +++-
5 files changed, 53 insertions(+), 40 deletions(-)
diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js
index 0c85116..ddb52be 100644
--- a/src/filters/commFilter.js
+++ b/src/filters/commFilter.js
@@ -96,7 +96,7 @@ export function cancelOrderStatusFilter(status) {
export function orderPayType(type) {
const typeMap = {
- '0': '消费券支付',
+ '0': '余额支付',
'1': '微信支付',
'2': '小程序',
'3': '微信支付',
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index d7d0e7a..d431d44 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -79,7 +79,7 @@
class="selWidth"
@change="getList(1),getCardList()"
>
-
+
diff --git a/src/views/order/orderRefund/index.vue b/src/views/order/orderRefund/index.vue
index 022c6f4..b321bac 100644
--- a/src/views/order/orderRefund/index.vue
+++ b/src/views/order/orderRefund/index.vue
@@ -113,7 +113,7 @@
class="selWidth"
@change="getList(1)"
>
-
+
diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue
index ca91886..12e1e69 100644
--- a/src/views/product/addProduct/index.vue
+++ b/src/views/product/addProduct/index.vue
@@ -1007,26 +1007,21 @@
controls-position="right"
/>
@@ -1048,7 +1043,7 @@
@@ -1181,26 +1176,21 @@
controls-position="right"
/>
@@ -1223,11 +1213,11 @@
@@ -1237,7 +1227,7 @@
:min="0"
type="number"
size="small"
- :disabled="formThead[iii].title === '成本价'||formThead[iii].title === '占比'||formThead[iii].title === '成长值'"
+ :disabled="isForbidden(iii)"
class="priceBox"
controls-position="right"
/>
@@ -1363,26 +1353,21 @@
class="priceBox"
/> -->
@@ -1411,12 +1396,12 @@
class="priceBox"
/> -->
@@ -1435,7 +1420,7 @@
type="number"
size="small"
class="priceBox"
- :disabled="formThead[iii].title === '成本价'||formThead[iii].title === '占比'||formThead[iii].title === '成长值'"
+ :disabled="isForbidden(iii)"
controls-position="right"
/>
@@ -2637,6 +2622,25 @@ export default {
window.removeEventListener('popstate', this.goBack, false)
},
methods: {
+ // 输入的联动的
+ isSpecification(iii){
+ let arr = ['商品编号','依据链接','售价','市场价']
+ return arr.includes(this.formThead[iii].title)
+ },
+ // 审核后禁止编辑
+ isVirStatus(iii){
+ let arr = ['依据链接','商品编号']
+ return this.virStatus&&arr.includes(this.formThead[iii].title)
+ },
+ isForbidden(iii){
+ let arr = ['成本价','占比','成长值']
+ let forbidden = ['库存','重量(KG)','体积(m³)']
+ return arr.includes(this.formThead[iii].title) || (this.virStatus&&forbidden.includes(this.formThead[iii].title))
+ },
+ isForbiddens(iii){
+ let arr = ['付费会员价','商品编号','依据链接','售价','市场价','库存']
+ return !arr.includes(this.formThead[iii].title)
+ },
onsubmit(){
this.dialogVisible = false
},
diff --git a/src/views/product/productList/proDetails.vue b/src/views/product/productList/proDetails.vue
index 347412c..b6d0f79 100644
--- a/src/views/product/productList/proDetails.vue
+++ b/src/views/product/productList/proDetails.vue
@@ -169,7 +169,7 @@
{{ scope.row[iii] }}
@@ -208,7 +208,7 @@
{{ scope.row[iii] }}
@@ -857,6 +857,15 @@ export default {
filters: {
},
methods: {
+ isValidURL(url) {
+ // (http|https):\/\/([\w.]+\/?)\S*
+ var pattern = /^(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?$/;
+ if(!pattern.test(url)){
+ return `https://${url}`
+ }
+ return url
+ // return pattern.test(url);
+ },
getType(val){
var regex = /(?:\.([^.]+))?$/;
let suffix = regex.exec(val.url)[1]