Browse Source

fix:删除多余的store

chenzhen2 1 year ago
parent
commit
eb81a7d5f7

+ 14 - 0
src/api/user.js

@@ -43,6 +43,20 @@ function register(params) {
   })
 }
 
+// 根据手机号获取租户数据
+function getCompanyByPhone(params) {
+  return $http({
+    url: `${config.duoduoenvService}userNew/company?phone=${params.phone}`,
+    method: 'get'
+  })
+
+
+}
+
+
+
+
+
 
 
 

+ 1 - 0
src/app.wpy

@@ -43,6 +43,7 @@ wepy.app({
 <config>
 {
     pages: [
+   
       'pages/auth/index',
       'pages/bindTenant/index',
     ],

+ 12 - 4
src/pages/auth/index.wpy

@@ -65,11 +65,12 @@
 <template>
  <div class="login-box">
   <button class="avatar-wrapper"
+    v-if="canIUseGetUserProfile"
     open-type="chooseAvatar" 
     bind:chooseavatar="onChooseAvatar">
     <image class="avatar" src="{{avatarUrl}}"/>
   </button>  
-  <div class="avatar-tip">可点击获取头像</div>
+  <div class="avatar-tip" v-if="canIUseGetUserProfile">可点击获取头像</div>
   <div class="bind-btn-box">
    <button class="bind-btn"
    open-type="getPhoneNumber"
@@ -87,8 +88,8 @@ import { mapState } from '@wepy/x';
 import store from '@/store';
 import config from '@/config';
 import { setAvatar, setUserInfoByAuth } from '@/service/user';
-let defaultAvatarUrl =
-  config.h5StaticPath + 'page-bind-tenant/default_avatar.svg';
+import {getCompanyByPhone} from '@/api/user';
+let defaultAvatarUrl =config.h5StaticPath + '/page-bind-tenant/default_avatar.svg';
 wepy.page({
   store,
   config: {
@@ -98,6 +99,7 @@ wepy.page({
     nicknameValue: '',
     avatarUrl: defaultAvatarUrl,
     msg: '测试数据',
+    canIUseGetUserProfile: false,
     userInformation: wx.getStorageSync('userInformation')
   },
   onLoad() {
@@ -123,6 +125,9 @@ wepy.page({
         }
       });
     },
+    getPageCompanyByPhone(){
+
+    },
     goHome() {
       wx.navigateTo({
         url: '/packagesEnv/pages/home/index'
@@ -130,7 +135,10 @@ wepy.page({
     },
     // 手机号认证
     phonenumberAuth(e) {
-      console.log(e)
+      console.log(e);
+      let detail = e.$wx.detail;
+      let code = detail.code;
+      let errMsg = detail.errMsg;
     },
     goBindTenant() {
       console.log('被点击了');

+ 4 - 2
src/pages/index.wpy

@@ -64,10 +64,12 @@ wepy.page({
     h5StaticPath: config.h5StaticPath,
     isActivated: 0
   },
-  onLoad() {},
-  onShow() {
+  onLoad() {
     this.checkTenantRegist();
   },
+  onShow() {
+    // this.checkTenantRegist();
+  },
   methods: {
     checkTenantRegist() {
       checkRegist()

+ 3 - 1
src/service/user.js

@@ -2,6 +2,7 @@ import { getUserInfo, setWxAuthUserInfo, getThirdInfo, createAccount, changePhon
 import store from '@/store';
 import config from '@/config';
 import { login } from '@/api/user.js';
+import { getAppId } from '@/utils/index';
 
 // 获取用户数据
 function getUserData() {
@@ -124,7 +125,7 @@ function checkRegist() {
     wx.login({
       success(wxLoginRes) {
         const jsCode = wxLoginRes.code;
-        const appId = wx.getAccountInfoSync().miniProgram.appId;
+        const appId = getAppId();
         if (jsCode) {
           let params = {
             "appId": appId,
@@ -203,6 +204,7 @@ function getAvatar() {
   wx.getStorageSync('avatarBase64');
 }
 
+
 export {
   checkHasUserInfo,
   checkRegist,

+ 0 - 38
src/store/carport.js

@@ -1,38 +0,0 @@
-export default {
-  state: {
-    // 企业车位
-    companyCarportList: [],
-    // 个人车位
-    personalCarportList: [],
-    // 我的常用车辆
-    myCarList: []
-  },
-  mutations: {
-    addCompanyCarport(state, companyCarport) {
-      state.companyCarportList.push(companyCarport);
-    },
-    addPersonalCarport(state, personalCarport) {
-      state.personalCarportList.push(personalCarport);
-    },
-    addMyCar(state, carObj) {
-      state.myCarList.push(carObj);
-    },
-    deleteMyCar(state, carNumber) {
-      state.myCarList.find((item, index) => {
-        if (item.number === carNumber) {
-          state.myCarList.splice(index, 1)
-          return true;
-        }
-        return false;
-      })
-    }
-  },
-  actions: {
-    addMyCar({ commit }, carObj) {
-      commit('addMyCar', carObj);
-    },
-    deleteMyCar({ commit }, carNumber) {
-      commit('deleteMyCar', carNumber);
-    }
-  }
-}

+ 0 - 37
src/store/home.js

@@ -1,37 +0,0 @@
-export default {
-  state: {
-    subscribeMessageTemplates: {},
-    spaceCardInfo: {
-      imgUrl: '',
-      roomName: '',
-      envData: {
-        temperature: '',
-        humidity: '',
-        pm25: '',
-        co2: '',
-        hcho: '',
-        tvoc: '',
-        pmIndicator: '优'
-      },
-
-      spaceId: '',
-      roomType: '' // private_room-房间,public_room-开发空间
-    }
-  },
-  mutations: {
-    setSubscribeMessageTemplates(state, subscribeMessageTemplates) {
-      state.subscribeMessageTemplates = subscribeMessageTemplates
-    },
-    setspaceCardInfo(state, spaceCardInfo) {
-      state.spaceCardInfo = {...spaceCardInfo}
-    }
-  },
-  actions: {
-    setSubscribeMessageTemplates({ commit }, data) {
-      commit('setSubscribeMessageTemplates', data);
-    },
-    setspaceCardInfo({commit}, data) {
-      commit('setspaceCardInfo', data);
-    }
-  }
-}

+ 0 - 36
src/store/index 2.js

@@ -1,36 +0,0 @@
-import wepy from '@wepy/core';
-import Vuex from '@wepy/x';
-import user from '@/store/user.js'
-import task from '@/store/task.js'
-import carport from '@/store/carport.js'
-import restaurant from '@/store/restaurant.js'
-import wifi from '@/store/wifi.js'
-import home from '@/store/home.js'
-import meetingroom from '@/store/meetingroom.js'
-import company from '@/store/company'
-import portrait from '@/store/portrait'
-import officehome from '@/store/officehome'
-import previewImage from '@/store/previewImage'
-import location from '@/store/location'
-wepy.use(Vuex);
-
-export default new Vuex.Store({
-  modules: {
-    user,
-    task,
-    carport,
-    restaurant,
-    wifi,
-    location,
-    home,
-    meetingroom,
-    company,
-    portrait,
-    officehome,
-    previewImage
-  },
-  state: {},
-  mutations: {},
-  actions: {},
-  getters: {}
-});

+ 1 - 15
src/store/index.js

@@ -1,33 +1,19 @@
 import wepy from '@wepy/core';
 import Vuex from '@wepy/x';
 import user from '@/store/user.js'
-// import task from '@/store/task.js'
-// import carport from '@/store/carport.js'
-// import restaurant from '@/store/restaurant.js'
-// import wifi from '@/store/wifi.js'
-// import home from '@/store/home.js'
-// import meetingroom from '@/store/meetingroom.js'
 // import company from '@/store/company'
 import portrait from '@/store/portrait'
 import officehome from '@/store/officehome'
-// import previewImage from '@/store/previewImage'
 import location from '@/store/location'
 wepy.use(Vuex);
 
 export default new Vuex.Store({
   modules: {
     user,
-    // task,
-    // carport,
-    // restaurant,
-    // wifi,
     location,
-    // home,
-    // meetingroom,
-    // company,
     portrait,
     officehome,
-    // previewImage
+
   },
   state: {},
   mutations: {},

+ 0 - 15
src/store/meetingroom.js

@@ -1,15 +0,0 @@
-export default {
-  state: {
-    choosedColleaguList: []
-  },
-  mutations: {
-    setChoosedColleaguList(state, list) {
-      state.choosedColleaguList = list
-    }
-  },
-  actions: {
-    setChoosedColleaguList({ commit }, data) {
-      commit('setChoosedColleaguList', data);
-    }
-  }
-}

+ 0 - 22
src/store/previewImage.js

@@ -1,22 +0,0 @@
-export default {
-  state: {
-    imageList: [],
-    currentIndex: 1
-  },
-  mutations: {
-    setImageList(state, imageList) {
-      state.imageList = [...imageList];
-    },
-    setImageIndex(state, index) {
-      state.currentIndex = index;
-    }
-  },
-  actions: {
-    setImageList({ commit }, data) {
-      commit('setImageList', data);
-    },
-    setImageIndex({ commit }, data) {
-      commit(setImageIndex, data);
-    },
-  },
-};

+ 0 - 29
src/store/restaurant.js

@@ -1,29 +0,0 @@
-export default {
-  state: {
-    // 是否营业中
-    isOpen: true,
-    dishInfo: {}
-  },
-  mutations: {
-    openRestaurant(state) {
-      state.isOpen = true;
-    },
-    closeRestaurant(state) {
-      state.isOpen = false;
-    },
-    updateDishInfo(state, dish) {
-      console.log('----------------')
-      console.log(state)
-      console.log(dish)
-      state.dishInfo = dish
-    }
-  },
-  actions: {
-    openRestaurant({ commit }) {
-      commit('openRestaurant');
-    },
-    closeRestaurant({ commit }) {
-      commit('closeRestaurant');
-    }
-  }
-}

+ 0 - 93
src/store/task.js

@@ -1,93 +0,0 @@
-import config from '@/config';
-import { getCompanyApplyPendingList } from '@/api/companyApply.js';
-
-let taskList = [
-  {
-    name: '访客指引',
-    remarks: 'Wi-Fi、洗手间使用等信息',
-    icon: config.h5StaticPath + '/test-data/home/task/visitor-guidance.png',
-    belongRoleList: [4],
-    navigationUrl:
-      '/h5/pages/common/h5?url=/visitor-guide-tenantslink&pageTitle=访客指引&navigationBarBgColor=#ffffff',
-  },
-  {
-    name: '全面塑形瑜伽',
-    remarks: '下午 06:15',
-    icon: config.h5StaticPath + '/test-data/home/task/sport.png',
-    belongRoleList: [1, 2, 3],
-    navigationUrl:
-      'fitness/homeDetail?isReserved=1&title=' +
-      encodeURIComponent('全面塑形瑜伽训练'),
-  },
-  {
-    name: '京东快递未领取',
-    remarks: '33号储物柜',
-    belongRoleList: [1, 2, 3],
-    icon: config.h5StaticPath + '/test-data/home/task/jingdong.png',
-  },
-];
-
-export default {
-  state: {
-    taskList: taskList,
-  },
-  mutations: {
-    addEnergyTask(state, data) {
-      let energyTask = {
-        type: 'energy',
-        name: '能量站食品待领取',
-        remarks: '约 ' + data.recevieTime,
-        icon: config.h5StaticPath + '/test-data/home/task/energy.png',
-        navigationUrl: 'energy/order-detail',
-        shoppingList: data.shoppingList,
-        recevieTime: data.recevieTime,
-      };
-      state.taskList.unshift(energyTask);
-    },
-    addMeetingRoomTask(state, data) {
-      let energyTask = {
-        type: 'meetingRoom',
-        name: data.roomName + '会议室预约',
-        remarks: data.reserveTimeDesc,
-        icon: config.h5StaticPath + '/test-data/home/task/meeting.png',
-        navigationUrl: '/meetingroom/pages/detail?roomName=' + data.roomName,
-        ...data,
-      };
-      state.taskList.unshift(energyTask);
-    },
-    initCompanyApplyTask(state) {
-      initCompanyApplyTask(state.taskList);
-    },
-  },
-  actions: {
-    addEnergyTask({ commit }, data) {
-      commit('addEnergyTask', data);
-    },
-    addMeetingRoomTask({ commit }, data) {
-      commit('addMeetingRoomTask', data);
-    },
-    initCompanyApplyTask({ commit }) {
-      commit('initCompanyApplyTask');
-    },
-  },
-};
-
-function initCompanyApplyTask(taskList) {
-  let filteredList = taskList.filter((item) => {
-    return item.type != 'apply';
-  });
-  getCompanyApplyPendingList().then((res) => {
-    let list = res.data || [];
-    list.forEach((item) => {
-      filteredList.unshift({
-        type: 'apply',
-        name: '加入企业申请',
-        remarks: item.companyName,
-        belongRoleList: [1, 2, 3, 4],
-        statusText: item.statusText,
-        navigationUrl: `/account/pages/company-apply?applyId=${item.id}`,
-      });
-    });
-    taskList.splice(0, taskList.length, ...filteredList);
-  });
-}

+ 0 - 34
src/store/wifi.js

@@ -1,34 +0,0 @@
-export default {
-  state: {
-    wifiInfo: {
-      ssid: '',
-      password: ''
-    },
-    isConnected: false
-  },
-  mutations: {
-    setWifiInfo(state, wifiInfo) {
-      state.wifiInfo = wifiInfo
-    },
-    changeConnectStatus(state, isConnected) {
-      state.isConnected = isConnected
-    },
-    resetWifiInfo(state) {
-      state.wifiInfo = {
-        ssid: '',
-        password: ''
-      }
-    }
-  },
-  actions: {
-    setWifiInfo({ commit }, data) {
-      commit('setWifiInfo', data);
-    },
-    resetWifiInfo({ commit }) {
-      commit('resetWifiInfo');
-    },
-    changeConnectStatus({ commit }, data) {
-      commit('changeConnectStatus', data);
-    }
-  }
-}

+ 23 - 0
src/utils/index.js

@@ -0,0 +1,23 @@
+
+function getMiniProgram() {
+    const miniProgram = wx.getAccountInfoSync();
+    return miniProgram;
+    // this.version = miniProgram.miniProgram.version;
+}
+function getAppId() {
+    const miniProgram = wx.getAccountInfoSync();
+    return miniProgram && miniProgram.miniProgram && miniProgram.miniProgram.appId || 'wxda2ef261ac3cca32';
+}
+
+// 正式版本上能获取,体验和开发版本无法获取到版本号
+function getVersion() {
+    const miniProgram = wx.getAccountInfoSync();
+    return miniProgram && miniProgram.miniProgram && miniProgram.miniProgram.version;
+}
+
+
+export {
+    getAppId,
+    getVersion,
+    getMiniProgram
+}