Merge branch 'feature/GFRS-615【待确定】问卷' into dev

src/assets/js/utils/wxShare.js

@@ -18,9 +18,9 @@ export function weixinShare(options) {
 
       wx.config({
         //debug: true,
-        appId: data.appId,
+        appId: data.appid,
         timestamp: data.timestamp,
-        nonceStr: data.nonceStr,
+        nonceStr: data.noncestr,
         signature: data.signature,
         jsApiList: ['onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareWeibo']
       })
@@ -47,3 +47,7 @@ export function weixinShare(options) {
     }
   })
 }
+
+export function closeWindow() {
+  wx.closeWindow()
+}

src/views/ebiz/survey/ShareCover.vue

@@ -46,7 +46,7 @@
       <img v-if="resultImgUrl != 'PHYSICAL'" style="width: 100%;" src="@/assets/images/shareSurveyResult_1.png" />
       <img style="width: 100%;" :src="resultImgUrl" />
       <div class="mt30 mr2 ml2">
-        <van-button type="danger" style="width: 100%;" @click="showType = 'Detail'">返回</van-button>
+        <van-button type="danger" style="width: 100%;" @click="closeWXWindow">返回</van-button>
       </div>
     </div>
     <!-- 底部透明 -->
@@ -66,7 +66,7 @@
 <script>
 import { Field, CellGroup, Popup, Picker, List, Cell, Row, Col, RadioGroup, Radio, Button } from 'vant'
 import { getSurveyQuestion, saveSurveyAnswer, getSurveyAgentInfo } from '@/api/ebiz/survey/survey'
-import { weixinShare } from '@/assets/js/utils/wxShare.js'
+import { weixinShare, closeWindow } from '@/assets/js/utils/wxShare.js'
 
 export default {
   components: {
@@ -174,7 +174,7 @@ export default {
       let returnFlag = true
       that.questionList.map(item => {
         if (!that.anwerJson[item.orderCode + '']) {
-          that.$toast('请完成全部档案填写')
+          that.$toast('请认真填写问卷的全部内容！')
           returnFlag = false
         }
       })
@@ -223,6 +223,9 @@ export default {
     callPhone() {
       console.log('callPhone')
       window.location.href = 'tel://' + this.agentInfo.mobile
+    },
+    closeWXWindow() {
+      closeWindow()
     }
   }
 }