up

pages/apply/apply.wxml

@@ -7,7 +7,7 @@
         <text wx:if="{{item.order_status == 2}}">学习中</text> 
         <text wx:if="{{item.order_status == 3}}">已完成</text> 
         <text style="color:green;">{{item.train_type}}</text></view>
-        <view class="title">{{item.name}}   {{item.phone}}  <text>{{item.class_name}}（{{item.ctime}}）</text></view>
+        <view class="title">{{item.name}}   {{item.phone}}  <text>{{item.class_name}}</text></view>
         <view class="info">
             <text>{{item.subject_item_1[0]}}</text>
             <text decode="{{true}}">作业类别  &nbsp;&nbsp; {{item.subject_item_1[1]}}</text>

pages/index/index.wxml

@@ -9,7 +9,7 @@
     <view class="zd"></view>
     <image src="../../images/tt.png" mode="widthFix"></image>
       <view class="marquee_text">
-        <text wx:for="{{news}}">{{item}}</text>
+        <navigator url="../intro/intro?id={{item.id}}&type=1" wx:for="{{news}}">{{item.title}}</navigator>
       </view>
   </view>
   <block wx:for="{{data}}" wx:key='*this'>
@@ -63,7 +63,7 @@
         <!-- <text bindtap='tabchange' data-id='2' class="{{act==2 ? 'active':''}}">咨询文章</text> -->
     </view>
     <view wx:for="{{data}}" wx:key='*this' wx:if="{{item.type=='article' && act == index}}" class="article">
-        <navigator url="../intro/intro?id={{list.id}}" class="list" wx:for="{{item.list}}" wx:for-item="list" wx:key='*this'>
+        <navigator url="../intro/intro?id={{list.id}}&type=1" class="list" wx:for="{{item.list}}" wx:for-item="list" wx:key='*this'>
             <view>{{list.title}}</view>
             <text>{{list.ctime}}</text>
         </navigator>

pages/index/index.wxss

@@ -161,6 +161,6 @@ page{
   animation-iteration-count: infinite;
   animation-timing-function:linear;
 }
-.marquee_text text{
+.marquee_text navigator{
   margin-right: 200px;
 }

pages/intro/intro.js

@@ -7,13 +7,26 @@ Page({
    * 页面的初始数据
    */
   data: {
-    
+    datas:{
+      imgs:[]
+    },
+    type:1
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    if(options.type){
+      this.setData({
+        type:1
+      })
+    }else{
+      this.setData({
+        type: 0
+      })
+    }
+    
     wx.request({
       url: host + '/api/wx/article?id=' + options.id,
       method: 'GET',

pages/intro/intro.wxml

@@ -1,4 +1,4 @@
-<block wx:if="{{data.imgs.length>0}}">
+<block wx:if="{{!type}}">
       <swiper indicator-dots="true"  autoplay="{{true}}" interval="3000" duration="500">
         <block wx:for="{{data.imgs}}" wx:key="*this">
           <swiper-item>
@@ -22,8 +22,10 @@
               <image src="../../images/addr.png" mode="widthFix"></image>
           </view>
       </view>
-    </block>
-<view class="content">
+      <editor style="height:calc(100vh - 300px);margin-top:10px;" read-only="{{true}}" id="editor"  class="ql-container">
+    </editor>
+</block>
+<view wx:else class="content">
     <!-- <view class="title">{{data.title}}</view> -->
     
     <editor style="height:100vh;margin-top:10px;" read-only="{{true}}" id="editor"  class="ql-container">