新增功能：首页视频、分享朋友圈、公益信息

components/newsList.vue

@@ -9,7 +9,7 @@
 					{{item.title}}
 				</view>
 			</view>
-			<view class="time" v-if="isAddress!=4">
+			<view class="time">
 				<view class="size14 c999" style="width:60%">
 					<icon class="iconfont icon-icon-test1"></icon>
 					{{item.createdtime}}
@@ -19,7 +19,7 @@
 					{{item.browsecnt}}次浏览
 				</view>
 			</view>
-			<view class="time isAddress" v-if="isAddress==4">
+			<!-- <view class="time isAddress" v-if="isAddress==4">
 				<view class="size14 c999">
 					<uni-icons type="location-filled" size="20" class="location"></uni-icons>
 					{{item.province}}{{item.city}}{{item.area}}{{item.address}}
@@ -28,7 +28,7 @@
 					<icon class="iconfont icon-icon-test1"></icon>
 					{{item.starttime}}至{{item.endtime}}
 				</view>
-			</view>
+			</view> -->
 		</view>
 	</view>
 </template>
@@ -58,17 +58,18 @@
 				// 	that.$tools.msg("登录后查看更多")
 				// 	return
 				// }
-				let type = that.isAddress
+				let type = that.isAddress == 1 || that.isAddress == 4 ? 1 : that.isAddress
 				let account = {
 					id: id,
 					IsBrowseCnt: 2,
 					type: type.toString()
 				}
 				let https = ""
-				if (type == 1 || type == 5 || type == 6 || type == 7) {
+				if (type == 1 || type == 4 || type == 5 || type == 6 || type == 7) {
 					https = that.$model.getInfoDetail(account)
-				} else if (type == 4) {
+					// } else if (type == 4) {
-					https = that.$model.getCampaignDetail(account)
+
+					// 	https = that.$model.getCampaignDetail(account)
 				}
 				return https.then((res) => {
 					if (res.code != 0) return

pageTwo/index/detail.vue

@@ -26,6 +26,34 @@
 			let that = this
 			this.content = option.content == 1 ? this.HomeContent.privacydesc : this.HomeContent.appdesc
 		},
+		onShareAppMessage() {
+			let that = this
+			return {
+				title: that.content.title,
+				path: '/pageTwo/index/detail?content=' + that.content,
+				imageUrl: that.content.headimg,
+				success: function(res) {
+					console.log("分享到朋友成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友失败")
+				},
+			}
+		},
+		onShareTimeline() {
+			let that = this
+			return {
+				title: that.content.title,
+				query: 'content=' + that.content,
+				imageUrl: that.content.headimg,
+				success: function(res) {
+					console.log("分享到朋友圈成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友圈失败")
+				},
+			}
+		},
 		methods: {}
 	}
 </script>

pageTwo/login/add.vue

@@ -75,7 +75,7 @@
 				<text class="size12 c999 desc">点击上传企业营业执照，仅用于资质审核</text>
 			</view>
 			<view class="lan border-bottom">
-				<view class="left">通过什么途径了解智造团？</view>
+				<view class="left">通过什么途径了解智照团？</view>
 				<view class="radio">
 					<label @click="radioChange('抖音')">
 						<icon class="iconfont radioimg"
@@ -152,7 +152,7 @@
 				</view>
 			</view>
 			<view class="lan c999 size12 mt-15">
-				所有上传的资料信息同意公开展示，最终解释权归智造团平台所有。
+				所有上传的资料信息同意公开展示，最终解释权归智照团平台所有。
 			</view>
 
 		</view>

pageTwo/login/login.vue

@@ -4,7 +4,7 @@
 		<!--  -->
 		<view class="ts">
 			<view class="mb-5">欢迎登录</view>
-			<view>智造团资源共享数据库平台</view>
+			<view>智照团资源共享数据库平台</view>
 		</view>
 		<view class="edit">
 			<image src="../../static/logo.png" class="logo" mode="widthFix"></image>
@@ -23,11 +23,11 @@
 			</view>
 			<view class="btnlogin" @click="handleTelLogin">登录</view>
 			<view class="wxbtn" @click="handleAdd">
-				<text>没有账号，我要加入智造团</text>
+				<text>没有账号，我要加入智照团</text>
 			</view>
 			<view class="xieyi">
 				<checkbox-group @change="checkboxChange">
-					<checkbox :value="1" style="transform:scale(0.8)" />勾选同意智造团<text @click="handlexieyi "
+					<checkbox :value="1" style="transform:scale(0.8)" />勾选同意智照团<text @click="handlexieyi "
 						class="bluecolor">《个人信息保护政策》</text>
 				</checkbox-group>
 			</view>
@@ -80,7 +80,7 @@
 					return
 				}
 				if (this.value == 0) {
-					this.$tools.msg("请先勾选同意智造团《个人信息保护政策》")
+					this.$tools.msg("请先勾选同意智照团《个人信息保护政策》")
 					return
 				}
 				this.$model.getlogin({

pageTwo/me/user.vue

@@ -22,7 +22,7 @@
 				</view>
 			</view>
 			<view class="lan border-bottom">
-				<view class="left">智造团职务<text class="redcolor">*</text></view>
+				<view class="left">智照团职务<text class="redcolor">*</text></view>
 				<view class="right">
 					<picker mode="selector" :range="poslist" range-key="name" :value="userInfo.posname"
 						@change="changePos">
@@ -183,7 +183,7 @@
 					return;
 				}
 				if (!this.userInfo.posname) {
-					this.$tools.msg("请选择智造团职务")
+					this.$tools.msg("请选择智照团职务")
 					return;
 				}
 				if (!this.userInfo.name) {

pageTwo/news/detail.vue

@@ -93,10 +93,9 @@
 			console.log("资讯", options)
 			this.type = options.type
 			this.handleActive(options.id)
-			// this.handleNewsList()
 			uni.showShareMenu({
 				withShareTicket: true,
-				menus: ["shareAppMessage"]
+				menus: ['shareAppMessage', 'shareTimeline']
 			})
 		},
 		onShareAppMessage() {
@@ -113,6 +112,20 @@
 				},
 			}
 		},
