pages/personalCenter/index.wxml
@@ -1,4 +1,3 @@ <<<<<<< HEAD <view class="background {{ isWhite ? 'white':''}}"> <text class="text">个人中心</text> </view> @@ -68,8 +67,4 @@ </view> </view> </view> </view> ======= <!--pages/personalCenter/index.wxml--> <text>pages/personalCenter/index.wxml</text> >>>>>>> master </view>
