Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !51

src/views/appointDetails/index.vue

@@ -278,7 +278,7 @@ export default {
       console.log('window.miniProgram', window._miniprogram);
       if (window._miniprogram) {
         this.$rocNative.WXInstance.miniProgram.navigateTo({
-          url:`/pagesInsurance/binding-code/index?yunOrderNo=${this.yunOrderNo}&detectionRecordId=${detectionServiceRecordId}&pprotocolType=${pprotocolType}&channelSource=insurance_channel`
+          url:`/pagesInsurance/binding-code/index?yunOrderNo=${this.yunOrderNo}&projectEquityNo=${this.projectEquityNo}&detectionRecordId=${detectionServiceRecordId}&pprotocolType=${pprotocolType}&channelSource=insurance_channel`
         });
       } else {
         this.$router.push({

src/views/home/index.vue

@@ -133,7 +133,7 @@ export default {
     checkStatus(res) {
       this.yunOrderNo = res.data.yunOrderNo;
       this.query.yunOrderNo = res.data.yunOrderNo;
-      this.status = res.data.status;
+      this.status = res.data.statusCode;
 
       this.getDetectionName(this.yunOrderNo);
       switch (this.status) {

src/views/insurance-question-result/insuranceQuestionResult.vue

@@ -36,7 +36,7 @@
           建议您进行以下防癌筛查：
         </div>
         <div class="ad-fs">
-          {{ result.detectName || '' }}
+          {{ detectionName || '' }}
         </div>
       </div>
       <div
@@ -63,7 +63,8 @@
 </template>
 
 <script>
-import {getButtonStatus} from '@/api/question';
+import { getButtonStatus } from '@/api/question';
+import {getDetectionName} from '@/api/appoint';
 export default {
   data() {
     return {
@@ -76,7 +77,7 @@ export default {
         background: '',
       },
       needDetect: false,
-      result: {},
+      detectionName:'',
       detailInfo: {},
       isLoading: true,
       projectEquityNo: '',
@@ -90,11 +91,14 @@ export default {
   },
 
   mounted() {
-    console.log(11223);
+
     const { query } = this.$route;
+
     this.query = query;
-    this.needDetect = query.needDetect === 1;
+    this.needDetect = !(query.needDetect == '1');
+    console.log('query', this.needDetect);
     this.getButtonStatus(query.yunOrderNo);
+    this.getDetectionName(query.yunOrderNo);
   },
   methods: {
     statusMap(status) {
@@ -108,14 +112,24 @@ export default {
       };
       return m[status];
     },
-
+     // 目前是配置一个检测信息，可能会拓展，所以返回的是一个list
+     getDetectionName(yunOrderNo) {
+      getDetectionName(yunOrderNo).then(res => {
+        if (res.code === '000000' && res.data) {
+          const dectionData = res.data[0] || {};
+          console.log('dectionData.detectionName', dectionData.detectionName);
+          this.detectionName = dectionData.detectionName;
+          this.$store.dispatch('home/setInsuranceInfo', dectionData);
+        }
+      });
+    },
     // 去预约
     toAppoint() {
       if (this.buttonStatus) {
-        const {projectEquityNo, orderNo, yunOrderNo} = this.query;
+        const {projectEquityNo, externalOrderNo, yunOrderNo} = this.query;
         this.$router.push({
           path: '/appoint',
-          query: {projectEquityNo, orderNo, yunOrderNo},
+          query: {projectEquityNo, externalOrderNo, yunOrderNo},
         });
       }
     },
@@ -180,6 +194,7 @@ background: #fff;
     font-size: 12px;
     font-weight: 400;
     color: #999999;
+    margin-bottom:6px ;
   }
   .ad-fs {
     font-size: 18px;