zs 1 рік тому
батько
коміт
6446518181

+ 3 - 3
components/login.vue

@@ -55,12 +55,12 @@
 <script lang="ts" setup>
 	const emit = defineEmits(["showChange"])
 	import moment from 'moment';
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $apifile = getCurrentInstance()?.appContext.config.globalProperties.$apifile;
+	const $api = inject('$api');
+	const $apifile = inject('$apifile');
 	// 遮罩层
 	const showType = ref(false);
 	// 表单

+ 8 - 7
main.js

@@ -17,20 +17,21 @@ import {
 	requestFile
 } from '@/common/api.js';
 // 配置文件
-import config from '@/config.js';
+import config from '@/config.js';
 import share from '@/common/share.js';
 // #ifdef VUE3
 import {
-	createSSRApp
+	createSSRApp,
+	provide
 } from 'vue'
 export function createApp() {
 	const app = createSSRApp(App)
 	app.use(uviewPlus)
-	app.config.globalProperties.$api = requestBase;
-	app.config.globalProperties.$app = requestApp;
-	app.config.globalProperties.$apifile = requestFile;
-	app.config.globalProperties.$config = config;
-	app.config.globalProperties.$share = share;
+	app.provide('$api', requestBase);
+	app.provide('$app', requestApp);
+	app.provide('$apifile', requestFile);
+	app.provide('$config', config);
+	app.provide('$share', share);
 	return {
 		app
 	}

+ 3 - 3
pages/home/index.vue

@@ -35,12 +35,12 @@
 
 <script setup lang="ts">
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $apifile = getCurrentInstance()?.appContext.config.globalProperties.$apifile;
+	const $api = inject('$api');
+	const $apifile = inject('$apifile');
 	// 基本信息
 	const typeList = ref([
 		{ name: '兴趣', icon: 't-icon-xingqu', type: '0' },

+ 4 - 4
pages/index/index.vue

@@ -5,13 +5,13 @@
 </template>
 
 <script setup lang="ts">
-	import { getCurrentInstance, ref } from 'vue';
+	import { inject, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onLoad } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $app = getCurrentInstance()?.appContext.config.globalProperties.$app;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $app = inject('$app');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [] });
 	onLoad(async () => {

+ 3 - 3
pages/my/index.vue

@@ -60,12 +60,12 @@
 <script setup lang="ts">
 	import configInfo from '../../config.js';
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [], icon: [], file: [] });
 	// 遮罩层

+ 3 - 3
pages/teacher/index.vue

@@ -9,12 +9,12 @@
 
 <script setup lang="ts">
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [], file: [] });
 	const list = ref([]);

+ 3 - 3
pagesMy/account/index.vue

@@ -9,12 +9,12 @@
 
 <script setup lang="ts">
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [], file: [] });
 	const list = ref([]);

+ 3 - 3
pagesMy/course/index.vue

@@ -9,12 +9,12 @@
 
 <script setup lang="ts">
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [], file: [] });
 	const list = ref([]);

+ 4 - 4
pagesMy/follow/index.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="content">
-		我的关注我的关注
+		我的关注
 		<up-overlay :show="show">
 			<login @showChange='showChange'></login>
 		</up-overlay>
@@ -9,12 +9,12 @@
 
 <script setup lang="ts">
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [], file: [] });
 	const list = ref([]);

+ 3 - 3
pagesMy/opinion/index.vue

@@ -9,12 +9,12 @@
 
 <script setup lang="ts">
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [], file: [] });
 	const list = ref([]);

+ 3 - 3
pagesMy/order/index.vue

@@ -9,12 +9,12 @@
 
 <script setup lang="ts">
 	import login from "@/components/login.vue"
-	import { getCurrentInstance, computed, ref } from 'vue';
+	import { inject, computed, ref } from 'vue';
 	//该依赖已内置不需要单独安装
 	import { onShow, onPullDownRefresh } from "@dcloudio/uni-app";
 	// 请求接口
-	const $api = getCurrentInstance()?.appContext.config.globalProperties.$api;
-	const $config = getCurrentInstance()?.appContext.config.globalProperties.$config;
+	const $api = inject('$api');
+	const $config = inject('$config');
 	// 基本信息
 	const config = ref({ logo: [], file: [] });
 	const list = ref([]);

+ 5 - 5
unpackage/dist/dev/mp-weixin/app.js

