From 0a4bfff2df5111b5f07cae021e377ac89439dd22 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Thu, 21 Mar 2024 11:20:37 +0800
Subject: [PATCH] 1
---
api/product.js | 8 +-
pages/admin/orderList/index.vue | 211 +++++++++++++++++------
pages/product/basicSet.vue | 20 +--
pages/product/shop_type_change/index.vue | 5 +-
pages/product/shop_type_change/list.vue | 17 ++
pages/users/order_confirm/index.vue | 49 +++---
6 files changed, 211 insertions(+), 99 deletions(-)
diff --git a/api/product.js b/api/product.js
index 94fb534..ee62028 100644
--- a/api/product.js
+++ b/api/product.js
@@ -9,8 +9,14 @@
// +----------------------------------------------------------------------
import request from "@/utils/request.js";
+
/**
- * 获取商品详情
+ * 商户类型列表
+ */
+export const intentionList = (data) => request.get('intention/detail', data)
+
+/**
+ * 商户类型申请
*/
export const shopTypeChange = (data) => request.post('intention/change', data)
diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 12f1385..a018b6e 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -50,7 +50,8 @@
-
+
@@ -96,12 +97,12 @@
- 云商品
+ 云商品
{{ item.activity_type == 1 ? '秒杀' : item.activity_type == 2 ? '预售' : item.activity_type == 3 ? '助力' : item.activity_type == 4 ? '拼团' : item.activity_type == 10 ? '套餐' :'' }}
-
- 订单号：{{ item.order_sn }}
- 下单时间：{{ item.create_time }}
+
+ 订单号：{{ item.order_sn }}
+ 下单时间：{{ item.create_time }}
{{item.refunding==1 ? '退款中' : item.refunding==2 ? '部分退款' : '全部退款'}}
@@ -120,9 +121,10 @@
{{ val.cart_info.productAttr.sku }}
-
- 商品条码: {{ val.cart_info.productAttr.product.bar_code }}
-
+
+ 商品条码: {{ val.cart_info.productAttr.product.bar_code }}
+
@@ -174,10 +176,12 @@
一键改价
订单备注
- 去发货
- 去发货
+
-
+
+
+
+
+ 送货人姓名
+
+
+
+
+
+ 送货人电话
+
+
+
+
+
+
+ 备注
+
+
+
+
+
+
+ 取消
+ 确认
+
-
-
-
+
+
+
@@ -260,7 +294,7 @@
},
data() {
return {
- showBar: false,
+ showBar: false,
current: "",
change: false,
refundMark: false,
@@ -271,7 +305,7 @@
status: 1,
search_info: '',
product_type: '',
- pay_time: null,
+ pay_time: null,
},
list: [],
loaded: false,
@@ -293,17 +327,17 @@
that.init();
}
},
-
+
},
onLoad(option) {
this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? ""
this.where.status = option.types
this.current = "";
this.merId = option.merId;
- if(option.pay_time){
- this.where.pay_time = option.pay_time;
- }
-
+ if (option.pay_time) {
+ this.where.pay_time = option.pay_time;
+ }
+
this.getIndex();
},
methods: {
@@ -312,13 +346,13 @@
this.popUpShow = false
},
- showBarCode(val){
- this.showBar = true
- this.$refs['code'].init({
- name: val.store_name,
- code: val.bar_code
- });
- },
+ showBarCode(val) {
+ this.showBar = true
+ this.$refs['code'].init({
+ name: val.store_name,
+ code: val.bar_code
+ });
+ },
//同意先货后款订单
tongyi(id, number) {
let data = {
@@ -342,14 +376,14 @@
},
handleSearch() {
this.loaded = false;
- this.where.page = 1;
- this.list = [];
+ this.where.page = 1;
+ this.list = [];
this.getIndex();
},
// 获取数据
getIndex() {
-
-
+
+
let that = this;
// console.log(that.merId)
if (that.loading || that.loaded) return;
@@ -402,12 +436,12 @@
if (val != 'verify') {
if (this.where.status != val) {
this.where.status = val;
- this.where.search_info=''
+ this.where.search_info = ''
delete this.where.is_verify;
this.init();
}
} else {
- this.where.search_info=''
+ this.where.search_info = ''
this.where.is_verify = 1;
delete this.where.status;
this.init();
@@ -477,6 +511,7 @@
}
})
},
+
//收件码
toPostagequ(item) {
this.popUpShow = true
@@ -486,7 +521,12 @@
this.payCodeUrl = res.data.qrcode
}
})
+
+
+
+
},
+
toPostage(item) {
let that = this;
if (item.refunding != 0) {
@@ -575,7 +615,7 @@
uni.navigateTo({
url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}`
})
-
+
},
toRefundDetail(item) {
uni.navigateTo({
@@ -590,6 +630,63 @@
\ No newline at end of file
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index 9bfcced..de670ae 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -80,13 +80,6 @@
建议尺寸:710*134px或710*460px(请根据平台要求选择尺寸，此图如未上传默认展示店铺背景图)
-
-
- 商户类型变更
-
- 类型变更
-
-
@@ -100,8 +93,7 @@
到店自提
- 商家配送
+ 商家配送
@@ -482,16 +474,6 @@
});
},
- // 商户类型变更
- changeType() {
- uni.navigateTo({
- url: "/pages/product/shop_type_change/index",
- fail(err) {
- console.log(err);
- }
- })
- },
-
seleckImage(i) {
let that = this;
that.$util.uploadImageOne('upload/image', function(res) {
diff --git a/pages/product/shop_type_change/index.vue b/pages/product/shop_type_change/index.vue
index d023f0a..8462196 100644
--- a/pages/product/shop_type_change/index.vue
+++ b/pages/product/shop_type_change/index.vue
@@ -90,9 +90,12 @@
title: res.message
}, () => {
uni.navigateTo({
- url: "/pages/product/shop_type_change/progress",
+ url: "/pages/product/shop_type_change/list",
fail(err) {
console.log(err);
+ },
+ success(res) {
+
}
})
})
diff --git a/pages/product/shop_type_change/list.vue b/pages/product/shop_type_change/list.vue
index 143ced7..efe1980 100644
--- a/pages/product/shop_type_change/list.vue
+++ b/pages/product/shop_type_change/list.vue
@@ -45,12 +45,29 @@