From 7ea965d6203786fd7fd4e6dd38230586c427885f Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 25 九月 2023 23:48:42 +0800
Subject: [PATCH] 企业端
---
h5/pages/index/index.vue | 8 +++++---
company_admin/.env | 1 +
company_admin/src/components/business/selectProductItem.vue | 3 ++-
h5/utils/request.js | 4 ++--
company_admin/.env.production | 2 --
company_admin/.env.development | 4 ++--
company_admin/src/utils/request.js | 2 ++
h5/manifest.json | 2 +-
8 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/company_admin/.env b/company_admin/.env
index ddde43a..79637a9 100644
--- a/company_admin/.env
+++ b/company_admin/.env
@@ -10,3 +10,4 @@
# 鎺ュ彛鍓嶇紑
# VUE_APP_API_PREFIX = '/preselect_interface/'
VUE_APP_API_PREFIX = '/web_interface'
+# VUE_APP_API_PREFIX = '/preselect_web_interface'
diff --git a/company_admin/.env.development b/company_admin/.env.development
index e53d86e..ea6e028 100644
--- a/company_admin/.env.development
+++ b/company_admin/.env.development
@@ -3,8 +3,8 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-VUE_APP_API = 'http://192.168.0.35:10022/'
-# VUE_APP_API = 'http://192.168.0.15:10024/'
+# VUE_APP_API = 'http://192.168.0.35:10022/'
+# VUE_APP_API = 'http://192.168.0.15:10022/'
VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
diff --git a/company_admin/.env.production b/company_admin/.env.production
index 89f2f32..ecab490 100644
--- a/company_admin/.env.production
+++ b/company_admin/.env.production
@@ -5,8 +5,6 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
-# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
-
# VUE_APP_API = 'http://127.0.0.1:10022/'
# VUE_APP_API = 'https://dm.ahapp.net/preselect_interface/'
diff --git a/company_admin/src/components/business/selectProductItem.vue b/company_admin/src/components/business/selectProductItem.vue
index 39acc7d..3aa2a57 100644
--- a/company_admin/src/components/business/selectProductItem.vue
+++ b/company_admin/src/components/business/selectProductItem.vue
@@ -165,7 +165,7 @@
type: this.form.type
}).then(res => {
this.visible = false
- this.$tip.apiSuccess('鎿嶄綔鎴愬姛')
+ this.$tip.apiSuccess(res)
// this.$emit('success')
this.$emit('result')
})
@@ -184,6 +184,7 @@
open(title, target) {
this.title = title
this.visible = true
+ this.form.name = ''
this.form.categoryId = Number(target.categoryId.split(',')[0])
this.form.categoryId1 = Number(target.categoryId.split(',')[1])
this.form.rate = Number(target.rate)
diff --git a/company_admin/src/utils/request.js b/company_admin/src/utils/request.js
index 51dae67..2dbe4d3 100644
--- a/company_admin/src/utils/request.js
+++ b/company_admin/src/utils/request.js
@@ -41,7 +41,9 @@
// 鏂板缓鍝嶅簲鎷︽埅鍣�
axiosInstance.interceptors.response.use((response) => {
+
console.log(response.status)
+ // debugger
// 璇锋眰澶辫触
if (response.status !== 200) {
return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
diff --git a/h5/manifest.json b/h5/manifest.json
index f3a4ff9..86f50bd 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -87,7 +87,7 @@
// "target" : "https://dmtest.ahapp.net/",
"changeOrigin" : true,
"secure" : false,
- "pathRewrite": {
+ "pathRewrite" : {
"^/preselect_h5_interface" : "/"
}
}
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index c87983b..4ac7cd0 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -707,12 +707,10 @@
})
}
})
- // console.log(this.imgList)
+ if (this.imgList.length === 0) return
this.$viewerApi({
images: this.imgList,
})
- // this.$refs.bigImg.open(0)
- // this.$refs.bigImg1.open(0)
},
empty() {
this.shopList = []
@@ -842,6 +840,7 @@
this.shopList[index].zdPrice = ''
this.shopList[index].price = ''
this.shopList[index].xhData = []
+ this.shopList[index].multifileList = []
this.shopList[index].ppShow = false
this.$forceUpdate()
},
@@ -935,12 +934,15 @@
},
copyItem(item) {
let obj = JSON.parse(JSON.stringify(item))
+ obj.multifileList = []
+ obj.xhData = []
obj.brandId = ''
obj.brand = ''
obj.brandName = ''
obj.name = ''
obj.zdPrice = ''
obj.price = ''
+ console.log(obj)
this.shopList.push(obj)
},
deleItem(i) {
diff --git a/h5/utils/request.js b/h5/utils/request.js
index 314893c..1412e8c 100644
--- a/h5/utils/request.js
+++ b/h5/utils/request.js
@@ -14,11 +14,11 @@
// http://mjyx.doumee.com/preselect_interface/
// http://yx.doumee.com/preselect_interface/
// http://127.0.0.1/interface/ http://192.168.0.15:10024/ preselect_web_interface
- // https://dmtest.ahapp.net/preselect_web_interface/${url} http://127.0.0.1:10022/ http://192.168.0.35:10024/
+ // https://dmtest.ahapp.net/preselect_h5_interface/${url} http://127.0.0.1:10022/ http://192.168.0.35:10024/
// http://127.0.0.1:10024/ 娴嬭瘯
// https://yx.ahapp.net/h5_interface/${url}
uni.request({
- url: `https://dmtest.ahapp.net/preselect_h5_interface/${url}`,
+ url: `https://yx.ahapp.net/h5_interface/${url}`,
method,
data,
header: {
--
Gitblit v1.9.3