新增util,首页非遗和新闻

app.js

@@ -1,5 +1,15 @@
 //app.js
+var restAjax = require('utils/restAjax.js');
+var dialog = require('utils/dialog.js');
 App({
+  loginUrl: 'http://192.168.0.113:7001/usercenter',
+  usercenterUrl: 'http://192.168.0.113:7001/usesrcenter',
+  newsUrl: 'http://192.168.0.113:8082/news',
+  libraryUrl: 'http://192.168.0.113:8081/library',
+  activityUrl: '',
+  venueUrl: '',
+  restAjax: restAjax,
+  dialog: dialog,
   onLaunch: function () {
     // 展示本地存储能力
     var logs = wx.getStorageSync('logs') || []

pages/index/index.js

@@ -1,42 +1,91 @@
+var app = getApp();
 Page({
-
   /**
    * 页面的初始数据
    */
   data: {
     indicatorDots: true,
     autoplay: true,
-    baseUrl: 'http://192.168.0.111:8888/volunteer/',
     token: '',
-    key: ''
+    library: {
+      libraryUrl: app.libraryUrl,
+      bannerLibrary: [],
+    },
+    news: {
+      newsUrl: app.newsUrl,
+      newsList: []
+    },
+    venue: {
+      venueUrl: app.venueUrl
+    },
+    activity: {
+      activityUrl: app.activityUrl
+    }
   },
-  doLogin: function() {
+  doLogin: function () {
     var self = this;
     wx.login({
       success(res) {
-        console.log(res)
+        if (res.code) {
-        if(res.code) {
+          app.restAjax.post(app.restAjax.path('{url}/wxminiapp/auth/login', [app.loginUrl]), {
-          var WechatMiniAppLoginVO = {jsCode: res.code};
+            jsCode: res.code
-          wx.request({
+          }, null, function (code, data) {
-            url: self.data.baseUrl + 'wxminiapp/auth/login',
+            var tokenArray = data.data.split('_');
-            method: 'post',
+            var token = tokenArray[0];
-            data: WechatMiniAppLoginVO,
+            var isRandomUsername = tokenArray[1];
-            success: function(res) {
+            self.setData({
-              self.setData({
+              token: token
-                token: res.data.data
+            })
-              })
+            wx.setStorageSync('token', token);
-              wx.setStorage({
+            wx.setStorageSync('isRandomUsername', isRandomUsername)
-                data: res.data.data,
+          }, function (code, data) {
-                key: 'token'
+            app.dialog.msg(data.msg);
-              })
+          });
-            }
+        } else {
-          })
-        }else {
           console.log('登陆失败！' + res.errMsg);
         }
       }
     })
   },
+  doGetLibrary: function() {
+    var self = this;
+    app.restAjax.get(app.restAjax.path('{libraryUrl}/app/intangiblelibrary/listpageintangiblelibraryrelease', [self.data.library.libraryUrl]), {
+      page: 1,
+      rows: 5
+    }, null, function(code, data) {
+      self.setData({
+        'library.bannerLibrary': data.rows
+      });
+    }, function(code, data){
+      app.dialog.msg(data.msg);
+    });
+  },
+  doGetVenue: function() {
+    app.restAjax.get(app.restAjax.path('', []), {
+
+    }, null, function(code, data) {
+      
+    }, function(code, data) {
+      app.dialog.msg(data.msg);
+    });
+  },
+  doGetActivity: function() {
+
+  },
+  doGetNewsList: function() {
+    var self = this;
+    app.restAjax.get(app.restAjax.path('{newsUrl}/app/newscontent/listpagenewscontentrelease', [self.data.news.newsUrl]), {
+      page: 1,
+      rows: 5
+    }, null, function(code, data) {
+      console.log(data);
+      self.setData({
+        'news.newsList': data.rows
+      })
+    }, function(code, data) {
+      app.dialog.msg(data.msg);
+    });
+  },
   goNewsDetail: function () {
     wx.navigateTo({
       url: '../newsDetail/newsDetail',
@@ -78,54 +127,56 @@ Page({
   onLoad: function (options) {
     var self = this;
     self.doLogin();
+    self.doGetLibrary();
+    self.doGetNewsList();
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
-    
+
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    
+
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
   onHide: function () {
-    
+
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
   onUnload: function () {
-    
+
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
   onPullDownRefresh: function () {
-    
+
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-    
+
   },
 
   /**
    * 用户点击右上角分享
    */
   onShareAppMessage: function () {
-    
+
   }
 })

pages/index/index.wxml

@@ -1,13 +1,7 @@
 <view class="swiper-box">
   <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" >
-    <swiper-item class="swiper-item">
+    <swiper-item class="swiper-item" wx:for="{{library.bannerLibrary}}" wx:for-index="idx" wx:for-item="item" wx:key="bannerLibrary">
-      <image src="../../images/center-bg.png" class="swiper-img"></image>
+      <image src="{{library.libraryUrl}}/route/file/downloadfile/true/{{item.libraryCover}}" class="swiper-img"></image>
-    </swiper-item>
-    <swiper-item class="swiper-item">
-      <image src="../../images/center-bg.png" class="swiper-img"></image>
-    </swiper-item>
-    <swiper-item class="swiper-item">
-      <image src="../../images/center-bg.png" class="swiper-img"></image>
     </swiper-item>
   </swiper>
 </view>
@@ -67,48 +61,56 @@
       <image src="../../images/selected-r.png" class="selected-r"></image>
     </view>
   </view>
-  <view class="news-box" bindtap="goNewsDetail">
+  <view wx:for="{{news.newsList}}" wx:for-index="idx" wx:for-item="item" wx:key="newsList">
-    <view class="news-title">银保监会印发《关于加快推进意外险改革的意见》</view>
+    <view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_1'}}">
-    <view class="news-info">
+      <view class="news-title">{{item.newsContentTitle}}</view>
-      <text>来源：百度</text>
+      <view class="news-small-pic">
-      <text>10评论</text>
+        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
-      <text>2020-03-02</text>
+      </view>
-    </view>
-  </view>
-  <view class="news-box" bindtap="goNewsDetail">
-    <view class="news-title">银保监会印发《关于加快推进意外险改革的意见》</view>
-    <view class="news-big-pic">
-      <image src="../../images/big-news.png"></image>
-    </view>
-    <view class="news-info">
-      <text>来源：百度</text>
-      <text>10评论</text>
-      <text>2020-03-02</text>
-    </view>
-  </view>
-  <view class="news-box" bindtap="goNewsDetail">
-    <view class="news-title">银保监会印发《关于加快推进意外险改革的意见》</view>
-    <view class="news-small-pic">
-      <image src="../../images/big-news.png"></image>
-      <image src="../../images/big-news.png"></image>
-      <image src="../../images/big-news.png"></image>
-    </view>
-    <view class="news-info">
-      <text>来源：百度</text>
-      <text>10评论</text>
-      <text>2020-03-02</text>
-    </view>
-  </view>
-  <view class="news-box transverse-news" bindtap="goNewsDetail">
-    <view class="news-row-img">
-      <image src="../../images/big-news.png"></image>
-    </view>
-    <view class="news-row-info">
-      <view class="news-title">银保监会印发《关于加快推进意外险改革的意见》</view>
       <view class="news-info">
-        <text>来源：百度</text>
+        <text>来源：{{item.newsContentResource}}</text>
-        <text>10评论</text>
+        <text>{{item.newsContentPublishTime}}</text>
-        <text>2020-03-02</text>
+      </view>
+    </view>
+    <view class="news-box transverse-news" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_2'}}">
+      <view class="news-row-img">
+        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+      </view>
+      <view class="news-row-info">
+        <view class="news-title">{{item.newsContentTitle}}</view>
+        <view class="news-info">
+          <text>来源：{{item.newsContentResource}}</text>
+          <text>{{item.newsContentPublishTime}}</text>
+        </view>
+      </view>
+    </view>
+    <view class="news-box transverse-news" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_3'}}">
+      <view class="news-row-info">
+        <view class="news-title">{{item.newsContentTitle}}</view>
+        <view class="news-info">
+          <text>来源：{{item.newsContentResource}}</text>
+          <text>{{item.newsContentPublishTime}}</text>
+        </view>
+      </view>
+      <view class="news-row-img">
+        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+      </view>
+    </view>
+    <view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_4'}}">
+      <view class="news-title">{{item.newsContentTitle}}</view>
+      <view class="news-big-pic">
+        <image src="{{news.newsUrl}}/route/file/downloadfile/true/{{coverItem.contentCoverId}}" wx:for="{{item.newsContentCoverList}}" wx:for-item="coverItem" wx:key="coverItem"></image>
+      </view>
+      <view class="news-info">
+        <text>来源：{{item.newsContentResource}}</text>
+        <text>{{item.newsContentPublishTime}}</text>
+      </view>
+    </view>
+    <view class="news-box" bindtap="goNewsDetail" wx:if="{{item.typesettingCode == 'key_5'}}">
+      <view class="news-title">{{item.newsContentTitle}}</view>
+      <view class="news-info">
+        <text>来源：{{item.newsContentResource}}</text>
+        <text>{{item.newsContentPublishTime}}</text>
       </view>
     </view>
   </view>

project.config.json

@@ -5,35 +5,35 @@
 	},
 	"setting": {
 		"urlCheck": false,
-		"scopeDataCheck": false,
-		"coverView": true,
 		"es6": true,
+		"enhance": false,
 		"postcss": true,
-		"compileHotReLoad": false,
 		"preloadBackgroundData": false,
 		"minified": true,
-		"autoAudits": false,
 		"newFeature": true,
-		"uglifyFileName": false,
+		"coverView": true,
-		"uploadWithSourceMap": true,
-		"useIsolateContext": true,
 		"nodeModules": false,
-		"enhance": false,
+		"autoAudits": false,
-		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": false,
 		"showShadowRootInWxmlPanel": true,
+		"scopeDataCheck": false,
+		"uglifyFileName": false,
 		"checkInvalidKey": true,
 		"checkSiteMap": true,
+		"uploadWithSourceMap": true,
+		"compileHotReLoad": false,
 		"babelSetting": {
 			"ignore": [],
 			"disablePlugins": [],
 			"outputPath": ""
-		}
+		},
+		"useIsolateContext": true,
+		"useCompilerModule": true,
+		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.11.1",
-	"appid": "wxe7f135356342a070",
+	"appid": "wxb9c87f3dcf05852f",
-	"projectname": "miniprogram-2",
+	"projectname": "xz_mini",
 	"debugOptions": {
 		"hidedInDevtools": []
 	},

utils/dialog.js

@@ -0,0 +1,8 @@
+function msg(text) {
+  wx.showToast({
+    title: text,
+    icon: 'none',
+    duration: 1000
+  })
+}
+module.exports.msg = msg;

utils/restAjax.js

@@ -0,0 +1,226 @@
+var methods = {
+  POST_METHOD: 'POST',
+  DELETE_METHOD: 'DELETE',
+  PUT_METHOD: 'PUT',
+  GET_METHOD: 'GET'
+};
+
+/**
+ * 新增
+ * @param url
+ * @param dataObj
+ * @param args
+ * @param successCallback
+ * @param errorCallback
+ * @param completeCallback
+ */
+function postJson(url, dataObj, args, successCallback, errorCallback, completeCallback) {
+  doAjax(url, methods.POST_METHOD, dataObj, args, successCallback, errorCallback, completeCallback);
+}
+
+/**
+ * 删除
+ * @param url
+ * @param dataObj
+ * @param args
+ * @param successCallback
+ * @param errorCallback
+ * @param completeCallback
+ */
+function deleteForm(url, dataObj, args, successCallback, errorCallback, completeCallback) {
+  doAjax(url, methods.DELETE_METHOD, dataObj, args, successCallback, errorCallback, completeCallback);
+}
+
+/**
+ * 修改
+ * @param url
+ * @param dataObj
+ * @param args
+ * @param successCallback
+ * @param errorCallback
+ * @param completeCallback
+ */
+function putJson(url, dataObj, args, successCallback, errorCallback, completeCallback) {
+  doAjax(url, methods.PUT_METHOD, dataObj, args, successCallback, errorCallback, completeCallback);
+}
+
+/**
+ * 查询
+ * @param url
+ * @param dataObj
+ * @param args
+ * @param successCallback
+ * @param errorCallback
+ * @param completeCallback
+ */
+function getForm(url, dataObj, args, successCallback, errorCallback, completeCallback) {
+  doAjax(url, methods.GET_METHOD, dataObj, args, successCallback, errorCallback, completeCallback);
+}
+
+/**
+ * 执行上传
+ * @param url
+ * @param method
+ * @param dataObj
+ * @param args
+ * @param successCallback
+ * @param errorCallback
+ * @param completeCallback
+ */
+function doAjax(url, method, dataObj, args, successCallback, errorCallback, completeCallback) {
+  var headers = {};
+  if (args != null && typeof (args.headers) != 'undefined' && args.headers != null) {
+    headers = args.headers;
+  }
+  wx.request({
+    url: url,
+    method: method,
+    data: dataObj,
+    header: headers,
+    dataType: 'json',
+    success: function (response) {
+      if (response.statusCode == 200) {
+        successCallback(response.statusCode, response.data, args);
+      } else {
+        if (errorCallback && typeof (errorCallback) == 'function') {
+          errorCallback(response.statusCode, response.data);
+        }
+      }
+    },
+    fail: function (response) {
+      console.log(response);
+    },
+    complete: function () {
+      if (completeCallback && typeof (completeCallback) == 'function') {
+        completeCallback();
+      }
+    }
+  })
+}
+
+/**
+ * 检测是路径参数有重复值
+ * @param pathArgArray
+ * @returns {boolean}
+ */
+function pathArgsHasSameValue(pathArgArray) {
+  var tempArgIndex = 0;
+  var tempArgs = pathArgArray[tempArgIndex];
+  for (var i = (tempArgIndex + 1), item; item = pathArgArray[i]; i++) {
+    if (tempArgs == item) {
+      throw new Error('参数' + item + '有重复值!!!');
+    }
+    if (i == pathArgArray.length - 1) {
+      tempArgs = pathArgArray[++tempArgIndex];
+      i = tempArgIndex;
+      continue;
+    }
+  }
+}
+
+/**
+ * 获取页面间传递的参数
+ * @param url
+ */
+function getParamsArg(url) {
+  var params = url.split('?')[1];
+  var paramsObj = {};
+  if (typeof (params) == 'undefined' || params == null) {
+    return paramsObj;
+  }
+  var paramsKVs = params.split('&');
+  for (var i = 0, item = null; item = paramsKVs[i++];) {
+    var kvs = item.split('=');
+    if (kvs.length == 1) {
+      paramsObj[kvs[0]] = null;
+    }
+    if (kvs.length == 2) {
+      paramsObj[kvs[0]] = decodeURI(kvs[1]);
+    }
+  }
+  return paramsObj;
+}
+
+/**
+ * 构建路径
+ * @param basePath 请求路径，{参数},
+ * @param pathArgs 替换的路径参数，不能重复
+ * @returns {*}
+ */
+function buildPath(basePath, pathArgs) {
+  var path = basePath;
+  if (!basePath || !(typeof (basePath) == 'string')) {
+    throw new Error('basePath必须为字符串!!!');
+  }
+  if (!pathArgs || !Array.isArray(pathArgs)) {
+    throw new Error('pathArgs必须为数组!!!');
+  }
+  var pathArgArray = basePath.match(/\{\w+\}/g);
+  if (!pathArgArray) {
+    return path;
+  }
+  pathArgsHasSameValue(pathArgArray);
+  for (var i = 0, item; item = pathArgArray[i]; i++) {
+    path = path.replace(item, pathArgs[i]);
+  }
+  return path;
+}
+
+/**
+ * 通过form对象上传文件
+ * @param url
+ * @param formData
+ * @param args
+ * @param successCallback
+ * @param errorCallback
+ * @param beforeCallback
+ * @param completeCallback
+ */
+function postFile(url, path, name, args, successCallback, errorCallback, completeCallback) {
+  var headers = {};
+  if (args != null && typeof (args.headers) != 'undefined' && args.headers != null) {
+    headers = args.headers;
+  }
+  wx.uploadFile({
+    filePath: path,
+    name: name,
+    url: url,
+    header: headers,
+    success: function (response) {
+      if (response.statusCode == 200) {
+        successCallback(response.statusCode, response.data, args);
+      } else {
+        if (errorCallback && typeof (errorCallback) == 'function') {
+          errorCallback(response.statusCode, response.data);
+        }
+      }
+    },
+    fail: function (response) {
+      console.log(response);
+    },
+    complete: function () {
+      if (completeCallback && typeof (completeCallback) == 'function') {
+        completeCallback();
+      }
+    }
+  })
+};
+
+/**
+ * xss 转义
+ * @param html
+ * @returns {string}
+ */
+function escape(html) {
+  return String(html || '').replace(/&(?!#?[a-zA-Z0-9]+;)/g, '&')
+    .replace(/</g, '&lt;').replace(/>/g, '&gt;')
+    .replace(/'/g, '&#39;').replace(/"/g, '&quot;');
+}
+
+module.exports.post = postJson;
+module.exports.delete = deleteForm;
+module.exports.put = putJson;
+module.exports.get = getForm;
+module.exports.params = getParamsArg;
+module.exports.path = buildPath;
+module.exports.escape = escape;