From e95460716cc5388dc0bddc99a06296e7aaf60587 Mon Sep 17 00:00:00 2001 From: Eratosici Date: Wed, 10 Nov 2021 16:16:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mall4m/README.md | 4 ++-- mall4m/pages/user/user.wxml | 4 ++-- mall4uni/README.md | 4 ++-- mall4uni/pages/user/user.vue | 4 +++- mall4uni/utils/config.js | 14 +++++++------- mall4v/README.md | 4 ++-- mall4v/static/config/index-prod.js | 4 ++-- mall4v/static/config/index.js | 2 +- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/mall4m/README.md b/mall4m/README.md index 0ec150e..7946179 100644 --- a/mall4m/README.md +++ b/mall4m/README.md @@ -28,7 +28,7 @@ vue中后台：https://gitee.com/gz-yami/mall4v **由于我们并不希望小程序的数据被弄混乱，我们弄了两个数据库。因此，您修改了后台的商品信息，小程序并不能看到！** -后台： 账号：admin/123456 +后台： 账号：admin/123456 小程序：1. 扫描二维码 @@ -64,6 +64,6 @@ vue中后台：https://gitee.com/gz-yami/mall4v ![QQ群](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/qqGroup.png) -- 论坛： +- 论坛： - 商务邮箱：yamitech@163.com \ No newline at end of file diff --git a/mall4m/pages/user/user.wxml b/mall4m/pages/user/user.wxml index 610a0d8..6b6494a 100644 --- a/mall4m/pages/user/user.wxml +++ b/mall4m/pages/user/user.wxml @@ -56,11 +56,11 @@ 我的收藏 - 0 + 5 我的消息 - 0 + 3 我的足迹 diff --git a/mall4uni/README.md b/mall4uni/README.md index 2345f42..038a8fd 100644 --- a/mall4uni/README.md +++ b/mall4uni/README.md @@ -26,7 +26,7 @@ uni-app：https://gitee.com/gz-yami/mall4uni ## 演示地址 -后台： 账号：admin/123456 +后台： 账号：admin/123456 小程序：1. 扫描二维码 @@ -50,6 +50,6 @@ uni-app：https://gitee.com/gz-yami/mall4uni ![QQ群](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/qqGroup.png) -- 论坛： +- 论坛： - 商务邮箱：yamitech@163.com diff --git a/mall4uni/pages/user/user.vue b/mall4uni/pages/user/user.vue index 35e5743..b6f6525 100644 --- a/mall4uni/pages/user/user.vue +++ b/mall4uni/pages/user/user.vue @@ -20,7 +20,7 @@ - + {{loginResult.nickName ? loginResult.nickName : "用户昵称"}} @@ -139,6 +139,7 @@ // pages/user/user.js var http = require("../../utils/http.js"); var util = require("../../utils/util.js"); + var config = require("../../utils/config.js"); export default { data() { @@ -148,6 +149,7 @@ collectionCount: 0, isAuthInfo: false, loginResult: '', + picDomain: config.picDomain }; }, diff --git a/mall4uni/utils/config.js b/mall4uni/utils/config.js index defde2b..889c0d4 100644 --- a/mall4uni/utils/config.js +++ b/mall4uni/utils/config.js @@ -6,13 +6,13 @@ //配置文件 // #ifndef MP -// var domain = "http://mall4j-admin.gz-yami.com/api"; //统一接口域名，正式环境 -// var wsDomain = "http://mall4j-admin.gz-yami.com/api"; //统一接口域名，正式环境 +// var domain = "http://mall4j-admin.mall4j.com/api"; //统一接口域名，正式环境 +// var wsDomain = "http://mall4j-admin.mall4j.com/api"; //统一接口域名，正式环境 // #endif // #ifndef MP -// var domain = "https://h5.gz-yami.com/api"; //统一接口域名，正式环境 -// var wsDomain = "https://h5.gz-yami.com/api"; //统一接口域名，正式环境 +// var domain = "https://h5.mall4j.com/api"; //统一接口域名，正式环境 +// var wsDomain = "https://h5.mall4j.com/api"; //统一接口域名，正式环境 // #endif var mpAppId = 'wx42bbe857570c5b40' @@ -20,9 +20,9 @@ var mpAppId = 'wx42bbe857570c5b40' var domain = "http://192.168.1.90:8989/api"; //统一接口域名，测试环境 var wsDomain = "ws://192.168.1.90:8989/api"; //统一接口域名，测试环境 -// var picDomain = "http://img-test.gz-yami.com/"; //图片域名 +var picDomain = "https://img.mall4j.com/"; //图片域名 exports.domain = domain; -// exports.picDomain = picDomain; +exports.picDomain = picDomain; exports.wsDomain = wsDomain; -exports.mpAppId = mpAppId; \ No newline at end of file +exports.mpAppId = mpAppId; diff --git a/mall4v/README.md b/mall4v/README.md index 1a22561..53a86be 100644 --- a/mall4v/README.md +++ b/mall4v/README.md @@ -28,7 +28,7 @@ vue中后台：https://gitee.com/gz-yami/mall4v **由于我们并不希望小程序的数据被弄混乱，我们弄了两个数据库。因此，您修改了后台的商品信息，小程序并不能看到！** -后台： 账号：admin/123456 +后台： 账号：admin/123456 小程序：1. 扫描二维码 @@ -84,6 +84,6 @@ npm run build ![QQ群](https://gitee.com/gz-yami/mall4j/raw/master/screenshot/qqGroup.png) -- 论坛： +- 论坛： - 商务邮箱：yamitech@163.com \ No newline at end of file diff --git a/mall4v/static/config/index-prod.js b/mall4v/static/config/index-prod.js index 9a914c1..3b758a5 100644 --- a/mall4v/static/config/index-prod.js +++ b/mall4v/static/config/index-prod.js @@ -5,9 +5,9 @@ window.SITE_CONFIG = {} // api接口请求地址 - window.SITE_CONFIG['baseUrl'] = 'https://mall4j-admin.gz-yami.com/apis' + window.SITE_CONFIG['baseUrl'] = 'https://mall4j-admin.mall4j.com/apis' // 静态资源文件url - window.SITE_CONFIG['resourcesUrl'] = 'https://img-test.gz-yami.com/' + window.SITE_CONFIG['resourcesUrl'] = 'https://img.mall4j.com/' // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['version'] = '' // 版本号(年月日时分) diff --git a/mall4v/static/config/index.js b/mall4v/static/config/index.js index 85df207..d93e743 100644 --- a/mall4v/static/config/index.js +++ b/mall4v/static/config/index.js @@ -8,7 +8,7 @@ window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.143:8085' // 静态资源文件url - window.SITE_CONFIG['resourcesUrl'] = 'http://img-test.gz-yami.com/' + window.SITE_CONFIG['resourcesUrl'] = 'https://img.mall4j.com/' // cdn地址 = 域名 + 版本号 window.SITE_CONFIG['domain'] = './' // 域名 window.SITE_CONFIG['version'] = '' // 版本号(年月日时分)