From 09c0fcf0d3ea8b0db103e7d2c43a6272eec8d90c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 4 Jun 2024 15:29:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=9B=BA=E5=AE=9A=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anmo-admin/config/index.js | 6 +- anmo-admin/src/main.js | 1 + anmo-admin/src/utils/enumData.js | 9 +++ anmo-admin/src/utils/httpRequest.js | 17 +---- .../src/views/allocation/allocationList.vue | 10 ++- anmo-admin/src/views/applyList/technician.vue | 14 ++-- anmo-admin/src/views/autonym/autonym.vue | 12 +-- anmo-admin/src/views/banner/bannerList.vue | 15 ++-- .../src/views/business/merchantList.vue | 76 ++++++++++--------- anmo-admin/src/views/campus/couponYhq.vue | 15 ++-- anmo-admin/src/views/campus/couponissue.vue | 45 +++++------ .../src/views/integral/exchangeList.vue | 3 +- anmo-admin/src/views/locality/locality.vue | 16 ++-- .../src/views/locality/materialLink.vue | 7 +- anmo-admin/src/views/locality/quill-config.js | 2 +- .../src/views/materialPackage/quill-config.js | 2 +- anmo-admin/src/views/mission/mission.vue | 5 +- anmo-admin/src/views/mission/missionAdd.vue | 5 +- anmo-admin/src/views/mission/quill-config.js | 2 +- anmo-admin/src/views/mission/system.vue | 7 +- .../src/views/purchaseShop/classifyAdmin.vue | 5 +- .../src/views/purchaseShop/inteAmend.vue | 14 ++-- .../src/views/purchaseShop/intepublich.vue | 19 ++--- .../src/views/purchaseShop/shopAmend.vue | 11 +-- .../src/views/purchaseShop/shopConfig.vue | 9 ++- .../src/views/purchaseShop/shopPublish.vue | 17 +++-- anmo-admin/src/views/recruit/recruitList.vue | 3 +- .../src/views/sysmission/missionAdd.vue | 5 +- .../src/views/sysmission/missionRedact.vue | 5 +- anmo-admin/src/views/user/userDetail.vue | 10 ++- anmo-admin/src/views/user/userDetail1.vue | 58 +++++++------- anmo-admin/src/views/user/userList.vue | 12 +-- anmo-admin/src/views/user/vipPrivilege.vue | 5 +- .../src/views/vipPrivilege/vipPrivilege.vue | 25 +++--- anmo-admin/src/views/vueMchat/vueMchat.vue | 5 +- anmo-shop/common/config.js | 15 ++-- anmo-shop/common/queue.js | 6 +- anmo-shop/index.html | 3 +- anmo-shop/manifest.json | 3 +- anmo-shop/uview-ui/libs/request/index.js | 3 +- anmo-user/common/config.js | 6 +- anmo-user/uview-ui/libs/request/index.js | 3 +- 42 files changed, 278 insertions(+), 233 deletions(-) create mode 100644 anmo-admin/src/utils/enumData.js diff --git a/anmo-admin/config/index.js b/anmo-admin/config/index.js index 13dfe9c..4904f29 100644 --- a/anmo-admin/config/index.js +++ b/anmo-admin/config/index.js @@ -5,6 +5,8 @@ const path = require('path') const devEnv = require('./dev.env') +import { serverPaths } from '@/utils/enumData' + module.exports = { dev: { @@ -14,9 +16,7 @@ module.exports = { // 代理列表, 是否开启代理通过[./dev.env.js]配置 proxyTable: devEnv.OPEN_PROXY === false ? {} : { '/proxyApi': { - // target: 'http://192.168.0.109:8187/sqx_fast/', - // target: 'http://192.168.1.168:8187/sqx_fast/', - target: 'https://admin.sjajk.com/sqx_fast/', + target: this.serverPaths.serverUrl, changeOrigin: true, pathRewrite: { '^/proxyApi': '' diff --git a/anmo-admin/src/main.js b/anmo-admin/src/main.js index 469a94d..8efc29b 100644 --- a/anmo-admin/src/main.js +++ b/anmo-admin/src/main.js @@ -12,6 +12,7 @@ import { isAuth } from '@/utils' import cloneDeep from 'lodash/cloneDeep' import BaiduMap from 'vue-baidu-map' import { VueJsonp } from 'vue-jsonp' +import { serverPaths } from '@/utils/enumData' Vue.use(VueJsonp) diff --git a/anmo-admin/src/utils/enumData.js b/anmo-admin/src/utils/enumData.js new file mode 100644 index 0000000..de2836d --- /dev/null +++ b/anmo-admin/src/utils/enumData.js @@ -0,0 +1,9 @@ +import Vue from 'vue' + +export const serverPaths = { + // serverUrl : "https://admin.sjajk.com/sqx_fast/",//生产需替换 + serverUrl : "http://192.168.2.222:8187/sqx_fast/", + uploadUrl : this.serverUrl + "alioss/upload", + uploadWatermarkUrl : this.serverUrl + "alioss/uploadWatermark", + uploadMusicUrl : this.serverUrl + "alioss/uploadMusic", +} diff --git a/anmo-admin/src/utils/httpRequest.js b/anmo-admin/src/utils/httpRequest.js index 90c2b86..64e6083 100644 --- a/anmo-admin/src/utils/httpRequest.js +++ b/anmo-admin/src/utils/httpRequest.js @@ -7,6 +7,8 @@ import { clearLoginInfo } from '@/utils' +import { serverPaths } from '@/utils/enumData' + const http = axios.create({ timeout: 1000 * 30, // withCredentials: true, @@ -45,20 +47,7 @@ http.interceptors.response.use(response => { * @param {*} actionName action方法名称 */ http.adornUrl = (actionName) => { - // 非生产环境 && 开启代理, 接口前缀统一使用[/proxyApi/]前缀做代理拦截! - // return (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl) + actionName - // return 'http://192.168.0.109:8187/sqx_fast/' + actionName - //return 'http://127.0.0.1:8187/sqx_fast/' + actionName - //生产环境 - return 'https://admin.sjajk.com/sqx_fast/' + actionName - //测试环境 - // return "http://192.168.1.169:8187/sqx_fast/" + actionName; - //客户地址 - // return "http://192.168.110.85:8187/sqx_fast/" + actionName; - // 后台本地韩玉东 - // return "http://192.168.1.50:8187/sqx_fast/" + actionName; - //后台本地张聪 - // return "http://192.168.1.48:8187/sqx_fast/" + actionName; + return this.serverPaths.serverUrl + actionName; } http.adornWss = (actionName) => { diff --git a/anmo-admin/src/views/allocation/allocationList.vue b/anmo-admin/src/views/allocation/allocationList.vue index 5001d26..f0263d9 100644 --- a/anmo-admin/src/views/allocation/allocationList.vue +++ b/anmo-admin/src/views/allocation/allocationList.vue @@ -403,10 +403,10 @@ @@ -436,7 +436,7 @@
@@ -445,7 +445,7 @@
点击上传 @@ -559,6 +559,8 @@ export default { } } return { + uploadUrl: this.serverPaths.uploadUrl, + uploadMusicUrl: this.serverPaths.uploadMusicUrl, openValue: '是', closeValue: '否', limit: 10, diff --git a/anmo-admin/src/views/applyList/technician.vue b/anmo-admin/src/views/applyList/technician.vue index 0e5d59f..87db23c 100644 --- a/anmo-admin/src/views/applyList/technician.vue +++ b/anmo-admin/src/views/applyList/technician.vue @@ -441,7 +441,7 @@
头像：
身份证正面图：
身份证反面图：
-
- @@ -322,6 +322,8 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, + uploadWatermarkUrl: this.serverPaths.uploadWatermarkUrl, limit: 10, page: 1, content: '', diff --git a/anmo-admin/src/views/banner/bannerList.vue b/anmo-admin/src/views/banner/bannerList.vue index dbb486f..d72f375 100644 --- a/anmo-admin/src/views/banner/bannerList.vue +++ b/anmo-admin/src/views/banner/bannerList.vue @@ -51,7 +51,7 @@
@@ -133,7 +133,7 @@
@@ -373,7 +373,7 @@ layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
- +
@@ -427,7 +427,7 @@ layout="total,sizes, prev, pager, next,jumper" :total="tableData.totalCount">
- + @@ -436,7 +436,7 @@
@@ -468,7 +468,7 @@
@@ -498,6 +498,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, page: 1, limit: 5, classify: 1, @@ -609,7 +610,7 @@ this.classify = 6 this.dataSelect() } - + if (tab._props.label == '精选商品') { this.page = 1 this.limit = 5 diff --git a/anmo-admin/src/views/business/merchantList.vue b/anmo-admin/src/views/business/merchantList.vue index 86c54a4..3d793de 100644 --- a/anmo-admin/src/views/business/merchantList.vue +++ b/anmo-admin/src/views/business/merchantList.vue @@ -19,7 +19,7 @@ v-model="phoneT">     
- + 刷新 重置 @@ -36,7 +36,7 @@ @click="updates(scope.row)">{{ scope.row.userName ? scope.row.userName : '未设置' }} - + @@ -70,7 +70,7 @@
- + @@ -84,7 +84,7 @@
- + @@ -137,7 +137,7 @@ 商家名称：
- +
商家抽成比例： @@ -168,7 +168,7 @@ 商家头像：
@@ -185,7 +185,7 @@
-
-
- +
取 消 确 定 @@ -229,7 +229,7 @@ 商家名称：
- +
商家抽成比例： @@ -260,7 +260,7 @@ 商家头像：
@@ -277,7 +277,7 @@
-
- 确 定
- - - + + + @@ -27,7 +27,7 @@
素材图片：
- @@ -48,7 +48,7 @@
- @@ -71,6 +71,7 @@ export default { data () { return { + uploadUrl: this.serverPaths.uploadUrl, imgUrl: '', linkUrl: '', type: 3, diff --git a/anmo-admin/src/views/locality/quill-config.js b/anmo-admin/src/views/locality/quill-config.js index d7835b1..bed7e83 100644 --- a/anmo-admin/src/views/locality/quill-config.js +++ b/anmo-admin/src/views/locality/quill-config.js @@ -1,6 +1,6 @@ /*富文本编辑图片上传配置*/ const uploadConfig = { - action: 'https://admin.sjajk.com/sqx_fast/alioss/upload', // 必填参数 图片上传地址 + action: this.serverPaths.uploadUrl, // 必填参数 图片上传地址 methods: 'POST', // 必填参数 图片上传方式 token: '', // 可选参数 如果需要token验证，假设你的token有存放在sessionStorage name: 'file', // 必填参数 文件的参数名 diff --git a/anmo-admin/src/views/materialPackage/quill-config.js b/anmo-admin/src/views/materialPackage/quill-config.js index d7835b1..bed7e83 100644 --- a/anmo-admin/src/views/materialPackage/quill-config.js +++ b/anmo-admin/src/views/materialPackage/quill-config.js @@ -1,6 +1,6 @@ /*富文本编辑图片上传配置*/ const uploadConfig = { - action: 'https://admin.sjajk.com/sqx_fast/alioss/upload', // 必填参数 图片上传地址 + action: this.serverPaths.uploadUrl, // 必填参数 图片上传地址 methods: 'POST', // 必填参数 图片上传方式 token: '', // 可选参数 如果需要token验证，假设你的token有存放在sessionStorage name: 'file', // 必填参数 文件的参数名 diff --git a/anmo-admin/src/views/mission/mission.vue b/anmo-admin/src/views/mission/mission.vue index 70b0e2c..44973e7 100644 --- a/anmo-admin/src/views/mission/mission.vue +++ b/anmo-admin/src/views/mission/mission.vue @@ -185,7 +185,7 @@
@@ -214,7 +214,7 @@
@@ -258,6 +258,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, dialogVisible: false, imageUrl: [], limit: 10, diff --git a/anmo-admin/src/views/mission/missionAdd.vue b/anmo-admin/src/views/mission/missionAdd.vue index 115c025..e3f34e7 100644 --- a/anmo-admin/src/views/mission/missionAdd.vue +++ b/anmo-admin/src/views/mission/missionAdd.vue @@ -33,7 +33,7 @@
@@ -50,7 +50,7 @@
- @@ -351,6 +351,7 @@ }, data() { return { + uploadUrl: this.serverPaths.uploadUrl, titles: '添加任务', goodsType:'', goodsId: '', //任务id diff --git a/anmo-admin/src/views/mission/quill-config.js b/anmo-admin/src/views/mission/quill-config.js index d7835b1..bed7e83 100644 --- a/anmo-admin/src/views/mission/quill-config.js +++ b/anmo-admin/src/views/mission/quill-config.js @@ -1,6 +1,6 @@ /*富文本编辑图片上传配置*/ const uploadConfig = { - action: 'https://admin.sjajk.com/sqx_fast/alioss/upload', // 必填参数 图片上传地址 + action: this.serverPaths.uploadUrl, // 必填参数 图片上传地址 methods: 'POST', // 必填参数 图片上传方式 token: '', // 可选参数 如果需要token验证，假设你的token有存放在sessionStorage name: 'file', // 必填参数 文件的参数名 diff --git a/anmo-admin/src/views/mission/system.vue b/anmo-admin/src/views/mission/system.vue index 3e10393..4b903de 100644 --- a/anmo-admin/src/views/mission/system.vue +++ b/anmo-admin/src/views/mission/system.vue @@ -348,7 +348,7 @@
@@ -427,7 +427,7 @@
@@ -459,7 +459,7 @@
@@ -492,6 +492,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, openValue: '1', closeValue: '0', limit: 10, diff --git a/anmo-admin/src/views/purchaseShop/classifyAdmin.vue b/anmo-admin/src/views/purchaseShop/classifyAdmin.vue index f0d1458..941e1c9 100644 --- a/anmo-admin/src/views/purchaseShop/classifyAdmin.vue +++ b/anmo-admin/src/views/purchaseShop/classifyAdmin.vue @@ -85,7 +85,7 @@ @@ -113,7 +113,7 @@ @@ -135,6 +135,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, size:5, page:1, name:'', diff --git a/anmo-admin/src/views/purchaseShop/inteAmend.vue b/anmo-admin/src/views/purchaseShop/inteAmend.vue index b1da5fe..a1bcb83 100644 --- a/anmo-admin/src/views/purchaseShop/inteAmend.vue +++ b/anmo-admin/src/views/purchaseShop/inteAmend.vue @@ -51,7 +51,7 @@
@@ -69,7 +69,7 @@
- @@ -171,7 +171,7 @@
@@ -248,7 +248,7 @@
@@ -338,7 +338,7 @@ import { quillEditor } from 'vue-quill-editor' import 'quill/dist/quill.core.css' - import 'quill/dist/quill.snow.css' + import 'quill/dist/quill.snow.css' import 'quill/dist/quill.bubble.css' import quillConfig from '../mission/quill-config.js' export default { @@ -348,6 +348,7 @@ }, data() { return { + uploadUrl: this.serverPaths.uploadUrl, quillOption: quillConfig, type: '', typeId: '', @@ -734,7 +735,8 @@ xhr = new XMLHttpRequest(); xhr.withCredentials = false; - xhr.open('POST', "https://admin.sjajk.com/sqx_fast/alioss/upload"); + // xhr.open('POST', "https://admin.sjajk.com/sqx_fast/alioss/upload");//生产需替换 + xhr.open('POST', "http://192.168.2.222/sqx_fast/alioss/upload"); xhr.onload = function() { var json; diff --git a/anmo-admin/src/views/purchaseShop/intepublich.vue b/anmo-admin/src/views/purchaseShop/intepublich.vue index d9e77e4..d44c8ac 100644 --- a/anmo-admin/src/views/purchaseShop/intepublich.vue +++ b/anmo-admin/src/views/purchaseShop/intepublich.vue @@ -42,7 +42,7 @@ - +
商品封面图： @@ -50,7 +50,7 @@ @@ -63,7 +63,7 @@ 商品轮播图：
@@ -321,7 +321,7 @@ style="width: 60px;height: 60px;" class="avatar-uploader" v-model="scope.row.skuImg" - action="https://admin.sjajk.com/sqx_fast/alioss/upload" + :action="uploadUrl" :show-file-list="false" :on-success="handleAvatarSuccess3" > @@ -423,6 +423,7 @@ }, data() { return { + uploadUrl: this.serverPaths.uploadUrl, quillOption: quillConfig, specif:'', typeId: '', @@ -527,7 +528,7 @@ descrition: '' } }, - + methods: { // 验证input只能输入正整数 proving() { @@ -774,7 +775,7 @@ }) }) }, - + // 商品分类 dataSelect () { this.tableDataLoading = true @@ -935,7 +936,7 @@ if(this.price == ''){ this.price = '0' } - + this.$http({ url: this.$http.adornUrl(`goods/isFormatAttr?coverImg=${this.coverImg}&price=${this.price}`), method: 'post', @@ -954,7 +955,7 @@ mounted() { this.specifSelect() }, - + } diff --git a/anmo-admin/src/views/purchaseShop/shopAmend.vue b/anmo-admin/src/views/purchaseShop/shopAmend.vue index 518dd7a..a7e4dbb 100644 --- a/anmo-admin/src/views/purchaseShop/shopAmend.vue +++ b/anmo-admin/src/views/purchaseShop/shopAmend.vue @@ -109,7 +109,7 @@
@@ -127,7 +127,7 @@
- @@ -229,7 +229,7 @@
@@ -302,7 +302,7 @@
@@ -395,6 +395,7 @@ }, data() { return { + uploadUrl: this.serverPaths.uploadUrl, type: '', typeId: '', title: '', @@ -677,7 +678,7 @@ }else{ this.postagePrice = returnData.postagePrice } - + }else{ this.postagePrice = 0 } diff --git a/anmo-admin/src/views/purchaseShop/shopConfig.vue b/anmo-admin/src/views/purchaseShop/shopConfig.vue index f50e2a5..41e5252 100644 --- a/anmo-admin/src/views/purchaseShop/shopConfig.vue +++ b/anmo-admin/src/views/purchaseShop/shopConfig.vue @@ -34,7 +34,7 @@ 图片地址：
- @@ -57,7 +57,7 @@
@@ -128,7 +128,7 @@
@@ -160,7 +160,7 @@
@@ -408,6 +408,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, size: 5, page: 1, pages: 1, diff --git a/anmo-admin/src/views/purchaseShop/shopPublish.vue b/anmo-admin/src/views/purchaseShop/shopPublish.vue index c761eff..b039617 100644 --- a/anmo-admin/src/views/purchaseShop/shopPublish.vue +++ b/anmo-admin/src/views/purchaseShop/shopPublish.vue @@ -109,7 +109,7 @@
@@ -119,7 +119,7 @@
商品轮播图：
- @@ -222,7 +222,7 @@
@@ -295,7 +295,7 @@
@@ -374,7 +374,7 @@ diff --git a/anmo-admin/src/views/recruit/recruitList.vue b/anmo-admin/src/views/recruit/recruitList.vue index cd98dc1..ead48f4 100644 --- a/anmo-admin/src/views/recruit/recruitList.vue +++ b/anmo-admin/src/views/recruit/recruitList.vue @@ -91,7 +91,7 @@
@@ -155,6 +155,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, page: 1, limit: 10, tableDataLoading: true, diff --git a/anmo-admin/src/views/sysmission/missionAdd.vue b/anmo-admin/src/views/sysmission/missionAdd.vue index 07b798c..69e6305 100644 --- a/anmo-admin/src/views/sysmission/missionAdd.vue +++ b/anmo-admin/src/views/sysmission/missionAdd.vue @@ -15,7 +15,7 @@
- @@ -1751,7 +1751,7 @@
- @@ -1942,6 +1942,8 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, + uploadWatermarkUrl: this.serverPaths.uploadWatermarkUrl, artificerIdSet: null, integratingDataStatus: true, totalIntegrating: 0, diff --git a/anmo-admin/src/views/user/userDetail1.vue b/anmo-admin/src/views/user/userDetail1.vue index 2cf6e1c..dc48ced 100644 --- a/anmo-admin/src/views/user/userDetail1.vue +++ b/anmo-admin/src/views/user/userDetail1.vue @@ -281,7 +281,7 @@ :disabled="!isAuth('userList:updateXyf')" style="color: #4f9dec;background: #fff;border: none;" @click="ageChange2(tableData.userId,tableData.creditScore)">修改 - + 完成订单数量 @@ -404,7 +404,7 @@ - + @@ -1219,7 +1219,7 @@ - + @@ -1308,7 +1308,7 @@ --> - + - +
{} }) } - + }) }).catch(() => {}) }, diff --git a/anmo-admin/src/views/user/userList.vue b/anmo-admin/src/views/user/userList.vue index 59e4861..e2b792f 100644 --- a/anmo-admin/src/views/user/userList.vue +++ b/anmo-admin/src/views/user/userList.vue @@ -1161,7 +1161,7 @@
@@ -1174,7 +1174,7 @@
@@ -1191,7 +1191,7 @@
- @@ -1209,7 +1209,7 @@
- @@ -1223,7 +1223,7 @@
@@ -1257,6 +1257,8 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, + uploadWatermarkUrl: this.serverPaths.uploadWatermarkUrl, openValue: 1, closeValue: 2, state: 'false', diff --git a/anmo-admin/src/views/user/vipPrivilege.vue b/anmo-admin/src/views/user/vipPrivilege.vue index 0b13469..c39f6aa 100644 --- a/anmo-admin/src/views/user/vipPrivilege.vue +++ b/anmo-admin/src/views/user/vipPrivilege.vue @@ -5,7 +5,7 @@ icon="document" @click="addNotice">添加会员特权
- + @@ -40,7 +40,7 @@ @@ -69,6 +69,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, page:1, limit:10, tableDataLoading: true, diff --git a/anmo-admin/src/views/vipPrivilege/vipPrivilege.vue b/anmo-admin/src/views/vipPrivilege/vipPrivilege.vue index f7ad2f9..c22aeda 100644 --- a/anmo-admin/src/views/vipPrivilege/vipPrivilege.vue +++ b/anmo-admin/src/views/vipPrivilege/vipPrivilege.vue @@ -5,7 +5,7 @@ icon="document" @click="addNotice">添加会员特权
- + @@ -37,16 +37,16 @@
图片：
- - - - + + + +
@@ -78,7 +78,8 @@ memberImg:'', memberId:'', sort:'', - title:'添加' + title:'添加', + uploadUrl: this.serverPaths.uploadUrl } }, methods: { diff --git a/anmo-admin/src/views/vueMchat/vueMchat.vue b/anmo-admin/src/views/vueMchat/vueMchat.vue index 2a8d507..c9bea11 100644 --- a/anmo-admin/src/views/vueMchat/vueMchat.vue +++ b/anmo-admin/src/views/vueMchat/vueMchat.vue @@ -159,8 +159,8 @@
-->
-
@@ -185,6 +185,7 @@ export default { data() { return { + uploadUrl: this.serverPaths.uploadUrl, chatList: [], page: 1, size: 5, diff --git a/anmo-shop/common/config.js b/anmo-shop/common/config.js index 72d10f3..306b687 100644 --- a/anmo-shop/common/config.js +++ b/anmo-shop/common/config.js @@ -1,5 +1,6 @@ -// const ROOTPATH = "http://192.168.1.169:8187/sqx_fast"; -// const ROOTPATH1 = "http://192.168.1.169:8187/sqx_fast"; +const ROOTPATH = "http://192.168.2.222:8187/sqx_fast"; +const ROOTPATH1 = "http://192.168.2.222:8187/sqx_fast"; +const ROOTPATH3 = "wss://192.168.2.222:8187/wss/websocket/"; //客户现场 // const ROOTPATH = "http://192.168.110.85:8187/sqx_fast"; // const ROOTPATH1 = "http://192.168.110.85:8187/sqx_fast"; @@ -11,9 +12,9 @@ // const ROOTPATH1 = "http://192.168.1.50:8187/sqx_fast"; // const ROOTPATH3 = "wss://wx.sjajk.com/wss/websocket/";//联系客服 //生产环境 -const ROOTPATH = "https://wx.sjajk.com/sqx_fast"; -const ROOTPATH1 = "https://wx.sjajk.com/sqx_fast"; -const ROOTPATH3 = "wss://wx.sjajk.com/wss/websocket/"; //联系客服 +// const ROOTPATH = "https://wx.sjajk.com/sqx_fast";//生产需替换 +// const ROOTPATH1 = "https://wx.sjajk.com/sqx_fast";//生产需替换 +// const ROOTPATH3 = "wss://wx.sjajk.com/wss/websocket/"; //联系客服//生产需替换 //上传地址 const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload'; @@ -28,8 +29,8 @@ const TX_MAP_KEY = 'VIWBZ-5OM3F-CV7JZ-NLKJY-AXSYV-TMFM6'; //ws基础连接地址 //const WS_BASE_PATH = 'ws://192.168.31.21:8187/sqx_fast/'; -//const WS_BASE_PATH = 'ws://127.0.0.1:8187/sqx_fast/'; -const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/'; +const WS_BASE_PATH = 'ws://192.168.2.222:8187/sqx_fast/'; +// const WS_BASE_PATH = 'wss://admin.sjajk.com/sqx_fast/';//生产需替换 //地图ws接口 const WS_UPLOAD_MAP_PATH = WS_BASE_PATH + 'mapWebsocket/'; diff --git a/anmo-shop/common/queue.js b/anmo-shop/common/queue.js index d6b2a07..f08af28 100644 --- a/anmo-shop/common/queue.js +++ b/anmo-shop/common/queue.js @@ -18,11 +18,13 @@ module.exports = { }, //全局域名 部分html中需要单独替换 需要修改config中的网络请求域名 publicYuMing() { - return 'https://admin.sjajk.com' + // return 'https://admin.sjajk.com'//生产需替换 + return 'http://192.168.2.222:8187' }, //全局域名 部分html中需要单独替换 需要修改config中的网络请求域名 publicYuMingApp() { - return 'https://wx.sjajk.com' + //return 'https://wx.sjajk.com'//生产需替换 + return 'http://192.168.2.222:8187' }, logout() { this.remove("token"); diff --git a/anmo-shop/index.html b/anmo-shop/index.html index 340738e..53ac2e7 100644 --- a/anmo-shop/index.html +++ b/anmo-shop/index.html @@ -20,7 +20,8 @@ diff --git a/anmo-shop/manifest.json b/anmo-shop/manifest.json index 22da77c..60d1324 100644 --- a/anmo-shop/manifest.json +++ b/anmo-shop/manifest.json @@ -185,7 +185,8 @@ "amap" : { "key" : "2acf1b8c3d1aaf0070472dec19018d96", "securityJsCode" : "2b07c8496878c327a8ae7a19de33e2a7", - "serviceHost" : "http://wx.sjajk.com/_AMapService" + // "serviceHost" : "http://wx.sjajk.com/_AMapService",//生产需替换 + "serviceHost" : "http://192.168.2.222:8187/_AMapService" } } }, diff --git a/anmo-shop/uview-ui/libs/request/index.js b/anmo-shop/uview-ui/libs/request/index.js index 062cf23..7de8dd5 100644 --- a/anmo-shop/uview-ui/libs/request/index.js +++ b/anmo-shop/uview-ui/libs/request/index.js @@ -101,7 +101,8 @@ class Request { constructor() { this.config = { - baseUrl: 'https://admin.sjajk.com/', // 请求的根域名 + // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 + baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 // 默认的请求头 header: {}, method: 'POST', diff --git a/anmo-user/common/config.js b/anmo-user/common/config.js index 8b5482b..57461b7 100644 --- a/anmo-user/common/config.js +++ b/anmo-user/common/config.js @@ -1,7 +1,9 @@ -const PROT = "https://" //生产环境 -const ROOTHOST = "admin.sjajk.com"; +// const PROT = "https://"//生产需替换 +// const ROOTHOST = "admin.sjajk.com";//生产需替换 //测试环境 +const PROT = "http://" +const ROOTHOST = "192.168.2.222:8187"; // const ROOTHOST = "192.168.0.115:8187"; // const ROOTHOST = "192.168.1.169:8187"; // 后端本地张聪 diff --git a/anmo-user/uview-ui/libs/request/index.js b/anmo-user/uview-ui/libs/request/index.js index 062cf23..ac8c249 100644 --- a/anmo-user/uview-ui/libs/request/index.js +++ b/anmo-user/uview-ui/libs/request/index.js @@ -101,7 +101,8 @@ class Request { constructor() { this.config = { - baseUrl: 'https://admin.sjajk.com/', // 请求的根域名 + // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 + baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 // 默认的请求头 header: {}, method: 'POST',