Merge branch 'liuxin' into develop

src/pages/messageCenter/message-list.vue

@@ -45,7 +45,7 @@
                 </div>
               </div>
             </div>
-            <div v-if="item.notice_type==2" class="detail-wrap" @click="goDetail">
+            <div v-if="item.notice_type==2" class="detail-wrap" @click="goDetail(item.notice_id)">
               <div class="detail-wrap-content">
                 <span>查看详情</span>
                 <img src="@/assets/messageCenter/right-gray.png" >
@@ -119,9 +119,12 @@ export default {
         }
       }
     },
-    goDetail () {
+    goDetail (e) {
       this.$router.push({
         name: 'RejectDetail',
+        params: {
+          notice_id: e,
+        },
       })
     },
     getInfo () {

src/pages/messageCenter/reject-detail.vue

@@ -9,14 +9,41 @@
     <h-content>
       <div class="userInfo">审批意见</div>
       <div class="info-content">
-        <p>XXXXXXXXX。请联系业务员重新提交申请，谢谢！</p>
+        <p>{{ notice_detail }}</p>
       </div>
     </h-content>
   </h-view>
 </template>
 <script>
 export default {
-
+  data () {
+    return {
+      notice_detail: '',
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getDetail()
+    })
+  },
+  methods: {
+    getDetail () {
+      let vm = this
+      let url = process.env.basePath + 'app_notice_detail_query'
+      let param = {
+        notice_id: vm.$route.params.notice_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.notice_detail = res.info.notice_detail
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+  },
 }
 </script>
 <style lang="less" >

src/pages/pay/pay-page.vue

@@ -72,6 +72,9 @@ export default {
     return {
       name: '',
       url: '',
+      info: {
+
+      },
       showSelect: false,
       showpay: true,
       isSuccess: false,
@@ -102,6 +105,22 @@ export default {
         vm.showpay = false
       }, 1000)
     },
+    getDetail () {
+      let vm = this
+      let url = process.env.basePath + 'order_info_query'
+      let param = {
+        order_id: vm.$route.params.order_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     searchResult () {
       let vm = this
       let url = process.env.basePath + 'merchant_query_order'