+		onShareTimeline() {
+			let that = this
+			return {
+				title: that.content.title,
+				query: 'id=' + that.content.id + '&type=' + that.type,
+				imageUrl: that.content.headimg,
+				success: function(res) {
+					console.log("分享到朋友圈成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友圈失败")
+				},
+			}
+		},
 		methods: {
 			handleActive(id) {
 				let that = this
@@ -160,11 +173,13 @@
 			},
 			handleZan() {
 				console.log("点赞")
-				this.$model.getLike({
+				let that = this
-					id: this.content.id,
+				that.$model.getLike({
-					type: this.type
+					id: that.content.id,
+					type: that.type
 				}).then(res => {
-					this.content.islike = true
+					that.content.islike = true
+					that.content.likecnt++
 				})
 			}
 		}

pageTwo/news/list.vue

@@ -52,6 +52,34 @@
 			this.page++
 			this.handleInfoList(that.page)
 		},
+		// onShareAppMessage() {
+		// 	let that = this
+		// 	return {
+		// 		title: "智照团线上展厅",
+		// 		path: '/pageTwo/news/list?type=' + that.type,
+		// 		imageUrl: '',
+		// 		success: function(res) {
+		// 			console.log("分享到朋友成功")
+		// 		},
+		// 		fail: function(res) {
+		// 			console.log("分享到朋友失败")
+		// 		},
+		// 	}
+		// },
+		// onShareTimeline() {
+		// 	let that = this
+		// 	return {
+		// 		title: "智照团线上展厅",
+		// 		query: 'type=' + that.type,
+		// 		imageUrl: '',
+		// 		success: function(res) {
+		// 			console.log("分享到朋友成功")
+		// 		},
+		// 		fail: function(res) {
+		// 			console.log("分享到朋友失败")
+		// 		},
+		// 	}
+		// },
 		methods: {
 			handleInfoList(page) {
 				let that = this
@@ -60,8 +88,8 @@
 					pageSize: 10,
 					searchValue: "",
 				}
-				let https = this.type == 1 ? that.$model.getinfolist(account) : this.type == 4 ? that.$model
+				// 1资讯，4公益，7党建
-					.getCampaignList(account) : that.$model.getPartyList(account)
+				let https = this.type == 1 ? that.$model.getinfolist(account) : this.type == 4 ? that.$model.getGongyiList(account) : that.$model.getPartyList(account)
 				return https.then((res) => {
 					if (res.code != 0) return
 					that.newsList = this.newsList.concat(res.data.rows)

pageTwo/product/detail.vue

@@ -79,6 +79,20 @@
 				},
 			}
 		},
+		onShareTimeline() {
+			let that = this
+			return {
+				title: that.content.title,
+				query: 'id=' + that.id + '&type=' + that.type,
+				imageUrl: "",
+				success: function(res) {
+					console.log("分享到朋友圈成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友圈失败")
+				},
+			}
+		},
 		methods: {
 			previewImage(ind) {
 				let that = this

pageTwo/product/list.vue

@@ -83,7 +83,6 @@
 			this.page++
 			this.handleList()
 		},
-
 		methods: {
 			handleActive(ind) {
 				this.active = ind

pages.json

@@ -3,7 +3,7 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "智造团"
+				"navigationBarTitleText": "智照团线上展厅"
 			}
 		}, {
 			"path": "pages/me/me",
@@ -54,7 +54,7 @@
 		}, {
 			"path": "login/add",
 			"style": {
-				"navigationBarTitleText": "我要加入智造团",
+				"navigationBarTitleText": "我要加入智照团",
 				"enablePullDownRefresh": false
 			}
 

pages/index/index.vue

@@ -47,8 +47,12 @@
 			<view class="f_banner centerList" style="margin-top: 10px;">
 				<view v-if="HomeContent&&centerList.length">
 					<swiper class="swiper" autoplay="true">
-						<swiper-item v-for="(image, index) in centerList" :key="index" @click="detail(image.id,5)">
+						<swiper-item v-for="(ite, index) in centerList" :key="index">
-							<image :src="image.headimg" />
+							<image :src="ite.headimg" v-if='ite.posfmtype!=2' @click="detail(ite.id,5)" />
+							<video v-else id="myVideo" :src="ite.headimg" @error="videoErrorCallback" controls
+								:muted="true" :autoplay="true" show-mute-btn object-fit="fill"></video>
+							<!-- <video id="myVideo" src="https://qiniu-web-assets.dcloud.net.cn/unidoc/zh/2minute-demo.mp4" @error="videoErrorCallback" controls
+									:muted="true" :autoplay="true" show-mute-btn object-fit="fill"></video> -->
 						</swiper-item>
 					</swiper>
 				</view>
@@ -59,7 +63,6 @@
 					<text class="ml-10">领导风采</text>
 					<text class="mr-10">查看更多></text>
 				</view>
-
 				<swiper class="swiper " display-multiple-items='5' autoplay="true" circular="true" interval='3000'>
 					<swiper-item v-for="(item,index) in list" :key="index" @click="handleDetail(item)">
 						<view class="item mt-15">
@@ -143,12 +146,11 @@
 				pageSize: 3,
 			})
 			that.handleVipList()
-
 		},
 		onShareAppMessage() {
 			let that = this
 			return {
-				title: "智造团",
+				title: "智照团线上展厅",
 				path: '/pages/index/index',
 				imageUrl: '',
 				success: function(res) {
@@ -159,6 +161,19 @@
 				},
 			}
 		},
