Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-mer

src/views/active/index.vue

@@ -9,6 +9,7 @@
         <el-radio-button :label="1">平台优惠券</el-radio-button>
         <el-radio-button :label="2">平台秒杀</el-radio-button>
         <el-radio-button :label="3">平台限时折扣</el-radio-button>
+        <el-radio-button :label="5">交易金活动</el-radio-button>
       </el-radio-group>
     </div>
     <!-- 搜索 -->

vue.config.js

@@ -40,8 +40,8 @@ module.exports = {
     },
     proxy: {
       '/businessapi': {
-        // target: 'http://192.168.0.91:9104',
-        target: 'https://nsbusinessapitest.tuanfengkeji.cn',
+        target: 'http://192.168.0.91:9104',
+        // target: 'https://nsbusinessapitest.tuanfengkeji.cn',
         changeOrigin: true,
         pathRewrite: {
           '^/businessapi': ''