Merge pull request #31 from John-Hong/John/release-2.4.0/SCRM-3298

John/release 2.4.0/scrm 3298

src/api/request.js

@@ -25,8 +25,8 @@ function getHeaders(config = {}) {
   const ct = CONTENT_TYPE_ARRAY[contentType];
   let header = {
     // appId: uni.getStorageSync('appid'),
-    appId: 'wx92c3e55fbef6b2af',
-    'Content-Type': ct,
+    // appId: 'wx92c3e55fbef6b2af',
+    // 'Content-Type': ct,
   };
   const token = getToken();
   if (token) {
@@ -35,12 +35,12 @@ function getHeaders(config = {}) {
 
   const groupId = uni.getStorageSync('groupId');
   const mallId = uni.getStorageSync('mallid');
-  if (groupId) {
-    header['brandId'] = groupId;
-  }
-  if (mallId) {
-    header['lbsId'] = mallId;
-  }
+  // if (groupId) {
+  //   header['brandId'] = groupId;
+  // }
+  // if (mallId) {
+  //   header['lbsId'] = mallId;
+  // }
   const sourceObj = getUTMSource();
   return Object.assign(header, sourceObj);
 }
@@ -133,8 +133,8 @@ export const createAxiosByinterceptors = (config) => {
       config.headers = {
         ...config.headers,
         ...handleConfig().header,
-        ...getSign(config),
-        'XConversationId': uuidv4(),
+        // ...getSign(config),
+        'x-conversation-id': uuidv4(),
         'X-User': XUser(config),
       };
       return config;

src/store/order.js

@@ -395,7 +395,7 @@ const actions = {
     if (type === 'add' && state.pointsTime < maxPointsTime) {
       const pointsTime = state.pointsTime + state.unitAmount;
       const available = state.available - state.pointsPerUnit;
-      const usingTotalDiscount = usingTotalDiscount + state.unitAmount; // 重新计算已经使用的优惠逻辑
+      const usingTotalDiscount = state.usingTotalDiscount + state.unitAmount; // 重新计算已经使用的优惠逻辑
       if (available > -1) {
         // 如果是深圳车场
         commit('setAvailable', available);