+		onShareTimeline() {
+			return {
+				title: '智照团线上展厅',
+				query: '',
+				imageUrl: '',
+				success: function(res) {
+					console.log("分享到朋友圈成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友圈失败")
+				},
+			}
+		},
 		methods: {
 			login() {
 				let that = this
@@ -188,6 +203,12 @@
 					}
 				})
 			},
+			videoErrorCallback: function(e) {
+				uni.showModal({
+					content: e.target.errMsg,
+					showCancel: false
+				})
+			},
 			// 领导风采
 			handleVipList() {
 				let that = this
@@ -355,10 +376,15 @@
 	}
 
 	.centerList {
-		height: 237rpx;
+		height: 399.4rpx;
 
 		/deep/swiper {
-			height: 237rpx;
+			height: 399.4rpx;
+		}
+
+		/deep/video {
+			width: 100%;
+			height: 399.4rpx;
 		}
 	}
 

pages/me/me.vue

@@ -93,7 +93,7 @@
 			</view>
 			<view>
 				<text>长按识别二维码</text>
-				<text>关注智造团公众号接收最新动态</text>
+				<text>关注智照团公众号接收最新动态</text>
 			</view>
 		</view>
 		<!-- 身份卡 -->
@@ -365,7 +365,7 @@
 
 			image {
 				width: 166rpx;
-				height: 54rpx;
+				height: 56rpx;
 			}
 		}
 

