1004749546@qq.com 4 tahun lalu
induk
melakukan
d221cb47d6
4 mengubah file dengan 10 tambahan dan 10 penghapusan
  1. 1 1
      api/order.js
  2. 3 3
      pages/index/index.vue
  3. 2 2
      pages/order/historyOrder.vue
  4. 4 4
      pages/recoveryTotal/index.vue

+ 1 - 1
api/order.js

@@ -29,7 +29,7 @@ export const orderDetailFind = (params) => {
 // 预订单提交
 export const orderSubmit = (params) => {
   return axios.request({
-    url: 'reserve/OrderReserveSubmit',
+    url: 'reserve/submitOrderReserve',
     method: 'post',
 	data:params
   })

+ 3 - 3
pages/index/index.vue

@@ -253,10 +253,10 @@
 			getTotalData() {
 				this.titleStatus = true
 				reserveTotal({}).then(res=>{
-					if(res.status == 200) {
+					if(res.status == 200 && res.data) {
 						this.numTotal = res.data.orderReserveCount || 0
-						this.weightTotal = res.data.totalAllWeight/1000 || 0
-						this.moneyTotal = res.data.originalAllAmount || 0
+						this.weightTotal = res.data.totalWeight/1000 || 0
+						this.moneyTotal = res.data.originalAmount || 0
 					} else {
 						this.numTotal = 0
 						this.weightTotal = 0

+ 2 - 2
pages/order/historyOrder.vue

@@ -130,8 +130,8 @@
 			getTotalData() {
 				historyOrderTotal({}).then(res=>{
 					if(res.status == 200 && res.data) {
-						this.totalWeight = res.data.totalAllWeight/1000 || 0
-						this.totalMoney = res.data.originalAllAmount || 0
+						this.totalWeight = res.data.totalWeight/1000 || 0
+						this.totalMoney = res.data.originalAmount || 0
 					} 
 				})
 			},

+ 4 - 4
pages/recoveryTotal/index.vue

@@ -25,8 +25,8 @@
 				<!-- 列表数据 -->
 				<view class="table item" v-for="item in listdata" :key="item.id">
 					<view>{{item.reserveFinishDate}}</view>
-					<view>{{item.totalAllWeight/1000 || 0}}</view>
-					<view>{{item.originalAllAmount || 0}}</view>
+					<view>{{item.totalWeight/1000 || 0}}</view>
+					<view>{{item.originalAmount || 0}}</view>
 				</view>
 				<view class="nodata" v-if="listdata.length==0 && status!='loading'">
 					<u-empty src="/static/def_result.png" :text="noDataText" icon-size="260"></u-empty>
@@ -138,8 +138,8 @@
 					beginDate: this.searchForm.beginDate?moment(this.searchForm.beginDate).format('YYYY-MM-DD 00:00:00'):'',
 					endDate: this.searchForm.endDate ? moment(this.searchForm.endDate).format('YYYY-MM-DD 23:59:59'):''}).then(res=>{
 						if(res.status==200 && res.data){
-							this.totalWeight = res.data.totalAllWeight/1000 || 0
-							this.totalMoney = res.data.originalAllAmount || 0
+							this.totalWeight = res.data.totalWeight/1000 || 0
+							this.totalMoney = res.data.originalAmount || 0
 						} else {
 							this.totalWeight = 0
 							this.totalMoney = 0