Merge branch 'master' of http://git.ycjcjy.com/ershoufang/mp-agent into master

package.json

@@ -8,6 +8,8 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@zjxpcyc/vue-tiny-store": "^1.0.1",
+    "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "vant": "^3.0.0",
     "vue": "^3.0.0",

src/components/Authentication/index.vue

@@ -0,0 +1,35 @@
+<template>
+    <template v-if="!show">
+      <span style="display: inline-block" v-if="error">{{error}}</span>
+      <slot name="callback"></slot>
+    </template>
+    <slot v-else></slot>
+</template>
+
+<script>
+import { computed } from 'vue'
+
+export default {
+  props: {
+    check: undefined,
+    error: String,
+  },
+  
+  setup(props) {
+    const show = computed(() => {
+      if (typeof props.check === 'boolean') {
+        return props.check
+      } else if (typeof props.check === 'function') {
+        // 函数必须返回 boolean 值
+        return props.check()
+      } else {
+        return false
+      }
+    })
+
+    return {
+      show,
+    }
+  }
+}
+</script>

src/components/XLoading/index.vue

@@ -0,0 +1,61 @@
+<template>
+  <div class="x-loading">
+    <div v-show="show" class="loadding-wrapper">
+      <div class="loading-flex">
+        <div style="flex:none">
+          <van-loading :color="color || '#1989fa'">{{tip}}</van-loading>
+        </div>
+      </div>
+    </div>
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+import { computed } from 'vue'
+import { Loading } from 'vant'
+import { useModel } from '@zjxpcyc/vue-tiny-store'
+// import store from '../../store'
+
+export default {
+  components: {
+    [Loading.name]: Loading,
+  },
+  props: {
+    color: String,
+    tip: String,
+    xId: String,
+  },
+  setup(props) {
+    const { loading } = useModel('loading')
+
+    const show = computed(() => loading[props.xId])
+
+    return {
+      show
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.x-loading {
+  position: relative;
+
+  .loadding-wrapper {
+    width: 100%;
+    height: 100%;
+    background: rgba(255, 255, 255, .9);
+    z-index: 9999;
+    position: absolute;
+    top: 0;
+    left: 0;
+
+    .loading-flex {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+    }
+  }
+}
+</style>

src/main.js

@@ -2,7 +2,17 @@
 import { createApp } from 'vue';
 import App from './App.vue';
 import { router } from './router';
+import store from './store'
 import 'vant/lib/index.css';
+
+import Authentication from './components/Authentication'
+import XLoading from './components/XLoading'
+
 const app = createApp(App);
+app.use(store);
 app.use(router);
-app.mount('#app');
+
+app.component('x-loading', XLoading)
+app.component('x-auth', Authentication)
+
+app.mount('#app');

src/store/index.js

@@ -0,0 +1,8 @@
+import createStore from '@zjxpcyc/vue-tiny-store'
+import loading from './models/loading'
+
+const store = createStore({
+  loading,
+})
+
+export default store

src/store/models/loading.js

@@ -0,0 +1,9 @@
+import { reactive } from "@vue/reactivity"
+
+export default () => {
+  const loading = reactive({})
+
+  const setLoading = (id, state) => loading[id] = state
+
+  return { loading, setLoading }
+}

src/utils/request/index.js

@@ -0,0 +1,52 @@
+import axios from 'axios'
+
+// request 拦截器
+const requestInterceptor = config => {
+  return config
+}
+
+// response 拦截器
+const responseInterceptor = response => {
+  const { data, headers } = response
+  const contentType = headers['Content-Type'] || headers['content-type'] || ''
+
+  if (/json/.test(contentType)) {
+    if ('0' === data.code) {
+      return data.data
+    } else if ('1' === data.code) {
+      return Promise.reject('账号未登录或没有权限')
+    } else {
+      return Promise.reject(data.message)
+    }
+
+  } else {
+    return Promise.reject("账号未登录或没有权限")
+  }
+}
+
+// 错误处理
+const handleError = type => error => {
+  if (error.response) {
+    console.error(`[${type}]:`)
+    console.error(error.response)    
+  } else {
+    const errorMessage = error.message || error.msg || error
+    console.error(`[${type}] ${errorMessage}`)
+    console.error(error)
+    return Promise.reject(errorMessage)
+  }
+}
+
+const request = axios.create({
+  // 通用前缀
+  baseURL: '/mp',
+  // 允许 cookie
+  withCredentials: true,
+  // 全部都是 post 请求
+  method: 'post',
+})
+
+request.interceptors.request.use(requestInterceptor, handleError('REQUEST'))
+request.interceptors.response.use(responseInterceptor, handleError('RESPONSE'))
+
+export default request

yarn.lock

@@ -1625,6 +1625,11 @@
   resolved "https://registry.npm.taobao.org/@xtuc/long/download/@xtuc/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
   integrity sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=
 
+"@zjxpcyc/vue-tiny-store@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npm.taobao.org/@zjxpcyc/vue-tiny-store/download/@zjxpcyc/vue-tiny-store-1.0.1.tgz#9e67c0f08e9bddd802bdcb543a28c18181e27395"
+  integrity sha1-nmfA8I6b3dgCvctUOijBgYHic5U=
+
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
   version "1.3.7"
   resolved "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
@@ -1912,6 +1917,13 @@ aws4@^1.8.0:
   resolved "https://registry.npm.taobao.org/aws4/download/aws4-1.11.0.tgz?cache=0&sync_timestamp=1604101244098&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faws4%2Fdownload%2Faws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
   integrity sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=
 
+axios@^0.21.1:
+  version "0.21.1"
+  resolved "https://registry.npm.taobao.org/axios/download/axios-0.21.1.tgz?cache=0&sync_timestamp=1608611162952&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Faxios%2Fdownload%2Faxios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
+  integrity sha1-IlY0gZYvTWvemnbVFu8OXTwJsrg=
+  dependencies:
+    follow-redirects "^1.10.0"
+
 babel-eslint@^10.1.0:
   version "10.1.0"
   resolved "https://registry.npm.taobao.org/babel-eslint/download/babel-eslint-10.1.0.tgz?cache=0&sync_timestamp=1611946213770&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbabel-eslint%2Fdownload%2Fbabel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
@@ -4004,7 +4016,7 @@ flush-write-stream@^1.0.0:
     inherits "^2.0.3"
     readable-stream "^2.3.6"
 
-follow-redirects@^1.0.0:
+follow-redirects@^1.0.0, follow-redirects@^1.10.0:
   version "1.13.3"
   resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
   integrity sha1-5VmK1QF0wbxOhyMB6CrCzZf5Amc=