project.config.json

@@ -0,0 +1,29 @@
+{
+  "appid": "wxbbddd1888da43ab0",
+  "compileType": "miniprogram",
+  "libVersion": "3.4.7",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "condition": false
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}

project.private.config.json

@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "intelligentGroup",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}

tools/model.js

@@ -23,7 +23,7 @@ export default {
 			return res
 		})
 	},
-	getApplyfor(param) { // 申请加入智造团
+	getApplyfor(param) { // 申请加入智照团
 		return http.post("/api/app/wxopen/applyfor", param).then(res => {
 			return res
 		})
@@ -55,6 +55,11 @@ export default {
 			return res
 		})
 	},
+	getGongyiList(param) { // 公益列表
+		return http.post("/api/app/info/gongyilist", param).then(res => {
+			return res
+		})
+	},
 	getCampaignDetail(param) { // 活动详情
 		return http.post("/api/app/campaign/detail", param).then(res => {
 			return res

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -12788,7 +12788,7 @@ var _default = {
     });
   },
   getApplyfor: function getApplyfor(param) {
-    // 申请加入智造团
+    // 申请加入智照团
     return _https.default.post("/api/app/wxopen/applyfor", param).then(function (res) {
       return res;
     });
@@ -12824,6 +12824,12 @@ var _default = {
       return res;
     });
   },
