-
- {{ key }}:{{ value }}
-
-
- ¥{{ item.salePrice }}
- x{{ item.buyNum }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+ {{ scope.row.decrypt?scope.row.receiverName:getHiddenName(scope.row.receiverName) }} {{ scope.row.receiverPhone }}
+ 查看
+
+ 修改
+
+
+
+ {{ scope.row.receiverProvince }}{{ scope.row.receiverCity }}{{ scope.row.receiverDistrict }}
+ {{ scope.row.decrypt?scope.row.receiverDetailAddress:getHiddenDetailAddress(scope.row.receiverDetailAddress) }}
+
+
+
+
+
+ {{ scope.row.nickName }}
+ {{ scope.row.mark }}
+
+
+
+
+
+ 平台备注
+ {{ scope.row.merchantNote ? '修改' : '添加平台备注' }}
+
+
+ {{ scope.row.merchantNote }}
+ 买家备注
+ {{ scope.row.note }}
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{mm}-{dd} {hh}:{ii}') }} 下单
+ {{ parseTime(scope.row.payTime, '{mm}-{dd} {hh}:{ii}') }} 支付
+
+
+
+
+ ¥{{ scope.row.couponAmount }}
+ 无
+
+
+
+
+
+ 总数:
+ {{ scope.row.buyNum }}
+
+ 实付: ¥{{ scope.row.payAmount }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ key }}:{{ value }}
+
+
+ ¥{{ item.salePrice }}
+ x{{ item.buyNum }}
-
-
-
-
-
-
- {{ getOrderStatusText(scope.row.status) }}
-
-
- 物流单号:{{ scope.row.deliverySn }}
-
-
- 发货时间:{{ parseTime(scope.row.deliveryTime, '') }}
-
-
-
-
-
- {{ scope.row.orderSn }}
-
-
-
-
-
-
-
-
- 详情
-
- 日志
-
- 发货
-
-
+
+
+
+
+
+
+
+ {{ getOrderStatusText(scope.row.status) }}
+
+
+ 物流单号:{{ scope.row.deliverySn }}
+
+
+ 发货时间:{{ parseTime(scope.row.deliveryTime, '') }}
+
+
+
+
+
+ {{ scope.row.orderSn }}
+
+
+
+
+
+
+
+
+ 详情
+
+ 日志
+
+ 发货
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -284,7 +285,6 @@ import AddressSelector from "@/views/components/AddressSelector/index.vue";
import dateUtil, {dateFormat} from '@/utils/DateUtil';
import {isStarRepo} from "@/utils/is-star-plugin"
import {mapGetters} from "vuex";
-import SeeAdsComponent from "@/components/SeeAdsComponent.vue";
export default {
computed:{
@@ -293,7 +293,6 @@ export default {
name: "OmsOrder",
dicts: ["oms_order_status", "oms_pay_type"],
components: {
- SeeAdsComponent,
AddressSelector
},
data() {
@@ -412,30 +411,23 @@ export default {
};
},
async created() {
- this.$nextTick(()=>{
- this.$refs.seeAdsComponentRef.show()
- })
+ const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/order/order', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
+ this.show = res;
+ if (res) {
+ const {phone, status, today} = this.$route.query
+ if (phone) {
+ this.queryParams.userPhone = phone
+ }
+ if (status) {
+ this.queryParams.status = status
+ }
+ if (today) {
+ this.setToday()
+ }
+ this.getList();
+ }
},
methods: {
- async confirmOk(success) {
- if (success) {
- const res = await isStarRepo('zccbbg', 'RuoYi-Mall', this.userId, 'https://mall.ichengle.top/order/order', 'ruoyi-mall-商城', 'https://gitee.com/zccbbg/RuoYi-Mall')
- this.show = res;
- if (res) {
- const {phone, status, today} = this.$route.query
- if (phone) {
- this.queryParams.userPhone = phone
- }
- if (status) {
- this.queryParams.status = status
- }
- if (today) {
- this.setToday()
- }
- this.getList();
- }
- }
- },
/** 日期组件设置为今天 */
setToday() {
const temp = new Date();
diff --git a/src/views/pms/product/index.vue b/src/views/pms/product/index.vue
index c515f75..64f91a3 100644
--- a/src/views/pms/product/index.vue
+++ b/src/views/pms/product/index.vue
@@ -119,7 +119,7 @@
/>