Merge branch 'master' of http://47.112.106.152:10880/Saas/exam_mp

pages/order/index.vue

@@ -37,7 +37,7 @@ onMounted(async () => {
         <view class="right">
           <view class="price" v-if="item.order_preferential_price > 0">￥{{ item.order_preferential_price }}</view>
 		  <view class="price" v-if="item.order_preferential_price < 0.01">赠送</view>
-          <view class="line" v-if="item.order_preferential_price > 0">{{ item.order_original_price }}</view>
+          <view class="line" v-if="item.order_original_price > 0">{{ item.order_original_price }}</view>
 		  <view class="line" v-if="item.order_preferential_price < 0.01"></view>
         </view>
       </view>

pages/user/index.vue

@@ -251,7 +251,7 @@ export default {
 	}
 	.box_center {
 		float: left;
-		width: 300rpx;
+		width: 350rpx;
 		height: 140rpx;
 		margin-left: 35rpx;
 		.user_name {
@@ -335,7 +335,7 @@ export default {
 .navigator_list {
 	border-top: 1rpx solid #eeeeee;
 	height: 505rpx;
-	margin: 30rpx;
+	margin: 30rpx 30rpx 0rpx 30rpx;
 	border-radius: 30rpx;
 	.navigator_item_one {
 		position: relative;