From 27bb78c183fd7a8b5de4b99ffecbae81feb07e37 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期四, 21 九月 2023 18:32:06 +0800
Subject: [PATCH] 企业端
---
h5/pages/index/index.vue | 32 +++++++++++++++++++++++++-------
h5/utils/request.js | 3 ++-
company_admin/.env.production | 4 ++--
h5/apis/index.js | 5 +++++
h5/manifest.json | 11 ++++++++---
5 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/company_admin/.env.production b/company_admin/.env.production
index 87d6b63..89f2f32 100644
--- a/company_admin/.env.production
+++ b/company_admin/.env.production
@@ -3,7 +3,7 @@
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_interface/'
-VUE_APP_API = 'http://127.0.0.1:10022/'
+# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
# VUE_APP_API = 'https://dmtest.ahapp.net/preselect_web_interface/'
@@ -11,6 +11,6 @@
# VUE_APP_API = 'https://dm.ahapp.net/preselect_interface/'
-# VUE_APP_API = 'http://yx.doumee.com/preselect_interface/'
+VUE_APP_API = 'https://yx.ahapp.net/web_interface/'
# VUE_APP_API = 'http://mjyx.doumee.com/preselect_interface/'
\ No newline at end of file
diff --git a/h5/apis/index.js b/h5/apis/index.js
index a0a8c4c..6bdccf5 100644
--- a/h5/apis/index.js
+++ b/h5/apis/index.js
@@ -43,4 +43,9 @@
// 鍙栧綋鍓嶇櫥褰曠殑鐢ㄦ埛淇℃伅
export function getUserInfo() {
return get('system/getUserInfo')
+}
+
+// 閫�鍑虹櫥褰�
+export function logout(data){
+ return post('system/logout', data)
}
\ No newline at end of file
diff --git a/h5/manifest.json b/h5/manifest.json
index fae0a9b..86f50bd 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -78,13 +78,18 @@
"devServer" : {
"https" : false,
"proxy" : {
- "/web_interface" : {
- "target" : "http://127.0.0.1:10022/",
+ "/preselect_h5_interface" : {
+ // "target" : "http://127.0.0.1:10022/",
+ // "target" : "http://127.0.0.1:10024/",
+ "target" : "https://dmtest.ahapp.net/preselect_h5_interface/",
// "target" : "http://121.41.164.217/",
// "target" : "http://192.168.0.15:10022/",
// "target" : "https://dmtest.ahapp.net/",
"changeOrigin" : true,
- "secure" : false
+ "secure" : false,
+ "pathRewrite" : {
+ "^/preselect_h5_interface" : "/"
+ }
}
}
},
diff --git a/h5/pages/index/index.vue b/h5/pages/index/index.vue
index 0e00306..c87983b 100644
--- a/h5/pages/index/index.vue
+++ b/h5/pages/index/index.vue
@@ -263,7 +263,7 @@
import search from '@/components/search.vue'
import noData from '@/components/noData.vue'
import { mapState } from 'vuex'
- import { categoryList, goodsList, brandList, h5Image, goodsPage, listForH5 } from '@/apis/index.js'
+ import { categoryList, goodsList, brandList, h5Image, goodsPage, listForH5, logout } from '@/apis/index.js'
export default {
data() {
return {
@@ -424,6 +424,14 @@
}
}
},
+ onUnload() {
+ //娓呴櫎
+ document.onmouseup = function(ev){
+ document.onmousemove = null;
+ }
+ //娓呴櫎
+ document.onkeydown = null
+ },
computed: {
// 鎸囧浠锋�昏
zdTotalPrice() {
@@ -539,8 +547,11 @@
},
// 閫�鍑�
loginOut() {
- this.$store.commit('clean')
- uni.redirectTo({ url: '/pages/login/login' });
+ logout({})
+ .then(res => {
+ this.$store.commit('clean')
+ uni.redirectTo({ url: '/pages/login/login' });
+ })
},
// 鏌ヨ鍟嗗搧鏁版嵁
getShopList(type) {
@@ -1122,7 +1133,7 @@
// min-width: 750px;
.box_content_left {
position: fixed;
- left: 50px;
+ left: 80px;
top: 50%;
cursor: pointer;
transform: translate(-50%, 0);
@@ -1136,7 +1147,7 @@
}
.box_content_right {
position: fixed;
- right: 50px;
+ right: 0px;
top: 50%;
cursor: pointer;
transform: translate(-50%, 0);
@@ -1320,8 +1331,11 @@
font-weight: 500;
}
.commodityFrom_body_content_item_num_img {
- width: 24px;
- height: 24px;
+ width: 28px;
+ height: 28px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
margin-right: 4px;
image {
width: 100%;
@@ -1373,6 +1387,8 @@
display: flex;
align-items: center;
justify-content: center;
+ padding: 0 10px;
+ box-sizing: border-box;
&:hover {
text {
color: #FFF200;
@@ -1560,6 +1576,8 @@
line-height: 40px;
text-align: center;
cursor: pointer;
+ padding: 0 10px;
+ box-sizing: border-box;
&:hover {
text {
color: #FFF200;
diff --git a/h5/utils/request.js b/h5/utils/request.js
index 9726052..314893c 100644
--- a/h5/utils/request.js
+++ b/h5/utils/request.js
@@ -16,8 +16,9 @@
// 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/
// http://127.0.0.1:10024/ 娴嬭瘯
+ // https://yx.ahapp.net/h5_interface/${url}
uni.request({
- url: `http://127.0.0.1:10024/${url}`,
+ url: `https://dmtest.ahapp.net/preselect_h5_interface/${url}`,
method,
data,
header: {
--
Gitblit v1.9.3