Merge branch 'master' of http://121.40.40.223:3000/zizhong.wang/konggang-city-miniprogram

# Conflicts:
#	pages/enterprise/enterprise_detail.vue
合并提交样式

pages/enterprise/enterprise_detail.vue

@@ -19,6 +19,7 @@
         {{ item }}
       </view>
     </view>
+
     <view class="baseInfo" v-if="active === 0">
       <view class="card-title">{{ model.title }}</view>
       <view class="item-list">
@@ -39,11 +40,12 @@
                 {{ item.value[0] }}
               </div>
               <div class="copy" @click="copy(item.value[0])" style="color: #02a7f0;margin-left: 15rpx;">复制</div>
+            </view>
           </view>
         </view>
       </view>
     </view>
-    <view v-else-if="active === 1" class="proInfo">
+    <view v-if="active === 1" class="proInfo">
       <view class="products">
         <view class="product" @click="toDetail(item.id)" v-for="(item,idx) in productList" :key="idx">
           <view class="img">