chengjie 5 månader sedan
förälder
incheckning
778ae89fd7
2 ändrade filer med 2 tillägg och 7 borttagningar
  1. 1 2
      pages/main/article.js
  2. 1 5
      pages/main/article.wxml

+ 1 - 2
pages/main/article.js

@@ -358,8 +358,7 @@ Page({
358
     });
358
     });
359
     
359
     
360
     let url = common.Encrypt("GeneratePDF");
360
     let url = common.Encrypt("GeneratePDF");
361
-    url = "https://www.kylx365.com/apiData/" + url;
362
-    //url="http://localhost:3020/api/GeneratePDF";
361
+    url =app.globalData.serverUrl + url;
363
     wx.request({
362
     wx.request({
364
       url: url,
363
       url: url,
365
       method: "POST",
364
       method: "POST",

+ 1 - 5
pages/main/article.wxml

@@ -12,7 +12,7 @@
12
 
12
 
13
   <view wx:if="{{!IsShowQuestion}}" class="panelFooter FlexRow">
13
   <view wx:if="{{!IsShowQuestion}}" class="panelFooter FlexRow">
14
     <view class="panelFooter1 FlexRow">
14
     <view class="panelFooter1 FlexRow">
15
-      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="goto" data-url="">
15
+      <view class="panelFooter11 panelFooter10 FlexColumn" bindtap="generatePDF">
16
         <image src="../images/sysIcon_a07.png" class="sysIcon_a03"></image>
16
         <image src="../images/sysIcon_a07.png" class="sysIcon_a03"></image>
17
         <view class="text02">PDF下载</view>
17
         <view class="text02">PDF下载</view>
18
       </view>
18
       </view>
@@ -86,17 +86,13 @@
86
         <switch class="switchClass" bindchange="showData"  data-name="IsShowLightColor"/>
86
         <switch class="switchClass" bindchange="showData"  data-name="IsShowLightColor"/>
87
       </view>
87
       </view>
88
     </view>
88
     </view>
89
-    
90
     <view class="btnClose btnClose2 FlexRow" capture-bind:tap="showData" data-name="IsShowSetting">
89
     <view class="btnClose btnClose2 FlexRow" capture-bind:tap="showData" data-name="IsShowSetting">
91
       <image  wx:if="{{ThemeCSS=='DarkColor'}}" src="../images/sysIcon_a03.png" class="sysIcon_a03"></image>
90
       <image  wx:if="{{ThemeCSS=='DarkColor'}}" src="../images/sysIcon_a03.png" class="sysIcon_a03"></image>
92
       <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_a09.png" class="sysIcon_a03"></image>
91
       <image  wx:if="{{ThemeCSS=='LightColor'}}" src="../images/sysIcon_a09.png" class="sysIcon_a03"></image>
93
     </view>
92
     </view>
94
   </view>
93
   </view>
95
-
96
 </view>
94
 </view>
97
 
95
 
98
-
99
-
100
 <view wx:if="{{IsShowPanelHelp}}" class="panelHelp container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
96
 <view wx:if="{{IsShowPanelHelp}}" class="panelHelp container FlexColumn" style='min-height:{{Containnerheight}}rpx;'>
101
   <view class="panelHelp1">
97
   <view class="panelHelp1">
102
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>
98
     <image src="../images/sysIcon_b07.png" class="sysIcon_b07"></image>