处理merge

pages/store/goods.vue

@@ -387,11 +387,11 @@
                     }
                 }
                 this.specselect = newlist
-            },
-            toVip() {
-                uni.navigateTo({
-                    url: '/pages/store/vip/index/index?id=' + this.goods.shop.shop_id,
-                })
+            },
+            toVip(){
+				uni.navigateTo({
+				   url: '/pages/store/vip/index/index?id=' + this.goods.shop.shop_id + '&identityId=' + this.goods.shop_vip.card.identity_id,
+				})
             },
             // 会员商品领取
             vipBuy() {

pages/store/vip/index/index.vue

@@ -1,8 +1,8 @@
 <template>
     <view class="store-vip">
         <image class="vip-bg" src="/static/store/store-vip-bg.png"  mode="widthFix"/>
-        <swiper class="swiper" circular>
-            <swiper-item class="swiper-item" v-for="item in vip" :key="item.identity_id">
+        <swiper class="swiper" circular :current="swiperCurrent">
+            <swiper-item class="swiper-item" v-for="(item, index) in vip" :key="index">
                 <view class="top">
                     <view class="left" v-if="vip.length > 1">
                          <image class="left-img" src="/static/store/get-more.gif" mode="widthFix" /> 滑动获取更多 
@@ -14,7 +14,7 @@
                         <image class="title2" :src="item.title_cover" mode="widthFix" />
                         <view class="title3"> {{item.description}} </view> <!-- 分类 -->
                         <view class="type">
-                            <view class="type-item" v-for="it in item.rules" :key="it.order">
+                            <view class="type-item" v-for="(it, itIndex) in item.rules" :key="itIndex">
                                 <image :src="it.cover" mode="aspectFill" />
                                 <view class="title">{{it.name}}</view>
                             </view>
@@ -45,22 +45,27 @@
     } from '@/apis/interfaces/vip.js'
     export default {
         data() {
-            return {
-                vip: [],
+            return {
+				id				: '',
+				identityId		: '',
+                vip				: [],
+				swiperCurrent	: 0
             };
         },
-        onLoad(e) {
-            this.id = e.id;
+        onLoad(e) {
+            this.id = e.id;
+			this.identityId = e.identityId
             this.getInfo()
         },
         methods: {
-            getInfo() {
+            getInfo() {
                 shopVipInfo(this.id).then(res => {
                     uni.setNavigationBarTitle({
                         title: res[0].shop.name + '会员'
                     });
-                    this.vip = res;
-                }).catch(err => {
+                    this.vip 			= res;
+					this.swiperCurrent	= res.findIndex(val => val.identity_id == this.identityId)
+                }).catch(err => {
                     uni.showToast({
                         title: err.message,
                         icon: 'none',

pages/user/index.vue

@@ -114,10 +114,10 @@
             </block>
         </view>
         <view class="btns-box">
-            <view class="btns-box-item" @click="onBtn('PinList', {})">
+            <!-- <view class="btns-box-item" @click="onBtn('PinList', {})">
                 <image class="icon" src="@/static/user/userIcon_15.png" mode="widthFix" />
                 我的拼单 <uni-icons class="forward" type="forward" color="#999" />
-            </view>
+            </view> -->
             <view class="btns-box-item" @click="onBtn('MyCard', {})">
                 <image class="icon" src="@/static/user/userIcon_00.png" mode="widthFix" />
                 我的卡券 <uni-icons class="forward" type="forward" color="#999" />