修改

.gitignore

@@ -0,0 +1,8 @@
+/vendor
+/node_modules
+/public/storage
+/unpackage
+Homestead.yaml
+Homestead.json
+.env
+.idea

components/list-pu.vue

@@ -134,6 +134,7 @@
 				if(this.jieDuan==false){
 					let isAuth = this.$toolAll.tools.returnAuth()
 					if(!isAuth){
+						// this.$emit('chooseLike',this.list[index].id)
 						this.$emit('chooseLike',index)
 						this.current = index
 						if(this.list[index].is_collected==1) {
@@ -151,6 +152,7 @@
 			},
 			comfirmev(){
 				// console.log('取消收藏成功');
+				// this.$emit('comfirmev',this.list[this.current].id)
 				this.$emit('comfirmev',this.current)
 				this.isShowT = false
 			},

manifest.json

@@ -57,7 +57,7 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid" : "wxe28349e02aa8ddf3",
+        "appid" : "wx987dc41899f719e8",
         "setting" : {
             "urlCheck" : true,
             "es6" : false

pages.json

@@ -1,13 +1,13 @@
 {
 	"pages": [
 		{
-		    "path" : "pages/tabbar/pagehome/pagehome",
-		    "style" :{}
-		},{
 		    "path" : "pages/login/login",
 		    "style" :{
 				"navigationBarTextStyle":"black"  //状态栏字体颜色
 			}
+		},{
+		    "path" : "pages/tabbar/pagehome/pagehome",
+		    "style" :{}
 		},{
 		    "path" : "pages/tabbar/my/my",
 		    "style" :{}

pages/login/login.vue

@@ -36,7 +36,7 @@
 				publicColor:uni.getStorageSync('publicColor'),
 				canIGetUserProfile: false,
 				imgSrc: '/static/public/logo.png',//默认logo头像
-				isShowP:false
+				isShowP:true
 			};
 		},
 		onLoad(options) {
@@ -63,21 +63,22 @@
 				 uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
 			},
 			getphonenumber(e){//授权绑定手机号
-				if(e.detail.errMsg=="getPhoneNumber:ok"){
+				console.log(e);
-					this.$requst.post('user/bind-phone',{iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{
+				// if(e.detail.errMsg=="getPhoneNumber:ok"){
-						// console.log('手机号信息：',res);
+				// 	this.$requst.post('user/bind-phone',{iv:e.detail.iv,encryptedData:e.detail.encryptedData}).then(res=>{
-						if(res.code==0){
+				// 		console.log('手机号信息：',res);
-							this.isShowP = false
+				// 		if(res.code==0){
-							this.$toolAll.tools.showToast('手机号绑定成功','success')
+				// 			this.isShowP = false
-							uni.setStorageSync('bindPhone',false)
+				// 			this.$toolAll.tools.showToast('手机号绑定成功','success')
-							uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
+				// 			uni.setStorageSync('bindPhone',false)
-						}
+				// 			uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
-					},error=>{})
+				// 		}
-				} else {
+				// 	},error=>{})
-					this.isShowP = false
+				// } else {
-					this.$toolAll.tools.showToast('登录成功','success')
+				// 	this.isShowP = false
-					uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
+				// 	this.$toolAll.tools.showToast('登录成功','success')
-				}
+				// 	uni.reLaunch({url:'/pages/tabbar/pagehome/pagehome'})
+				// }
 			},
 			goXie(){
 				uni.navigateTo({

pages/tabbar/pagehome/pagehome.vue

@@ -62,8 +62,8 @@
 						<cate-pu :activeb="publicColor" :newcateList="ktList" :isMinW="true" :newCurrent="newCurrent*1" @choosecateEv="choosecateEv" :newbmo="'#E0E0E0'"></cate-pu>
 					</view>
 					<!-- 列表 -->
-					<wfalls-flow @chooseLike="chooseLike" @comfirmev="comfirmev" :list="dataList" ref="wfalls"></wfalls-flow>
+					<!-- <wfalls-flow @chooseLike="chooseLike" @comfirmev="comfirmev" :list="dataList" ref="wfalls"></wfalls-flow> -->
-					<!-- <list-pu @chooseLike="chooseLike" @comfirmev="comfirmev" :list="dataList"></list-pu> -->
+					<list-pu @chooseLike="chooseLike" @comfirmev="comfirmev" :list="dataList"></list-pu>
 				</view>
 			</view>
 		</template>
@@ -159,10 +159,10 @@
 		},
 		onLoad(options) {
 			// 模拟首次加载列表数据
-			setTimeout(()=>{
+			// setTimeout(()=>{
-			    // this.list = list;
+			//     // this.list = list;
-			    this.$refs.wfalls.init();
+			//     this.$refs.wfalls.init();
-			},1000)
+			// },1000)
 			if (options && options.q) {
 				let arr = decodeURIComponent(options.q).split('?')[1].split('&')
 				let obj = {}
@@ -403,31 +403,45 @@
 				},error=>{})
 			},
 			chooseLike(e){//收藏事件
-				// log(this.dataList[e].is_collected);
+				// console.log(this.dataList[e].is_collected);
-				let active = ''
+				if(this.dataList[e].is_collected==0){
-				this.dataList.forEach((item,index)=>{
+					this.dataList[e].is_collected = 1
-					if(e==item.id){
-						active = index
-					}
-				})
-				if(this.dataList[active].is_collected==0){
-					this.dataList[active].is_collected = 1
 					// 调用收藏事件
-					collectionEV({action:'collect',archive_id:e})
+					collectionEV({action:'collect',archive_id:this.dataList[e].id})
 				}
 			},
 			comfirmev(e){//确认取消收藏事件
-				let active = ''
+				this.dataList[e].is_collected = 0
-				this.dataList.forEach((item,index)=>{
-					if(e==item.id){
-						active = index
-					}
-				})
-				this.dataList[active].is_collected = 0
 				this.$toolAll.tools.showToast('正在取消...','loading')
 				// 调用取消收藏事件
-				cancleCollectionEV({action:'collect',archive_id:e})	
+				cancleCollectionEV({action:'collect',archive_id:this.dataList[e].id})	
 			},
+			// chooseLike(e){//收藏事件
+			// 	// log(this.dataList[e].is_collected);
+			// 	let active = ''
+			// 	this.dataList.forEach((item,index)=>{
+			// 		if(e==item.id){
+			// 			active = index
+			// 		}
+			// 	})
+			// 	if(this.dataList[active].is_collected==0){
+			// 		this.dataList[active].is_collected = 1
+			// 		// 调用收藏事件
+			// 		collectionEV({action:'collect',archive_id:e})
+			// 	}
+			// },
+			// comfirmev(e){//确认取消收藏事件
+			// 	let active = ''
+			// 	this.dataList.forEach((item,index)=>{
+			// 		if(e==item.id){
+			// 			active = index
+			// 		}
+			// 	})
+			// 	this.dataList[active].is_collected = 0
+			// 	this.$toolAll.tools.showToast('正在取消...','loading')
+			// 	// 调用取消收藏事件
+			// 	cancleCollectionEV({action:'collect',archive_id:e})	
+			// },
 			chooseGon(index){//宫格事件
 				if(!this.jieDuan){
 					let isAuth = this.$toolAll.tools.returnAuth()

pagesA/ppointmentEv/ppointmentEv.vue

@@ -231,11 +231,11 @@
 						this.$requst.post('user/appointment-apply',parmas).then(res=>{
 							// console.log('提交预约申请：',res);
 							if(res.code==0){
-								// this.isShowT = true
+								this.isShowT = true
 								wx.requestSubscribeMessage({
-									tmplIds: ['T1HcjdOxSVgomu_bD9Qf4rIWfKOVZApvieHuG_U3fM4'],
+									tmplIds: ['uvGd7RqaegheGU-uVxR-uM3y2MadZeMOHdQaNiiWm8U'],
 									success: (res)=> { 
-										// console.log('res',res);
+										console.log('res',res);
 										this.isShowT = true
 									}
 								})