Merge branch 'bugfix-wam-1201' into uat
This commit is contained in:
@@ -2,13 +2,13 @@ NODE_ENV = 'production'
|
|||||||
VUE_APP_CURRENTMODE = 'prod'
|
VUE_APP_CURRENTMODE = 'prod'
|
||||||
|
|
||||||
VUE_APP_BASEOSS = 'https://cxp-pubcos.yili.com/prod-yls'
|
VUE_APP_BASEOSS = 'https://cxp-pubcos.yili.com/prod-yls'
|
||||||
VUE_APP_BASEURL = 'https://ylst-api.xapi.digitalyili.com/'
|
VUE_APP_BASEURL = 'https://yls.xapi.digitalyili.com/'
|
||||||
|
|
||||||
VUE_APP_DELiVERY_BASEURL='https://ylsdist-net.x.digitalyili.com/'
|
VUE_APP_DELiVERY_BASEURL='https://ylsdist-net.x.digitalyili.com/'
|
||||||
VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.cxpin.digitalyili.com/apigtech/message-send-center/';
|
VUE_APP_MESSAGE_CENTER ='http://gtech-gateway.cxpin.digitalyili.com/apigtech/message-send-center/';
|
||||||
|
|
||||||
VUE_APP_LOGIN = 'https://yip.digitalyili.com//login'
|
VUE_APP_LOGIN = 'https://yip.digitalyili.com//login'
|
||||||
VUE_APP_SOCKETURL = 'wss://ylst-api.xapi.digitalyili.com/survey_sync'
|
VUE_APP_SOCKETURL = 'wss://yls.xapi.digitalyili.com/survey_sync'
|
||||||
VUE_APP_JSONPURL = 'https://iam.digitalyili.com/idp/restful/getIDPToken'
|
VUE_APP_JSONPURL = 'https://iam.digitalyili.com/idp/restful/getIDPToken'
|
||||||
|
|
||||||
VUE_APP_YQRURL = 'https://ocp.digitalyili.com'
|
VUE_APP_YQRURL = 'https://ocp.digitalyili.com'
|
||||||
|
|||||||
@@ -431,9 +431,16 @@ export default {
|
|||||||
|
|
||||||
var blob = await this.$refs.viewer.snapshot();
|
var blob = await this.$refs.viewer.snapshot();
|
||||||
|
|
||||||
console.log(blob);
|
|
||||||
|
|
||||||
const data = await common.cosUpload(blob, blob.name, "", () => {});
|
const data = await common.cosUpload(blob, blob.name, "", () => {});
|
||||||
|
|
||||||
|
// 商品截图名称优化项
|
||||||
|
try{
|
||||||
|
data.name = `${this.scene?.name}_${this.shelf?.name}_${new Date().getTime()}.png`;
|
||||||
|
}
|
||||||
|
catch(e) {
|
||||||
|
console.warn(e);
|
||||||
|
}
|
||||||
|
|
||||||
this.glbViewer.data = {
|
this.glbViewer.data = {
|
||||||
url: data.url,
|
url: data.url,
|
||||||
title: data.name,
|
title: data.name,
|
||||||
|
|||||||
@@ -507,7 +507,7 @@ export default {
|
|||||||
.iconfont {
|
.iconfont {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
&:hover {
|
&:hover {
|
||||||
color: #1c6fff;
|
color: #70b936;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user