Skip to content

S
shop-new
提交 93be27b4 authored 作者: huaxinzhu's avatar huaxinzhu
浏览文件
操作

dist冲突，提交

上级 7b72c61d fbeb7628
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 76 行增加 和 18 行删除
dist.zip
浏览文件 @ 93be27b4
No preview for this file type
dist/index.html
浏览文件 @ 93be27b4
差异被折叠。
dist/static/css/chunk-8c4aad80.7cb6d25f.css
浏览文件 @ 93be27b4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/chunk-dcbd9598.2fc0dad0.css 0 → 100644
浏览文件 @ 93be27b4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/app.88ca490a.js 0 → 100644
浏览文件 @ 93be27b4
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/chunk-dcbd9598.e08d12d9.js 0 → 100644
浏览文件 @ 93be27b4
差异被折叠。
public/index.html
浏览文件 @ 93be27b4
...@@ -227,9 +227,9 @@ ...@@ -227,9 +227,9 @@
} }
} }
}; };
// xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境 xhttp.open("GET", '//sysapi.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 正式环境
// xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发 // xhttp.open("GET", '//newsys.jxhh.com/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 内网开发
xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境 // xhttp.open("GET", 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel?domain='+ssa+'&field='+op, true); // 测试环境
xhttp.send(); xhttp.send();
} }
</script> </script>
......
src/api/webSite.js
浏览文件 @ 93be27b4
...@@ -3,8 +3,8 @@ import request from '@/utils/request' ...@@ -3,8 +3,8 @@ import request from '@/utils/request'
// 获取渠道id // 获取渠道id
export function indexInfo(params) { export function indexInfo(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel', url: 'http://sysapi.jxhh.com/api/v1/oem/webSite/domainChannel',
url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel', // url: 'http://192.168.26.179:6601/api/v1/oem/webSite/domainChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel', // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/domainChannel',
method: 'get', method: 'get',
params params
...@@ -13,8 +13,8 @@ export function indexInfo(params) { ...@@ -13,8 +13,8 @@ export function indexInfo(params) {
// 获取所有域名 // 获取所有域名
export function getdomain(params) { export function getdomain(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront', url: 'http://sysapi.jxhh.com/api/v1/oem/channel/domainFront',
url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront', // url: 'http://192.168.26.179:6601/api/v1/oem/channel/domainFront',
// url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront', // url: 'http://newsys.jxhh.com/api/v1/oem/channel/domainFront',
method: 'get', method: 'get',
params params
...@@ -23,8 +23,8 @@ export function getdomain(params) { ...@@ -23,8 +23,8 @@ export function getdomain(params) {
// 获取官网设置接口 // 获取官网设置接口
export function webSite(params) { export function webSite(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel', url: 'http://sysapi.jxhh.com/api/v1/oem/common/counsel',
url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel', // url: 'http://192.168.26.179:6601/api/v1/oem/common/counsel',
// url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel', // url: 'http://newsys.jxhh.com/api/v1/oem/common/counsel',
method: 'get', method: 'get',
params params
...@@ -34,8 +34,8 @@ export function webSite(params) { ...@@ -34,8 +34,8 @@ export function webSite(params) {
// 云仓所有列表——Banner和域名/产品和服务/供应商入驻 // 云仓所有列表——Banner和域名/产品和服务/供应商入驻
export function getallCloudList(params) { export function getallCloudList(params) {
return request({ return request({
// url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList', url: 'http://sysapi.jxhh.com/api/v1/oem/front/CloudList',
url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList', // url: 'http://192.168.26.179:6601/api/v1/oem/front/CloudList',
// url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList', // url: 'http://newsys.jxhh.com/api/v1/oem/front/CloudList',
method: 'get', method: 'get',
params params
...@@ -44,8 +44,8 @@ export function getallCloudList(params) { ...@@ -44,8 +44,8 @@ export function getallCloudList(params) {
//获取sso域名 //获取sso域名
export function getssoUrl(data) { export function getssoUrl(data) {
return request({ return request({
// url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel', url: '//sysapi.jxhh.com/api/v1/oem/webSite/ssoChannel',
url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel', // url: '//192.168.26.179:6601/api/v1/oem/webSite/ssoChannel',
// url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel', // url: 'http://newsys.jxhh.com/api/v1/oem/webSite/ssoChannel',
method: 'get', method: 'get',
params: data params: data
......
src/views/entry/fillBrandInf.vue
浏览文件 @ 93be27b4
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
this.Base64img = result[1]; this.Base64img = result[1];
let data = {"img_data":this.Base64img}; let data = {"img_data":this.Base64img};
upLoadImg(data).then((res) => { upLoadImg(data).then((res) => {
if (res.code === 1){ if (res.code == 1){
this.factoryImgFileList.push({'url':res.data.image_url}); this.factoryImgFileList.push({'url':res.data.image_url});
this.$message({type:'success',message:'上传成功'}); this.$message({type:'success',message:'上传成功'});
} else { } else {
...@@ -639,7 +639,7 @@ ...@@ -639,7 +639,7 @@
}); });
}else { }else {
upBrands(toArrBrandForm).then(res => { upBrands(toArrBrandForm).then(res => {
if(res.code === 1) { if(res.code == 1) {
this.$router.push("/fillShopInf"); this.$router.push("/fillShopInf");
}else { }else {
this.$message({type: 'error',message: res.message ? res.message : '操作失败'}); this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
......
src/views/entry/fillMainInf.vue
浏览文件 @ 93be27b4
...@@ -523,7 +523,7 @@ ...@@ -523,7 +523,7 @@
this.$refs[form].validate((valid) => { this.$refs[form].validate((valid) => {
if (valid) { if (valid) {
addMain(this.mainForm).then(res => { addMain(this.mainForm).then(res => {
if(res == 1) { if(res.code == 1) {
this.$router.push("/fillBrandInf"); this.$router.push("/fillBrandInf");
}else { }else {
this.$message({type:'error',message:res.message ? res.message : '操作失败'}); this.$message({type:'error',message:res.message ? res.message : '操作失败'});
......
src/views/entry/fillShopInf.vue
浏览文件 @ 93be27b4
...@@ -328,7 +328,7 @@ ...@@ -328,7 +328,7 @@
this.Base64img = result[1]; this.Base64img = result[1];
let data = {"img_data":this.Base64img}; let data = {"img_data":this.Base64img};
upLoadImg(data).then((res) => { upLoadImg(data).then((res) => {
if(res.code === 1){ if(res.code == 1){
this.businessImgFileList.push({'url':res.data.image_url}); this.businessImgFileList.push({'url':res.data.image_url});
this.$message({type:'success',message:'上传成功'}); this.$message({type:'success',message:'上传成功'});
this.$refs.storeForm.clearValidate('business_auth'); this.$refs.storeForm.clearValidate('business_auth');
...@@ -418,7 +418,7 @@ ...@@ -418,7 +418,7 @@
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if(valid) { if(valid) {
addShopInf(this.storeForm).then(res => { addShopInf(this.storeForm).then(res => {
if(res.code === 1){ if(res.code == 1){
this.$router.push("/reviewing"); this.$router.push("/reviewing");
}else { }else {
this.$message({type: 'error',message: res.message ? res.message : '操作失败'}); this.$message({type: 'error',message: res.message ? res.message : '操作失败'});
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论