Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

pages/account-management/index.vue

@@ -40,7 +40,8 @@ export default {
 				auto: true,
 				emptyText: '暂无用户~',
 				background: '#F7F8FA',
-				fontSize: '40rpx'
+				fontSize: '40rpx',
+				 emptyImage: '/static/imgs/order/order-empty.png'
 			},
 			params: {
 				asc: '',

pages/my-offer/index.vue

@@ -30,7 +30,7 @@
             <text class="list-time">{{ items.deliveryDay }}</text>
           </view>
           <view class="">
-            <text class="list-title-Subtitle">¥{{ items.totalOfferPrice }}</text>
+            <text class="list-title-Subtitle">¥{{ items.totalPrice }}</text>
           </view>
         </view>
         <uGap></uGap>