Merge branch 'master' into feature/orderPaymentStatus

* master:
  fix(package.lock): delete package-lock
  fix(package.lock): change package-lock
  fix(orderList): 取出默认收银台指向
  build(pre.config.js): 问题接口调整
  build(vue.config.js): 添加pre环境配置
  feat: 修改appid
  feat: 配置生成小程序scheme接口请求头，增加tenantid和mini-app-id
  feat: 配置生成小程序scheme接口请求头，增加tenantid和mini-app-id

.env.preproduction

+NODE_ENV=production
+VUE_APP_PRE_ENV=pre
\ No newline at end of file

.env.production

+NODE_ENV=production
+VUE_APP_PRE_ENV=production
\ No newline at end of file

commitlint.config.js

+module.exports = {
+  extends: ['@commitlint/config-angular'],
+};

package.json

@@ -6,6 +6,7 @@
     "serve": "vue-cli-service serve --open",
     "report": "vue-cli-service build --report",
     "build": "vue-cli-service build",
+    "build:pre": "vue-cli-service build --mode preproduction",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
@@ -18,6 +19,8 @@
     "@qg/ui-track-web": "0.0.3",
     "core-js": "^3.6.5",
     "crypto-js": "^3.1.9-1",
+    "@commitlint/cli": "^13.2.1",
+    "@commitlint/config-angular": "^13.2.0",
     "intersection-observer": "^0.12.0",
     "js-cookie": "^2.2.1",
     "qiniu-js": "^3.3.1",
@@ -52,7 +55,7 @@
     "postcss-px2rem": "^0.3.0",
     "prettier": "^1.19.1",
     "svg-sprite-loader": "^5.2.1",
-    "vue-template-compiler": "^2.6.11",
+    "vue-template-compiler": "2.6.11",
     "webpack-sentry-plugin": "^2.0.3"
   },
   "lint-staged": {
@@ -63,7 +66,8 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "lint-staged"
+      "pre-commit": "lint-staged",
+      "commit-msg": "commitlint -e $HUSKY_GIT_PARAMS"
     }
   }
 }

src/api/groupBuy.js

@@ -2,6 +2,8 @@ import config from '@/config';
 import http from '@/service/httpDecorator';
 import qs from 'qs';
 const { talosHost } = config;
