Merge branch 'feat/rules' into 'master'

feat: 增加活动规则、调整我的拼团按钮

See merge request !16

package-lock.json

@@ -4005,24 +4005,6 @@
         }
       }
     },
-    "@sentry/tracing": {
-      "version": "7.8.1",
-      "resolved": "http://npmprivate.quantgroups.com/@sentry%2ftracing/-/tracing-7.8.1.tgz",
-      "integrity": "sha512-orNVCsMtQUKhvh7GmyJzjOhU6oT7lC7TRT7tTRlyXQVrUmfJZsthmBtyfrTC7QWJ9vXQ0mB4jab8kMT3xE4ltg==",
-      "requires": {
-        "@sentry/hub": "7.8.1",
-        "@sentry/types": "7.8.1",
-        "@sentry/utils": "7.8.1",
-        "tslib": "^1.9.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "1.14.1",
-          "resolved": "http://npmprivate.quantgroups.com/tslib/-/tslib-1.14.1.tgz",
-          "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-        }
-      }
-    },
     "@sentry/types": {
       "version": "7.8.1",
       "resolved": "http://npmprivate.quantgroups.com/@sentry%2ftypes/-/types-7.8.1.tgz",
@@ -14752,11 +14734,6 @@
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true
     },
-    "raven-js": {
-      "version": "3.27.2",
-      "resolved": "http://npmprivate.quantgroups.com/raven-js/-/raven-js-3.27.2.tgz",
-      "integrity": "sha512-mFWQcXnhRFEQe5HeFroPaEghlnqy7F5E2J3Fsab189ondqUzcjwSVi7el7F36cr6PvQYXoZ1P2F5CSF2/azeMQ=="
-    },
     "raw-body": {
       "version": "2.4.0",
       "resolved": "http://npmprivate.quantgroups.com/raw-body/-/raw-body-2.4.0.tgz",

package.json

@@ -70,4 +70,4 @@
       "commit-msg": "commitlint -e $HUSKY_GIT_PARAMS"
     }
   }
-}
\ No newline at end of file
+}

src/config/env.config.js

@@ -7,10 +7,10 @@
 const protocol = window.location.protocol;
 const qiniuHost = protocol + '//kdspstatic.q-gp.com/';
 const shenceHost = 'https://bn.xyqb.com/sa?project=default'; // 测试地址
-const talosHost = 'https://talos-test1.liangkebang.net';
-const faceHost = 'https://auth-test1.liangkebang.net';
-const kdspHost = 'https://kdsp-api-test1.liangkebang.net';
-const localHost = 'https://group-buy-test1.liangkebang.net'; // 测试环境页面地址
+const talosHost = 'https://talos-yxm2.liangkebang.net';
+const faceHost = 'https://auth-yxm2.liangkebang.net';
+const kdspHost = 'https://kdsp-api-yxm2.liangkebang.net';
+const localHost = 'https://group-buy-yxm2.liangkebang.net'; // 测试环境页面地址
 const openLink = 'https://mall.q-gp.com';
 // const talosHost = 'http://192.168.29.89:8098'; // 唐峰
 // const talosHost = 'http://192.168.25.210:8080'; // 张超
@@ -18,7 +18,7 @@ const openLink = 'https://mall.q-gp.com';
 // const talosHost = 'http://192.168.25.122:8098'; // 王永杰
 // const talosHost = protocol + '//192.168.28.41'; // 超人
 const shenceUrl = protocol + '//bn.xyqb.com/sa?project=default';
-const yxmGateway = 'https://yxm-gateway-yxm.liangkebang.net';
+const yxmGateway = 'https://gw-yxm2.liangkebang.net';
 const VCC_CHANNEL = '';
 const TERMINAL = 'H5';
 const VERSION = '7.9.00';

src/views/goodsList/index.less

@@ -8,15 +8,44 @@
   &-puzzle {
     position: absolute;
     right: 0;
-    top: 0;
+    top: 12px;
     z-index: 1;
     // border-radius: 16px 0 0 16px;
     // color: #e92615;
     // background-image: linear-gradient(180deg, #ffd545 0%, #ffcc79 100%);
     // padding: 6px 12px 6px 16px;
-
-    padding: 24px; // 线上使用背景遮罩层
-    opacity: 0;
+    color: @white;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 68px;
+    height: 25px;
+    font-size: 12px;
+    background: rgba(0, 0, 0, .25);
+    border-radius: 16px 0px 0px 16px;
+    box-sizing: border-box;
+    padding-left: 4px;
+  }
+  &-rules {
+    position: absolute;
+    right: 0;
+    top: 48px;
+    z-index: 1;
+    // border-radius: 16px 0 0 16px;
+    // color: #e92615;
+    // background-image: linear-gradient(180deg, #ffd545 0%, #ffcc79 100%);
+    // padding: 6px 12px 6px 16px;
+    color: @white;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 68px;
+    height: 25px;
+    font-size: 12px;
+    background: rgba(0, 0, 0, .25);
+    border-radius: 16px 0px 0px 16px;
+    box-sizing: border-box;
+    padding-left: 4px;
   }
   &-share {
     width: 44px;

src/views/goodsList/index.vue

@@ -3,6 +3,7 @@
   <div class="group" :style="{ backgroundColor: goodsTemp.bgcolor }">
     <!-- <cr-skeleton v-if="showLoading" class="loading" /> -->
     <div class="group-puzzle" @click="goToMyorder">我的拼团</div>
+    <div class="group-rules" @click="goToRules">活动规则</div>
     <!-- 配置头部动态信息 start -->
     <div class="group-top">
       <!-- 动态活动背景图 -->
@@ -164,6 +165,9 @@ export default {
       }
       this.$router.push('/orderList/0');
     },
+    goToRules() {
+      window.location.href = 'https://page.q-gp.com/0yuan-gou-huo-dong-gui-ze-2/';
+    },
     async openShareEvent() {
       const shareInfo = await this.getShareData();
       EventBus.$emit('goods_share_info', {