Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/user/App.vue

@@ -5,18 +5,44 @@
 </template>
 
 <script>
-  import '../../common/css/reset.css'
-
-  export default {
-    name: 'app',
-    components: {}
+import '../../common/css/reset.css'
+import { mapState, createNamespacedHelpers } from 'vuex'
+const { mapActions: actions } = createNamespacedHelpers('userCenter')
+export default {
+  name: 'app',
+  components: {},
+  computed: {
+    ...mapState({
+      userInfo: x => x.userCenter.userInfo,
+      org: x => x.app.orgId
+    })
+  },
+  created () {
+    if (location.search && this.toolClass.UrlSearch(location.search).code) {
+      this.code = this.toolClass.UrlSearch(location.search).code
+    } else {
+      this.code = null
+    }
+    this.getUserInfo({ org: this.org, code: this.code }).then((res) => {
+      if (typeof (res) === 'string') {
+        if (res.indexOf('401-') > -1) {
+          this.toolClass.getCode(res.substring(4, res.length))
+        }
+      }
+    }).catch((err) => {
+      console.log(err)
+    })
+  },
+  methods: {
+    ...actions(['getUserInfo'])
   }
+}
 </script>
 
 <style>
-  #app {
-    width: 100%;
-    height: 100%;
-    position: relative;
-  }
+#app {
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
 </style>

src/store/userCenter/userCenter.js

@@ -4,12 +4,18 @@ const http = new Object
 
 // 请求数据
 http.getUserInfo = (data) => { // 获取用户信息
+  let queryData
+  if (!data.code) {
+    queryData = {
+      org: data.org
+    }
+  } else {
+    queryData = data
+  }
   return new Promise((resolve, reject) => {
     Ajax(api.user.info.url, {
       method: api.user.info.method,
-      queryData: {
-        org: data.org
-      }
+      queryData: queryData
     }).then(res => {
       resolve(res)
     }).catch((err) => {

src/util/ajax.js

@@ -1,5 +1,6 @@
 import axios from 'axios'
 import qs from 'qs'
+import toolClass from './util'
 import { Toast } from '../../node_modules/vant';
 
 const Axios = axios.create({
@@ -53,6 +54,7 @@ const ajax = (...args) => {
         resolve(result)
       } else if (code === 401) {
         // reject(code)
+        toolClass.getCode()
       } else {
         Toast({
           message: message,

src/util/api.js

@@ -1,4 +1,4 @@
-const baseUrl = '/api'
+const baseUrl = '/api-v2'
 const wechat = '/wechat/:org'
 const guest = '/guest/:org'
 const common = '/common/:org'

src/util/util.js

@@ -1,24 +1,44 @@
 const toolClass = {
-  dateFormat: (timestamp) => {
+  dateFormat: (timestamp, fmt) => {
+    if (!fmt) {
+      fmt = 'yyyy-MM-dd hh:mm'
+    }
+
     let date = new Date(timestamp)
-    let y = date.getFullYear()
-    let m = date.getMonth() + 1
-    let d = date.getDate()
-    let h = date.getHours()
-    let min = date.getMinutes()
-    if (m < 10) {
-      m = '0' + m
+    var o = {
+      'M+': date.getMonth() + 1,
+      'd+': date.getDate(),
+      'h+': date.getHours(),
+      'm+': date.getMinutes(),
+      's+': date.getSeconds(),
+      'q+': Math.floor((date.getMonth() + 3) / 3),
+      'S': date.getMilliseconds()
     }
-    if (d < 10) {
-      d = '0' + d
+    if (/(y+)/.test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
     }
-    if (h < 10) {
-      h = '0' + h
+    for (var k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+      }
     }
-    if (min < 10) {
-      min = '0' + min
+    return fmt
+  },
+  UrlSearch: (urls) => {
+    let url = urls // 获取url中"?"符后的字串
+    let theRequest = {}
+    if (url.indexOf('?') !== -1) {
+      let str = url.substr(1)
+      let strs = str.split('&')
+      for (var i = 0; i < strs.length; i++) {
+        theRequest[strs[i].split('=')[0]] = unescape(strs[i].split('=')[1])
+      }
     }
-    return y + '-' + m + '-' + d + ' ' + h + ':' + min
+    return theRequest
+  },
+  getCode: (appid) => {
+    let url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${wechatConfig.redirect_uri}&response_type=${wechatConfig.response_type}&scope=${wechatConfig.scope}&state=${wechatConfig.state}#wechat_redirect`
+    window.location.href = url
   }
 }
 

title.js

@@ -1,5 +1,4 @@
 module.exports = {
-  index: '主页',
-  'user/login': '登录',
-  'customer/home': '用户首页'
+  user: '城的空间',
+  sales: '城的空间案场端'
 }

vue.config.js

@@ -15,14 +15,17 @@ glob.sync('./src/pages/**/app.js').forEach(path => {
 })
 module.exports = {
   pages,
+  baseUrl: './',
+  // 生产环境是否生成 sourceMap 文件
+  productionSourceMap: true,
   chainWebpack: config => config.plugins.delete('named-chunks'),
   devServer: {
     proxy: {
-      '/api': {
+      '/api-v2': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
         // target: 'http://192.168.0.62:8080', //wf
-        target: 'http://192.168.0.11:8080', //ys
-        // target: 'http://dev.ycjcjy.com', //zys
+        // target: 'http://192.168.0.11:8080', //ys
+        target: 'http://dev.ycjcjy.com', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         // pathRewrite: {
         //   '^/api': '/api-v2/api'