Merge pull request '取关' (#201) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/201

common/api/user.js

@@ -431,6 +431,13 @@ export default {
 					friend_tomid:id
 				});
 			},
-        }
+			//店铺取关
+			attentionMemberRemove({id}) {
+				return vm.$u.post('Member/attentionMemberRemove', { 
+					friend_tomid:id
+				});
+			},
+		}
+		
     }
 }

pageC/merchant/index.vue

@@ -169,7 +169,9 @@ export default {
 			}
 		},
 		getStoreInfo() {
+			console.log(this.sid )
 			this.$u.api.getStoreInfo({ id: this.sid }).then((res)=>{
+				console.log(JSON.stringify(res))
 				this.info = res.data;
 				uni.stopPullDownRefresh();
 			})

pageE/mine/MineConcerns.vue

@@ -11,13 +11,13 @@
 					<view @touchmove.stop="">
 						<u-swipe-action
 							v-for="(item, index) in shangjia" :key="index" 
-							:index='item.friend_tomid'
+							:index='item.friend_store_id'
 							:options="options"
 							:show="item.show"
 							@click="removeFavorite"
 							@open="open"
 						>
-							<view class="item u-border-bottom" @click="toDetailsPage(item.friend_tomid)">
+							<view class="item u-border-bottom" @click="toDetailsPage(item.friend_store_id)">
 								<image :src="item.friend_tomavatar"></image>
 								<!-- 此层wrap在此为必写的，否则可能会出现标题定位错误 -->
 								<view class="title-wrap">
@@ -179,10 +179,11 @@ export default {
 		},
 		removeFavorite(id) {
 			console.log(id)
-			this.$u.api.removeFavorite({
+			this.$u.api.attentionMemberRemove({
 				id: id,
 				type: 'store'
 			}).then(res => {
+				console.log(res)
 				this.$u.toast(res.message);
 				if(res.errCode == 0) {
 					this.sstatus = "loadmore"