diff --git a/java-mall-app-shop-admin/.hbuilderx/launch.json b/java-mall-app-shop-admin/.hbuilderx/launch.json
index 007bebb..fd7e778 100644
--- a/java-mall-app-shop-admin/.hbuilderx/launch.json
+++ b/java-mall-app-shop-admin/.hbuilderx/launch.json
@@ -4,27 +4,23 @@
"version" : "0.0",
"configurations" : [
{
- "app-plus" :
- {
- "launchtype" : "remote"
- },
- "default" :
- {
- "launchtype" : "local"
- },
- "h5" :
- {
- "launchtype" : "local"
- },
- "mp-weixin" :
- {
- "launchtype" : "local"
- },
- "provider" : "aliyun",
- "type" : "uniCloud"
+ "app-plus" : {
+ "launchtype" : "remote"
+ },
+ "default" : {
+ "launchtype" : "local"
+ },
+ "h5" : {
+ "launchtype" : "local"
+ },
+ "mp-weixin" : {
+ "launchtype" : "local"
+ },
+ "provider" : "aliyun",
+ "type" : "uniCloud"
},
{
- "playground" : "custom",
+ "playground" : "standard",
"type" : "uni-app:app-android"
},
{
diff --git a/java-mall-app-shop-admin/androidPrivacy.json b/java-mall-app-shop-admin/androidPrivacy.json
new file mode 100644
index 0000000..8bd06bf
--- /dev/null
+++ b/java-mall-app-shop-admin/androidPrivacy.json
@@ -0,0 +1,38 @@
+{
+ "version" : "1.0.0",
+ "prompt" : "template",
+ "title" : "服务协议和隐私政策",
+ "message" : "请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。
你可阅读《服务协议》和《隐私政策》了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+ "buttonAccept" : "同意并接受",
+ "buttonRefuse" : "暂不同意",
+ "hrefLoader" : "system",
+ "backToExit" : "false",
+ "second" : {
+ "title" : "确认提示",
+ "message" : "进入应用前，你需先同意《服务协议》和《隐私政策》，否则将退出应用。",
+ "buttonAccept" : "同意并继续",
+ "buttonRefuse" : "退出应用"
+ },
+ "disagreeMode" : {
+ "support" : false,
+ "loadNativePlugins" : false,
+ "visitorEntry" : false,
+ "showAlways" : false
+ },
+ "styles" : {
+ "backgroundColor" : "#ffffff",
+ "borderRadius" : "5px",
+ "title" : {
+ "color" : "#000000"
+ },
+ "buttonAccept" : {
+ "color" : "#fe411b"
+ },
+ "buttonRefuse" : {
+ "color" : "#666666"
+ },
+ "buttonVisitor" : {
+ "color" : "#222222"
+ }
+ }
+}
diff --git a/java-mall-app-shop-admin/manifest.json b/java-mall-app-shop-admin/manifest.json
index fdd1549..a4a5492 100644
--- a/java-mall-app-shop-admin/manifest.json
+++ b/java-mall-app-shop-admin/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "小发同城商家版",
+ "name" : "小发同城",
"appid" : "__UNI__95F809F",
"package" : "com.xiaofa.shopAdmin",
"description" : "",
@@ -30,6 +30,9 @@
"distribute" : {
/* android打包配置 */
"android" : {
+ "targetSdkVersion" : 30,
+ "minSdkVersion" : 21,
+ "compileSdkVersion" : 30,
"permissions" : [
"",
"",
@@ -68,8 +71,8 @@
"unipush" : {
"version" : "2",
"offline" : false,
- "appid": "rQxaGAKl7t83KlTubAaKC3",
- "appkey": "QSElTn6ttq5nmrIZtFhCT"
+ "appid" : "rQxaGAKl7t83KlTubAaKC3",
+ "appkey" : "QSElTn6ttq5nmrIZtFhCT"
}
}
},
@@ -106,8 +109,12 @@
}
},
"splashscreen" : {
- "androidStyle" : "default"
+ "androidStyle" : "default",
+ "useOriginalMsgbox" : true
}
+ },
+ "uniStatistics" : {
+ "enable" : true
}
},
/* 快应用特有相关 */
@@ -155,9 +162,11 @@
"usingComponents" : true
},
"uniStatistics" : {
- "enable" : false
+ "enable" : false,
+ "version" : "2"
},
- "vueVersion" : "2"
+ "vueVersion" : "2",
+ "fallbackLocale" : "zh-Hans"
}
/* 5+App特有相关 */
diff --git a/java-mall-app-shop-admin/pages/login/launch.vue b/java-mall-app-shop-admin/pages/login/launch.vue
index 04de652..d5e1e2b 100644
--- a/java-mall-app-shop-admin/pages/login/launch.vue
+++ b/java-mall-app-shop-admin/pages/login/launch.vue
@@ -1,6 +1,6 @@
-
+
@@ -48,18 +48,23 @@ export default {
};
},
mounted() {
- this.getProtoco();
- try {
- const val = uni.getStorageSync("isNeedAgreementDialog");
- if (val === "" || val === false) {
- this.show = true;
- } else {
- this.checkAppUpdate();
- uni.redirectTo({
- url: "/pages/index/index",
- });
- }
- } catch (e) {}
+ // this.getProtoco();
+ // try {
+ // const val = uni.getStorageSync("isNeedAgreementDialog");
+ // if (val === "" || val === false) {
+ // this.show = true;
+ // } else {
+ // this.checkAppUpdate();
+ // uni.redirectTo({
+ // url: "/pages/index/index",
+ // });
+ // }
+ // } catch (e) {}
+
+ this.checkAppUpdate();
+ uni.redirectTo({
+ url: "/pages/index/index",
+ });
},
methods: {
async getProtoco() {
diff --git a/java-mall-app-shop-admin/static/mp3/您的预约订单快到时间了.MP3 b/java-mall-app-shop-admin/static/mp3/1.MP3
similarity index 100%
rename from java-mall-app-shop-admin/static/mp3/您的预约订单快到时间了.MP3
rename to java-mall-app-shop-admin/static/mp3/1.MP3
diff --git a/java-mall-app-shop-admin/static/mp3/您有部分退款订单，请注意查看.MP3 b/java-mall-app-shop-admin/static/mp3/2.MP3
similarity index 100%
rename from java-mall-app-shop-admin/static/mp3/您有部分退款订单，请注意查看.MP3
rename to java-mall-app-shop-admin/static/mp3/2.MP3
diff --git a/java-mall-app-shop-admin/static/mp3/您有订单快超时了.MP3 b/java-mall-app-shop-admin/static/mp3/3.MP3
similarity index 100%
rename from java-mall-app-shop-admin/static/mp3/您有订单快超时了.MP3
rename to java-mall-app-shop-admin/static/mp3/3.MP3
diff --git a/java-mall-app-shop-admin/static/mp3/您有退货订单，请注意查看.MP3 b/java-mall-app-shop-admin/static/mp3/4.MP3
similarity index 100%
rename from java-mall-app-shop-admin/static/mp3/您有退货订单，请注意查看.MP3
rename to java-mall-app-shop-admin/static/mp3/4.MP3
diff --git a/java-mall-app-shop-admin/static/mp3/您有新的消息，请尽快回复.MP3 b/java-mall-app-shop-admin/static/mp3/5.MP3
similarity index 100%
rename from java-mall-app-shop-admin/static/mp3/您有新的消息，请尽快回复.MP3
rename to java-mall-app-shop-admin/static/mp3/5.MP3
diff --git a/java-mall-app-shop-admin/static/mp3/您有新的小发同城订单.MP3 b/java-mall-app-shop-admin/static/mp3/6.MP3
similarity index 100%
rename from java-mall-app-shop-admin/static/mp3/您有新的小发同城订单.MP3
rename to java-mall-app-shop-admin/static/mp3/6.MP3
diff --git a/java-mall-app-shop-admin/static/mp3/您有新的预约订单.MP3 b/java-mall-app-shop-admin/static/mp3/7.MP3
similarity index 100%
rename from java-mall-app-shop-admin/static/mp3/您有新的预约订单.MP3
rename to java-mall-app-shop-admin/static/mp3/7.MP3