备份

src/common/js/BaseDictionary.js

@@ -36,6 +36,7 @@ const HKC = {
   },
 };
 
+// 前海
 const QHKC = {
   qa: {
     ...testAppIdInfo,
@@ -52,7 +53,53 @@ const QHKC = {
   },
 }
 
+// 浦东
+const PKC = {
+  dev: {
+    ...testAppIdInfo,
+    groupId: '8aaa82ea804d07cd01805174dd3b000c',
+    mallId: '8aaa81cb7c836c6b017c83e46b110001',
+    projectId: 'PKC',
+  },
+  qa: {
+    ...testAppIdInfo,
+    groupId: '8a8480487c96d58f017c9b7bab7d0020',
+    mallId: '8a8481f57cca9442017ce02875b8004a',
+    projectId: '184',
+  },
+  prod: {
+    // TODO: 等待对应公众号上线
+    ...testAppIdInfo,
+    groupId: '8a8884e77cc9e70a017cca14d07e0002',
+    mallId: '8a88835c7cd96d31017cda3f77e80003',
+    projectId: '184',
+  },
+}
+// 静安
+const JAKC = {
+  dev: {
+    ...testAppIdInfo,
+    groupId: '8aaa82ea804d07cd01805174dd3b000c',
+    mallId: '8aaa81cb7c836c6b017c83e2c76f0000',
+    projectId: 'JAKC',
+  },
+  qa: {
+    ...testAppIdInfo,
+    groupId: '8a8480487c96d58f017c9b7bab7d0020',
+    mallId: '8a8481f57cca9442017ce026ddd40049',
+    projectId: 'JAKC',
+  },
+  prod: {
+    // TODO: 等待对应公众号上线
+    ...testAppIdInfo,
+    groupId: '8a8884e77cc9e70a017cca14d07e0002',
+    mallId: '8a88835c7cd96d31017cda2fd9910000',
+    projectId: '189',
+  },
+}
+
 export const lbsDictionary = {
+  // 沈阳
   '8aaa87bc7ce98224017ce995fd8a0002': {
     ...SKC,
   },
@@ -65,6 +112,7 @@ export const lbsDictionary = {
   "8a8883607d029a46017d02a2be880000": {
     ...SKC,
   },
+  // 杭州
   '4028e3817bf860f3017bf86279b50001': {
     ...HKC,
   },
@@ -74,6 +122,7 @@ export const lbsDictionary = {
   '8a8883557cca9463017ccaedb04f0000': {
     ...HKC,
   },
+  // 前海
   '8aaa83397bf7310e017bf7c8fb740009': {
     ...QHKC,
   },
@@ -82,6 +131,26 @@ export const lbsDictionary = {
   },
   '8a8884e77cc9e70a017cca3ad6170006': {
     ...QHKC,
+  },
+  // 静安
+  "8aaa80ae7c741565017c74ea1efe004d":{
+    ...JAKC
+  },
+  "8a8481f57cca9442017ce3f4aebc0099":{
+    ...JAKC
+  },
+  "8a88835c7cd96d31017cda3c148a0002":{
+    ...JAKC
+  },
+  // 浦东
+  "8aaa80ae7c741565017c74dbedd0004c":{
+    ...PKC
+  },
+  "8a8481f57cca9442017ce3f5e0b0009a":{
+    ...PKC
+  },
+  "8a88835c7cd96d31017cda47d11b0004":{
+    ...PKC
   }
 };
 

src/store/index.js

@@ -3,7 +3,7 @@ import Vuex from 'vuex';
 import { Encrypt,Decrypt } from '@/utils/crypto';
 import { crmQueryMemberInfo } from '@/utils/api-crm-member';
 import uni from '@/utils/uniHooks';
-import { kipAllCities,kipGetUserDetail } from '@/utils/api-kip';
+import { kipAllCities,kipGetUserDetail,getVIPIntegral } from '@/utils/api-kip';
 import cachedViews from './cachedViews';
 import order from './order';
 import invoice from './invoice';
@@ -254,21 +254,22 @@ const store = new Vuex.Store({
           commit('SET_ACCESS_TOKEN',accessToken);
           commit('SET_KIP_USER_ID',kipUserId);
           commit('SET_MOBILE',mobile);
-          const memberRes = await crmQueryMemberInfo({
-            groupId,
-            kipUserId,
-            mallId,
-          });
-          // console.log(130, memberRes);
+          dispatch('getUserDetail');
+          const memberRes = await getVIPIntegral()
+          // const memberRes = await crmQueryMemberInfo({
+          //   groupId,
+          //   kipUserId,
+          //   mallId,
+          // });
           // 请求 projectId
           window.toWXSendMsg({
             type: 'getProjectId',
             options: {},
           });
           const marketListRes = await kipAllCities();
-          if ( memberRes.code === 0 ) {
+          if ( memberRes) {
             dispatch('getUserDetail');
-            commit('SET_MEMBER',memberRes.data);
+            commit('SET_MEMBER',memberRes);
           }
           // console.log(929292, marketListRes);
         }

src/utils/api-kip.js

@@ -3,6 +3,7 @@ const DEFAULT_CONFIG = {
 	refreshTokenUrl: `/oauth/v1/oauth/renewToken?refreshToken=`,
 }
 
+const POINTS_PREFIX = '/points/v1';
 // 微信授权手机号登录，注册
 export function kipPhoneLogin(params) {
 	const url = `/oauth/v1/auth/phone-login`;
@@ -216,4 +217,8 @@ export function kipAgreementCheck (params) {
 export function wxEasyPointsCommitStatus(params) {
 	const url = `/points/v1/auto/points/commit-status`;
 	return request.get(url, params);
+}
+
+export function getVIPIntegral(){
+  return request.get(`/points/v1/member/current`);
 }

src/utils/index.js

@@ -66,6 +66,8 @@ export function getPlatform() {
   if ( /micromessenger/g.test(userAgent) ) {
     return 'micromessenger';
   }
+  //
+  // 
   return 'miniprogram'; // TODO: 上线前改为其他
 }
 
@@ -132,6 +134,9 @@ export function getGroupIdAndMallIdByLsbId( lbsId ) {
   if ( window.env === 'prod' ) {
     return lbsObj['prod'];
   }
+  if ( window.env === 'dev' ) {
+    return lbsObj['dev'];
+  }
   return lbsObj['qa'];
 }
 
@@ -170,12 +175,12 @@ export function initEnv() {
   const href = window.location.href;
   console.log('当前页面的url地址  ',href);
   if ( /dev-|8080/.test(href) ) {
-    window.env = 'qa';
+    /*window.env = 'qa';
     window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
-    window.api = 'qaApi';
-    /*window.env = 'dev';
+    window.api = 'qaApi';*/
+    window.env = 'dev';
     window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
-    window.api = 'devApi';*/
+    window.api = 'devApi';
     // window.env = 'prod';
     // window.profileApi = 'https://sl-apim.kerryplus.com/c/api';
     // window.api = 'api';
@@ -214,7 +219,7 @@ export function requestInit() {
 
 // websocket 链接
 export function getUrl() {
-  return `https://crm.kerryplus.com/xcrm-api`; // TODO: 临时更改websocket域名为prod
+  // return `https://crm.kerryplus.com/xcrm-api`; // TODO: 临时更改websocket域名为prod
   // 如果 kerry+ 这边的访问环境是 sl 或者 lt，需要把 wss 指向 qa 环境。
   const href = `${ window.location.href }`;
   if ( /dev-|8080/.test(href) ) {

src/utils/request-kip.js

@@ -13,7 +13,7 @@ function getHeaders(config = {}) {
   const { contentType = 'json' } = config;
   const ct = CONTENT_TYPE_ARRAY[contentType];
   let header = {
-    appId: uni.getStorageSync('appid'),
+    appId: uni.getStorageSync('appId'),
     'Content-Type': ct,
   };
   const token = getToken();
@@ -22,7 +22,7 @@ function getHeaders(config = {}) {
   }
 
   const groupId = uni.getStorageSync('groupId');
-  const mallId = uni.getStorageSync('mallid');
+  const mallId = uni.getStorageSync('mallId');
   if (groupId) {
     header['brandId'] = groupId;
   }