diff --git a/.env b/.env index 99fd28f..6b28189 100644 --- a/.env +++ b/.env @@ -1,7 +1,7 @@ # 版本号 SHOPRO_VERSION=v2.4.1 # 后端接口 - 正式环境(通过 process.env.NODE_ENV 非 development) -SHOPRO_BASE_URL=http://www.qflyqzy.net:48090 +SHOPRO_BASE_URL=https://yougou.api.qflyqzy.net # SHOPRO_BASE_URL=https://yougoutest.api.riananyoumu.com # 后端接口 - 测试环境(通过 process.env.NODE_ENV = development) @@ -16,7 +16,7 @@ SHOPRO_BASE_URL=http://www.qflyqzy.net:48090 #SHOPRO_DEV_BASE_URL=http://192.168.101.58:48090 # 服务器 -# SHOPRO_DEV_BASE_URL=http://www.qflyqzy.net:48090 +# SHOPRO_DEV_BASE_URL=https://yougou.api.qflyqzy.net # SHOPRO_DEV_BASE_URL=https://www.qflyqzy.net/yg-api diff --git a/androidPrivacy.json b/androidPrivacy.json index f29a39d..eca17f4 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -1,7 +1,7 @@ { "prompt" : "template", "title" : "用户协议和隐私政策", - "message" : "欢迎使用本应用,我们非常重视您的个人信息和隐私保护。在使用服务之前,请仔细阅读《用户协议》和《隐私政策》。我们将按照您同意的条款使用您的个人信息,以便为您提供服务。", + "message" : "欢迎使用本应用,我们非常重视您的个人信息和隐私保护。在使用服务之前,请仔细阅读《用户协议》和《隐私政策》。我们将按照您同意的条款使用您的个人信息,以便为您提供服务。", "buttonAccept" : "同意并接受", "buttonRefuse" : "退出应用", "styles" : { diff --git a/manifest.json b/manifest.json index cad9e16..84e3067 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "优购商城", "appid" : "__UNI__8B19741", "description" : "", - "versionName" : "1.6.0", - "versionCode" : 160, + "versionName" : "1.6.3", + "versionCode" : 163, "transformPx" : false, "app-plus" : { "privacy" : { @@ -24,7 +24,8 @@ "VideoPlayer" : {}, "Payment" : {}, "OAuth" : {}, - "Share" : {} + "Share" : {}, + "Maps" : {} }, "distribute" : { "android" : { @@ -74,6 +75,13 @@ "appid" : "wx23b0c321b5d74d63", "UniversalLinks" : "" } + }, + "maps" : { + "amap" : { + "name" : "", + "appkey_ios" : "", + "appkey_android" : "" + } } }, "icons" : { diff --git a/pages/home/liquidation.vue b/pages/home/liquidation.vue index 575bbd5..01b84a3 100644 --- a/pages/home/liquidation.vue +++ b/pages/home/liquidation.vue @@ -248,7 +248,7 @@ const goRecord = () => { uni.navigateTo({ - url: '/pages/home/liquidationRecord', + url: `/pages/home/liquidationRecord?type=${liquidationType.value}`, }); }; diff --git a/pages/home/liquidationRecord.vue b/pages/home/liquidationRecord.vue index 91a0684..327b0cf 100644 --- a/pages/home/liquidationRecord.vue +++ b/pages/home/liquidationRecord.vue @@ -1,5 +1,5 @@