分享、动态菜单

App.vue

@@ -5,6 +5,7 @@
 			this.$store.dispatch('getHomeContent', {
 				appid: uni.getStorageSync('appid')
 			})
+			this.$store.dispatch('getNavbarlist')
 		},
 		onShow: function() {
 			console.log('App Show')
@@ -16,7 +17,6 @@
 </script>
 
 <style>
-	
 	@import url("@/uni_modules/u-parse/u-parse.css");
 
 	/*每个页面公共css */

assets/common.scss

@@ -338,6 +338,7 @@
 				image {
 					width: 100%;
 					height: 100%;
+					border-radius: 5px;
 				}
 			}
 	

components/productList.vue

@@ -3,7 +3,7 @@
 		<view class="productList" v-for="(item,index) in list" :key="index" @click="handleActive(item)">
 			<view class="name" v-if="isName">
 				<view class="post" :style="{'width':!isMoney?'60%':'100%'}">
-					<image :src="item.userinfo.avatar" class="mr-10" mode="aspectFit"></image>
+					<image :src="item.userinfo.avatar" class="mr-10" mode="aspectFill"></image>
 					<view class="bold size16 mr-10">{{item.userinfo.name}}</view>
 					<text>{{item.userinfo.posname}}</text>
 				</view>
@@ -26,7 +26,7 @@
 				</view>
 				<view class="address" v-if="isMoney">
 					<text class="mr-10" v-if="item.industryname">行业：{{item.industryname}}</text>
-					<text v-if="item.province">地址：{{item.province}}{{item.city}}{{item.area}}{{item.address}}</text>
+					<text>地址：{{item.province}}{{item.city}}{{item.area}}{{item.address}}</text>
 				</view>
 				<view v-if="item.type!=9">
 					<view class="money mt-10" v-if="isMoney">
@@ -88,6 +88,7 @@
 </script>
 
 <style scoped lang="scss">
+
 	.image {
 		:nth-child(2) {
 			margin: 0 10px;

components/secratary.vue

@@ -35,6 +35,11 @@
 		computed: {
 			...mapState(["HomeContent", 'isSecratary']),
 		},
+		watch: {
+			isSecratary() {
+				console.log("isSecratary", this.isSecratary)
+			}
+		},
 		methods: {
 			onTap() {
 				this.$store.commit("changeSecratary", false);

data.json

@@ -1,45 +1,4 @@
 {
-	"tools": [{
-			"src": "../../static/02.png",
-			"text": "智造团概况",
-			"path": "/pageTwo/index/detail"
-		},
-		{
-			"src": "../../static/03.png",
-			"text": "资讯列表",
-			"path": "/pageTwo/news/list?type=1"
-		},
-		{
-			"src": "../../static/04.png",
-			"text": "活动信息",
-			"path": "/pageTwo/news/list?type=4"
-		},
-		{
-			"src": "../../static/05.png",
-			"text": "企业名录",
-			"path": "/pages/phoneList/phoneList"
-		},
-		{
-			"src": "../../static/06.png",
-			"text": "商品展示",
-			"path": "/pageTwo/product/list?type=3"
-		},
-		{
-			"src": "../../static/07.png",
-			"text": "党建专栏",
-			"path": "/pageTwo/news/list?type=7"
-		},
-		{
-			"src": "../../static/08.png",
-			"text": "供求信息",
-			"path": "/pageTwo/product/list?type=8"
-		},
-		{
-			"src": "../../static/09.png",
-			"text": "申请加入",
-			"path": "/pageTwo/login/add"
-		}
-	],
 	"addNeeds":[
 		"找客户资源",
 		"扩大人脉圈子",

pageTwo/login/add.vue

@@ -148,7 +148,7 @@
 			<view class="lan border-bottom">
 				<view class="left">能给平台带来什么？</view>
 				<view class="right textarea">
-					<textarea v-model="content.provide" name="content" />
+					<textarea v-model="content.provide" name="content" maxlength="-1"/>
 				</view>
 			</view>
 			<view class="lan c999 size12 mt-15">

pageTwo/me/addNeeds.vue

@@ -37,7 +37,7 @@
 			</view>
 			<!--  -->
 			<view class="lan" v-if="type!=9">
-				<view class="left">配送范围</view>
+				<view class="left">所在省市</view>
 				<view class="right" v-if="!disabled">
 					<pickRegions @getRegion="handleGetRegion" class="regions" :isArea="true">
 						<view class="city" v-if="content.province">
@@ -72,7 +72,7 @@
 			<view class="lan">
 				<view class="left">产品规格及介绍</view>
 				<view class="right textarea">
-					<textarea v-model="content.desc" name="content" :disabled="disabled" />
+					<textarea v-model="content.desc" name="content" :disabled="disabled" maxlength="-1"/>
 				</view>
 			</view>
 		</view>
@@ -196,7 +196,7 @@
 						return;
 					}
 					if (!this.content.province) {
-						this.$tools.msg("请选择配送范围")
+						this.$tools.msg("请选择所在省市")
 						return;
 					}
 					if (!this.content.address) {
@@ -253,6 +253,10 @@
 					}
 				});
 			},
+			handlecolse(){
+				this.content.province = ""
+				this.content.city = ""
+			},
 			EditInfo(data) {
 				let that = this
 				that.$model.getProductEdit(data).then(res => {
@@ -307,8 +311,8 @@
 			handleGetRegion(ite) {
 				console.log("省市区", ite)
 				this.content.province = ite[0].name
-				this.content.city = ite[1].name
+				this.content.city = ite[1].name == '全部' ? '' : ite[1].name
-				this.content.area = ite[2].name
+				// this.content.area = ite[2].name
 			},
 			// 所属行业
 			changeIndustry(e) {

pageTwo/me/company.vue

@@ -33,7 +33,7 @@
 				</view>
 			</view>
 			<view class="lan border-bottom">
-				<view class="left">公司logo<text class="redcolor">*</text></view>
+				<view class="left">公司logo</view>
 				<view class="right logo" v-if="userInfo.logourl">
 					<image :src="userInfo.logourl" class="headimage" mode="aspectFit" @click="handleimage(1)" />
 					<uni-icons type="close" size="26" class="uni-icons" @click="userInfo.logourl=''"
@@ -68,7 +68,7 @@
 			<view class="lan border-bottom">
 				<view class="left">企业介绍</view>
 				<view class="right textarea">
-					<textarea v-model="userInfo.desc" name="content" />
+					<textarea v-model="userInfo.desc" name="content" maxlength="-1"/>
 				</view>
 			</view>
 			<view class="lan border-bottom">
@@ -157,10 +157,10 @@
 					this.$tools.msg("请输入公司职位")
 					return;
 				}
-				if (!this.userInfo.logourl) {
+				// if (!this.userInfo.logourl) {
-					this.$tools.msg("请上传公司logo")
+				// 	this.$tools.msg("请上传公司logo")
-					return;
+				// 	return;
-				}
+				// }
 				if (!this.userInfo.mobile) {
 					this.$tools.msg("请输入公司电话")
 					return;

pageTwo/me/user.vue

@@ -104,7 +104,7 @@
 			<view class="lan border-bottom">
 				<view class="left">能给平台带来什么</view>
 				<view class="right textarea">
-					<textarea v-model="userInfo.provide" name="content" />
+					<textarea v-model="userInfo.provide" name="content" maxlength="-1" />
 				</view>
 			</view>
 

pageTwo/news/detail.vue

@@ -90,7 +90,7 @@
 				menus: ["shareAppMessage"]
 			})
 		},
-		onShareAppMessage(res) {
+		onShareAppMessage() {
 			let that = this
 			return {
 				title: that.content.title,

pageTwo/news/list.vue

@@ -35,9 +35,9 @@
 		onLoad(options) {
 			let that = this
 			this.type = options.type
-			uni.setNavigationBarTitle({
+			// uni.setNavigationBarTitle({
-				title: this.type == 1 ? "资讯列表" : this.type == 4 ? '活动列表' : '党建专栏'
+			// 	title: this.type == 1 ? "资讯列表" : this.type == 4 ? '活动列表' : '党建专栏'
-			});
+			// });
 			this.handleInfoList(that.page)
 		},
 		onReachBottom() {

pageTwo/product/detail.vue

@@ -3,7 +3,7 @@
 		<view v-if="content">
 			<view class="info">
 				<view class="name">
-					<image :src="content.userinfo.avatar" class="mr-10" mode="aspectFit"></image>
+					<image :src="content.userinfo.avatar" class="mr-10" mode="aspectFill"></image>
 					<view class="bold size16 mr-10">{{content.userinfo.name}}</view>
 					<text class="post">{{content.userinfo.posname}}</text>
 				</view>
@@ -22,7 +22,8 @@
 					<text class="c999 size12">市场价:￥{{content.price}}</text>
 				</view>
 				<view class="c999 size12" v-if="type!=9">
-					地址：{{content.province}}{{content.city}}{{content.area}}{{content.address}}</view>
+					地址：{{content.province}}{{content.city}}{{content.area}}{{content.address}}
+				</view>
 				<view class="c999 size12">
 					浏览量：{{content.browsecnt}}次
 				</view>
@@ -64,6 +65,20 @@
 		computed: {
 			...mapState(["user"]),
 		},
+		onShareAppMessage() {
+			let that = this
+			return {
+				title: that.content.title,
+				path: '/pageTwo/product/detail?id=' + that.id + '&type=' + that.type,
+				imageUrl: '',
+				success: function(res) {
+					console.log("分享到朋友成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友失败")
+				},
+			}
+		},
 		methods: {
 			previewImage(ind) {
 				let that = this
@@ -149,7 +164,6 @@
 			height: 50px;
 			border-radius: 50%;
 			border: 1px solid #f7f7f7;
-			padding: 5px;
 		}
 	}
 </style>

pageTwo/product/list.vue

@@ -67,6 +67,9 @@
 				title: this.type == 3 ? "商品展示" : '供求信息'
 			});
 		},
+		onShow() {
+			this.$store.commit("changeSecratary", false);
+		},
 		onReachBottom() {
 			let that = this
 			console.log("this.lastPage", this.lastPage)
@@ -80,6 +83,7 @@
 			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",
@@ -88,7 +88,7 @@
 		}, {
 			"path": "news/list",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "列表",
 				"enablePullDownRefresh": false
 			}
 

pages/index/index.vue

@@ -37,9 +37,9 @@
 		</view>
 		<!-- 工具 -->
 		<view class="tools">
-			<view class="item" v-for="(item,index) in tools" :key="index" @click="handlePath(index,item.path)">
+			<view class="item" v-for="(item,index) in navbarlist" :key="index" @click="handlePath(index,item.link)">
-				<image :src="item.src"></image>
+				<image :src="item.image"></image>
-				<text>{{item.text}}</text>
+				<text>{{item.name}}</text>
 			</view>
 		</view>
 		<!-- 简介 -->
@@ -58,8 +58,8 @@
 				<text class="ml-10">领导风采</text>
 				<text class="mr-10">查看更多></text>
 			</view>
-			<view class="item mt-15" v-for="(item,index) in list" :key="index" @click="handleDetail(item)">
+			<view class="item mt-15" v-for="(item,index) in list.length>5?list.slice(0,5):list" :key="index" @click="handleDetail(item)" >
-				<image :src="item.avatar"></image>
+				<image :src="item.avatar" mode="aspectFill"></image>
 				<view class="name">{{item.name}}</view>
 				<view class="post">{{item.posname}}</view>
 			</view>
@@ -97,7 +97,7 @@
 			}
 		},
 		computed: {
-			...mapState(["user", "HomeContent", 'InfoList']),
+			...mapState(["user", "HomeContent", 'InfoList',"navbarlist"]),
 			mobile() {
 				return this.user.name ? this.user.cominfo.mobile : ''
 			},
@@ -136,6 +136,20 @@
 			})
 			that.handleVipList()
 		},