+  getGongyiList: function getGongyiList(param) {
+    // 公益列表
+    return _https.default.post("/api/app/info/gongyilist", param).then(function (res) {
+      return res;
+    });
+  },
   getCampaignDetail: function getCampaignDetail(param) {
     // 活动详情
     return _https.default.post("/api/app/campaign/detail", param).then(function (res) {

unpackage/dist/dev/mp-weixin/components/newsList.js

@@ -77,29 +77,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
 var components
-try {
-  components = {
-    uniIcons: function () {
-      return Promise.all(/*! import() | uni_modules/uni-icons/components/uni-icons/uni-icons */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uni-icons/components/uni-icons/uni-icons.vue */ 240))
-    },
-  }
-} catch (e) {
-  if (
-    e.message.indexOf("Cannot find module") !== -1 &&
-    e.message.indexOf(".vue") !== -1
-  ) {
-    console.error(e.message)
-    console.error("1. 排查组件名称拼写是否正确")
-    console.error(
-      "2. 排查组件是否符合 easycom 规范，文档：https://uniapp.dcloud.net.cn/collocation/pages?id=easycom"
-    )
-    console.error(
-      "3. 若组件不符合 easycom 规范，需手动引入，并在 components 中注册该组件"
-    )
-  } else {
-    throw e
-  }
-}
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -201,18 +178,20 @@ var _default2 = {
       // 	that.$tools.msg("登录后查看更多")
       // 	return
       // }
-      var type = that.isAddress;
+      var type = that.isAddress == 1 || that.isAddress == 4 ? 1 : that.isAddress;
       var account = {
         id: id,
         IsBrowseCnt: 2,
         type: type.toString()
       };
       var https = "";
-      if (type == 1 || type == 5 || type == 6 || type == 7) {
+      if (type == 1 || type == 4 || type == 5 || type == 6 || type == 7) {
         https = that.$model.getInfoDetail(account);
-      } else if (type == 4) {
+        // } else if (type == 4) {
-        https = that.$model.getCampaignDetail(account);
+
+        // 	https = that.$model.getCampaignDetail(account)
       }
+
       return https.then(function (res) {
         if (res.code != 0) return;
         res.data.type = type;

unpackage/dist/dev/mp-weixin/components/newsList.json

@@ -1,6 +1,4 @@
 {
-  "usingComponents": {
+  "usingComponents": {},
-    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
-  },
   "component": true
 }

unpackage/dist/dev/mp-weixin/components/newsList.wxml

@@ -1 +1 @@
-<view class="product data-v-299191cc"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleActive',['$0'],[[['list','',index,'id']]]]]]]}}" class="newslist data-v-299191cc" bindtap="__e"><view class="right data-v-299191cc"><image src="{{item.headimg}}" mode="aspectFit" class="data-v-299191cc"></image></view><view class="left data-v-299191cc"><view class="title data-v-299191cc">{{''+item.title+''}}</view></view><block wx:if="{{isAddress!=4}}"><view class="time data-v-299191cc"><view class="size14 c999 data-v-299191cc" style="width:60%;"><icon class="iconfont icon-icon-test1 data-v-299191cc"></icon>{{''+item.createdtime+''}}</view><view class="size14 c999 textR data-v-299191cc" style="width:40%;"><icon class="iconfont icon-icon-test data-v-299191cc"></icon>{{''+item.browsecnt+'次浏览'}}</view></view></block><block wx:if="{{isAddress==4}}"><view class="time isAddress data-v-299191cc"><view class="size14 c999 data-v-299191cc"><uni-icons class="location data-v-299191cc" vue-id="{{'08a128ba-1-'+index}}" type="location-filled" size="20" bind:__l="__l"></uni-icons>{{''+item.province+item.city+item.area+item.address+''}}</view><view class="size14 c999 ml-10 data-v-299191cc"><icon class="iconfont icon-icon-test1 data-v-299191cc"></icon>{{''+item.starttime+"至"+item.endtime+''}}</view></view></block></view></block></view>
+<view class="product data-v-299191cc"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleActive',['$0'],[[['list','',index,'id']]]]]]]}}" class="newslist data-v-299191cc" bindtap="__e"><view class="right data-v-299191cc"><image src="{{item.headimg}}" mode="aspectFit" class="data-v-299191cc"></image></view><view class="left data-v-299191cc"><view class="title data-v-299191cc">{{''+item.title+''}}</view></view><view class="time data-v-299191cc"><view class="size14 c999 data-v-299191cc" style="width:60%;"><icon class="iconfont icon-icon-test1 data-v-299191cc"></icon>{{''+item.createdtime+''}}</view><view class="size14 c999 textR data-v-299191cc" style="width:40%;"><icon class="iconfont icon-icon-test data-v-299191cc"></icon>{{''+item.browsecnt+'次浏览'}}</view></view></view></block></view>

unpackage/dist/dev/mp-weixin/pageTwo/index/detail.js

@@ -166,6 +166,34 @@ var _default = {
     var that = this;
     this.content = option.content == 1 ? this.HomeContent.privacydesc : this.HomeContent.appdesc;
   },
+  onShareAppMessage: function onShareAppMessage() {
+    var that = this;
+    return {
+      title: that.content.title,
+      path: '/pageTwo/index/detail?content=' + that.content,
+      imageUrl: that.content.headimg,
+      success: function success(res) {
+        console.log("分享到朋友成功");
+      },
+      fail: function fail(res) {
+        console.log("分享到朋友失败");
+      }
+    };
+  },
+  onShareTimeline: function onShareTimeline() {
+    var that = this;
+    return {
+      title: that.content.title,
+      query: 'content=' + that.content,
+      imageUrl: that.content.headimg,
+      success: function success(res) {
+        console.log("分享到朋友圈成功");
+      },
+      fail: function fail(res) {
+        console.log("分享到朋友圈失败");
+      }
+    };
+  },
   methods: {}
 };
 exports.default = _default;

unpackage/dist/dev/mp-weixin/pageTwo/login/add.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "我要加入智造团",
+  "navigationBarTitleText": "我要加入智照团",
   "enablePullDownRefresh": false,
   "usingComponents": {
     "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"

unpackage/dist/dev/mp-weixin/pageTwo/login/login.js

@@ -89,7 +89,7 @@ var _default = {
         return;
       }
       if (this.value == 0) {
-        this.$tools.msg("请先勾选同意智造团《个人信息保护政策》");
+        this.$tools.msg("请先勾选同意智照团《个人信息保护政策》");
         return;
       }
       this.$model.getlogin({

unpackage/dist/dev/mp-weixin/pageTwo/login/login.wxml

@@ -1 +1 @@
-<view class="content data-v-111bb4d3"><image class="bg data-v-111bb4d3" src="../../static/011.png" mode="scaleToFill"></image><view class="ts data-v-111bb4d3"><view class="mb-5 data-v-111bb4d3">欢迎登录</view><view class="data-v-111bb4d3">智造团资源共享数据库平台</view></view><view class="edit data-v-111bb4d3"><image class="logo data-v-111bb4d3" src="../../static/logo.png" mode="widthFix"></image><view class="editem data-v-111bb4d3"><view class="input data-v-111bb4d3"><icon class="iconfont icon-gerenzhongxin1 mr-10 data-v-111bb4d3"></icon><input class="uni-input input100 data-v-111bb4d3" placeholder="请输入账号" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" value="{{account}}" bindinput="__e"/></view><view class="input data-v-111bb4d3"><icon class="iconfont icon-icon-test5 mr-10 data-v-111bb4d3"></icon><input class="uni-input data-v-111bb4d3" type="password" placeholder="请输入密码" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindinput="__e"/></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="tips size12 data-v-111bb4d3" bindtap="__e">如忘记密码，请联系秘书处修改重置</view></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view><view data-event-opts="{{[['tap',[['handleAdd',['$event']]]]]}}" class="wxbtn data-v-111bb4d3" bindtap="__e"><text class="data-v-111bb4d3">没有账号，我要加入智造团</text></view><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" bindchange="__e" class="data-v-111bb4d3"><checkbox style="transform:scale(0.8);" value="{{1}}" class="data-v-111bb4d3"></checkbox>勾选同意智造团<text data-event-opts="{{[['tap',[['handlexieyi',['$event']]]]]}}" class="bluecolor data-v-111bb4d3" bindtap="__e">《个人信息保护政策》</text></checkbox-group></view></view><secratary vue-id="125b6693-1" class="data-v-111bb4d3" bind:__l="__l"></secratary></view>
+<view class="content data-v-111bb4d3"><image class="bg data-v-111bb4d3" src="../../static/011.png" mode="scaleToFill"></image><view class="ts data-v-111bb4d3"><view class="mb-5 data-v-111bb4d3">欢迎登录</view><view class="data-v-111bb4d3">智照团资源共享数据库平台</view></view><view class="edit data-v-111bb4d3"><image class="logo data-v-111bb4d3" src="../../static/logo.png" mode="widthFix"></image><view class="editem data-v-111bb4d3"><view class="input data-v-111bb4d3"><icon class="iconfont icon-gerenzhongxin1 mr-10 data-v-111bb4d3"></icon><input class="uni-input input100 data-v-111bb4d3" placeholder="请输入账号" data-event-opts="{{[['input',[['__set_model',['','account','$event',[]]]]]]}}" value="{{account}}" bindinput="__e"/></view><view class="input data-v-111bb4d3"><icon class="iconfont icon-icon-test5 mr-10 data-v-111bb4d3"></icon><input class="uni-input data-v-111bb4d3" type="password" placeholder="请输入密码" data-event-opts="{{[['input',[['__set_model',['','password','$event',[]]]]]]}}" value="{{password}}" bindinput="__e"/></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="tips size12 data-v-111bb4d3" bindtap="__e">如忘记密码，请联系秘书处修改重置</view></view><view data-event-opts="{{[['tap',[['handleTelLogin',['$event']]]]]}}" class="btnlogin data-v-111bb4d3" bindtap="__e">登录</view><view data-event-opts="{{[['tap',[['handleAdd',['$event']]]]]}}" class="wxbtn data-v-111bb4d3" bindtap="__e"><text class="data-v-111bb4d3">没有账号，我要加入智照团</text></view><view class="xieyi data-v-111bb4d3"><checkbox-group data-event-opts="{{[['change',[['checkboxChange',['$event']]]]]}}" bindchange="__e" class="data-v-111bb4d3"><checkbox style="transform:scale(0.8);" value="{{1}}" class="data-v-111bb4d3"></checkbox>勾选同意智照团<text data-event-opts="{{[['tap',[['handlexieyi',['$event']]]]]}}" class="bluecolor data-v-111bb4d3" bindtap="__e">《个人信息保护政策》</text></checkbox-group></view></view><secratary vue-id="125b6693-1" class="data-v-111bb4d3" bind:__l="__l"></secratary></view>

unpackage/dist/dev/mp-weixin/pageTwo/me/user.js

@@ -252,7 +252,7 @@ var _default = {
         return;
       }
       if (!this.userInfo.posname) {
-        this.$tools.msg("请选择智造团职务");
+        this.$tools.msg("请选择智照团职务");
         return;
       }
       if (!this.userInfo.name) {

unpackage/dist/dev/mp-weixin/pageTwo/news/detail.js

@@ -204,10 +204,9 @@ var _default = {
     console.log("资讯", options);
     this.type = options.type;
     this.handleActive(options.id);
-    // this.handleNewsList()
     uni.showShareMenu({
       withShareTicket: true,
-      menus: ["shareAppMessage"]
+      menus: ['shareAppMessage', 'shareTimeline']
     });
   },
   onShareAppMessage: function onShareAppMessage() {
@@ -224,6 +223,20 @@ var _default = {
       }
     };
   },
+  onShareTimeline: function onShareTimeline() {
+    var that = this;
+    return {
+      title: that.content.title,
+      query: 'id=' + that.content.id + '&type=' + that.type,
+      imageUrl: that.content.headimg,
+      success: function success(res) {
+        console.log("分享到朋友圈成功");
+      },
+      fail: function fail(res) {
+        console.log("分享到朋友圈失败");
+      }
+    };
+  },
   methods: {
     handleActive: function handleActive(id) {
       var _this = this;
@@ -270,13 +283,14 @@ var _default = {
       });
     },
     handleZan: function handleZan() {
-      var _this2 = this;
       console.log("点赞");
-      this.$model.getLike({
+      var that = this;
-        id: this.content.id,
+      that.$model.getLike({
-        type: this.type
+        id: that.content.id,
+        type: that.type
       }).then(function (res) {
-        _this2.content.islike = true;
+        that.content.islike = true;
+        that.content.likecnt++;
       });
     }
   }

unpackage/dist/dev/mp-weixin/pageTwo/news/list.js

@@ -196,6 +196,34 @@ var _default = {
     this.page++;
     this.handleInfoList(that.page);
   },
+  // onShareAppMessage() {
+  // 	let that = this
+  // 	return {
+  // 		title: "智照团线上展厅",
+  // 		path: '/pageTwo/news/list?type=' + that.type,
+  // 		imageUrl: '',
+  // 		success: function(res) {
+  // 			console.log("分享到朋友成功")
+  // 		},
+  // 		fail: function(res) {
+  // 			console.log("分享到朋友失败")
+  // 		},
+  // 	}
+  // },
+  // onShareTimeline() {
+  // 	let that = this
+  // 	return {
+  // 		title: "智照团线上展厅",
+  // 		query: 'type=' + that.type,
+  // 		imageUrl: '',
+  // 		success: function(res) {
+  // 			console.log("分享到朋友成功")
+  // 		},
+  // 		fail: function(res) {
+  // 			console.log("分享到朋友失败")
+  // 		},
+  // 	}
+  // },
   methods: {
     handleInfoList: function handleInfoList(page) {
       var _this = this;
@@ -205,7 +233,8 @@ var _default = {
         pageSize: 10,
         searchValue: ""
       };
-      var https = this.type == 1 ? that.$model.getinfolist(account) : this.type == 4 ? that.$model.getCampaignList(account) : that.$model.getPartyList(account);
+      // 1资讯，4公益，7党建
+      var https = this.type == 1 ? that.$model.getinfolist(account) : this.type == 4 ? that.$model.getGongyiList(account) : that.$model.getPartyList(account);
       return https.then(function (res) {
         if (res.code != 0) return;
         that.newsList = _this.newsList.concat(res.data.rows);

unpackage/dist/dev/mp-weixin/pageTwo/product/detail.js

@@ -179,6 +179,20 @@ var _default = {
       }
     };
   },
+  onShareTimeline: function onShareTimeline() {
+    var that = this;
+    return {
+      title: that.content.title,
+      query: 'id=' + that.id + '&type=' + that.type,
+      imageUrl: "",
+      success: function success(res) {
+        console.log("分享到朋友圈成功");
+      },
+      fail: function fail(res) {
+        console.log("分享到朋友圈失败");
+      }
+    };
+  },
   methods: {
     previewImage: function previewImage(ind) {
       var that = this;

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -247,7 +247,7 @@ var _default = {
   onShareAppMessage: function onShareAppMessage() {
     var that = this;
     return {
-      title: "智造团",
+      title: "智照团线上展厅",
       path: '/pages/index/index',
       imageUrl: '',
       success: function success(res) {
@@ -258,6 +258,19 @@ var _default = {
       }
     };
   },
+  onShareTimeline: function onShareTimeline() {
+    return {
+      title: '智照团线上展厅',
+      query: '',
+      imageUrl: '',
+      success: function success(res) {
+        console.log("分享到朋友圈成功");
+      },
+      fail: function fail(res) {
+        console.log("分享到朋友圈失败");
+      }
+    };
+  },
   methods: {
     login: function login() {
       var that = this;
@@ -287,6 +300,12 @@ var _default = {
         }
       });
     },
+    videoErrorCallback: function videoErrorCallback(e) {
+      uni.showModal({
+        content: e.target.errMsg,
+        showCancel: false
+      });
+    },
     // 领导风采
     handleVipList: function handleVipList() {
       var _this2 = this;

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "智造团",
+  "navigationBarTitleText": "智照团线上展厅",
   "usingComponents": {
     "list": "/components/newsList",
     "piker-search": "/components/search",

unpackage/dist/dev/mp-weixin/pages/index/index.wxss

@@ -89,10 +89,14 @@
   background-size: 100%;
 }
 .centerList.data-v-57280228 {
-  height: 237rpx;
+  height: 399.4rpx;
 }
 .centerList.data-v-57280228 swiper {
-  height: 237rpx;
+  height: 399.4rpx;
+}
+.centerList.data-v-57280228 video {
+  width: 100%;
+  height: 399.4rpx;
 }
 .notice.data-v-57280228 {
   width: 100%;

unpackage/dist/dev/mp-weixin/pages/me/me.wxss

@@ -136,7 +136,7 @@
 }
 .foot .logo image.data-v-259fb574 {
   width: 166rpx;
-  height: 54rpx;
+  height: 56rpx;
 }
 .foot .ercode.data-v-259fb574 {
   width: 100%;

unpackage/dist/dev/mp-weixin/project.config.json

@@ -19,27 +19,10 @@
     "condition": false
   },
   "compileType": "miniprogram",
-  "libVersion": "",
+  "libVersion": "3.0.2",
   "appid": "wxbbddd1888da43ab0",
   "projectname": "intelligentGroup",
-  "condition": {
+  "condition": {},
-    "search": {
-      "current": -1,
-      "list": []
-    },
-    "conversation": {
-      "current": -1,
-      "list": []
-    },
-    "game": {
-      "current": -1,
-      "list": []
-    },
-    "miniprogram": {
-      "current": -1,
-      "list": []
-    }
-  },
   "editorSetting": {
     "tabIndent": "insertSpaces",
     "tabSize": 2

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -3,19 +3,5 @@
   "projectname": "intelligentGroup",
   "setting": {
     "compileHotReLoad": true
-  },
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "",
-          "pathName": "pageTwo/login/editPassword",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
   }
-      ]
-    }
-  },
-  "libVersion": "3.2.2"
 }

unpackage/project.config.json

@@ -0,0 +1,29 @@
+{
+  "appid": "wx6f48cc32c5c0a4a2",
+  "compileType": "miniprogram",
+  "libVersion": "3.4.7",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "condition": false
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}

unpackage/project.private.config.json

@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "unpackage",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}