|
|
@@ -40,13 +40,8 @@
|
|
|
|
|
|
</view>
|
|
|
<view style="padding: 20rpx;position: relative;top: 680rpx;" v-show="current==0">
|
|
|
-<<<<<<< HEAD
|
|
|
<view class="content">
|
|
|
<view v-html="detail.mobileDetailHtml" style="width: 100%;overflow: hidden;"></view>
|
|
|
-=======
|
|
|
- <view class="content" style="padding: 10rpx;">
|
|
|
- <view v-html="detail.mobileDetailHtml" style="width: 100%;"></view>
|
|
|
->>>>>>> 50b8991b1bbfc147f6098874fb80946439feb3c1
|
|
|
</view>
|
|
|
</view>
|
|
|
<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;top: 680rpx;" v-show="current==1">
|
