From 6f5a8de5330bfe3f181218994ad77c4c7f1656e8 Mon Sep 17 00:00:00 2001
From: lihenian <2629534615@qq.com>
Date: Wed, 20 Oct 2021 17:28:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC1.7.22=20=E9=A6=96=E9=A1=B5ba?=
 =?UTF-8?q?nner=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7=E5=8A=A0=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/indexNew/indexNew.js     |  9 ++++----
 pages/indexNew/indexNew.wxml   | 39 +++++++++-------------------------
 pages/toRegister/toRegister.js |  2 +-
 project.config.json            |  7 +-----
 utils/api.js                   |  7 +++++-
 5 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/pages/indexNew/indexNew.js b/pages/indexNew/indexNew.js
index 744b1f5..4f3c35c 100644
--- a/pages/indexNew/indexNew.js
+++ b/pages/indexNew/indexNew.js
@@ -550,13 +550,12 @@ Page({
 
   // 跳转到banner详情
   navigatetoBannerDetail (e) {
-    const {
-      id,
-      url,
-      newsflag
-    } = e.currentTarget.dataset
+    const { id, url, newsflag, bannertype } = e.currentTarget.dataset
     console.log(id, url, newsflag)
     if (newsflag == "0") {
+      if (bannertype === "1") {
+        api.wenjuanPoints(id)
+      }
       wx.navigateTo({
         url: `/subpages/home/pages/webview/webview?url=${url}`
       })
diff --git a/pages/indexNew/indexNew.wxml b/pages/indexNew/indexNew.wxml
index 12994c4..0f13e48 100644
--- a/pages/indexNew/indexNew.wxml
+++ b/pages/indexNew/indexNew.wxml
@@ -1,12 +1,12 @@
 <wxs module="filter" src="../../utils/filter.wxs"></wxs>
 <view class="header" style="height: {{statusHeight + navigationHeight}}px;">
   <image class="header-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-w6AJBH6AAAk6D4lsPc207.png" />
-  <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">e锦水</view>
+  <view class="navigation" style="height: {{navigationHeight}}px; top: {{statusHeight}}px;">
+    e锦水
+  </view>
 </view>
-
 <view class="home" style="margin-top: {{statusHeight + navigationHeight}}px">
-
-  <!--所属网格-->
+  <!-- 所属网格 -->
   <view class="belong-grid">
     <image class="belong-grid-bg" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7160-u6ATTx1AAEZrXGthow458.png" />
     <view class="newbelong-grid">
@@ -33,7 +33,7 @@
   <view class="banner">
     <swiper circular="{{true}}" autoplay="{{true}}" interval="{{3000}}" current="{{currentIndex}}" bindchange="swiperChange">
       <swiper-item wx:for="{{swiperBannerList}}" wx:key="index" wx:for-index="index" wx:for-item="item">
-        <view class="banner-item" data-id="{{item.id}}" data-url="{{item.url}}" data-newsflag="{{item.newsFlag}}" bindtap="navigatetoBannerDetail">
+        <view class="banner-item" data-id="{{item.id}}" data-url="{{item.url}}" data-newsflag="{{item.newsFlag}}" data-bannertype="{{item.bannerType}}" bindtap="navigatetoBannerDetail">
           <image mode="aspectFill" class="banner-img" src="{{item.imgUrl}}" />
           <view class="banner-content">
             <view class="title">
@@ -51,7 +51,7 @@
   </view>
   <view class="tab-right">
     <view class="tab" wx:for="{{tabRightList}}" wx:key="index" data-title="{{item.remark}}" data-code="{{item.imgCode}}" bindtap="toJumpPage">
-      <image src="{{item.imgUrl}}"/>
+      <image src="{{item.imgUrl}}" />
       <view class="tab-text"></view>
     </view>
   </view>
@@ -91,7 +91,6 @@
     <!-- <image class="image2" src="https://epdc-kongcun.elinkit.com.cn/epdcFile/M00/00/06/rBAB7161AbyAfYVeAAAdNklNbvM579.png"></image> -->
     <!-- <text></text> -->
   </view>
-
   <!-- 我有话说 -->
   <view class="grid-all-new">
     <button bindtap="wysy" class="weui-btn-left" form-type='submit' plain='true' hover-class="hover-btn" wx:if="{{departmentId == leaderGridId}}">
@@ -162,8 +161,7 @@
   <view class="list-all">
     <view class="list-item" wx:for-index="index" wx:for-item="item" wx:key="index" wx:for="{{newsList}}" data-id="{{item.id}}" bindtap="toDetail">
       <view class="item-info">
-        <view class="item-info-name">{{item.newsTitle}}
-        </view>
+        <view class="item-info-name">{{item.newsTitle}}</view>
         <view class="item-info-time">
           <text>{{item.deptName}}-{{item.newsCategoryName}}</text>
           <text>{{filter.formatTime(item.newsStartTime, 'yyyy-MM-dd')}}</text>
@@ -176,29 +174,12 @@
     </view>
   </view>
   <!-- <view hidden="{{nomorenews}}" class="nomorenews">没有更多了~</view> -->
-  <!--加载更多提示-->
+  <!-- 加载更多提示 -->
   <load-more loadMoreType="{{loadMoreType}}" loadMoreVisible="{{loadMoreVisible}}"></load-more>
 </view>
-
-<move-btn wx:if="{{sxjs.id}}"
-          button-top="820"
-          area-top="120"
-          area-height="90%"
-          img-url="{{sxjs.imgUrl}}"
-          bindmovebtnCallBack="toSxjs"></move-btn>
-
-<move-btn wx:if="{{shouye.id}}"
-          area-top="120"
-          area-height="90%"
-          button-top="1080"
-          button-left="600"
-          button-width="140"
-          button-height="140"
-          img-url="{{shouye.imgUrl}}"
-          bindmovebtnCallBack="toShouye"></move-btn>
-
+<move-btn wx:if="{{sxjs.id}}" button-top="820" area-top="120" area-height="90%" img-url="{{sxjs.imgUrl}}" bindmovebtnCallBack="toSxjs"></move-btn>
+<move-btn wx:if="{{shouye.id}}" area-top="120" area-height="90%" button-top="1080" button-left="600" button-width="140" button-height="140" img-url="{{shouye.imgUrl}}" bindmovebtnCallBack="toShouye"></move-btn>
 <complete-info-dialog completeInfoDialogVisible="{{completeInfoDialogVisible}}"></complete-info-dialog>
-
 <!-- 签到后提醒 -->
 <wux-popup visible="{{visible}}" title="{{signCode === 0 ? '签到成功' : '签到失败'}}" content="{{signMsg}}" bind:close="onClose">
   <view slot="footer" class="popup__button" bindtap="onClose">确定</view>
diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js
index caf39aa..0a0b5fb 100644
--- a/pages/toRegister/toRegister.js
+++ b/pages/toRegister/toRegister.js
@@ -21,7 +21,7 @@ Page({
     //   }
     // })
     let that = this
-    const versionNum = "1.7.21"
+    const versionNum = "1.7.22"
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data ? res.data.scanFlag : '1'
diff --git a/project.config.json b/project.config.json
index 6440879..7388078 100644
--- a/project.config.json
+++ b/project.config.json
@@ -6,31 +6,26 @@
   "setting": {
     "urlCheck": false,
     "es6": true,
-    "enhance": true,
     "postcss": true,
     "preloadBackgroundData": false,
     "minified": true,
     "newFeature": true,
     "coverView": true,
-    "nodeModules": false,
     "autoAudits": false,
     "showShadowRootInWxmlPanel": true,
     "scopeDataCheck": false,
-    "uglifyFileName": false,
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
-    "useApiHostProcess": false,
+    "useApiHostProcess": true,
     "babelSetting": {
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
     },
-    "enableEngineNative": false,
     "useIsolateContext": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
diff --git a/utils/api.js b/utils/api.js
index c177f1d..3f14101 100755
--- a/utils/api.js
+++ b/utils/api.js
@@ -82,7 +82,8 @@ module.exports = {
   getEnterpriseReportDetail,
   //
   getActPeriods,
-  getSignInActPeriods
+  getSignInActPeriods,
+  wenjuanPoints: wenjuanPoints
 }
 
 function getToken (wxCode) {
@@ -676,4 +677,8 @@ function getActPeriods (actId) {
 // 取消报名时间段列表接口
 function getSignInActPeriods (actId) {
   return fly.get(`heart/act/getSignInActPeriods`, {actId: actId})
+}
+// 问卷加积分
+function wenjuanPoints (bannerId) {
+  return fly.post('news/banner/wenjuanPoints', { bannerId: bannerId })
 }
\ No newline at end of file