Browse Source

Merge pull request #542 from tron/lock/release-3.7.0/SCRM-6145

feat(KIP-15593): 问卷弹窗触发|临停
Tron 1 year ago
parent
commit
e16b7505fd

+ 40 - 6
src/pages/parkingFeeV2/mixins/parkingFeeSuccess.js

@@ -2,7 +2,9 @@
 import payIcon from '@/pages/parkingFee/static/images/pay-success.png';
 import payIcon from '@/pages/parkingFee/static/images/pay-success.png';
 import { mapState } from 'vuex';
 import { mapState } from 'vuex';
 import uni from '@/utils/uniHooks';
 import uni from '@/utils/uniHooks';
-
+import {
+  getSceneUser,
+} from '@/utils/api-kip.js';
 export default {
 export default {
   onLoad(params) {
   onLoad(params) {
     const parkInfo = JSON.parse(uni.getStorageSync('parkinfo'));
     const parkInfo = JSON.parse(uni.getStorageSync('parkinfo'));
@@ -14,6 +16,16 @@ export default {
       outParkCharging: 15,
       outParkCharging: 15,
       blueIcon: this.$picUrl + '/images/icon-success-blue.png',
       blueIcon: this.$picUrl + '/images/icon-success-blue.png',
       greenIcon: this.$picUrl + '/images/icon-success-green.png',
       greenIcon: this.$picUrl + '/images/icon-success-green.png',
+      pointsNew: '',
+      wenjuanObj: {
+        id: '',
+        name: '',
+        sceneId: '',
+        tokenId: this.$route.query.sessionId,
+        lbsId: this.$route.query.mallId,
+        brandId: this.$route.query.groupId,
+        platform: this.isAlipayClient === true ? 'MP-ALIPAY' : 'MP-WEIXIN'
+      }
     };
     };
   },
   },
   computed: {
   computed: {
@@ -30,11 +42,11 @@ export default {
     },
     },
   },
   },
   mounted() {
   mounted() {
-    const leftLeavingTime = JSON.parse(uni.getStorageSync('leftLeavingTime'));
-    console.log('leftLeavingTime::', leftLeavingTime)
-    if (leftLeavingTime) {
-      this.outParkCharging = leftLeavingTime;
-    }
+    // const leftLeavingTime = JSON.parse(uni.getStorageSync('leftLeavingTime'));
+    // console.log('leftLeavingTime::', leftLeavingTime)
+    // if (leftLeavingTime) {
+    //   this.outParkCharging = leftLeavingTime;
+    // }
     // setTimeout(() => {
     // setTimeout(() => {
     //   window?.toWXSendMsg({
     //   window?.toWXSendMsg({
     //     type: 'nowRoute',
     //     type: 'nowRoute',
@@ -58,11 +70,33 @@ export default {
     //     },
     //     },
     //   });
     //   });
     // }, 500)
     // }, 500)
+    this.getSceneUserParking()
     if ( this.$router.query?.vehicleNo ) {
     if ( this.$router.query?.vehicleNo ) {
       this.vehicleNo = this.$route.query.vehicleNo  
       this.vehicleNo = this.$route.query.vehicleNo  
     }
     }
   },
   },
   methods: {
   methods: {
+    goSceneUser () {
+      window.location.href = `${window.QUESTIONNAIRE_BASE_URL}?type=writeIn&id=${this.wenjuanObj.id}&name=${this.wenjuanObj.name}&sceneId=${this.wenjuanObj.sceneId}&tokenId=${this.wenjuanObj.tokenId}&lbsId=${this.wenjuanObj.lbsId}&brandId=${this.wenjuanObj.brandId}&platform=${this.wenjuanObj.platform}`
+    },
+    async getSceneUserParking () {
+      try {
+        const res = await getSceneUser({
+          triggerPoint: 5
+        })
+        if (res !== '' && res !== null && res !== undefined) {
+          this.pointsNew = res.rewardPointsAmount
+          this.wenjuanObj.id = res.questionnaireId
+          this.wenjuanObj.name = res.name
+          this.wenjuanObj.sceneId = res.id
+        }
+        console.log('问卷', typeof res)
+      } catch (err) {
+        console.log('err:::', err)
+      }
+      
+      
+    },
     page_button() {
     page_button() {
       // fromPage && format && unlicensed
       // fromPage && format && unlicensed
       this.$router.replace({
       this.$router.replace({

+ 15 - 1
src/pages/parkingFeeV2/parkingFeeSuccess.vue

@@ -10,7 +10,12 @@
       <k-button title="查看缴费记录" style="margin-bottom: 24px;" @click="page_button" />
       <k-button title="查看缴费记录" style="margin-bottom: 24px;" @click="page_button" />
       <k-button type="outline" title="返回首页" @click="page_button1" />
       <k-button type="outline" title="返回首页" @click="page_button1" />
     </div>
     </div>
-
+    <div class="pay-success-wenjuan" v-if="isLogin && pointsNew !== ''" @click="goSceneUser()">
+      <span>填写问卷,获取{{pointsNew}}积分</span>
+    </div>
+    <!-- <div class="pay-success-wenjuan" @click="goSceneUser()">
+      <span>填写问卷,获取1000积分</span>
+    </div> -->
     <!--    <div :class="{'page_button': true, 'blue_page_button': custTypeId === 1, 'green_page_button': custTypeId === 2}" @click="page_button">查看缴费记录</div>-->
     <!--    <div :class="{'page_button': true, 'blue_page_button': custTypeId === 1, 'green_page_button': custTypeId === 2}" @click="page_button">查看缴费记录</div>-->
     <!--    <div :class="{'page_button1': true, 'blue_page_button1': custTypeId === 1, 'green_page_button1': custTypeId === 2}" @click="page_button1">返回首页</div>-->
     <!--    <div :class="{'page_button1': true, 'blue_page_button1': custTypeId === 1, 'green_page_button1': custTypeId === 2}" @click="page_button1">返回首页</div>-->
   </div>
   </div>
@@ -60,6 +65,15 @@ export default {
     color: #999999;
     color: #999999;
     margin-bottom: 10px;
     margin-bottom: 10px;
   }
   }
+  .pay-success-wenjuan {
+    color: var(--k-color-primary);
+    margin-top:140px;
+    span {
+      display: inline-block;
+      text-decoration: underline;
+    }
+    
+  }
   .pay-success-dec {
   .pay-success-dec {
     /* 请在20分钟内离场 */
     /* 请在20分钟内离场 */
 
 

+ 6 - 1
src/utils/api-kip.js

@@ -226,4 +226,9 @@ export function getVIPIntegral(){
 // 通过sessionId获取token
 // 通过sessionId获取token
 export const getTokenById = ( query )=> {
 export const getTokenById = ( query )=> {
 	return request.get('/oauth/v1/oauth/credit/achieve', query, {skipCodeCheck: true, requireLogin: false});
 	return request.get('/oauth/v1/oauth/credit/achieve', query, {skipCodeCheck: true, requireLogin: false});
-  };
+  };
+
+// 问卷调查 无场景触发
+export function getSceneUser(params = {}) {
+	return request.get('/questionnaire/v1/scene/user', params)
+}

+ 6 - 0
src/utils/index.js

@@ -189,6 +189,7 @@ export function initEnv() {
     window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
     window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
     window.api = 'qaApi';
     window.api = 'qaApi';
     window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
     window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
+    window.QUESTIONNAIRE_BASE_URL = 'https://qa-questionnaire.kerryplus.com';
     // window.env = 'dev';
     // window.env = 'dev';
     // window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
     // window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
     // window.cmrApi = 'https://dev-crm.kerryplus.com/xcrm-api/api';
     // window.cmrApi = 'https://dev-crm.kerryplus.com/xcrm-api/api';
@@ -207,6 +208,7 @@ export function initEnv() {
     window.api = 'devApi';
     window.api = 'devApi';
     window.wechatOfficialAccountId = 'wxb81a622ed6d60adf';
     window.wechatOfficialAccountId = 'wxb81a622ed6d60adf';
     window.QR_CODE_BASE_URL = 'https://pd.kerryplus.com';
     window.QR_CODE_BASE_URL = 'https://pd.kerryplus.com';
+    window.QUESTIONNAIRE_BASE_URL = 'https://dev-questionnaire.kerryonvip.com';
     return;
     return;
   }
   }
   if ( origin.indexOf('https://qa-') > -1 ) {
   if ( origin.indexOf('https://qa-') > -1 ) {
@@ -216,6 +218,7 @@ export function initEnv() {
     window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
     window.cmrApi = 'https://qa-crm.kerryplus.com/xcrm-api/api';
     window.wechatOfficialAccountId = 'wxb81a622ed6d60adf';
     window.wechatOfficialAccountId = 'wxb81a622ed6d60adf';
     window.QR_CODE_BASE_URL = 'https://pq.kerryplus.com';
     window.QR_CODE_BASE_URL = 'https://pq.kerryplus.com';
+    window.QUESTIONNAIRE_BASE_URL = 'https://qa-questionnaire.kerryplus.com';
     return;
     return;
   }
   }
   if ( origin.indexOf('https://sl-') > -1 ) {
   if ( origin.indexOf('https://sl-') > -1 ) {
@@ -225,6 +228,7 @@ export function initEnv() {
     window.api = 'api';
     window.api = 'api';
     window.wechatOfficialAccountId = 'wxb150c7d193e8662d'
     window.wechatOfficialAccountId = 'wxb150c7d193e8662d'
     window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
     window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
+    window.QUESTIONNAIRE_BASE_URL = 'https://sl-questionnaire.kerryplus.com';
     return;
     return;
   }
   }
   if ( origin.indexOf('https://lt-') > -1 ) {
   if ( origin.indexOf('https://lt-') > -1 ) {
@@ -234,6 +238,7 @@ export function initEnv() {
     window.api = 'api';
     window.api = 'api';
     window.wechatOfficialAccountId = 'wx2bd99ca94d6acd7e';
     window.wechatOfficialAccountId = 'wx2bd99ca94d6acd7e';
     window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
     window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
+    window.QUESTIONNAIRE_BASE_URL = 'https://lt-questionnaire.kerryplus.com';
     return;
     return;
   }
   }
   window.env = 'prod';
   window.env = 'prod';
@@ -242,6 +247,7 @@ export function initEnv() {
   window.api = 'api';
   window.api = 'api';
   window.wechatOfficialAccountId = 'wxb150c7d193e8662d';
   window.wechatOfficialAccountId = 'wxb150c7d193e8662d';
   window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
   window.QR_CODE_BASE_URL = 'https://p.kerryplus.com';
+  window.QUESTIONNAIRE_BASE_URL = 'https://questionnaire.kerryplus.com';
 }
 }
 
 
 export function requestInit() {
 export function requestInit() {