Browse Source

fix conflict

Your Name 4 months ago
parent
commit
ad1efe63e4
2 changed files with 1 additions and 2 deletions
  1. 1 1
      app.json
  2. 0 1
      pages/upload/upload.wxml

+ 1 - 1
app.json

@@ -61,4 +61,4 @@
       }
       }
     ]
     ]
   }
   }
-}
+}

+ 0 - 1
pages/upload/upload.wxml

@@ -62,7 +62,6 @@
   </view>
   </view>
   <view bindtap="post" class="post">提交资料</view>
   <view bindtap="post" class="post">提交资料</view>
 </view>
 </view>
-
 <view class="model {{show?'show':''}}" bindtap="hideImg">
 <view class="model {{show?'show':''}}" bindtap="hideImg">
   <image src="{{img}}" mode="widthFix"></image>
   <image src="{{img}}" mode="widthFix"></image>
 </view>
 </view>