Merge branch 'master' of http://118.190.145.217:3000/xiaojincai/zkyxcx

pages/actDetail/actDetail.wxml

@@ -6,7 +6,10 @@
     </view>
     <view class="tweo">
       <view>发布单位：{{info.journal_name}}</view>
+      <view>出版信息：{{info.publish_info}}</view>
+      <view>DOI信息：{{info.doi}}</view>
       <view>作者：{{info.author}}</view>
+      <view>作者单位：{{info.author_unit}}</view>
       <view>发表时间：{{info.publish_time}}</view>
       <text wx:if='{{info.is_collected}}' class="collect" data-id='1' bindtap="collect">取消收藏</text>
       <text wx:else class="collect" bindtap="collect">收藏</text>

pages/verify/verify.js

@@ -14,7 +14,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    options.sid=1;
+    const q = decodeURIComponent(options.q) 
     wx.showNavigationBarLoading();
     wx.getStorage({
       key: 'uid',
@@ -23,7 +23,7 @@ Page({
           wx.request({
             url: host + '/api/signup/verify',
             method: 'POST',
-            data: { uid: res.data, sid: options.sid },
+            data: { uid: res.data, sid: q},
             success: result => {
               wx.hideLoading();
               this.setData({

pages/verify/verify.wxml

@@ -1,11 +1,11 @@
 <view wx:if='{{check==false}}'>
     <icon class="icon-box-img" type="warn" size="100"></icon>
     <text>您没有该会议的核销权限</text>
-    <navigator>返回首页</navigator>
+    <navigator url="../index/index" open-type="switchTab">返回首页</navigator>
 </view>
 
 <view wx:if='{{check==true}}'>
     <icon class="icon-box-img" type="success" size="100"></icon>
     <text>核销成功</text>
-    <navigator>返回首页</navigator>
+    <navigator url="../index/index" open-type="switchTab">返回首页</navigator>
 </view>