diff --git a/components/vc-upload/vc-upload.vue b/components/vc-upload/vc-upload.vue index 2d92493..9f608a9 100644 --- a/components/vc-upload/vc-upload.vue +++ b/components/vc-upload/vc-upload.vue @@ -156,17 +156,10 @@ that.imgList.push(tempFilePaths); that.$forceUpdate(); - //#ifdef H5 - TanslateImage.translate(tempFilePaths, (url) => { + TanslateImage.translate(this,tempFilePaths, (url) => { that.photos.push(url); }) - //#endif - - //#ifdef MP-WEIXIN - factory.base64.urlTobase64(tempFilePaths).then(function(_res) { - that.photos.push(_res); - }); - //#endif + } }); }, diff --git a/conf/config.js b/conf/config.js index cdeae9f..84d824c 100644 --- a/conf/config.js +++ b/conf/config.js @@ -15,13 +15,13 @@ const baseUrl = '/'; // #ifndef H5 //服务器域名 小程序 或者 app 时 后端地址 -const baseUrl = 'https://wuye.yunxiaowuye.com/'; +const baseUrl = 'https://pms.x2wl.com/'; // #endif -let commonBaseUrl = 'https://wuye.yunxiaowuye.com/'; +let commonBaseUrl = 'https://pms.x2wl.com/'; //商城的url -let mallUrl = 'https://mallapp.yunxiaowuye.com/'; +let mallUrl = 'https://mallapp.x2wl.com/'; //商城小程序ID let mallMinAppId = "wxa4211361ca1e1bfb"; diff --git a/pages/settings/settings.vue b/pages/settings/settings.vue index 69145e3..7635f18 100644 --- a/pages/settings/settings.vue +++ b/pages/settings/settings.vue @@ -132,20 +132,11 @@ }); var tempFilePaths = res.tempFilePaths console.log('头像地址', tempFilePaths); - //#ifdef H5 - TanslateImage.translate(tempFilePaths, (_baseInfo) => { + TanslateImage.translate(this,tempFilePaths, (_baseInfo) => { _that.headerImg = _baseInfo; _that._uploadOwnerHeaderImg(); wx.hideLoading() }) - //#endif - //#ifdef MP-WEIXIN - factory.base64.urlTobase64(tempFilePaths[0]).then(function(_baseInfo) { - _that.headerImg = _baseInfo; - _that._uploadOwnerHeaderImg(); - wx.hideLoading() - }); - //#endif } }) },