Commit 9ac8c3d1a460a5c64f718542973b815c49274e95
1 parent
b0a34327
Exists in
dev
订单相关状态修改
Showing
5 changed files
with
16 additions
and
13 deletions
Show diff stats
frontend/app-user/main.js
frontend/app-user/pages/home/placeOrder.vue
| ... | ... | @@ -256,8 +256,8 @@ export default { |
| 256 | 256 | //#ifdef H5 |
| 257 | 257 | this.orderBody.zffs = dd_zffs.WX_PAY.code; |
| 258 | 258 | this.orderBody.zflx = dd_zflx.JSAPI.code; |
| 259 | - // this.orderBody.openId = uni.getStorageSync('openId'); | |
| 260 | - this.orderBody.openId = "oH7LG54_Y49mVunw2FLXzUCxHWlM"; | |
| 259 | + this.orderBody.openId = uni.getStorageSync('openId'); | |
| 260 | + // this.orderBody.openId = "oH7LG54_Y49mVunw2FLXzUCxHWlM"; | |
| 261 | 261 | console.log('H5环境---------》') |
| 262 | 262 | console.log('H5环境rData---------》', this.orderBody) |
| 263 | 263 | //#endif | ... | ... |
frontend/app-user/pages/order/components/orderCard.vue
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | </view> |
| 10 | 10 | </view> |
| 11 | 11 | <view class="themeColor"> |
| 12 | - {{pageForm.fDdzt}} | |
| 12 | + {{ddDdzt.get(pageForm.fDdzt)}} | |
| 13 | 13 | </view> |
| 14 | 14 | </view> |
| 15 | 15 | <u-divider></u-divider> |
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | </view> |
| 20 | 20 | <view class="w60 flex flex-direction justify-between margin-left-sm"> |
| 21 | 21 | <view class="overflow-one-lines"> |
| 22 | - {{item.fSpmc}} | |
| 22 | + {{ddPsfs.get(item.fSpmc)}} | |
| 23 | 23 | </view> |
| 24 | 24 | <view class="text-sm text-gray overflow-one-lines"> |
| 25 | 25 | 规格：{{item.fMs}} |
| ... | ... | @@ -55,7 +55,7 @@ |
| 55 | 55 | </view> |
| 56 | 56 | </view> |
| 57 | 57 | <view class="flex justify-end"> |
| 58 | - <view class="margin-left-sm" v-if="pageForm.fDdzt =='待配送' " @click.stop="goGasCancel"> | |
| 58 | + <view class="margin-left-sm" v-if="pageForm.fDdzt =='202' " @click.stop="goGasCancel"> | |
| 59 | 59 | <u-button shape="circle" color="">取消订单</u-button> |
| 60 | 60 | </view> |
| 61 | 61 | <!-- <view class="margin-left-sm" @click.stop="goGasDetailPage">--> |
| ... | ... | @@ -73,6 +73,7 @@ |
| 73 | 73 | |
| 74 | 74 | <script> |
| 75 | 75 | import {cancelOrder} from "../../../api/order"; |
| 76 | + import {dd_zflx, dd_fkfs, dd_psfs, dd_zffs, dd_ddly, sys_sf, dd_ddzt} from "@/utils/enums"; | |
| 76 | 77 | |
| 77 | 78 | export default { |
| 78 | 79 | components: {}, |
| ... | ... | @@ -86,10 +87,12 @@ |
| 86 | 87 | }, |
| 87 | 88 | data() { |
| 88 | 89 | return { |
| 90 | + ddDdzt: new Map(Object.values(dd_ddzt).map(item => [item.code, item.info])), | |
| 91 | + ddPsfs: new Map(Object.values(dd_psfs).map(item => [item.code, item.info])), | |
| 89 | 92 | pageForm: { |
| 90 | 93 | fCzmc: '', |
| 91 | - fDdzt: '待付款', | |
| 92 | - fDddh: 'A2011100221001', | |
| 94 | + fDdzt: '201', | |
| 95 | + fDddh: '', | |
| 93 | 96 | ddxqList: [], |
| 94 | 97 | fSpmc: '', |
| 95 | 98 | fGg: '', |
| ... | ... | @@ -124,7 +127,7 @@ |
| 124 | 127 | let cancelOrderResult = await this.$api.orderApi.cancelOrder(paramsData); |
| 125 | 128 | if(cancelOrderResult.code ==200){ |
| 126 | 129 | this.$modal.msgSuccess('订单取消成功!'); |
| 127 | - this.pageForm.fDdzt ='已取消'; | |
| 130 | + this.pageForm.fDdzt ='207'; | |
| 128 | 131 | this.$emit('orderCancel'); |
| 129 | 132 | }else { |
| 130 | 133 | this.$modal.msgError('会员信息修改失败!'); |
| ... | ... | @@ -194,4 +197,4 @@ |
| 194 | 197 | background-color: #fff6e6; |
| 195 | 198 | } |
| 196 | 199 | } |
| 197 | -</style> | |
| 198 | 200 | \ No newline at end of file |
| 201 | +</style> | ... | ... |
frontend/app-user/pages/order/orderDetail.vue
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | </view> |
| 30 | 30 | <view class="w60 flex flex-direction justify-between margin-left-xs"> |
| 31 | 31 | <view class="overflow-one-lines"> |
| 32 | - {{item.fSpmc}} | |
| 32 | + {{ddPsfs.get(item.fSpmc)}} | |
| 33 | 33 | </view> |
| 34 | 34 | <view class="text-sm text-gray overflow-one-lines"> |
| 35 | 35 | 规格：{{item.fMs}} | ... | ... |
frontend/app-user/utils/enums.js
| ... | ... | @@ -16,8 +16,8 @@ export const dd_ddly = { |
| 16 | 16 | * 付款方式枚举 |
| 17 | 17 | */ |
| 18 | 18 | export const dd_fkfs = { |
| 19 | - CASH_ON_DELIVERY: {code: '1', info: '货到付款'}, | |
| 20 | - ONLINE_PAYMENT: {code: '2', info: '在线支付'} | |
| 19 | + HDFK: {code: '1', info: '货到付款'}, | |
| 20 | + ZXZF: {code: '2', info: '在线支付'} | |
| 21 | 21 | }; |
| 22 | 22 | |
| 23 | 23 | /** | ... | ... |