Merge branch 'jiaoneiqunuan' of gitlab2.dui88.com:wanghongyuan/new_taobao into jiaoneiqunuan

taobao_jn/client/app.js

@@ -32,8 +32,8 @@ App({
   handleQuery(query) {
     const { activityId } = query;
     // this.activityId = activityId || '5f8550a3964f97be3647a635';
-    this.activityId = activityId || '5f8831e67389891bfd6bb35f'; //赵然1
-    // this.activityId = activityId || '5f895d0f0cb733e071b4082b'; //开发者测试
+    // this.activityId = activityId || '5f8831e67389891bfd6bb35f'; //赵然1
+    this.activityId = activityId || '5f895d0f0cb733e071b4082b'; //开发者测试
     
     
   }

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -406,7 +406,7 @@ Page({
             step: this.data.curGameStep
         }).catch(r => {
             if (r && r.data && !r.data.isVip) {
-                commonToast("3s入会，即可为好友助力", 1500, () => {
+                commonToast("3s入会，即可进行pk", 1500, () => {
                     this.goVip = true;
                     this.canOpenGamePage = true;
                     navigateToOutside(r.data.url);