+		onShareAppMessage() {
+			let that = this
+			return {
+				title: "智造团",
+				path: '/pages/index/index',
+				imageUrl: '',
+				success: function(res) {
+					console.log("分享到朋友成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友失败")
+				},
+			}
+		},
 		methods: {
 			login() {
 				let that = this

pages/index/searchList.vue

@@ -90,7 +90,7 @@
 					</view>
 					<view class="corporate c999">{{ite.data.name}}</view>
 				</view>
-				<view class="tell" @click="$tools.getCall(user.authlist,ite.data.mobile)">
+				<view class="tell" @click="$tools.getCall(user.authlist,ite.data.mobile)" @click.stop>
 					<image src="../../static/tall.png"></image>
 				</view>
 			</view>

pages/me/me.vue

@@ -5,7 +5,7 @@
 			<view class="headbox">
 				<view class="head">
 					<view class="image">
-						<image :src="userInfo.avatarurl" mode="aspectFit"></image>
+						<image :src="userInfo.avatarurl" mode="aspectFill"></image>
 					</view>
 					<view class="info">
 						<view class="name">

pages/phoneList/detail.vue

@@ -5,13 +5,14 @@
 				<view class="headbox">
 					<view class="head">
 						<view class="image">
-							<image :src='con.avatarurl' mode="aspectFit"></image>
+							<image :src='con.avatarurl' mode="aspectFill"></image>
 						</view>
 						<view class="info">
 							<view class="name">
 								{{con.name}}<text>{{con.posname}}</text>
 							</view>
-							<view class="post">{{con.orgname}}<text v-if="con.place" class="ml-5 mr-5">|</text>{{con.place}}</view>
+							<view class="post">{{con.orgname}}<text v-if="con.place"
+									class="ml-5 mr-5">|</text>{{con.place}}</view>
 							<view class="phone">电话:{{con.phone}}</view>
 							<view class="phone" v-if="con.email">邮箱:{{con.email}}</view>
 						</view>
@@ -76,7 +77,7 @@
 				<!--个人简介  -->
 				<view class="show" v-if="active==3">
 					<view class="headimage">
-						<image :src='con.avatarurl' mode="aspectFit"></image>
+						<image :src='con.avatarurl' mode="aspectFill"></image>
 					</view>
 					<view class="name">
 						{{con.name}}<text>{{con.posname}}</text>
@@ -85,7 +86,7 @@
 					</view>
 					<view class="mt-10"><text>性别:</text>{{con.sex==1?'男':con.sex==2?'女':'未知'}}</view>
 					<view class="mt-10"><text>出生年月:</text>{{con.birthday.substring(0,10)}}</view>
-					<view class="mt-10"><text>籍贯:</text>{{con.place}}</view>
+					<view class="mt-10" v-if="con.place"><text>籍贯:</text>{{con.place}}</view>
 					<view class="mt-10 ml-15" v-if="con.interests">
 						<text class="text">爱好:</text>{{con.interests}}
 					</view>
@@ -136,6 +137,7 @@
 			this.id = options.id
 			this.handleInfo(options.id)
 			this.handleList()
+			this.$store.commit("changeSecratary", false);
 		},
 		onReachBottom() {
 			let that = this
@@ -151,6 +153,20 @@
 			this.page++
 			this.handleList()
 		},
+		onShareAppMessage() {
+			let that = this
+			return {
+				title: that.con.cominfo.name,
+				path: '/pages/phoneList/detail?id=' + that.id,
+				imageUrl: that.con.cominfo.logourl,
+				success: function(res) {
+					console.log("分享到朋友成功")
+				},
+				fail: function(res) {
+					console.log("分享到朋友失败")
+				},
+			}
+		},
 		methods: {
 			handleInfo(id) {
 				let that = this
@@ -218,6 +234,7 @@
 	image {
 		width: 100%;
 		height: 100%;
+		border-radius: 5px;
 	}
 
 	.title {

pages/phoneList/phoneList.vue

@@ -62,6 +62,9 @@
 			this.handleList()
 			that.token = uni.getStorageSync('token')
 		},
+		onShow() {
+			this.$store.commit("changeSecratary", false);
+		},
 		onReachBottom() {
 			let that = this
 			if (!this.lastPage || this.page >= this.lastPage) {

store/actions.js

@@ -31,6 +31,15 @@ export default {
 			commit('changeHomeContent', res.data)
 		}).catch(e => {})
 	},
+	// 导航栏列表
+	getNavbarlist({
+		commit
+	}) {
+		return model.getNavbarlist({}).then(res => {
+			if (res.code != 0) false
+			commit('changeNavbarlist', res.data)
+		}).catch(e => {})
+	},
 
 	// 用户信息
 	getUserInfo({

store/index.js

@@ -46,9 +46,10 @@ export default new Vuex.Store({
 			officialqrcode: "",
 			secrataryphone: "",
 			secrataryqrcode: "",
-			privacydesc: ""
+			privacydesc: "",
 		},
 		InfoList: {},
+		navbarlist: [],
 		isLogout: true,
 		isSecratary: false,
 	},
@@ -62,6 +63,10 @@ export default new Vuex.Store({
 		changeHomeContent(state, newData) {
 			state.HomeContent = newData
 		},
+		// 导航栏列表
+		changeNavbarlist(state, newData) {
+			state.navbarlist = newData
+		},
 		// 资讯列表
 		changeInfoList(state, newData) {
 			state.InfoList = newData

tools/model.js

@@ -28,6 +28,11 @@ export default {
 			return res
 		})
 	},
+	getNavbarlist(param) { // 获取导航栏列表
+		return http.post("/api/app/wxopen/navbarlist", param).then(res => {
+			return res
+		})
+	},
 
 	// 内容管理
 	getHomeContent(param) { // 获取首页内容

tools/tools.js

@@ -34,23 +34,20 @@ function NewsPtype(con) {
 }
 
 function getCall(authlist, num) {
-	console.log("authlist", authlist,)
+	console.log("authlist", authlist)
-	if (!authlist.length) {
+	if (authlist.length) {
+		let arr = authlist.findIndex(v => v.code == 'phone:show')
+		if (arr == -1) {
 			$store.commit("changeSecratary", true);
 		} else {
-		authlist.forEach(ite => {
-			if (ite.code.indexOf('phone:show') != -1) {
-				console.log("包含")
 			uni.makePhoneCall({
 				phoneNumber: num //仅为示例
 			}).catch((e) => {
 				console.log(e) //用catch(e)来捕获错误{makePhoneCall:fail cancel}
 			});
-			} else {
-				console.log("不包含")
-				$store.commit("changeSecratary", true);
 		}
-		})
+	} else {
+		$store.commit("changeSecratary", true);
 	}
 }
 

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

@@ -140,6 +140,7 @@ var _default = {
     this.$store.dispatch('getHomeContent', {
       appid: uni.getStorageSync('appid')
     });
+    this.$store.dispatch('getNavbarlist');
   },
   onShow: function onShow() {
     console.log('App Show');

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -582,6 +582,7 @@ page {
 .phonetop .head .image image {
   width: 100%;
   height: 100%;
+  border-radius: 5px;
 }
 .phonetop .head .info {
   width: calc(100% - 100px);

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

@@ -1758,7 +1758,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -10434,7 +10434,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -10455,14 +10455,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -10558,7 +10558,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"intelligentGroup","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -11279,6 +11279,7 @@ var _default = new _vuex.default.Store({
       privacydesc: ""
     },
     InfoList: {},
+    navbarlist: [],
     isLogout: true,
     isSecratary: false
   },
@@ -11291,6 +11292,10 @@ var _default = new _vuex.default.Store({
     changeHomeContent: function changeHomeContent(state, newData) {
       state.HomeContent = newData;
     },
+    // 导航栏列表
+    changeNavbarlist: function changeNavbarlist(state, newData) {
+      state.navbarlist = newData;
+    },
     // 资讯列表
     changeInfoList: function changeInfoList(state, newData) {
       state.InfoList = newData;
@@ -12640,9 +12645,17 @@ var _default = {
       commit('changeHomeContent', res.data);
     }).catch(function (e) {});
   },
-  // 用户信息
+  // 导航栏列表
-  getUserInfo: function getUserInfo(_ref3) {
+  getNavbarlist: function getNavbarlist(_ref3) {
     var commit = _ref3.commit;
+    return _model.default.getNavbarlist({}).then(function (res) {
+      if (res.code != 0) false;
+      commit('changeNavbarlist', res.data);
+    }).catch(function (e) {});
+  },
+  // 用户信息
+  getUserInfo: function getUserInfo(_ref4) {
+    var commit = _ref4.commit;
     return _model.default.getuserinfo({}).then(function (res) {
       if (res.code != 0) false;
       commit('changeUserInfo', res.data);
@@ -12650,16 +12663,16 @@ var _default = {
     });
   },
   // 资讯列表
-  getInfoList: function getInfoList(_ref4, account) {
+  getInfoList: function getInfoList(_ref5, account) {
-    var commit = _ref4.commit;
+    var commit = _ref5.commit;
     return _model.default.getinfolist(account).then(function (res) {
       if (res.code != 0) false;
       commit('changeInfoList', res.data);
     });
   },
   // 获取历史记录
-  gethistoryList: function gethistoryList(_ref5, account) {
+  gethistoryList: function gethistoryList(_ref6, account) {
-    var commit = _ref5.commit;
+    var commit = _ref6.commit;
     return _model.default.getList(account).then(function (res) {
       if (res.data && res.data.items) {
         commit('changehistoryList', res.data.items);
@@ -12670,8 +12683,8 @@ var _default = {
     });
   },
   // 宠物列表
-  getPetList: function getPetList(_ref6) {
+  getPetList: function getPetList(_ref7) {
-    var commit = _ref6.commit;
+    var commit = _ref7.commit;
     return _model.default.getPetList({
       pagenum: 20,
       pagesize: 1
@@ -12685,8 +12698,8 @@ var _default = {
     });
   },
   //养护提醒
-  getAlertList: function getAlertList(_ref7, account) {
+  getAlertList: function getAlertList(_ref8, account) {
-    var commit = _ref7.commit;
+    var commit = _ref8.commit;
     return _model.default.getAlertList(account).then(function (res) {
       if (res.data && res.data.rows) {
         commit('changeAlertList', res.data.rows);
@@ -12697,8 +12710,8 @@ var _default = {
     });
   },
   //通知提醒
-  getNoticelist: function getNoticelist(_ref8) {
+  getNoticelist: function getNoticelist(_ref9) {
-    var commit = _ref8.commit;
+    var commit = _ref9.commit;
     return _model.default.getnoticelist({}).then(function (res) {
       if (res.data) {
         commit('changeNoticelist', res.data);
@@ -12780,6 +12793,12 @@ var _default = {
       return res;
     });
   },
+  getNavbarlist: function getNavbarlist(param) {
+    // 获取导航栏列表
+    return _https.default.post("/api/app/wxopen/navbarlist", param).then(function (res) {
+      return res;
+    });
+  },
   // 内容管理
   getHomeContent: function getHomeContent(param) {
     // 获取首页内容
@@ -13083,22 +13102,21 @@ function NewsPtype(con) {
 }
 function getCall(authlist, num) {
   console.log("authlist", authlist);
-  if (!authlist.length) {
+  if (authlist.length) {
+    var arr = authlist.findIndex(function (v) {
+      return v.code == 'phone:show';
+    });
+    if (arr == -1) {
       _store.default.commit("changeSecratary", true);
     } else {
-    authlist.forEach(function (ite) {
-      if (ite.code.indexOf('phone:show') != -1) {
-        console.log("包含");
       uni.makePhoneCall({
         phoneNumber: num //仅为示例
       }).catch(function (e) {
         console.log(e); //用catch(e)来捕获错误{makePhoneCall:fail cancel}
       });
-      } else {
-        console.log("不包含");
-        _store.default.commit("changeSecratary", true);
     }
-    });
+  } else {
+    _store.default.commit("changeSecratary", true);
   }
 }
 function msg(str) {
@@ -13153,10 +13171,10 @@ function getTime() {
 /*!************************************************************!*\
   !*** E:/qiaocongli/小程序/智造团资源共享/intelligentGroup/data.json ***!
   \************************************************************/
-/*! exports provided: tools, addNeeds, default */
+/*! exports provided: addNeeds, default */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"tools\":[{\"src\":\"../../static/02.png\",\"text\":\"智造团概况\",\"path\":\"/pageTwo/index/detail\"},{\"src\":\"../../static/03.png\",\"text\":\"资讯列表\",\"path\":\"/pageTwo/news/list?type=1\"},{\"src\":\"../../static/04.png\",\"text\":\"活动信息\",\"path\":\"/pageTwo/news/list?type=4\"},{\"src\":\"../../static/05.png\",\"text\":\"企业名录\",\"path\":\"/pages/phoneList/phoneList\"},{\"src\":\"../../static/06.png\",\"text\":\"商品展示\",\"path\":\"/pageTwo/product/list?type=3\"},{\"src\":\"../../static/07.png\",\"text\":\"党建专栏\",\"path\":\"/pageTwo/news/list?type=7\"},{\"src\":\"../../static/08.png\",\"text\":\"供求信息\",\"path\":\"/pageTwo/product/list?type=8\"},{\"src\":\"../../static/09.png\",\"text\":\"申请加入\",\"path\":\"/pageTwo/login/add\"}],\"addNeeds\":[\"找客户资源\",\"扩大人脉圈子\",\"能力提升\",\"为企业做品牌宣传\",\"直播\",\"个人IP打造\",\"拍摄剪辑\",\"学习新媒体运营\",\"老板思维\",\"团队打造\",\"销售话术\",\"外贸平台搭建\",\"其他\"]}");
+module.exports = JSON.parse("{\"addNeeds\":[\"找客户资源\",\"扩大人脉圈子\",\"能力提升\",\"为企业做品牌宣传\",\"直播\",\"个人IP打造\",\"拍摄剪辑\",\"学习新媒体运营\",\"老板思维\",\"团队打造\",\"销售话术\",\"外贸平台搭建\",\"其他\"]}");
 
 /***/ }),
 

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

@@ -1 +1 @@
-<view class="product data-v-4b57edc2"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleActive',['$0'],[[['list','',index]]]]]]]}}" class="productList data-v-4b57edc2" bindtap="__e"><block wx:if="{{isName}}"><view class="name data-v-4b57edc2"><view class="post data-v-4b57edc2" style="{{'width:'+(!isMoney?'60%':'100%')+';'}}"><image class="mr-10 data-v-4b57edc2" src="{{item.$orig.userinfo.avatar}}" mode="aspectFit"></image><view class="bold size16 mr-10 data-v-4b57edc2">{{item.$orig.userinfo.name}}</view><text class="data-v-4b57edc2">{{item.$orig.userinfo.posname}}</text></view><block wx:if="{{!isMoney}}"><text data-event-opts="{{[['tap',[['e0',['$event']],['',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="call data-v-4b57edc2" catchtap="__e"><icon class="iconfont icon-dianhua1 mr-10 data-v-4b57edc2"></icon>拨打电话</text></block></view></block><view class="info data-v-4b57edc2"><view class="bold size16 title data-v-4b57edc2"><text style="{{'width:'+(isState?'80%':'100%')+';'}}" class="data-v-4b57edc2">{{item.$orig.title}}</text><block wx:if="{{isState}}"><text class="state data-v-4b57edc2">{{''+(item.$orig.status==4?'待审核':item.$orig.status==5?'已驳回':'审核通过')+''}}</text></block></view><view class="mt-5 c999 size14 data-v-4b57edc2">{{item.$orig.desc}}</view><block wx:if="{{item.g0}}"><view class="image data-v-4b57edc2"><block wx:for="{{item.$orig.pics}}" wx:for-item="img" wx:for-index="ind" wx:key="ind"><image src="{{img.url}}" mode="aspectFill" class="data-v-4b57edc2"></image></block></view></block><block wx:if="{{isMoney}}"><view class="address data-v-4b57edc2"><block wx:if="{{item.$orig.industryname}}"><text class="mr-10 data-v-4b57edc2">{{"行业："+item.$orig.industryname}}</text></block><block wx:if="{{item.$orig.province}}"><text class="data-v-4b57edc2">{{"地址："+item.$orig.province+item.$orig.city+item.$orig.area+item.$orig.address}}</text></block></view></block><block wx:if="{{item.$orig.type!=9}}"><view class="data-v-4b57edc2"><block wx:if="{{isMoney}}"><view class="money mt-10 data-v-4b57edc2"><block wx:if="{{item.$orig.vipprice}}"><text class="redcolor size16 mr-5 bold data-v-4b57edc2">{{"会员价:￥"+item.$orig.vipprice}}</text></block><block wx:if="{{item.$orig.price}}"><text class="size12 c999 data-v-4b57edc2">{{"市场价:￥"+item.$orig.price}}</text></block><block wx:if="{{isPhone}}"><text data-event-opts="{{[['tap',[['',['$event']],['e1',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="call data-v-4b57edc2" catchtap="__e"><icon class="iconfont icon-dianhua1 mr-10 data-v-4b57edc2"></icon>拨打电话</text></block></view></block></view></block></view></view></block><secratary vue-id="1fa64b84-1" class="data-v-4b57edc2" bind:__l="__l"></secratary></view>
+<view class="product data-v-4b57edc2"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleActive',['$0'],[[['list','',index]]]]]]]}}" class="productList data-v-4b57edc2" bindtap="__e"><block wx:if="{{isName}}"><view class="name data-v-4b57edc2"><view class="post data-v-4b57edc2" style="{{'width:'+(!isMoney?'60%':'100%')+';'}}"><image class="mr-10 data-v-4b57edc2" src="{{item.$orig.userinfo.avatar}}" mode="aspectFill"></image><view class="bold size16 mr-10 data-v-4b57edc2">{{item.$orig.userinfo.name}}</view><text class="data-v-4b57edc2">{{item.$orig.userinfo.posname}}</text></view><block wx:if="{{!isMoney}}"><text data-event-opts="{{[['tap',[['e0',['$event']],['',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="call data-v-4b57edc2" catchtap="__e"><icon class="iconfont icon-dianhua1 mr-10 data-v-4b57edc2"></icon>拨打电话</text></block></view></block><view class="info data-v-4b57edc2"><view class="bold size16 title data-v-4b57edc2"><text style="{{'width:'+(isState?'80%':'100%')+';'}}" class="data-v-4b57edc2">{{item.$orig.title}}</text><block wx:if="{{isState}}"><text class="state data-v-4b57edc2">{{''+(item.$orig.status==4?'待审核':item.$orig.status==5?'已驳回':'审核通过')+''}}</text></block></view><view class="mt-5 c999 size14 data-v-4b57edc2">{{item.$orig.desc}}</view><block wx:if="{{item.g0}}"><view class="image data-v-4b57edc2"><block wx:for="{{item.$orig.pics}}" wx:for-item="img" wx:for-index="ind" wx:key="ind"><image src="{{img.url}}" mode="aspectFill" class="data-v-4b57edc2"></image></block></view></block><block wx:if="{{isMoney}}"><view class="address data-v-4b57edc2"><block wx:if="{{item.$orig.industryname}}"><text class="mr-10 data-v-4b57edc2">{{"行业："+item.$orig.industryname}}</text></block><text class="data-v-4b57edc2">{{"地址："+item.$orig.province+item.$orig.city+item.$orig.area+item.$orig.address}}</text></view></block><block wx:if="{{item.$orig.type!=9}}"><view class="data-v-4b57edc2"><block wx:if="{{isMoney}}"><view class="money mt-10 data-v-4b57edc2"><block wx:if="{{item.$orig.vipprice}}"><text class="redcolor size16 mr-5 bold data-v-4b57edc2">{{"会员价:￥"+item.$orig.vipprice}}</text></block><block wx:if="{{item.$orig.price}}"><text class="size12 c999 data-v-4b57edc2">{{"市场价:￥"+item.$orig.price}}</text></block><block wx:if="{{isPhone}}"><text data-event-opts="{{[['tap',[['',['$event']],['e1',['$event']]]]]}}" data-event-params="{{({item:item.$orig})}}" class="call data-v-4b57edc2" catchtap="__e"><icon class="iconfont icon-dianhua1 mr-10 data-v-4b57edc2"></icon>拨打电话</text></block></view></block></view></block></view></view></block><secratary vue-id="1fa64b84-1" class="data-v-4b57edc2" bind:__l="__l"></secratary></view>

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

@@ -152,6 +152,11 @@ var _default = {
     return {};
   },
   computed: _objectSpread({}, (0, _vuex.mapState)(["HomeContent", 'isSecratary'])),
+  watch: {
+    isSecratary: function isSecratary() {
+      console.log("isSecratary", this.isSecratary);
+    }
+  },
   methods: {
     onTap: function onTap() {
       this.$store.commit("changeSecratary", false);

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

@@ -291,7 +291,7 @@ var _default = {
           return;
         }
         if (!this.content.province) {
-          this.$tools.msg("请选择配送范围");
+          this.$tools.msg("请选择所在省市");
           return;
         }
         if (!this.content.address) {
@@ -348,6 +348,10 @@ var _default = {
         }
       });
     },
+    handlecolse: function handlecolse() {
+      this.content.province = "";
+      this.content.city = "";
+    },
     EditInfo: function EditInfo(data) {
       var that = this;
       that.$model.getProductEdit(data).then(function (res) {
@@ -403,8 +407,8 @@ var _default = {
     handleGetRegion: function handleGetRegion(ite) {
       console.log("省市区", ite);
       this.content.province = ite[0].name;
-      this.content.city = ite[1].name;
+      this.content.city = ite[1].name == '全部' ? '' : ite[1].name;
-      this.content.area = ite[2].name;
+      // this.content.area = ite[2].name
     },
     // 所属行业
     changeIndustry: function changeIndustry(e) {

unpackage/dist/dev/mp-weixin/pageTwo/me/addNeeds.wxml

@@ -1 +1 @@
-<view class="box fromClass data-v-0f7d18a3"><block wx:if="{{active==5}}"><view class="pass data-v-0f7d18a3">{{'驳回原因：'+content.statusremark+''}}</view></block><view class="lanBox data-v-0f7d18a3"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">产品名称（标题）</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="标题" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','title','$event',[]],['content']]]]]}}" value="{{content.title}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">产品图片</view><block wx:for="{{$root.l0}}" wx:for-item="img" wx:for-index="ind"><block wx:if="{{img.g0}}"><view class="right pics mr-10 data-v-0f7d18a3"><image src="{{img.$orig}}" mode="aspectFill" data-event-opts="{{[['tap',[['handleimage',[ind]]]]]}}" bindtap="__e" class="data-v-0f7d18a3"></image><block wx:if="{{!disabled}}"><uni-icons class="uni-icons data-v-0f7d18a3" vue-id="{{'3fb3067a-1-'+ind}}" type="close" size="22" data-event-opts="{{[['^click',[['handleDel',[ind]],['',['$event']]]]]}}" catch:click="__e" bind:__l="__l"></uni-icons></block></view></block></block><block wx:if="{{$root.g1}}"><view data-event-opts="{{[['tap',[['handleimage']]]]}}" class="right pics size20 data-v-0f7d18a3" bindtap="__e">+</view></block><text class="size12 c999 desc data-v-0f7d18a3">最多可上传3张，大小不超过2M</text></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">所属行业</view><block wx:if="{{!disabled}}"><view class="right data-v-0f7d18a3"><picker mode="selector" range="{{industrylist}}" range-key="name" value="{{content.industryname}}" data-event-opts="{{[['change',[['changeIndustry',['$event']]]]]}}" bindchange="__e" class="data-v-0f7d18a3"><view class="uni-input data-v-0f7d18a3">{{content.industryname?content.industryname:"请选择"}}</view><uni-icons vue-id="3fb3067a-2" type="forward" size="20" color="#999" class="data-v-0f7d18a3" bind:__l="__l"></uni-icons></picker></view></block><block wx:else><view class="right data-v-0f7d18a3">{{''+content.industryname+''}}</view></block></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">配送范围</view><block wx:if="{{!disabled}}"><view class="right data-v-0f7d18a3"><pick-regions class="regions data-v-0f7d18a3" vue-id="3fb3067a-3" isArea="{{true}}" data-event-opts="{{[['^getRegion',[['handleGetRegion']]]]}}" bind:getRegion="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:if="{{content.province}}"><view class="city data-v-0f7d18a3">{{''+content.province+content.city+content.area+''}}</view></block><block wx:else><view class="data-v-0f7d18a3">请选择省/市/区</view></block><uni-icons vue-id="{{('3fb3067a-4')+','+('3fb3067a-3')}}" type="forward" size="20" color="#999" class="data-v-0f7d18a3" bind:__l="__l"></uni-icons></pick-regions></view></block><block wx:else><view class="right data-v-0f7d18a3">{{''+content.province+content.city+content.area+''}}</view></block></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">详细地址</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="单元楼栋" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','address','$event',[]],['content']]]]]}}" value="{{content.address}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">市场价</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="市场价" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','price','$event',[]],['content']]]]]}}" value="{{content.price}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">会员价</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="会员价" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','vipprice','$event',[]],['content']]]]]}}" value="{{content.vipprice}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view></block><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">产品规格及介绍</view><view class="right textarea data-v-0f7d18a3"><textarea name="content" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','desc','$event',[]],['content']]]]]}}" value="{{content.desc}}" bindinput="__e" class="data-v-0f7d18a3"></textarea></view></view></view><block wx:if="{{!disabled}}"><view data-event-opts="{{[['tap',[['confirmInfo',['$event']]]]]}}" class="btn data-v-0f7d18a3" bindtap="__e">提交</view></block></view>
+<view class="box fromClass data-v-0f7d18a3"><block wx:if="{{active==5}}"><view class="pass data-v-0f7d18a3">{{'驳回原因：'+content.statusremark+''}}</view></block><view class="lanBox data-v-0f7d18a3"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">产品名称（标题）</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="标题" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','title','$event',[]],['content']]]]]}}" value="{{content.title}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">产品图片</view><block wx:for="{{$root.l0}}" wx:for-item="img" wx:for-index="ind"><block wx:if="{{img.g0}}"><view class="right pics mr-10 data-v-0f7d18a3"><image src="{{img.$orig}}" mode="aspectFill" data-event-opts="{{[['tap',[['handleimage',[ind]]]]]}}" bindtap="__e" class="data-v-0f7d18a3"></image><block wx:if="{{!disabled}}"><uni-icons class="uni-icons data-v-0f7d18a3" vue-id="{{'3fb3067a-1-'+ind}}" type="close" size="22" data-event-opts="{{[['^click',[['handleDel',[ind]],['',['$event']]]]]}}" catch:click="__e" bind:__l="__l"></uni-icons></block></view></block></block><block wx:if="{{$root.g1}}"><view data-event-opts="{{[['tap',[['handleimage']]]]}}" class="right pics size20 data-v-0f7d18a3" bindtap="__e">+</view></block><text class="size12 c999 desc data-v-0f7d18a3">最多可上传3张，大小不超过2M</text></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">所属行业</view><block wx:if="{{!disabled}}"><view class="right data-v-0f7d18a3"><picker mode="selector" range="{{industrylist}}" range-key="name" value="{{content.industryname}}" data-event-opts="{{[['change',[['changeIndustry',['$event']]]]]}}" bindchange="__e" class="data-v-0f7d18a3"><view class="uni-input data-v-0f7d18a3">{{content.industryname?content.industryname:"请选择"}}</view><uni-icons vue-id="3fb3067a-2" type="forward" size="20" color="#999" class="data-v-0f7d18a3" bind:__l="__l"></uni-icons></picker></view></block><block wx:else><view class="right data-v-0f7d18a3">{{''+content.industryname+''}}</view></block></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">所在省市</view><block wx:if="{{!disabled}}"><view class="right data-v-0f7d18a3"><pick-regions class="regions data-v-0f7d18a3" vue-id="3fb3067a-3" isArea="{{true}}" data-event-opts="{{[['^getRegion',[['handleGetRegion']]]]}}" bind:getRegion="__e" bind:__l="__l" vue-slots="{{['default']}}"><block wx:if="{{content.province}}"><view class="city data-v-0f7d18a3">{{''+content.province+content.city+content.area+''}}</view></block><block wx:else><view class="data-v-0f7d18a3">请选择省/市/区</view></block><uni-icons vue-id="{{('3fb3067a-4')+','+('3fb3067a-3')}}" type="forward" size="20" color="#999" class="data-v-0f7d18a3" bind:__l="__l"></uni-icons></pick-regions></view></block><block wx:else><view class="right data-v-0f7d18a3">{{''+content.province+content.city+content.area+''}}</view></block></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">详细地址</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="单元楼栋" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','address','$event',[]],['content']]]]]}}" value="{{content.address}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">市场价</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="市场价" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','price','$event',[]],['content']]]]]}}" value="{{content.price}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view></block><block wx:if="{{type!=9}}"><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">会员价</view><view class="right data-v-0f7d18a3"><input name="name" type="text" placeholder="会员价" disabled="{{disabled}}" data-event-opts="{{[['input',[['__set_model',['$0','vipprice','$event',[]],['content']]]]]}}" value="{{content.vipprice}}" bindinput="__e" class="data-v-0f7d18a3"/></view></view></block><view class="lan data-v-0f7d18a3"><view class="left data-v-0f7d18a3">产品规格及介绍</view><view class="right textarea data-v-0f7d18a3"><textarea name="content" disabled="{{disabled}}" maxlength="-1" data-event-opts="{{[['input',[['__set_model',['$0','desc','$event',[]],['content']]]]]}}" value="{{content.desc}}" bindinput="__e" class="data-v-0f7d18a3"></textarea></view></view></view><block wx:if="{{!disabled}}"><view data-event-opts="{{[['tap',[['confirmInfo',['$event']]]]]}}" class="btn data-v-0f7d18a3" bindtap="__e">提交</view></block></view>

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

@@ -251,10 +251,10 @@ var _default = {
         this.$tools.msg("请输入公司职位");
         return;
       }
-      if (!this.userInfo.logourl) {
+      // if (!this.userInfo.logourl) {
-        this.$tools.msg("请上传公司logo");
+      // 	this.$tools.msg("请上传公司logo")
-        return;
+      // 	return;
-      }
+      // }
       if (!this.userInfo.mobile) {
         this.$tools.msg("请输入公司电话");
         return;

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

@@ -199,7 +199,7 @@ var _default = {
       menus: ["shareAppMessage"]
     });
   },
-  onShareAppMessage: function onShareAppMessage(res) {
+  onShareAppMessage: function onShareAppMessage() {
     var that = this;
     return {
       title: that.content.title,

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

@@ -179,9 +179,9 @@ var _default = {
   onLoad: function onLoad(options) {
     var that = this;
     this.type = options.type;
-    uni.setNavigationBarTitle({
+    // uni.setNavigationBarTitle({
-      title: this.type == 1 ? "资讯列表" : this.type == 4 ? '活动列表' : '党建专栏'
+    // 	title: this.type == 1 ? "资讯列表" : this.type == 4 ? '活动列表' : '党建专栏'
-    });
+    // });
     this.handleInfoList(that.page);
   },
   onReachBottom: function onReachBottom() {

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

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "",
+  "navigationBarTitleText": "列表",
   "enablePullDownRefresh": false,
   "usingComponents": {
     "list": "/components/newsList"

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

@@ -165,6 +165,20 @@ var _default = {
     this.handleDetail(options.id, options.type);
   },
   computed: _objectSpread({}, (0, _vuex.mapState)(["user"])),
+  onShareAppMessage: function onShareAppMessage() {
+    var that = this;
+    return {
+      title: that.content.title,
+      path: '/pageTwo/product/detail?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/pageTwo/product/detail.wxml

@@ -1 +1 @@
-<view class="content data-v-e17a73de"><block wx:if="{{content}}"><view class="data-v-e17a73de"><view class="info data-v-e17a73de"><view class="name data-v-e17a73de"><image class="mr-10 data-v-e17a73de" src="{{content.userinfo.avatar}}" mode="aspectFit"></image><view class="bold size16 mr-10 data-v-e17a73de">{{content.userinfo.name}}</view><text class="post data-v-e17a73de">{{content.userinfo.posname}}</text></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="call data-v-e17a73de" bindtap="__e"><icon class="iconfont icon-dianhua1 mr-10 data-v-e17a73de"></icon>拨打电话</view></view><view class="newsDetail box data-v-e17a73de"><view class="title data-v-e17a73de">{{''+content.title+''}}</view><block wx:if="{{type!=9}}"><view class="data-v-e17a73de"><text class="redcolor size14 mr-10 bold data-v-e17a73de">{{"会员价:￥"+content.vipprice}}</text><text class="c999 size12 data-v-e17a73de">{{"市场价:￥"+content.price}}</text></view></block><block wx:if="{{type!=9}}"><view class="c999 size12 data-v-e17a73de">{{'地址：'+content.province+content.city+content.area+content.address}}</view></block><view class="c999 size12 data-v-e17a73de">{{'浏览量：'+content.browsecnt+'次'}}</view><block wx:for="{{content.pics}}" wx:for-item="ite" wx:for-index="ind"><block wx:if="{{type!=9}}"><view class="image data-v-e17a73de"><image src="{{ite.url}}" mode="widthFix" data-event-opts="{{[['tap',[['previewImage',[ind]]]]]}}" bindtap="__e" class="data-v-e17a73de"></image></view></block></block><view class="con mt-15 data-v-e17a73de">{{''+content.desc+''}}</view></view><secratary vue-id="59167d15-1" class="data-v-e17a73de" bind:__l="__l"></secratary></view></block><block wx:else><view class="nolist data-v-e17a73de"><image src="/static/none.png" class="data-v-e17a73de"></image><text class="data-v-e17a73de">暂无数据</text></view></block></view>
+<view class="content data-v-e17a73de"><block wx:if="{{content}}"><view class="data-v-e17a73de"><view class="info data-v-e17a73de"><view class="name data-v-e17a73de"><image class="mr-10 data-v-e17a73de" src="{{content.userinfo.avatar}}" mode="aspectFill"></image><view class="bold size16 mr-10 data-v-e17a73de">{{content.userinfo.name}}</view><text class="post data-v-e17a73de">{{content.userinfo.posname}}</text></view><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="call data-v-e17a73de" bindtap="__e"><icon class="iconfont icon-dianhua1 mr-10 data-v-e17a73de"></icon>拨打电话</view></view><view class="newsDetail box data-v-e17a73de"><view class="title data-v-e17a73de">{{''+content.title+''}}</view><block wx:if="{{type!=9}}"><view class="data-v-e17a73de"><text class="redcolor size14 mr-10 bold data-v-e17a73de">{{"会员价:￥"+content.vipprice}}</text><text class="c999 size12 data-v-e17a73de">{{"市场价:￥"+content.price}}</text></view></block><block wx:if="{{type!=9}}"><view class="c999 size12 data-v-e17a73de">{{'地址：'+content.province+content.city+content.area+content.address+''}}</view></block><view class="c999 size12 data-v-e17a73de">{{'浏览量：'+content.browsecnt+'次'}}</view><block wx:for="{{content.pics}}" wx:for-item="ite" wx:for-index="ind"><block wx:if="{{type!=9}}"><view class="image data-v-e17a73de"><image src="{{ite.url}}" mode="widthFix" data-event-opts="{{[['tap',[['previewImage',[ind]]]]]}}" bindtap="__e" class="data-v-e17a73de"></image></view></block></block><view class="con mt-15 data-v-e17a73de">{{''+content.desc+''}}</view></view><secratary vue-id="59167d15-1" class="data-v-e17a73de" bind:__l="__l"></secratary></view></block><block wx:else><view class="nolist data-v-e17a73de"><image src="/static/none.png" class="data-v-e17a73de"></image><text class="data-v-e17a73de">暂无数据</text></view></block></view>

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

@@ -70,6 +70,5 @@
   height: 50px;
   border-radius: 50%;
   border: 1px solid #f7f7f7;
-  padding: 5px;
 }
 

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

@@ -219,6 +219,9 @@ var _default = {
       title: this.type == 3 ? "商品展示" : '供求信息'
     });
   },
+  onShow: function onShow() {
+    this.$store.commit("changeSecratary", false);
+  },
   onReachBottom: function onReachBottom() {
     var that = this;
     console.log("this.lastPage", this.lastPage);

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

@@ -105,9 +105,20 @@ var render = function () {
   var g0 = _vm.fimages.length
   var g1 = _vm.HomeContent && _vm.centerList.length
   var g2 = _vm.list.length
-  var g3 = _vm.newsList.length
+  var g3 = g2 ? _vm.list.length : null
-  var g4 = _vm.newsList.length
+  var g4 = g2 && g3 > 5 ? _vm.list.slice(0, 5) : null
   var g5 = _vm.newsList.length
+  var g6 = _vm.newsList.length
+  var g7 = _vm.newsList.length
+  if (!_vm._isMounted) {
+    _vm.e0 = function ($event, item) {
+      var _temp = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp2 = _temp.eventParams || _temp["event-params"],
+        item = _temp2.item
+      var _temp, _temp2
+      return _vm.handleDetail(item)
+    }
+  }
   _vm.$mp.data = Object.assign(
     {},
     {
@@ -118,6 +129,8 @@ var render = function () {
         g3: g3,
         g4: g4,
         g5: g5,
+        g6: g6,
+        g7: g7,
       },
     }
   )
@@ -189,7 +202,7 @@ var _default = {
       token: ''
     };
   },
-  computed: _objectSpread(_objectSpread({}, (0, _vuex.mapState)(["user", "HomeContent", 'InfoList'])), {}, {
+  computed: _objectSpread(_objectSpread({}, (0, _vuex.mapState)(["user", "HomeContent", 'InfoList', "navbarlist"])), {}, {
     mobile: function mobile() {
       return this.user.name ? this.user.cominfo.mobile : '';
     },
@@ -244,6 +257,20 @@ var _default = {
       }, _callee);
     }))();
   },
+  onShareAppMessage: function onShareAppMessage() {
+    var that = this;
+    return {
+      title: "智造团",
+      path: '/pages/index/index',
+      imageUrl: '',
+      success: function success(res) {
+        console.log("分享到朋友成功");
+      },
+      fail: function fail(res) {
+        console.log("分享到朋友失败");
+      }
+    };
+  },
   methods: {
     login: function login() {
       var that = 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.wxml

@@ -1 +1 @@
-<view class="content data-v-57280228"><block wx:if="{{token}}"><view class="head data-v-57280228"><piker-search vue-id="8dd740cc-1" placeholder="找客户/找产品/找供应" width="60" data-event-opts="{{[['^handleSearch',[['handleSearch']]]]}}" bind:handleSearch="__e" class="data-v-57280228" bind:__l="__l"></piker-search>--><view class="fangke data-v-57280228"><icon class="iconfont icon-remen data-v-57280228"></icon><text class="data-v-57280228">{{"今日访客："+todayviewer+"人"}}</text></view></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleLogin',['$event']]]]]}}" class="login data-v-57280228" bindtap="__e">登录后查看更多内容资讯，点击此处<text class="data-v-57280228">登录</text></view></block><view class="tips data-v-57280228" style="{{'margin:'+(!token?'0':'110rpx 0 10px')+';'}}"><block wx:if="{{token&&!mobile}}"><text data-event-opts="{{[['tap',[['navTo',['/pageTwo/me/company']]]]]}}" bindtap="__e" class="data-v-57280228">请尽快完善企业信息</text></block></view><view class="f_banner data-v-57280228"><block wx:if="{{$root.g0}}"><view class="data-v-57280228"><swiper class="swiper data-v-57280228" indicator-dots="true" autoplay="true"><block wx:for="{{fimages}}" wx:for-item="image" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$0',5],[[['fimages','',index,'id']]]]]]]}}" bindtap="__e" class="data-v-57280228"><image src="{{image.headimg}}" class="data-v-57280228"></image></swiper-item></block></swiper></view></block></view><view class="notice data-v-57280228"><text class="data-v-57280228">头条</text><swiper class="swiper data-v-57280228" vertical="true" autoplay="true"><block wx:for="{{notices}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$0',6],[[['notices','',index,'id']]]]]]]}}" bindtap="__e" class="data-v-57280228"><view class="overflow data-v-57280228">{{item.title}}</view></swiper-item></block></swiper></view><view class="tools data-v-57280228"><block wx:for="{{tools}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handlePath',[index,'$0'],[[['tools','',index,'path']]]]]]]}}" class="item data-v-57280228" bindtap="__e"><image src="{{item.src}}" class="data-v-57280228"></image><text class="data-v-57280228">{{item.text}}</text></view></block></view><view class="f_banner data-v-57280228" style="margin-top:15px;"><block wx:if="{{$root.g1}}"><view class="data-v-57280228"><swiper class="swiper data-v-57280228" autoplay="true"><block wx:for="{{centerList}}" wx:for-item="image" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$0',5],[[['centerList','',index,'id']]]]]]]}}" bindtap="__e" class="data-v-57280228"><image src="{{image.headimg}}" class="data-v-57280228"></image></swiper-item></block></swiper></view></block></view><block wx:if="{{$root.g2}}"><view class="tools fengcai data-v-57280228"><view data-event-opts="{{[['tap',[['navTo',['/pages/index/fengCai']]]]]}}" class="title data-v-57280228" bindtap="__e"><text class="ml-10 data-v-57280228">领导风采</text><text class="mr-10 data-v-57280228">查看更多></text></view><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handleDetail',['$0'],[[['list','',index]]]]]]]}}" class="item mt-15 data-v-57280228" bindtap="__e"><image src="{{item.avatar}}" class="data-v-57280228"></image><view class="name data-v-57280228">{{item.name}}</view><view class="post data-v-57280228">{{item.posname}}</view></view></block></view></block><view class="zixun data-v-57280228"><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/news/list?type=1']]]]]}}" class="title mt-10 data-v-57280228" bindtap="__e"><text class="data-v-57280228">资讯活动</text><block wx:if="{{$root.g3}}"><text class="data-v-57280228">查看更多></text></block></view><block wx:if="{{$root.g4}}"><list vue-id="8dd740cc-2" isAddress="{{1}}" list="{{newsList}}" class="data-v-57280228" bind:__l="__l"></list></block><block wx:if="{{!$root.g5}}"><view class="nolist data-v-57280228" style="margin-top:15px;"><image src="/static/none.png" class="data-v-57280228"></image><text class="data-v-57280228">暂无数据</text></view></block></view><message vue-id="8dd740cc-3" class="data-v-57280228" bind:__l="__l"></message></view>
+<view class="content data-v-57280228"><block wx:if="{{token}}"><view class="head data-v-57280228"><piker-search vue-id="8dd740cc-1" placeholder="找客户/找产品/找供应" width="60" data-event-opts="{{[['^handleSearch',[['handleSearch']]]]}}" bind:handleSearch="__e" class="data-v-57280228" bind:__l="__l"></piker-search>--><view class="fangke data-v-57280228"><icon class="iconfont icon-remen data-v-57280228"></icon><text class="data-v-57280228">{{"今日访客："+todayviewer+"人"}}</text></view></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleLogin',['$event']]]]]}}" class="login data-v-57280228" bindtap="__e">登录后查看更多内容资讯，点击此处<text class="data-v-57280228">登录</text></view></block><view class="tips data-v-57280228" style="{{'margin:'+(!token?'0':'110rpx 0 10px')+';'}}"><block wx:if="{{token&&!mobile}}"><text data-event-opts="{{[['tap',[['navTo',['/pageTwo/me/company']]]]]}}" bindtap="__e" class="data-v-57280228">请尽快完善企业信息</text></block></view><view class="f_banner data-v-57280228"><block wx:if="{{$root.g0}}"><view class="data-v-57280228"><swiper class="swiper data-v-57280228" indicator-dots="true" autoplay="true"><block wx:for="{{fimages}}" wx:for-item="image" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$0',5],[[['fimages','',index,'id']]]]]]]}}" bindtap="__e" class="data-v-57280228"><image src="{{image.headimg}}" class="data-v-57280228"></image></swiper-item></block></swiper></view></block></view><view class="notice data-v-57280228"><text class="data-v-57280228">头条</text><swiper class="swiper data-v-57280228" vertical="true" autoplay="true"><block wx:for="{{notices}}" wx:for-item="item" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$0',6],[[['notices','',index,'id']]]]]]]}}" bindtap="__e" class="data-v-57280228"><view class="overflow data-v-57280228">{{item.title}}</view></swiper-item></block></swiper></view><view class="tools data-v-57280228"><block wx:for="{{navbarlist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['handlePath',[index,'$0'],[[['navbarlist','',index,'link']]]]]]]}}" class="item data-v-57280228" bindtap="__e"><image src="{{item.image}}" class="data-v-57280228"></image><text class="data-v-57280228">{{item.name}}</text></view></block></view><view class="f_banner data-v-57280228" style="margin-top:15px;"><block wx:if="{{$root.g1}}"><view class="data-v-57280228"><swiper class="swiper data-v-57280228" autoplay="true"><block wx:for="{{centerList}}" wx:for-item="image" wx:for-index="index" wx:key="index"><swiper-item data-event-opts="{{[['tap',[['detail',['$0',5],[[['centerList','',index,'id']]]]]]]}}" bindtap="__e" class="data-v-57280228"><image src="{{image.headimg}}" class="data-v-57280228"></image></swiper-item></block></swiper></view></block></view><block wx:if="{{$root.g2}}"><view class="tools fengcai data-v-57280228"><view data-event-opts="{{[['tap',[['navTo',['/pages/index/fengCai']]]]]}}" class="title data-v-57280228" bindtap="__e"><text class="ml-10 data-v-57280228">领导风采</text><text class="mr-10 data-v-57280228">查看更多></text></view><block wx:for="{{$root.g3>5?$root.g4:list}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" data-event-params="{{({item})}}" class="item mt-15 data-v-57280228" bindtap="__e"><image src="{{item.avatar}}" mode="aspectFill" class="data-v-57280228"></image><view class="name data-v-57280228">{{item.name}}</view><view class="post data-v-57280228">{{item.posname}}</view></view></block></view></block><view class="zixun data-v-57280228"><view data-event-opts="{{[['tap',[['navTo',['/pageTwo/news/list?type=1']]]]]}}" class="title mt-10 data-v-57280228" bindtap="__e"><text class="data-v-57280228">资讯活动</text><block wx:if="{{$root.g5}}"><text class="data-v-57280228">查看更多></text></block></view><block wx:if="{{$root.g6}}"><list vue-id="8dd740cc-2" isAddress="{{1}}" list="{{newsList}}" class="data-v-57280228" bind:__l="__l"></list></block><block wx:if="{{!$root.g7}}"><view class="nolist data-v-57280228" style="margin-top:15px;"><image src="/static/none.png" class="data-v-57280228"></image><text class="data-v-57280228">暂无数据</text></view></block></view><message vue-id="8dd740cc-3" class="data-v-57280228" bind:__l="__l"></message></view>

unpackage/dist/dev/mp-weixin/pages/phoneList/detail.js

@@ -201,6 +201,7 @@ var _default = {
     this.id = options.id;
     this.handleInfo(options.id);
     this.handleList();
+    this.$store.commit("changeSecratary", false);
   },
   onReachBottom: function onReachBottom() {
     var that = this;
@@ -216,6 +217,20 @@ var _default = {
     this.page++;
     this.handleList();
   },
+  onShareAppMessage: function onShareAppMessage() {
+    var that = this;
+    return {
+      title: that.con.cominfo.name,
+      path: '/pages/phoneList/detail?id=' + that.id,
+      imageUrl: that.con.cominfo.logourl,
+      success: function success(res) {
+        console.log("分享到朋友成功");
+      },
+      fail: function fail(res) {
+        console.log("分享到朋友失败");
+      }
+    };
+  },
   methods: {
     handleInfo: function handleInfo(id) {
       var that = this;

unpackage/dist/dev/mp-weixin/pages/phoneList/detail.wxss

@@ -31,6 +31,7 @@
 image.data-v-0f4de70d {
   width: 100%;
   height: 100%;
+  border-radius: 5px;
 }
 .title.data-v-0f4de70d {
   font-size: 16px;

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

@@ -193,6 +193,9 @@ var _default = {
     this.handleList();
     that.token = uni.getStorageSync('token');
   },
+  onShow: function onShow() {
+    this.$store.commit("changeSecratary", false);
+  },
   onReachBottom: function onReachBottom() {
     var that = this;
     if (!this.lastPage || this.page >= this.lastPage) {