@@ -60,11 +60,11 @@ const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:
 function createApp() {
   const app = common_vendor.createSSRApp(App);
   app.use(common_vendor.uviewPlus);
-  app.config.globalProperties.$api = common_api.requestBase;
-  app.config.globalProperties.$app = common_api.requestApp;
-  app.config.globalProperties.$apifile = common_api.requestFile;
-  app.config.globalProperties.$config = config.configInfo;
-  app.config.globalProperties.$share = common_share.share;
+  app.provide("$api", common_api.requestBase);
+  app.provide("$app", common_api.requestApp);
+  app.provide("$apifile", common_api.requestFile);
+  app.provide("$config", config.configInfo);
+  app.provide("$share", common_share.share);
   return {
     app
   };

+ 1 - 1
unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -16212,11 +16212,11 @@ exports.e = e;
 exports.error = error;
 exports.f = f;
 exports.formValidate = formValidate;
-exports.getCurrentInstance = getCurrentInstance;
 exports.getPx = getPx;
 exports.hooks = hooks;
 exports.icons = icons;
 exports.index = index$1;
+exports.inject = inject;
 exports.mixin = mixin;
 exports.mixinUp = mixinUp;
 exports.mpMixin = mpMixin;

+ 2 - 3
unpackage/dist/dev/mp-weixin/components/login.js

@@ -18,9 +18,8 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "login",
   emits: ["showChange"],
   setup(__props, { emit }) {
-    var _a, _b;
-    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    const $apifile = (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$apifile;
+    const $api = common_vendor.inject("$api");
+    const $apifile = common_vendor.inject("$apifile");
     const showType = common_vendor.ref(false);
     const form = common_vendor.ref({});
     const roleList = common_vendor.ref([]);

+ 2 - 3
unpackage/dist/dev/mp-weixin/pages/home/index.js

@@ -26,9 +26,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$apifile;
+    const $api = common_vendor.inject("$api");
+    common_vendor.inject("$apifile");
     const typeList = common_vendor.ref([
       { name: "兴趣", icon: "t-icon-xingqu", type: "0" },
       { name: "小学", icon: "t-icon-xiaoxue", type: "1" },

+ 9 - 10
unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -3,10 +3,9 @@ const common_vendor = require("../../common/vendor.js");
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b, _c;
-    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    const $app = (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$app;
-    const $config = (_c = common_vendor.getCurrentInstance()) == null ? void 0 : _c.appContext.config.globalProperties.$config;
+    const $api = common_vendor.inject("$api");
+    const $app = common_vendor.inject("$app");
+    const $config = common_vendor.inject("$config");
     const config = common_vendor.ref({ logo: [] });
     common_vendor.onLoad(async () => {
       await searchConfig();
@@ -26,11 +25,11 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       common_vendor.index.getStorage({
         key: "openid",
         success: async function(res) {
-          var _a2;
+          var _a;
           const user = await $api("token/openid", "POST", {
             openid: res.data
           });
-          if (user.errcode == "0" && ((_a2 = user.data) == null ? void 0 : _a2._id)) {
+          if (user.errcode == "0" && ((_a = user.data) == null ? void 0 : _a._id)) {
             common_vendor.index.setStorage({
               key: "user",
               data: user.data
@@ -50,7 +49,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         fail: function(err) {
           common_vendor.index.login({
             success: async function(res) {
-              var _a2;
+              var _a;
               if (res.code) {
                 common_vendor.index.reLaunch({
                   url: `/pages/home/index`
@@ -67,7 +66,7 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
                   const user = await $api("token/openid", "POST", {
                     openid: aee.data.openid
                   });
-                  if (user.errcode == "0" && ((_a2 = user.data) == null ? void 0 : _a2._id)) {
+                  if (user.errcode == "0" && ((_a = user.data) == null ? void 0 : _a._id)) {
                     common_vendor.index.setStorage({
                       key: "user",
                       data: user.data
@@ -101,9 +100,9 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
       });
     };
     return (_ctx, _cache) => {
-      var _a2, _b2;
+      var _a, _b;
       return {
-        a: ((_b2 = (_a2 = config.value) == null ? void 0 : _a2.logo[0]) == null ? void 0 : _b2.url) || "/static/logo.jpg"
+        a: ((_b = (_a = config.value) == null ? void 0 : _a.logo[0]) == null ? void 0 : _b.url) || "/static/logo.jpg"
       };
     };
   }

+ 2 - 3
unpackage/dist/dev/mp-weixin/pages/my/index.js

@@ -17,9 +17,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    const $api = (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
+    const $api = common_vendor.inject("$api");
+    common_vendor.inject("$config");
     const config$1 = common_vendor.ref({ logo: [], icon: [], file: [] });
     const show = common_vendor.ref(false);
     const user = common_vendor.computed(() => {

+ 2 - 3
unpackage/dist/dev/mp-weixin/pages/teacher/index.js

@@ -12,9 +12,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
+    common_vendor.inject("$api");
+    common_vendor.inject("$config");
     const config = common_vendor.ref({ logo: [], file: [] });
     common_vendor.ref([]);
     common_vendor.ref(0);

+ 2 - 3
unpackage/dist/dev/mp-weixin/pagesMy/account/index.js

@@ -12,9 +12,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
+    common_vendor.inject("$api");
+    common_vendor.inject("$config");
     const config = common_vendor.ref({ logo: [], file: [] });
     common_vendor.ref([]);
     common_vendor.ref(0);

+ 2 - 3
unpackage/dist/dev/mp-weixin/pagesMy/course/index.js

@@ -12,9 +12,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
+    common_vendor.inject("$api");
+    common_vendor.inject("$config");
     const config = common_vendor.ref({ logo: [], file: [] });
     common_vendor.ref([]);
     common_vendor.ref(0);

+ 2 - 3
unpackage/dist/dev/mp-weixin/pagesMy/follow/index.js

@@ -12,9 +12,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
+    common_vendor.inject("$api");
+    common_vendor.inject("$config");
     const config = common_vendor.ref({ logo: [], file: [] });
     common_vendor.ref([]);
     common_vendor.ref(0);

+ 2 - 3
unpackage/dist/dev/mp-weixin/pagesMy/opinion/index.js

@@ -12,9 +12,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
+    common_vendor.inject("$api");
+    common_vendor.inject("$config");
     const config = common_vendor.ref({ logo: [], file: [] });
     common_vendor.ref([]);
     common_vendor.ref(0);

+ 2 - 3
unpackage/dist/dev/mp-weixin/pagesMy/order/index.js

@@ -12,9 +12,8 @@ const login = () => "../../components/login.js";
 const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
   __name: "index",
   setup(__props) {
-    var _a, _b;
-    (_a = common_vendor.getCurrentInstance()) == null ? void 0 : _a.appContext.config.globalProperties.$api;
-    (_b = common_vendor.getCurrentInstance()) == null ? void 0 : _b.appContext.config.globalProperties.$config;
+    common_vendor.inject("$api");
+    common_vendor.inject("$config");
     const config = common_vendor.ref({ logo: [], file: [] });
     common_vendor.ref([]);
     common_vendor.ref(0);