Merge branch 'developer' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developerX

pages/h5/activity/components/activity-contact.vue

@@ -3,10 +3,10 @@
         <!-- 未展开状态 -->
         <view class="cm-close-box" v-show="!isActive">
             <view class="cm-icon cm-entry" @click="handleToggleEntry(true)" v-if="activityEntryVisiable"></view>
-            <view class="cm-icon cm-bround cm-open-btn" @click="handleToggleAcitve(true)" v-if="contactVisiable"></view>
+            <view class="cm-icon cm-bround cm-open-btn" @click="handleToggleAcitve(true)"></view>
         </view>
         <!-- 展开状态 -->
-        <!-- <view class="cm-close-box" v-show="contactVisiable && isActive">
+        <view class="cm-close-box" v-show="isActive">
             <view class="cm-icon cm-entry" @click="handleToggleEntry(true)" v-if="activityEntryVisiable"></view>
             <view class="cm-icon regexp" @click="handleToCouponExp">优惠券\n规则</view>
             <view class="cm-icon cm-bround cm-mobile" @click="handelShowMobile">
@@ -46,7 +46,7 @@
                 </view>
             </view>
             <view class="cm-icon cm-bround cm-close-btn" @click="handleToggleAcitve(false)"></view>
-        </view> -->
+        </view>
         <view class="mask cover" v-if="activityEntryVisiable && entryVisiable">
             <view class="content">
                 <!-- <image

pages/h5/activity/quick-operation.vue

@@ -9,8 +9,6 @@
 		</view>
 		<!-- 侧边 -->
 		<scroll-top :isScrollTop="isScrollTop" :bottom="50" ></scroll-top>
-        <!-- 右侧联系 活动入口 -->
-        <activity-contact :pageInfo="pageInfo" v-if="isRequest"></activity-contact>
 	</view>
 </template>
 
@@ -19,7 +17,6 @@
 	import customFloor from '@/components/cm-custom/custom-floor' 		 //自定义导航
 	import templateNav from '@/components/cm-module/pageTemplate/templateNav.vue'
     import pageFloor from './components/active-floor.vue'
-    import  ActivityContact from './components/activity-contact.vue'
 	import authorize from '@/common/config/authorize.js'
 	import wxLogin from '@/common/config/wxLogin.js'
 	
@@ -28,7 +25,6 @@
 			customFloor,
 			templateNav,
 			pageFloor,
-            ActivityContact
 		},
 		data(){
 			return{