diff --git a/App.vue b/App.vue index a33f264..22bb76c 100644 --- a/App.vue +++ b/App.vue @@ -8,8 +8,9 @@ // +---------------------------------------------------------------------- // | Author: CRMEB Team // +---------------------------------------------------------------------- +// #ifdef APP-PLUS var jpushModule = uni.requireNativePlugin("JG-JPush"); - import { +// #endif import { checkLogin } from "./libs/login"; import { @@ -20,7 +21,6 @@ history } from '@/api/public.js' import Routine from './libs/routine.js'; - var jpushModule = uni.requireNativePlugin("JG-JPush"); export default { globalData: { spid: 0, diff --git a/manifest.json b/manifest.json index d58f68c..6656750 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "CRMEB", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.0.11", - "versionCode" : 134, + "versionName" : "1.0.15", + "versionCode" : 138, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { @@ -111,12 +111,6 @@ "__platform__" : [ "ios", "android" ] } }, - "push" : { - "unipush" : { - "version" : "2", - "offline" : false - } - }, "oauth" : { "apple" : {} }, diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue index 0e82e89..b2338d0 100644 --- a/pages/short_video/appSwiper/index.nvue +++ b/pages/short_video/appSwiper/index.nvue @@ -1632,4 +1632,5 @@ .root { background-color: #000000; } - \ No newline at end of file + + diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue index bf0b973..5059e40 100644 --- a/pages/users/login/login_copy.vue +++ b/pages/users/login/login_copy.vue @@ -297,9 +297,10 @@ mapGetters } from "vuex"; import Verify from '@/components/verify/verify.vue'; - var jpushModule = uni.requireNativePlugin("JG-JPush"); const BACK_URL = "login_back_url"; - + // #ifdef APP-PLUS + var jpushModule = uni.requireNativePlugin("JG-JPush"); + // #endif export default { name: "Login", mixins: [sendVerifyCode], diff --git a/static/images/icon 2@4x.png b/static/images/icon 2@4x.png new file mode 100644 index 0000000..3823397 Binary files /dev/null and b/static/images/icon 2@4x.png differ diff --git a/static/images/icon 3@4x.png b/static/images/icon 3@4x.png new file mode 100644 index 0000000..50ce2be Binary files /dev/null and b/static/images/icon 3@4x.png differ diff --git a/static/images/icon 4@4x.png b/static/images/icon 4@4x.png new file mode 100644 index 0000000..43f0cb2 Binary files /dev/null and b/static/images/icon 4@4x.png differ diff --git a/static/images/icon 5@4x.png b/static/images/icon 5@4x.png new file mode 100644 index 0000000..6f8fc0e Binary files /dev/null and b/static/images/icon 5@4x.png differ diff --git a/static/images/icon 6@4x.png b/static/images/icon 6@4x.png new file mode 100644 index 0000000..4bd02a6 Binary files /dev/null and b/static/images/icon 6@4x.png differ diff --git a/static/images/icon 7@4x.png b/static/images/icon 7@4x.png new file mode 100644 index 0000000..f6eb6ea Binary files /dev/null and b/static/images/icon 7@4x.png differ diff --git a/static/images/icon 8@4x.png b/static/images/icon 8@4x.png new file mode 100644 index 0000000..5177753 Binary files /dev/null and b/static/images/icon 8@4x.png differ diff --git a/static/images/icon 9@4x.png b/static/images/icon 9@4x.png new file mode 100644 index 0000000..ff6dff3 Binary files /dev/null and b/static/images/icon 9@4x.png differ