2022.8.26

riku

2022-08-26 9f78f3f014a3423ea3fcab8f9f1056c57cd47fc8

2022.8.26

 app.js

@@ -12,9 +12,11 @@
    //     // å‘送 res.code åˆ°åŽå°æ¢å– openId, sessionKey, unionId
    //   }
    // })
    console.log('onLaunch');
  },
  globalData: {
    userInfo: null,
    accessToken: null,
    isLogin: false
  }
})

 app.json

@@ -8,7 +8,7 @@
    "pages/promise/promise",
    "pages/assessment/assessment",
    "pages/mine/mine",
    "pages/learn/learn",
    "pages/module_learn/learn/learn",
    "pages/grade/grade",
    "pages/gradedetail/gradedetail",
    "pages/promisefile/promisefile",
@@ -33,7 +33,9 @@
    "pages/icons/icons",
    "pages/module_common/pagevideo/pagevideo",
    "pages/module_consult/consultresultmore/consultresultmore",
    "pages/module_consult/consultdetailitem/consultdetailitem"
    "pages/module_consult/consultdetailitem/consultdetailitem",
    "pages/module_learn/learfile/learnfile",
    "pages/module_learn/learncase/learncase"
  ],
  "window": {
    "backgroundTextStyle": "light",

 component/progress/progress.js

@@ -94,7 +94,7 @@
      wx.createSelectorQuery().in(this)
        .select("#canvasProgressbg")
        .context(function (res) {
          console.log("节点实例：", res);
          // console.log("节点实例：", res);
          // èŠ‚点对应的 Canvas å®žä¾‹ã€‚
          ctx = res.context;
          ctx.setLineWidth(8); // è®¾ç½®åœ†çŽ¯çš„宽度
@@ -151,7 +151,7 @@
      wx.createSelectorQuery().in(this)
        .select("#canvasProgress")
        .context(function (res) {
          console.log("节点实例：", res); // èŠ‚点对应的 Canvas å®žä¾‹ã€‚
          // console.log("节点实例：", res); // èŠ‚点对应的 Canvas å®žä¾‹ã€‚
          ctx = res.context;
          // è®¾ç½®æ¸å˜
          var gradient = ctx.createLinearGradient(0, 0, 0, 200);

 pages/assessment/assessment.js

@@ -121,12 +121,6 @@
    this.ecComponent = this.selectComponent('#mychart-dom-line');
    this.initChart()
    // }, 1000);

    wx.startPullDownRefresh({
      success: (res) => {},
      fail: (res) => {},
      complete: (res) => {},
    })
  },

  /**
@@ -134,6 +128,11 @@
   */
  onShow: function () {
    var that = this
    wx.startPullDownRefresh({
      success: (res) => {},
      fail: (res) => {},
      complete: (res) => {},
    })
  },

  onPullDownRefresh(){
@@ -206,6 +205,7 @@
            text1: "",
            text2: "本次测评已完成",
            text3: "查看详情",
            hasScore: true
          })
        } else {
          that.setData({
@@ -213,6 +213,7 @@
            text2: "请尽快完成测评",
            text3: "去测评",
            score: undefined,
            hasScore: false
          })
        }

@@ -226,8 +227,10 @@
            color: d.color,
            rank: d.rank,
            level: d.level,
            period: d.period,
            time: d.period.replace('/', 'å¹´').replace(/\-[0-9]+/, '月'),
            scoreId: d.tPGuid
            scoreId: d.tPGuid,
            updateTime: moment(d.updateDate).format('YYYY-MM-DD hh:mm')
          })

          //折线图数据

 pages/assessment/assessment.wxml

@@ -14,6 +14,7 @@
        <view class="title">{{text1}}</view>
        <view class="title">{{text2}}</view>
        <view class="tag">测评截止时间：{{deadline}}</view>
        <image wx:if="{{hasScore}}" src="/res/icons/complete.png" class="t-image" mode="aspectFit"></image>
      </view>
      <view class="btn" bindtap="goto" data-index="0">{{text3}}</view>
    </view>
@@ -24,10 +25,10 @@

  <view class="page__bd">
    <view style="margin-left: 10px;">分类测评</view>
    <view class="top-card top-card_main">
      <image src="/res/icons/ass_1.png" mode="aspectFit"></image>
    <view class="top-card top-card_main" bindtap="goto" data-index="0">
      <image src="/res/icons/ass_3.png" mode="aspectFit"></image>
      <view>
        <view class="top-card__name">综合自测智评</view>
        <view class="top-card__name">守法自测智评</view>
        <view class="top-card__tag">点击进行测评 ></view>
      </view>
      <!-- <mp-icon icon="arrow" class="" size="15" color="white"></mp-icon> -->
@@ -35,18 +36,18 @@
    <view class="flex-h">
      <view class="flex-h_block">
        <view class="top-card">
          <image src="/res/icons/ass_1.png" mode="aspectFit"></image>
          <image src="/res/icons/ass_2.png" mode="aspectFit"></image>
          <view>
            <view class="top-card__name">其他专项自测</view>
            <view class="top-card__name">碳排放智能估算</view>
            <view class="top-card__tag">点击进行测评 ></view>
          </view>
        </view>
      </view>
      <view class="flex-h_block">
        <view class="top-card top-card_2">
          <image src="/res/icons/ass_2.png" mode="aspectFit"></image>
          <image src="/res/icons/ass_1.png" mode="aspectFit"></image>
          <view>
            <view class="top-card__name">碳排放智能估算</view>
            <view class="top-card__name">其他专项自测</view>
            <view class="top-card__tag">点击进行测评 ></view>
          </view>
        </view>
@@ -80,6 +81,7 @@
      <view style="flex: 1;">
        <view class="history_time">{{item.time}}</view>
        <view class="h-cell fyui-panel">
          <view class="h-tag">{{item.updateTime}}</view>
          <view class="h-line_1">
            <view class="flex-h">
              <view class="h-score" style="background-color: {{item.color}};">