+// const MINI_APP_ID = 'wxb3e6270e1b1e0bc7'; // 羊小咩
+const MINI_APP_ID = 'wxe16bf9293671506c'; // 狼大呜
 
 export default {
   // 查询商品sku详情
@@ -43,7 +45,13 @@ export default {
   getScheme(params) {
     return http.get(
       `${talosHost}/api/kdsp/ka/info/getShareMiniUrl`,
-      { params },
+      {
+        params,
+        headers: {
+          'qg-tenant-id': 560761, // 羊小咩租户ID
+          'mini-app-id': MINI_APP_ID // 羊小咩小程序appid
+        }
+      },
       { hideLoading: true }
     );
   },
@@ -54,7 +62,12 @@ export default {
   // 获取小程序码
   getQrcodeUrl(params) {
     const qsString = qs.stringify(params);
-    return http.get(`${talosHost}/api/kdsp/playBill/getMakePicData?${qsString}`);
+    return http.get(`${talosHost}/api/kdsp/playBill/getMakePicData?${qsString}`, {
+      headers: {
+        'qg-tenant-id': 560761, // 羊小咩租户ID
+        'mini-app-id': MINI_APP_ID // 羊小咩小程序appid
+      }
+    });
   },
   getGroupShareInfo(orderNo) {
     return http.get(`${talosHost}/api/kdsp/groupShareInfo?orderNo=${orderNo}`);

src/config/env.config.js

@@ -2,7 +2,7 @@
  * @Description:
  * @Date: 2021-03-31 19:59:12
  * @LastEditors: gzw
- * @LastEditTime: 2021-08-03 16:53:39
+ * @LastEditTime: 2021-11-29 22:40:33
  */
 const protocol = window.location.protocol;
 const qiniuHost = protocol + '//kdspstatic.q-gp.com/';
@@ -17,7 +17,6 @@ const openLink = 'https://mall.q-gp.com';
 // const talosHost = 'http://192.168.28.83:80'; // 董彪
 // const talosHost = 'http://192.168.25.122:8098'; // 王永杰
 // const talosHost = protocol + '//192.168.28.41'; // 超人
-const opapiHost = 'https://opapi-test1.liangkebang.net';
 const shenceUrl = protocol + '//bn.xyqb.com/sa?project=default';
 const VCC_CHANNEL = '';
 const TERMINAL = 'H5';
@@ -35,6 +34,5 @@ export default {
   TERMINAL,
   VERSION,
   kdspHost,
-  opapiHost,
   shenceUrl
 };

src/config/index.js

+/* eslint-disable prettier/prettier  */
+/* eslint-disable indent */
 import production from './prod.config';
+import preProduction from './pre-prod.config';
 import env from './env.config';
 
-export default process.env.NODE_ENV === 'production' ? production : env;
+export default process.env.VUE_APP_PRE_ENV === 'pre'
+  ? preProduction
+  : process.env.NODE_ENV === 'production'
+    ? production
+    : env;

src/config/pre-prod.config.js

+const protocol = window.location.protocol;
+const talosHost = protocol + '//talos-pre.xyqb.com';
+const qiniuHost = protocol + '//kdspstatic.q-gp.com/';
+const shenceHost = 'https://bn.xyqb.com/sa?project=production';
+const faceHost = 'https://auth-pre.quantgroup.cn';
+const VCC_CHANNEL = '';
+const TERMINAL = 'H5';
+const VERSION = '7.9.00';
+const kdspHost = 'https://kdsp-api-pre.q-gp.com';
+const localHost = 'https://group-buy-pre.q-gp.com'; // 正式环境页面地址
+// const localHost = 'https://group-buy-test1.liangkebang.net'; // 正式环境页面地址
+const shenceUrl = protocol + '//bn.xyqb.com/sa?project=production';
+const openLink = 'https://mall-pre.q-gp.com';
+export default {
+  openLink,
+  localHost,
+  // apiHost,
+  faceHost,
+  test: false,
+  shenceHost,
+  talosHost,
+  VCC_CHANNEL,
+  TERMINAL,
+  VERSION,
+  qiniuHost,
+  kdspHost,
+  shenceUrl
+};

src/config/prod.config.js

@@ -7,7 +7,6 @@ const VCC_CHANNEL = '';
 const TERMINAL = 'H5';
 const VERSION = '7.9.00';
 const kdspHost = 'https://kdsp-api.q-gp.com';
-const opapiHost = `${protocol}//opapi.xyqb.com`;
 const localHost = 'https://group-buy.q-gp.com'; // 正式环境页面地址
 // const localHost = 'https://group-buy-test1.liangkebang.net'; // 正式环境页面地址
 const shenceUrl = protocol + '//bn.xyqb.com/sa?project=production';
@@ -25,6 +24,5 @@ export default {
   VERSION,
   qiniuHost,
   kdspHost,
-  opapiHost,
   shenceUrl
 };

src/views/orderList/components/List.vue

@@ -185,7 +185,6 @@ export default {
       }
     },
     goGroupPayPages(skuInfo) {
-      this.$router.push(`/pay?orderNo=${skuInfo.orderNo}`);
       if (isWxMp) {
         this.nativeBridge.openNewUrl({
           newUrl: `/pages/pay/index?orderNo=${skuInfo.orderNo}`

vue.config.js

@@ -2,8 +2,8 @@ const path = require('path');
 const resolve = dir => path.join(__dirname, dir);
 const IS_PROD = process.env.NODE_ENV === 'production';
 const WebpackCosCdnUploadPlugin = require('@qg/webpack-cos-cdn-upload-plugin');
-// const SentryPlugin = require('webpack-sentry-plugin');
-// const SentryConfig = require('./.sentryclirc');
+const SentryPlugin = require('webpack-sentry-plugin');
+const SentryConfig = require('./.sentryclirc');
 // cdn预加载使用
 const externals = {
   vue: 'Vue',
@@ -127,8 +127,8 @@ module.exports = {
     if (IS_PROD) {
       config.externals = externals;
       configObj = {
-        // plugins: [new SentryPlugin(SentryConfig), new WebpackCosCdnUploadPlugin()]
-        plugins: [new WebpackCosCdnUploadPlugin()]
+        plugins: [new SentryPlugin(SentryConfig), new WebpackCosCdnUploadPlugin()]
+        // plugins: [new WebpackCosCdnUploadPlugin()]
       };
     }
     return configObj;