Merge remote-tracking branch 'origin/dev' into dev

src/apps/AppAskForm/components/List.vue

@@ -6,7 +6,7 @@
     </ai-top-fixed>
     <div class="form-list">
       <div class="form-item" v-for="(item, index) in list" :key="index"
-           @click="info = item, id = item.id, isShow = true">
+           @click="showPopup(item)">
         <div class="form-item__top">
           <div class="form-item__left">
             <h2>{{ item.title }}</h2>
@@ -125,6 +125,20 @@ export default {
       })
     },
 
+    showPopup (item) {
+      if (item.status === '2') {
+        this.$confirm('表单已停止发布，请在后台管理系统中查看调查结果', '', {
+          showCancel: false
+        })
+
+        return false
+      }
+
+      this.info = item
+      this.id = item.id
+      this.isShow = true
+    },
+
     toStop() {
       this.$http.post(`/app/appquestionnairetemplate/stopRelease?id=${this.info.id}`).then(res => {
         if (res.code === 0) {

src/apps/AppAskForm/components/Result.vue

@@ -28,6 +28,8 @@
 </template>
 
 <script>
+  import {mapActions} from 'vuex'
+
   export default {
     name: 'Result',
 
@@ -39,6 +41,8 @@
     },
 
     methods: {
+      ...mapActions(['injectJWeixin', 'wxInvoke']),
+
       copy() {
         let oInput = document.createElement('input')
         oInput.value = this.params.linkUrl

src/apps/AppAskForm/formDetail.vue

@@ -126,6 +126,9 @@ export default {
     }
   },
   methods: {
+    emitShow(){
+      document.title = this.form.title || "调查问卷"
+    },
     getForm() {
       let {id} = this.$route.query
       this.$http.post("/app/appquestionnairetemplate/queryDetailById", null, {
@@ -223,9 +226,6 @@ export default {
   },
   created() {
     this.isResult ? this.getResult() : this.getForm()
-  },
-  mounted() {
-    document.title = this.form.title || "调查问卷"
   }
 }
 </script>