@@ -90,7 +92,7 @@
                <view>风险等级：{{item.level}}</view>
              </view>
            </view>
            <view data-id="{{item.scoreId}}" class="h-btn" bindtap="goto" data-index="1" data-period="{{item.time}}">去看看</view>
            <view data-id="{{item.scoreId}}" class="h-btn" bindtap="goto" data-index="1" data-period="{{item.period}}">去看看</view>
          </view>
          <!-- <view class="h-line_2">
            <view data-id="{{item.scoreId}}" class="h-btn" bindtap="goto" data-index="1" data-period="{{item.time}}">去看看</view>

 pages/assessment/assessment.wxss

@@ -24,6 +24,11 @@
  margin-top: 8px;
}

.page__hd .t-image {
  width: 100px;
  height: 100px;
}

.page__hd .btn {
  border-radius: 20px;
  line-height: 20px;
@@ -85,6 +90,15 @@
  font-size: 14px;
}

.h-tag{
  position: absolute;
  color: var(--fyui-text-color_3);
  font-size: 12px;
  text-align: end;
  bottom: 0;
  right: 8px;
}

.flex-h_block {
  flex: 1;
}
@@ -92,7 +106,7 @@
.top-card {
  position: relative;
  border-radius: 4px;
  background: linear-gradient(90deg, #87CEB2, #6CD398);
  background: linear-gradient(90deg, #A3D9F5, #88E1EC);
  color: white;
  padding: 8px;
  margin-left: 10px;
@@ -103,12 +117,13 @@
}

.top-card_2 {
  background: linear-gradient(90deg, #A3D9F5, #88E1EC);
  background: linear-gradient(90deg, #87CEB2, #6CD398);
  margin-left: 2px;
  margin-right: 10px;
}

.top-card_main {
  background: linear-gradient(90deg, #55E2C9, #b6e9dc);
  margin-left: 10px;
  margin-right: 10px;
  margin-bottom: 4px;
@@ -126,7 +141,7 @@
}

.top-card .top-card__name {
  font-size: 12px;
  font-size: 14px;
  /* width: 100%; */
  /* font-weight: 600; */
  /* text-align: center; */

 pages/gradereport/gradereport.js

@@ -243,6 +243,12 @@
                itemlist: []
              }
              rule.forEach(r => {
                // fixme :  æ­¤å¤„暂时将【餐饮】类型的企业评估建议的第一句话删除
                if (app.globalData.userInfo.extension2  === '1') {
                  const i = r.third.indexOf('，')
                  r.third = r.third.slice(i+1)
                  r.third = r.third.replace('ä½ ', '您')
                }
                p.itemlist.push({
                  ruleName: r.first,
                  score: r.second,

 pages/gradereport/gradereport.wxml

@@ -28,10 +28,11 @@
    <!-- å¤±åˆ†æ¡ç›® -->
    <view class="fyui-panel fyui-panel__max">
      <view class="fyui-panel_title">自评诊断</view>
      <view>
      <view wx:if="{{losePoints.length > 0}}">
        æœ¬æ¬¡æµ‹è¯„主要失分类别为<text style="color: orange;font-weight: 600;font-size: 16px;" wx:for="{{losePointsItem}}" wx:key="index">{{index > 0 ? "、" : ""}}{{item}}</text>
        ï¼Œå…±è®¡<text style="color: orange;font-weight: 600;font-size: 18px;">{{losePoints.length}}</text>项，具体情况如下：
        ç­‰å…±è®¡<text style="color: orange;font-weight: 600;font-size: 18px;">{{losePoints.length}}</text>项，具体问题诊断及建议如下：
      </view>
      <view wx:else="">您本次自评满分，暂无诊断建议。</view>
      <block wx:for="{{losePoints}}" wx:key="index">
        <view class="{{index !=0 ? 'first' : ''}}">
          <view class="fyui-panel_title">{{index + 1}}. ã€<text style="color: orange;">{{item.baseRule}}</text>】{{item.name}}</view>
@@ -40,7 +41,7 @@
              <view>问题：</view>{{rule.ruleName}}
            </view>
            <view class="fyui-panel_desc">
              <view>失分：</view><text style="color: orange;">{{rule.score}}分</text>
              <view>扣分：</view><text style="color: orange;">{{rule.score}}分</text>
            </view>
            <view class="fyui-panel_desc">
              <view>建议：</view>{{rule.remark}}

 pages/home/home.js

@@ -73,6 +73,12 @@
    this.getLedgerType()
  },

  onShow(){
    if (app.globalData.isLogin) {
      
    }
  },

  onPullDownRefresh(){
    console.log('onPullDownRefresh');
    wx.stopPullDownRefresh({
@@ -246,7 +252,7 @@
        break;
      case "3":
        //在线守法学习
        url = `/pages/learn/learn`
        url = `/pages/module_learn/learn/learn`
        break;
      case "4":
        //守法动态

 pages/home/home.wxml

@@ -25,23 +25,43 @@
    <view class="flex-h">
      <view class="flex-h_block">
        <view class="top-card" bindtap="goto" data-index="0">
          <view>
          <view class="top-card__score"><text class="top-card__num">{{historyPoint.score}}</text>分</view>
          <view class="top-card__time">自测智评得分 ></view>
          <image src="/res/icons/wm_assessment.png"></image>
          </view>
          <view class="top-card__items">
            <view class="top-card__item">
              <view>守法排名</view>
              <text>{{historyPoint.rank}}</text>
            </view>
            <view class="top-card__item">
              <view>守法指数</view>
              <text>{{historyPoint.legalIndex}}</text>
            </view>
            <!-- <view class="top-card__item">
              <view>违法指数</view>
              <text>{{historyPoint.illegalIndex}}</text>
            </view> -->
          </view>
          <image src="/res/icons/wm_assessment.png" mode="aspectFit"></image>
        </view>
      </view>
      <view class="flex-h_block">
        <view class="top-card top-card_2" bindtap="goto" data-index="5">
          <view>
          <view class="top-card__score"><text class="top-card__num">{{monthInfo.percent}}</text>%</view>
          <view class="top-card__time">台账完成率 ></view>
          <image src="/res/icons/wm_ledger.png"></image>
          </view>
          <image src="/res/icons/wm_ledger.png" mode="aspectFit"></image>
        </view>
        <view class="top-card top-card_3" bindtap="goto" data-index="6">
          <view>
          <view class="top-card__score">{{promsieInfo.leftDays > 0 ? '剩余' : '失效'}}
            <text class="top-card__num">{{promsieInfo.leftDays > 0 ? promsieInfo.leftDays : 0 - promsieInfo.leftDays}}</text>天
          </view>
          <view class="top-card__time">承诺倒计时 ></view>
          <image src="/res/icons/wm_commitment.png"></image>
          </view>
          <image src="/res/icons/wm_commitment.png" mode="aspectFit"></image>
        </view>
      </view>
    </view>

 pages/home/home.wxss

@@ -6,6 +6,9 @@

.page__title {
  margin-left: 10px;
  font-size: 18px;
  color: var(--fyui-text-color_1);
  /* font-weight: 600; */
}

.flex-h_block{
@@ -23,6 +26,10 @@
  margin-left: 10px;
  margin-right: 2px;
  height: 20vh;
  text-align: center;
  display: flex;
  flex-direction: column;
  justify-content: space-between;
}

.top-card_2 {
@@ -32,6 +39,7 @@
  height: 8.5vh;
  background-color: #DDEEFF;
  color: #2B7BCB;
  text-align: start;
}

.top-card_3 {
@@ -41,24 +49,28 @@
  height: 8.5vh;
  background-color: #FAFCF0;
  color: #859438;
  text-align: start;
}

.top-card>image{
  width: 15vh;
  height: 18vh;
  width: 12vh;
  height: 12vh;
  position: absolute;
  bottom: 0px;
  right: 0px;
  opacity: 0.6;
}

.top-card_2>image{
  width: 13vw;
  height: 14vw;
  opacity: 0.5;
}

.top-card_3>image{
  width: 13vw;
  height: 14vw;
  opacity: 0.5;
}

.top-card .top-card__time {
@@ -102,7 +114,7 @@
}

.top-card__items .top-card__item view {
  color: #ffffffde;
  /* color: #ffffffde; */
  font-size: 12px;
}


 pages/mine/mine.js

@@ -18,4 +18,10 @@
      userRealName: app.globalData.userInfo.realname
    })
  },

  logout() {
    wx.reLaunch({
      url: '/pages/module_user/userlogin/userlogin',
    })
  }
})

 pages/mine/mine.wxml

@@ -2,7 +2,7 @@
<view class="page">
  <view class="page__hd">
    <view class="flex-h">
      <image class="user-icon" src="/res/icons/btn_bg_4.png" mode="aspectFill"></image>
      <image class="user-icon" src="/res/icons/learn_2.png" mode="aspectFill"></image>
      <view class="flex-v">
        <view class="user-name">{{userRealName}}</view>
        <view class="user-tag"></view>
@@ -36,6 +36,6 @@
  </view>

  <view class="page__ft">
    <view class="logout" bindtap="onSubmit">退出账户</view>
    <view class="logout" bindtap="logout">退出账户</view>
  </view>
</view>

 pages/module_common/pagevideo/pagevideo.wxml

@@ -9,7 +9,7 @@
        {{video.lrResourcetitle}}
      </view>
      <view class="fyui-box__bd">
        <view class="fyui-box__content">{{video.lrResourcetitle}}</view>
        <view class="fyui-box__content">{{video.lrResourcedesc}}</view>

      </view>
      <view class="fyui-box__ft">

 pages/module_consult/consulthome/consulthome.js

@@ -39,6 +39,7 @@
   */
  onLoad: function (options) {
    this.getHotTopic()
    this.getTopicItem()
  },

  /**
@@ -110,9 +111,30 @@
    })
  },

  gotoDetail(e) {
    var i = e.currentTarget.dataset.index
    var fileId = this.data.pageList[0][i].mfGuid
  getTopicItem() {
    var that = this
    consultservice.getTopicItem(app.globalData.accessToken.userId, {
      success(res) {
        res.forEach(r => {
          r.miItemContent = r.miItemContent.replace('\\n', '<br/>')
          // r.mfKeywordLv1 = r.mfKeywordLv1.split('、').slice(0, 5)
          // r.mfReleaseDate = that.formateTime(r.mfReleaseDate)
          // r.mfEffectiveDate = that.formateTime(r.mfEffectiveDate)
          // r.mfClosingDate = that.formateTime(r.mfClosingDate)
        });
        that.setData({
          'pageList[2]': res
        })
        console.log(that.data.pageList);
      }
    })
  },

  gotoFile(e) {
    const iList = e.currentTarget.dataset.index.split(',')
    const i1 = iList[0]
    const i2 = iList[1]
    var fileId = this.data.pageList[i1][i2].mfGuid
    wx.navigateTo({
      url: '/pages/module_consult/consultdetail/consultdetail',
      success: (res) => {
@@ -124,6 +146,22 @@
    })
  },

  gotoItem(e) {
    const iList = e.currentTarget.dataset.index.split(',')
    const i1 = iList[0]
    const i2 = iList[1]
    var itemId = this.data.pageList[i1][i2].miGuid
    wx.navigateTo({
      url: '/pages/module_consult/consultdetailitem/consultdetailitem',
      success: (res) => {
        // é€šè¿‡ eventChannel å‘被打开页面传送数据
        res.eventChannel.emit('acceptDataFromOpenerPage', {
          itemId: itemId
        })
      },
    })
  },

  formateTime(t) {
    if (t) {
      return moment(t).format("YYYYå¹´MM月DD日")

 pages/module_consult/consulthome/consulthome.wxml

@@ -32,10 +32,11 @@


    <switch-tab tabList="{{tabList}}" pageList="{{pageList}}">
      <view slot="slot{{index}}" wx:for="{{pageList}}" wx:for-item="page" wx:key="index">
      <view slot="slot{{i1}}" wx:for="{{pageList}}" wx:for-item="page" wx:key="i1" wx:for-index="i1">
        <block wx:if="{{page.length > 0}}">

          <view wx:for="{{page}}" wx:key="cIndex" wx:for-index="cIndex" data-index="{{cIndex}}" bindtap="gotoDetail">
          <block wx:if="{{i1 == 0 || i1 == 1}}">
            <view wx:for="{{page}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoFile">
            <view class="fyui-box  fyui-box__text">
              <view class="fyui-box__hd">
                {{item.mfName}}
@@ -58,11 +59,34 @@
            </view>
          </view>
        </block>

          <block wx:else="{{i1 == 2}}">
            <view wx:for="{{page}}" wx:key="i2" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoItem">
              <view class="fyui-box  fyui-box__text">
                <view class="fyui-box__hd">
                  <rich-text nodes="{{item.miItemContent}}" class="fyui-box__content des subtitle"></rich-text>
                </view>
                <view class="fyui-box__bd">
                  <!-- <view class="fyui-box__content tag">相关行业 -> {{item.fileIndustry}}</view> -->
                  <text class="tag2">所属章节：{{item.miChapterName}} {{item.miItemName ? ' ' + item.miItemName : ''}}</text>
                  <text class="tag2">所属文件：《{{item.mfName}}》</text>
                  <text class="tag2" wx:if="{{item.miReferenceNumber}}">所属文号：{{item.miReferenceNumber}}</text>
                </view>
                <view class="fyui-box__ft">
                  <!-- <text class="tag3 {{item.effective? '' : 'tag3_disable'}}">{{item.effective ? '生效中':'已失效' }}</text>
                  <text class="tag3 {{item.relatedItems? '' : 'tag3_disable'}}">{{item.relatedItems ? '关联条目' + item.relatedItems + '个 >':'无关联条目' }}</text>
                  <text class="tag3 {{item.relatedCases? '' : 'tag3_disable'}}">{{item.relatedCases ? '关联案例' + item.relatedCases + '个 >':'无关联案例' }}</text> -->
                  <!-- <text class="keyword">关键词：</text>
                <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view> -->
                </view>
              </view>
            </view>
          </block>
        </block>

        <view wx:else class="page__ft">
          <mp-loading duration="{{900}}" type="dot-gray" show="{{true}}" animated="{{true}}"></mp-loading>

</view>

      </view>
    </switch-tab>


 pages/module_consult/consulthome/consulthome.wxss

@@ -87,3 +87,12 @@
  margin-bottom: 8px;
  font-size: 14px;
}

.subtitle{
  font-size: 15px;
}

.tag2{
  font-size: 12px;
  color: var(--fyui-text-color_3);
}

 pages/module_consult/consultresult/consultresult.wxml

@@ -32,11 +32,16 @@
              </view>
              <view class="fyui-box__bd">
                <!-- <view class="fyui-box__content tag">相关行业 -> {{item.fileIndustry}}</view> -->
                <text class="tag2">来源：《{{item.fileName}}》 {{item.chapterName}}{{item.name ? ' ' + item.name : ''}}</text>
                <text class="tag2">所属章节：{{item.chapterName}} {{item.name ? ' ' + item.name : ''}}</text>
                <text class="tag2">所属文件：《{{item.fileName}}》</text>
                <text class="tag2" wx:if="{{item.referenceNumber}}">所属文号：{{item.referenceNumber}}</text>
              </view>
              <view class="fyui-box__ft">
                <text class="keyword">关键词：</text>
                <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view>
                <text class="tag3 {{item.effective? '' : 'tag3_disable'}}">{{item.effective ? '生效中':'已失效' }}</text>
                <text class="tag3 {{item.relatedItems? '' : 'tag3_disable'}}">{{item.relatedItems ? '关联条目' + item.relatedItems + '个 >':'无关联条目' }}</text>
                <text class="tag3 {{item.relatedCases? '' : 'tag3_disable'}}">{{item.relatedCases ? '关联案例' + item.relatedCases + '个 >':'无关联案例' }}</text>
                <!-- <text class="keyword">关键词：</text>
                <view class="keyword-item"><text wx:for="{{item.keywords}}" wx:for-index="i" wx:for-item="word" wx:key="i">{{word}}</text></view> -->
              </view>
            </view>
          </view>

 pages/module_consult/consultresult/consultresult.wxss

@@ -50,3 +50,21 @@
.btn-more:active{
  background-color: var(--fyui-BG-COLOR-ACTIVE);
}

.tag3{
  font-size: 10px;
  background-color: var(--fyui-primary-color);
  color: white;
  border-radius: 2px;
  padding: 2px 4px;
  white-space: nowrap;
  margin-right: 10px;
}

.tag3_disable{
  background-color: var(--fyui-text-color_3);
}

.fyui-box__text .fyui-box__ft{
  justify-content: flex-start;
}

 pages/module_learn/behaviors/beLearn.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,65 @@
const app = getApp()

/**
 * å®ˆæ³•å­¦ä¹ ææ–™çš„获取和打开
 */
module.exports = Behavior({
  data: {
    resources: [],
  },
  methods: {
    /**
     * å®ˆæ³•å­¦ä¹ ææ–™å†…容跳转
     */
    behaviorOpenFile: function (f) {
      var url = ""
      switch (f.lrResourcefiletype) {
        //文档
        case 1:
          let bodyUrl = f.lrBodyurl
          wx.showLoading({
            title: ' æ–‡ä»¶ä¸‹è½½ä¸­',
            mask: true,
          })
          wx.downloadFile({
            url: bodyUrl,
            success: function (res) {
              wx.hideLoading()
              const filePath = res.tempFilePath
              wx.openDocument({
                filePath: filePath,
                success: function (res) {
                  console.log('打开文档成功')
                },
                fail(error) {
                  console.log(error);
                }
              })
            }
          })
          break;
          //链接
        case 2:
          url = ""
          break;
          //图片
        case 3:
          url = ""
          break;
          //视频
        case 4:
          url = "/pages/module_common/pagevideo/pagevideo"
          break;
      }
      if (url != "") {
        wx.navigateTo({
          url: url,
          success: (res) => {
            // é€šè¿‡ eventChannel å‘被打开页面传送数据
            res.eventChannel.emit('acceptDataFromOpenerPage', f)
          },
        })
      }
    }
  }
})

 pages/module_learn/learfile/learnfile.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
// pages/module_learn/learfile/learnfile.js
Page({

  /**
   * é¡µé¢çš„初始数据
   */
  data: {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面加载
   */
  onLoad(options) {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面初次渲染完成
   */
  onReady() {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面显示
   */
  onShow() {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面隐藏
   */
  onHide() {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面卸载
   */
  onUnload() {

  },

  /**
   * é¡µé¢ç›¸å…³äº‹ä»¶å¤„理函数--监听用户下拉动作
   */
  onPullDownRefresh() {

  },

  /**
   * é¡µé¢ä¸Šæ‹‰è§¦åº•äº‹ä»¶çš„处理函数
   */
  onReachBottom() {

  },

  /**
   * ç”¨æˆ·ç‚¹å‡»å³ä¸Šè§’分享
   */
  onShareAppMessage() {

  }
})

 pages/module_learn/learfile/learnfile.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
{
  "usingComponents": {}
}

 pages/module_learn/learfile/learnfile.wxml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,34 @@
<!--pages/module_learn/learfile/learnfile.wxml-->
<view class="page__bd ">
  <view wx:for="{{resources}}" wx:key="index" wx:item="item" bindtap="openFile" data-index="{{index}}">
    <view wx:if="{{item.lrResourcefiletype != 4}}" class="fyui-box fyui-panel">
      <view class="fyui-box__hd">
        <image src="{{item.lrPicurl}}" class="" mode="aspectFill" />
      </view>
      <view class="fyui-box__bd">
        <view class="fyui-box__content">{{item.lrResourcetitle}}</view>
        <view class="fyui-box__tag">
          <view>{{item.lrPublishdate}}</view>
          <view class="flex-h">
            <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
          </view>
        </view>
      </view>
    </view>
    <view wx:else class="fyui-panel fyui-panel_video">
      <view style="position: relative;">
        <image src="{{item.lrPicurl}}" class="video-poster" mode="aspectFit" />
        <mp-icon class="video-play" icon="play" color="white" size="50" type="filled"></mp-icon>
      </view>
      <view class="video-title">{{item.lrResourcetitle}}</view>
      <view class="tag">
        <view>{{item.lrPublishdate}}</view>
        <view class="flex-h">
          <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
        </view>
      </view>
    </view>
  </view>
</view>

<view class="page__ft"></view>

 pages/module_learn/learfile/learnfile.wxss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
/* pages/module_learn/learfile/learnfile.wxss */

 pages/module_learn/learn/learn.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,179 @@
// pages/learn/learn.js
const lawservice = require("../../../service/lawservice")
const moment = require('../../../utils/moment.min')
const beLearn = require('../behaviors/beLearn')
const app = getApp()

Page({
  behaviors: [beLearn],
  /**
   * é¡µé¢çš„初始数据
   */
  data: {
    currentTab: 0,
    tabList: [{
        "name": "VOCs排放"
      },
      {
        "name": "台账"
      },
      {
        "name": "治理设施设备"
      },
      {
        "name": "在线监测设备"
      }
    ],
    pageList: [

    ],
    banners: [
      {
        pic: '',
        url: '',
        fileType: ''
      },
    ],
    resources: [],
    text2: [{
      title: "因违章建筑导致执法",
      content: "执法描述：环保主管部门可调阅并作为执法溯源依据之一环保主管部门可调阅并作为执法溯源依据之一",
      tags: ['违法搭建', '依法拆除'],
      views: 123,
      time: '2021å¹´3月2日',
      likes: 233
    }, {
      title: "因违章建筑导致执法",
      content: "执法描述：环保主管部门可调阅并作为执法溯源依据之一环保主管部门可调阅并作为执法溯源依据之一",
      tags: ['违法搭建', '依法拆除'],
      views: 123,
      time: '2021å¹´3月2日',
      likes: 233
    }, {
      title: "因违章建筑导致执法",
      content: "执法描述：环保主管部门可调阅并作为执法溯源依据之一环保主管部门可调阅并作为执法溯源依据之一",
      tags: ['违法搭建', '依法拆除'],
      views: 123,
      time: '2021å¹´3月2日',
      likes: 233
    }, {
      title: "因违章建筑导致执法",
      content: "执法描述：环保主管部门可调阅并作为执法溯源依据之一环保主管部门可调阅并作为执法溯源依据之一",
      tags: ['违法搭建', '依法拆除'],
      views: 123,
      time: '2021å¹´3月2日',
      likes: 233
    }]
  },
  //计算swiper高度方法（在切换的时候调用）
  tabsHeight(element) {
    let that = this;
    let query = wx.createSelectorQuery(); //必须要先创建一个查询
    query.select(element).boundingClientRect(function (rect) {
      that.setData({
        pageheight: rect.height + 'px'
      });
    }).exec();
  },
  swichNav: function (e) {
    var that = this;
    if (this.data.currentTab === e.target.dataset.current) {
      return false;
    } else {
      that.setData({
        currentTab: e.target.dataset.current,
        navScrollLeft: e.target.dataset.current >= 4 ? ((e.target.dataset.current) * 60) : 0 //判断当前选中的个数是否是第5个
      })
      that.tabsHeight('.page' + e.target.dataset.current); //查询哪一个元素
    }
  },
  bindChange: function (e) {
    var that = this;
    that.setData({
      currentTab: e.detail.current,
      navScrollLeft: e.detail.current >= 4 ? ((e.detail.current) * 60) : 0 //判断当前选中的个数是否是第5个
    });
    // that.tabsHeight('.page'+e.target.dataset.current);    //查询哪一个元素
  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面加载
   */
  onLoad: function (options) {
    // this.tabsHeight('.page0');
    this.getResources()
  },

  onReachBottom () {
    console.log('onReachBottom');
    if (this.cPage && this.tPage) {
      if (this.cPage < this.tPage) {
        this.getResources(this.cPage + 1)
      }
    }
  },

  getBanner() {
    let banners = []
    for (let i = 0; i < 6; i++) {
      const d = this.data.resources[i]
      banners.push({
        pic: d.lrPicurl,
        url: d.lrBodyurl,
        fileType: d.lrResourcefiletype,
      })
    }
    this.setData({
      banners
    })
  },

  getResources(cPage = 1) {
    var that = this
    let user = app.globalData.userInfo
    lawservice.getLawRegulations(user.guid, cPage, {sceneTypeId: user.extension2}, {
      onHead(header) {
        that.cPage = parseInt(header.currentPage)
        that.tPage = parseInt(header.totalPage)
        console.log(`cPage:${that.cPage}, tPage:${that.tPage}`);
      },
      success(data) {
        let resources = that.data.resources
        data.forEach(d => {
          d.views = parseInt(Math.random() * 1000 + 10)
          d.lrPublishdate = moment(d.lrPublishdate).format('YYYYå¹´MM月DD日')
        });
        resources = resources.concat(data)
        that.setData({
          resources
        })
        if (that.cPage == 1) {
          that.getBanner()
        }
      }
    }, 10)
  },

  openFile(e) {
    var index = e.currentTarget.dataset.index
    let f = this.data.resources[index]
    this.behaviorOpenFile(f)
  },
  goto: function (e) {
    var url = ""
    var index = e.currentTarget.dataset.index
    switch (index) {
      case '0':
        url = '/pages'
        break;
      case '1':
        url = ""
        break;
    }
    if (url != "") {
      wx.navigateTo({
        url: url,
      })
    }
  }
})

 pages/module_learn/learn/learn.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
{
  "navigationBarTitleText": "守法学习",
  "navigationBarBackgroundColor": "#65EAD2",
  "navigationBarTextStyle": "white",
  "usingComponents": {
    "mp-icon": "/component/icon/icon"
  }
}

 pages/module_learn/learn/learn.wxml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,120 @@
<!--pages/learn/learn.wxml-->
<view class="page ">

  <!-- <view class="swiper-tab">
    <scroll-view scroll-left="{{navScrollLeft}}" scroll-x="true" show-scrollbar="false" scroll-with-animation="true">
      <block wx:for="{{tabList}}" wx:key="i">
        <view class="swiper-tab-list {{currentTab==index ? 'on' : ''}}" data-current="{{index}}" bindtap="swichNav">{{item.name}}</view>
      </block>
    </scroll-view>
  </view> -->
  <!-- <swiper current="{{currentTab}}" class="swiper-box" duration="300" bindchange="bindChange" style="height: {{pageheight}};">
    <block wx:for="{{pageList}}" wx:for-item="page" wx:key="n">

      <swiper-item>

        <view class="page{{index}}">

        </view>
      </swiper-item>
    </block>
  </swiper> -->

  <view class="page__bd ">
    <view class="fyui-panel">
      <swiper indicator-dots="true" autoplay="true" circular="true" interval="2000" duration="500" previous-margin="0px" next-margin="0px">
        <block wx:for='{{banners}}' wx:key='u'>
          <swiper-item>
            <image src='{{item.pic}}' mode="aspectFill" class='swiper-item-images' data-index="{{index}}" bindtap="openFile" />
          </swiper-item>
        </block>
      </swiper>
    </view>

    <view class="flex-h" style="padding: 8px 10px;">
      <view class="image-btn" bindtap="goto" data-index="0">
        <image src="/res/icons/learn_1.png" class="image-btn__2" mode="aspectFit" />
        <view class="image-btn_title">
          <view class="image-btn_title_t">环保守法</view>
          <view>视频、文档材料</view>
          <mp-icon class="image-btn_goto" icon="arrow" color="#7F7F7F" size="8" type="filled"></mp-icon>
        </view>

      </view>
      <view class="flex-v">
        <view class="image-btn" style="background-color: #F4EED3;" bindtap="goto" data-index="1">
          <image src="/res/icons/learn_2.png" class="image-btn__2" mode="aspectFit" />
          <view class="image-btn_title">
            <view class="image-btn_title_t">执法案例</view>
            <view>相关执法案例</view>
            <mp-icon class="image-btn_goto" icon="arrow" color="#7F7F7F" size="8" type="filled"></mp-icon>
          </view>
        </view>
      </view>
    </view>

    <!-- <view class="fyui-cell fyui-cell_select title">
      <view class="fyui-cell__bd">环保守法</view>
      <view class="fyui-cell__ft">更多</view>
    </view> -->
    <view wx:for="{{resources}}" wx:key="index" wx:item="item" bindtap="openFile" data-index="{{index}}">
      <view wx:if="{{item.lrResourcefiletype != 4}}" class="fyui-box fyui-panel">
        <view class="fyui-box__hd">
          <image src="{{item.lrPicurl}}" class="" mode="aspectFill" />
        </view>
        <view class="fyui-box__bd">
          <view class="fyui-box__content">{{item.lrResourcetitle}}</view>
          <view class="fyui-box__tag">
            <view>{{item.lrPublishdate}}</view>
            <view class="flex-h">
              <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
            </view>
          </view>
        </view>
      </view>
      <view wx:else class="fyui-panel fyui-panel_video">
        <view style="position: relative;">
          <image src="{{item.lrPicurl}}" class="video-poster" mode="aspectFit" />
          <mp-icon class="video-play" icon="play" color="white" size="50" type="filled"></mp-icon>
        </view>
        <view class="video-title">{{item.lrResourcetitle}}</view>
        <view class="tag">
          <view>{{item.lrPublishdate}}</view>
          <view class="flex-h">
            <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
          </view>
        </view>
      </view>
    </view>

    <!-- <view class="fyui-cell fyui-cell_select title">
      <view class="fyui-cell__bd">执法案例</view>
      <view class="fyui-cell__ft">更多</view>
    </view>
    <view wx:for="{{text2}}" wx:key="index" data-index="index" wx:for-item="item">
      <view class="fyui-box fyui-panel fyui-box__text">
        <view class="fyui-box__hd">
          {{item.title}}
        </view>
        <view class="fyui-box__bd">
          <view class="fyui-box__content">{{item.content}}</view>
          <view class="fyui-box__tag">
            <view wx:for="{{item.tags}}" wx:key="i" data-index="i" wx:for-item="tag">{{tag}}</view>
          </view>
        </view>
        <view class="fyui-box__ft">
          <view class="flex-h">
            <image src="/res/icons/view.png" class="icon"></image>{{item.views}}
          </view>
          <view class="flex-h">
            <image src="/res/icons/like.png" class="icon"></image>{{item.likes}}
          </view>
          <view>{{item.time}}</view>
        </view>
      </view>
    </view> -->

  </view>

  <view class="page__ft"></view>
</view>

 pages/module_learn/learn/learn.wxss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
/* pages/learn/learn.wxss */
.swiper-tab{
  position: fixed;
  width: 100%;
  text-align: center;
  line-height: 80rpx;
  white-space: nowrap;
  z-index: 2;
  background-color: #65EAD2;
}

.swiper-tab-list{
  font-size: 30rpx;
  display: inline-block;
  min-width: 18%;
  padding: 0 1%;
  color: rgba(255, 255, 255, 0.658);
}

.on{ 
  color: white;
  font-weight: bold;
  border-bottom: 4rpx solid white;
}

.swiper-box{
  position: absolute;
  display: block;
  top: 80rpx;
  width: 100%;
  margin-top: 10px;
  background-color: var(--fyui-BG_1);
}

.city-item{
  width: 100%;
  display: flex;
  flex-flow: row nowrap;
  margin-bottom: 10px;
}

.img{
  width: 40%;
  height: 100px;
}

.text{
  width: 60%;
  display: flex;
  justify-content: center;
  align-items: center;
  font-size: 24px;
  border: 1px solid #ddd;
  box-sizing: border-box;
}

.swiper-item-images{
  width: 100%;
  height: 300rpx;
}

.image-btn{
  position: relative;
  width: 46vw;
  height: 20vw;
  background-color: #ECEEF9;
}

.image-btn_title{
  position: relative;
  white-space: nowrap;
  z-index: 1;
  color: var(--fyui-text-color_2);
  font-size: 12px;
  margin: 10px;
}

.image-btn_title_t{
  color: var(--fyui-text-color_1);
  font-weight: 600;
  font-size: 16px;
}

.image-btn__2 {
  position: absolute;
  width: 30vw;
  height: 20vw;
  /* background-color: red; */
  right: 0;
  bottom: 0;
  z-index: 0;
}

.image-btn_goto{
  display: block;
  background-color: white;
  width: 20px;
  height: 20px;
  text-align: center;
  border-radius: 50%;
}

.fyui-panel_video .video-poster {
  width: 100%;
  background-color: black;
}

.fyui-panel_video .video-title{
  padding: 2px 16px;
  font-size: 16px;
}

.fyui-panel_video .video-play {
  position: absolute;
  top: calc(50% - 25px);
  left: calc(50% - 25px);
  z-index: 10;
  background-color: rgba(138, 138, 138, 0.712);
  border-radius: 50%;
}

.fyui-panel_video .tag{
  display: flex;
  justify-content: space-between;
  font-size: 12px;
  color: var(--fyui-text-color_2);
  padding: 4px 16px;
}

 pages/module_learn/learncase/learncase.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
// pages/module_learn/learncase/learncase.js
Page({

  /**
   * é¡µé¢çš„初始数据
   */
  data: {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面加载
   */
  onLoad(options) {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面初次渲染完成
   */
  onReady() {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面显示
   */
  onShow() {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面隐藏
   */
  onHide() {

  },

  /**
   * ç”Ÿå‘½å‘¨æœŸå‡½æ•°--监听页面卸载
   */
  onUnload() {

  },

  /**
   * é¡µé¢ç›¸å…³äº‹ä»¶å¤„理函数--监听用户下拉动作
   */
  onPullDownRefresh() {

  },

  /**
   * é¡µé¢ä¸Šæ‹‰è§¦åº•äº‹ä»¶çš„处理函数
   */
  onReachBottom() {

  },

  /**
   * ç”¨æˆ·ç‚¹å‡»å³ä¸Šè§’分享
   */
  onShareAppMessage() {

  }
})

 pages/module_learn/learncase/learncase.json

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,3 @@
{
  "usingComponents": {}
}

 pages/module_learn/learncase/learncase.wxml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,2 @@
<!--pages/module_learn/learncase/learncase.wxml-->
<text>pages/module_learn/learncase/learncase.wxml</text>

 pages/module_learn/learncase/learncase.wxss

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1 @@
/* pages/module_learn/learncase/learncase.wxss */

 pages/module_ledger/ledgerhome/ledgerhome.js

@@ -142,12 +142,16 @@
      //选项卡
      if (s.upLoad) {
        s.tag = '/res/icons/round_check_fill.png'
        s.opacity = 0.2
      } else if (s.ledgerFinished) {
        s.tag = '/res/icons/warning_yellow.png'
        s.opacity = 1
      } else if (!s.needUpdate) {
        s.tag = '/res/icons/round_check_fill.png'
        s.tag = '/res/icons/warning_selected.png'
        s.opacity = 0.5
      } else {
        s.tag = '/res/icons/warning_red.png'
        s.opacity = 1
      }
      if (!map.has(s.ledgerType)) {
        map.set(s.ledgerType, [])

 pages/module_ledger/ledgerhome/ledgerhome.wxml

@@ -59,9 +59,9 @@
  <!-- </view> -->
  <view class="page__bd">
    <view class="swiper-tab">
      <scroll-view class="swiper-tab_view" scroll-left="{{navScrollLeft}}" scroll-x="true" show-scrollbar="true" scroll-with-animation="true">
      <scroll-view class="swiper-tab_view" scroll-into-view="item{{currentTab}}" scroll-x="true" show-scrollbar="true" scroll-with-animation="true">
        <block wx:for="{{tabList}}" wx:key="i">
          <view class="swiper-tab-list {{currentTab==index ? 'on' : ''}}" data-current="{{index}}" bindtap="swichNav">
          <view id="item{{index}}" class="swiper-tab-list {{currentTab==index ? 'on' : ''}}" data-current="{{index}}" bindtap="swichNav">
            {{item.name}}
            <text wx:if="{{item.tag > 0}}" class="swiper-tab-list__tag">{{item.tag}}</text>
          </view>
@@ -72,8 +72,8 @@
      <block wx:for="{{pageList}}" wx:for-item="page" wx:key="n" wx:for-index="i1">
        <swiper-item>
          <view class="ledger-group page{{i1}}">
            <view wx:for="{{page}}" wx:for-item="ledger" wx:key="t" class="ledger-item" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoLedgerDetail">
              <image class="ledger-tag" src="{{ledger.tag}}"></image>
            <view wx:for="{{page}}" wx:for-item="ledger" wx:key="t" class="ledger-item" wx:for-index="i2" data-index="{{i1}},{{i2}}" bindtap="gotoLedgerDetail" style="opacity: {{ledger.opacity}};">
              <image class="ledger-tag" src="{{ledger.tag}}" mode="aspectFit"></image>
              <image class="ledger-icon" src="{{ledger.iconUrl}}"></image>
              <view>{{ledger.ledgerName}}</view>
            </view>

 pages/module_ledger/ledgerhome/ledgerhome.wxss

@@ -162,9 +162,9 @@

.ledger-tag {
  position: absolute;
  right: 8vw;
  right: 6vw;
  top: 6px;
  width: 16px;
  width: 32px;
  height: 16px;
  color: white;
  padding: 1px;

 pages/module_user/userlogin/userlogin.js

@@ -119,6 +119,7 @@
    userservice.getUserInfo(app.globalData.accessToken.userId, {
      success(data) {
        app.globalData.userInfo = data
        app.globalData.isLogin = true
        wx.setStorage({
          key: 'userInfo',
          data: data,

 pages/module_user/userloginpw/userloginpw.js

@@ -101,6 +101,7 @@
    userservice.getUserInfo(app.globalData.accessToken.userId, {
      success(data) {
        app.globalData.userInfo = data
        app.globalData.isLogin = true
        wx.setStorage({
          key: 'userInfo',
          data: data,

 project.config.json

@@ -43,7 +43,7 @@
    "disableUseStrict": false,
    "showES6CompileOption": false,
    "useCompilerPlugins": false,
    "ignoreUploadUnusedFiles": true,
    "ignoreUploadUnusedFiles": false,
    "useStaticServer": true,
    "minifyWXML": true
  },

 res/icons/ass_3.png

 res/icons/btn_bg_2.png

 res/icons/btn_bg_3.png

Binary files differ

 res/icons/btn_bg_4.png

Binary files differ

 res/icons/btn_bg_5.png

Binary files differ

 res/icons/complete.png

 res/icons/con_qa.png

 res/icons/learn_1.png

 res/icons/learn_2.png

 res/icons/warning_selected.png

 service/baserequest.js

@@ -11,8 +11,8 @@

const originProperties = ['url', 'data', 'header', 'method', 'success', 'fail', 'complete'];
// const baseUrl = "http://127.0.0.1:8080"
const baseUrl = "http://192.168.0.105:8080"
// const baseUrl = "https://fyami.com.cn:447"
// const baseUrl = "http://192.168.0.106:8080"
const baseUrl = "https://fyami.com.cn:447"
// const basePicUrl = baseUrl + "/images/"
const basePicUrl = "https://fyami.com.cn:447/images/"
const baseIconUrl = "https://fyami.com.cn:447/images/weixin/eplaw/"

 service/consultservice.js

@@ -45,6 +45,18 @@
    $f.get(cb)
  },

  //获取热门条目
  getTopicItem: function (userId, fun) {
    let cb = {
      url: `/consultation/topic/item`,
      params: {
        userId: userId,
      },
    }
    Object.assign(cb, fun)
    $f.get(cb)
  },

  //获取法律法规文件
  getMgtFile: function (userId, fileId, fun) {
    let cb = {