Merge branch 'feat/group-buy' of git.quantgroup.cn:ui/group-buy-ui into feat/group-buy

src/api/groupBuy.js

@@ -41,10 +41,16 @@ export default {
       appId: 'wx2f44c7fe7b08458d'
     });
   },
-  getScheme(data) {
-    return http.post(`${talosHost}/api/kdsp/ka/info/getShareMiniUrl`, data, {
+  getScheme(params) {
+    return http.get(
+      `${talosHost}/api/kdsp/ka/info/getShareMiniUrl`,
+      {
+        params
+      },
+      {
         hideLoading: true
-    });
+      }
+    );
   },
   // 获取百人团订单
   getGroupOrderList(params) {

src/components/weapp.vue

@@ -35,7 +35,7 @@ export default {
   },
   methods: {
     async wxConfig() {
-      const res = await groupBuy.getWxConfig();
+      const [res] = await groupBuy.getWxConfig();
       wx.config({
         debug: false,
         jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage'], // 必填，需要使用的JS接口列表

src/config/env.config.js

@@ -7,7 +7,7 @@
 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 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'; // 测试环境页面地址
@@ -15,7 +15,7 @@ const localHost = 'https://group-buy-test1.liangkebang.net'; // 测试环境页
 // const talosHost = 'http://192.168.25.210:8080'; // 张超
 // const talosHost = 'http://192.168.28.83:80'; // 董彪
 // const talosHost = 'http://192.168.25.122:8098'; // 王永杰
-// const talosHost = protocol + '//192.168.28.41'; // 超人
+const talosHost = protocol + '//192.168.28.41'; // 超人
 const opapiHost = 'https://opapi-test1.liangkebang.net';
 const VCC_CHANNEL = '';
 const TERMINAL = 'H5';

src/store/module.js

@@ -103,7 +103,8 @@ const mutations = {
           // todo 跳转到小程序
           let getScheme = async function() {
             const [res] = await groupBuy.getScheme({
-              miniUrl: `pages/webview/webview?url=${encodeURIComponent(window.location.href)}`
+              miniUrl: 'pages/webview/webview',
+              params: window.location.href
             });
             const url = res;
             window.location.href = url; // todo 需要验证

src/views/orderList/components/List.vue

@@ -37,7 +37,7 @@
           <div class="Ol__foot-text">{{ cardInfoMation[item.openGroupStatus].footTxt }}</div>
           <div class="Ol__foot-btns">
             <cr-button
-              v-if="item.showInvite"
+              v-if="item.showInvite && item.payStatus === '1'"
               size="small"
               plain
               type="primary"
@@ -58,7 +58,7 @@
             </cr-button>
             <!-- 支付中按钮跳转支付页面 -->
             <cr-button
-              v-if="item.openGroupStatus === 0"
+              v-if="item.openGroupStatus === 0 && item.payStatus === '0'"
               size="small"
               plain
               type="primary"