Merge branch 'develop' of Software/android-cloud-H5 into release/v5.4.0

.env.development

@@ -23,3 +23,5 @@ BAIDU_TONGJI_KEY = "fb2fdf29d47485e36ea2ec253bf6ac06"
 SZX_APP_IOS_SCHEME = "shuangzixingiOSAppTest"
 
 SZX_APP_ANDROID_SCHEME = "opengeminiapp"
+
+QIYUKF_TEMPLATE_ID = "6635862"

.env.production

@@ -21,3 +21,6 @@ BAIDU_TONGJI_KEY = "fb2fdf29d47485e36ea2ec253bf6ac06"
 SZX_APP_IOS_SCHEME = "shuangzixingiOSApp"
 
 SZX_APP_ANDROID_SCHEME = "opengeminiapp"
+
+QIYUKF_TEMPLATE_ID = "6635862"
+

.env.test

@@ -21,3 +21,5 @@ BAIDU_TONGJI_KEY = "fb2fdf29d47485e36ea2ec253bf6ac06"
 SZX_APP_IOS_SCHEME = "shuangzixingiOSAppTest"
 
 SZX_APP_ANDROID_SCHEME = "opengeminiapp"
+
+QIYUKF_TEMPLATE_ID = "6635862"

.env.uat

@@ -21,3 +21,5 @@ BAIDU_TONGJI_KEY = "fb2fdf29d47485e36ea2ec253bf6ac06"
 SZX_APP_IOS_SCHEME = "shuangzixingiOSAppTest"
 
 SZX_APP_ANDROID_SCHEME = "opengeminiapp"
+
+QIYUKF_TEMPLATE_ID = "6635862"

pages/customer-service.vue

@@ -1,13 +1,30 @@
 <template lang="">
-  <div></div>
+  <div>
+    <!-- <v-btn @click="open({ templateId: 6635862 })">双子星模板</v-btn>
+    <v-btn @click="open({ templateId: 6634867 })">唔即云模板</v-btn> -->
+  </div>
 </template>
 <script>
+import qs from 'qs';
+
 export default {
   head() {
     return {
       script: [
         {
-          src: 'https://qiyukf.com/script/98112bcf552907c28ee450c6a58269c3.js',
+          src:
+            'https://qiyukf.com/script/98112bcf552907c28ee450c6a58269c3.js' +
+            qs.stringify(
+              {
+                hidden: 0,
+                sdkTemplateId:
+                  this.$route.query?.templateId ??
+                  process.env.QIYUKF_TEMPLATE_ID,
+              },
+              {
+                addQueryPrefix: true,
+              },
+            ),
           async: true,
           callback: () => {
             // console.log(window.ysf);
@@ -37,6 +54,7 @@ export default {
 
       await new Promise((resolve, reject) => {
         ysf('config', {
+          // welcomeTemplateId: 6635862,
           uid: String(this.$auth.user.id),
           name: this.$auth.user.userName,
           mobile: this.$auth.user.phone,
@@ -78,7 +96,9 @@ export default {
         });
       });
       if (this.isAutoOpen) {
-        this.open();
+        this.open({
+          // templateId: 6635862,
+        });
       }
       if (this.isOnunread) {
         this.onunread();

static/screenAndroid/WXdraw.js

@@ -64,6 +64,7 @@ function doConnectDirectives() {
       type: 'forwardMsg',
       data: {
         code: '3000',
+        username,
         desc: '询问是否有在控制', // 可选
       },
     };
@@ -155,7 +156,7 @@ function doConnectDirectives() {
           }
           case '4000': {
             // 当前是获取方
-            if (isAuth === 'huo' && result.data.desc === "控制权限收回") {
+            if (isAuth === 'huo' && isControl) {
               $.confirm(
                 '授权方已收回控制权，您进入观看屏幕模式',
                 function () {
@@ -181,6 +182,7 @@ function doConnectDirectives() {
                       type: 'forwardMsg',
                       data: {
                         code: '5000',
+                        username,
                         desc: '控制权限收回', // 可选
                       },
                     }),
@@ -201,7 +203,7 @@ function doConnectDirectives() {
             //   changIsControl(true);
             //   return;
             // }
-            if (isAuth === 'huo' && result.data.desc === "控制权限收回") {
+            if (isAuth === 'huo' && isControl) {
               $.confirm(
                 '授权方已收回控制权，您进入观看屏幕模式',
                 function () {

static/screenIos/WXdraw.js

@@ -72,6 +72,7 @@ function doConnectDirectives() {
       type: 'forwardMsg',
       data: {
         code: '3000',
+        username,
         desc: '询问是否有在控制', // 可选
       },
     };
@@ -162,7 +163,8 @@ function doConnectDirectives() {
             return;
           }
           case '4000': {
-            if (isAuth === 'huo' && result.data.desc === "控制权限收回") {
+            // 当前是获取方
+            if (isAuth === 'huo' && isControl) {
               $.confirm(
                 '授权方已收回控制权，您进入观看屏幕模式',
                 function () {
@@ -188,6 +190,7 @@ function doConnectDirectives() {
                       type: 'forwardMsg',
                       data: {
                         code: '5000',
+                        username,
                         desc: '控制权限收回', // 可选
                       },
                     }),
@@ -199,7 +202,7 @@ function doConnectDirectives() {
                   changIsControl(false);
                 },
               );
-  
+
               return;
             }
           }
@@ -208,7 +211,7 @@ function doConnectDirectives() {
             //   changIsControl(true);
             //   return;
             // }
-            if (isAuth === 'huo') {
+            if (isAuth === 'huo' && isControl) {
               $.confirm(
                 '授权方已收回控制权，您进入观看屏幕模式',
                 function () {