diff --git a/api/mall/order.js b/api/mall/order.js index 7570d89..43d82c8 100644 --- a/api/mall/order.js +++ b/api/mall/order.js @@ -121,6 +121,7 @@ export default { url: "/shop/OrderInpersonPayment/orderList", method: "POST", data, + type: "mall", }); }, @@ -129,6 +130,7 @@ export default { url: "/shop/OrderInpersonPayment/GetQrItem", method: "POST", data, + type: "mall", }); }, } diff --git a/api/mall/user.js b/api/mall/user.js deleted file mode 100644 index 6042141..0000000 --- a/api/mall/user.js +++ /dev/null @@ -1,56 +0,0 @@ -import { - request -} from "@/utils/request"; - -export default { - - userList(data) { - return request({ - url: "/shop/user/userList", - method: "GET", - data, - type: "mall", - }) - }, - - userItem(data) { - return request({ - url: "/shop/user/userItem", - method: "GET", - data, - type: "mall", - }) - }, - - - getLog(data) { - return request({ - url: "/shop/user/getLog", - method: "GET", - data, - type: "mall", - }) - }, - - changeInformation(data) { - return request({ - url: "/shop/user/changeInformation", - method: "GET", - data, - type: "mall", - }) - }, - - UpdateLevel(data) { - return request({ - url: "/shop/user/UpdateLevel", - method: "GET", - data, - type: "mall", - }) - }, - - - - -}; \ No newline at end of file diff --git a/api/store/coupon.js b/api/store/coupon.js new file mode 100644 index 0000000..4d237d4 --- /dev/null +++ b/api/store/coupon.js @@ -0,0 +1,33 @@ +import { + request +} from "@/utils/request"; + +export default { + List(data) { + return request({ + url: "/admin/Coupon/List", + method: "GET", + data, + type: 'store' + }); + }, + GetItem(data) { + return request({ + url: "/admin/Coupon/GetItem", + method: "GET", + data, + type: 'store' + }); + }, + Create(data) { + return request({ + url: "/admin/Coupon/Create", + method: "POST", + data, + type: 'store' + }); + }, + + + +}; \ No newline at end of file diff --git a/api/store/goods.js b/api/store/goods.js index 49a3922..f003915 100644 --- a/api/store/goods.js +++ b/api/store/goods.js @@ -8,6 +8,7 @@ export default { url: "/admin/goods/goodsList", method: "POST", data, + type: 'store' }); }, @@ -16,6 +17,7 @@ export default { url: "/admin/goods/goodsEditAttribute", method: "POST", data, + type: 'store' }); }, @@ -25,6 +27,7 @@ export default { url: "/admin/classify/list", method: "POST", data, + type: 'store' }); }, @@ -33,6 +36,7 @@ export default { url: "/admin/classify/createItem", method: "POST", data, + type: 'store' }); }, @@ -43,6 +47,7 @@ export default { url: "/admin/freightRules/list", method: "POST", data, + type: 'store' }); }, @@ -51,6 +56,7 @@ export default { url: "/admin/goods/goodsItem", method: "POST", data, + type: 'store' }); }, @@ -59,6 +65,7 @@ export default { url: "/admin/goods/goodsEdit", method: "POST", data, + type: 'store' }); }, diff --git a/api/store/index.js b/api/store/index.js index 2390ffe..2ea3098 100644 --- a/api/store/index.js +++ b/api/store/index.js @@ -9,6 +9,7 @@ export default { url: "/admin/dataCount/oneLine", method: "POST", data, + type: 'store' }); }, orderProfit(data) { @@ -16,6 +17,7 @@ export default { url: "/admin/dataCount/orderProfit", method: "POST", data, + type: 'store' }); }, orderGood(data) { @@ -23,6 +25,7 @@ export default { url: "/admin/dataCount/orderGood", method: "POST", data, + type: 'store' }); }, @@ -33,6 +36,7 @@ export default { url: "/admin/store/getStoreSetting", method: "POST", data, + type: 'store' }) }, @@ -41,6 +45,7 @@ export default { url: "/admin/store/setStoreSetting", method: "POST", data, + type: 'store' }) } diff --git a/api/store/order.js b/api/store/order.js index 924ce93..cc2636c 100644 --- a/api/store/order.js +++ b/api/store/order.js @@ -8,6 +8,7 @@ export default { url: "/admin/order/orderList", method: "POST", data, + type: 'store' }); }, @@ -16,6 +17,7 @@ export default { url: "/admin/order/orderSend", method: "POST", data, + type: 'store' }); }, @@ -24,6 +26,7 @@ export default { url: "/admin/order/GetExpressList", method: "POST", data, + type: 'store' }); }, @@ -32,6 +35,7 @@ export default { url: "/admin/order/printOrder", method: "POST", data, + type: 'store' }); }, @@ -40,6 +44,7 @@ export default { url: "/admin/order/updateNotes", method: "POST", data, + type: 'store' }); }, @@ -49,6 +54,7 @@ export default { url: "/admin/shop/checkLog", method: "POST", data, + type: 'store' }); }, @@ -57,6 +63,7 @@ export default { url: "/admin/order/confirmCancel", method: "POST", data, + type: 'store' }); }, @@ -66,6 +73,7 @@ export default { url: "/admin/after_sale/index", method: "POST", data, + type: 'store' }); }, @@ -75,6 +83,7 @@ export default { url: "/admin/after_sale/update", method: "POST", data, + type: 'store' }); }, @@ -83,6 +92,7 @@ export default { url: "/admin/after_sale/show", method: "POST", data, + type: 'store' }); }, @@ -91,6 +101,7 @@ export default { url: "/client/common/express", method: "POST", data, + type: 'store' }); }, enums(data) { @@ -98,6 +109,7 @@ export default { url: "/client/after_sale/enums", method: "POST", data, + type: 'store' }); }, @@ -110,6 +122,7 @@ export default { url: "/admin/OrderInpersonPayment/orderList", method: "POST", data, + type: 'store' }); }, @@ -118,6 +131,7 @@ export default { url: "/admin/OrderInpersonPayment/GetQrItem", method: "POST", data, + type: 'store' }); }, } diff --git a/api/store/shop.js b/api/store/shop.js index cd656c2..86bde72 100644 --- a/api/store/shop.js +++ b/api/store/shop.js @@ -9,6 +9,7 @@ export default { url: "/admin/shop/List", method: "POST", data, + type: 'store' }) }, @@ -17,6 +18,7 @@ export default { url: "/admin/shop/edit", method: "POST", data, + type: 'store' }) }, @@ -25,6 +27,7 @@ export default { url: "/admin/shop/editStatus", method: "POST", data, + type: 'store' }) }, @@ -33,6 +36,7 @@ export default { url: "/admin/shop/synchronousGoods", method: "POST", data, + type: 'store' }) }, diff --git a/api/store/user.js b/api/store/user.js index 04e3bfa..01fa152 100644 --- a/api/store/user.js +++ b/api/store/user.js @@ -9,6 +9,7 @@ export default { url: "/admin/user/userList", method: "GET", data, + type: 'store' }) }, @@ -17,6 +18,7 @@ export default { url: "/admin/user/userItem", method: "GET", data, + type: 'store' }) }, @@ -26,6 +28,7 @@ export default { url: "/admin/user/getLog", method: "GET", data, + type: 'store' }) }, @@ -34,6 +37,7 @@ export default { url: "/admin/user/changeInformation", method: "GET", data, + type: 'store' }) }, @@ -42,6 +46,7 @@ export default { url: "/admin/user/UpdateLevel", method: "GET", data, + type: 'store' }) }, diff --git a/api/store/userMembers.js b/api/store/userMembers.js index 4177987..aa97a73 100644 --- a/api/store/userMembers.js +++ b/api/store/userMembers.js @@ -9,6 +9,7 @@ export default { url: "/admin/UserMembers/LevelShow", method: "GET", data, + type: 'store' }) }, @@ -17,6 +18,7 @@ export default { url: "/admin/UserMembers/LevelSave", method: "GET", data, + type: 'store' }) }, @@ -25,6 +27,7 @@ export default { url: "/admin/UserMembers/SetList", method: "GET", data, + type: 'store' }) }, @@ -33,6 +36,7 @@ export default { url: "/admin/UserMembers/SetSave", method: "GET", data, + type: 'store' }) }, @@ -41,6 +45,7 @@ export default { url: "/admin/UserMembers/DiscountList", method: "GET", data, + type: 'store' }) }, @@ -49,6 +54,7 @@ export default { url: "/admin/UserMembers/CreateDiscount", method: "POST", data, + type: 'store' }) }, diff --git a/components/yGoods/index.vue b/components/yGoods/index.vue index 78086d6..10dc9ec 100644 --- a/components/yGoods/index.vue +++ b/components/yGoods/index.vue @@ -110,6 +110,9 @@ const open = (O) => { } if (props.modelValue) { + console.clear(props.modelValue); + console.log(props.modelValue); + if (Array.isArray(props.modelValue)) { LArr.value = JSON.parse(JSON.stringify(props.modelValue)) } else { diff --git a/mall/index/index.vue b/mall/index/index.vue index 7b7a338..0c6a6ba 100644 --- a/mall/index/index.vue +++ b/mall/index/index.vue @@ -86,9 +86,6 @@ --> - - - + + + + + + + + +
+ + 领取后过期 + 定时过期 + +
+ + +
+ + +
+
+ + + + + + + + + + + +
+ + 商品 + 分类 + 当面付 + +
+ + + + + + + + + + + +
+
+ + + + + + + + + +
+ + 不限 + 每天一次 + 每人一次 + +
+
+
+ + + + + 保存 + + + + + + + + + + + diff --git a/store/coupon/index.vue b/store/coupon/index.vue new file mode 100644 index 0000000..59edcb9 --- /dev/null +++ b/store/coupon/index.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/store/index/index.vue b/store/index/index.vue index f3c404a..eeda778 100644 --- a/store/index/index.vue +++ b/store/index/index.vue @@ -34,7 +34,7 @@ - + @@ -73,7 +73,7 @@ - 订单管理 + 商城订单 @@ -98,7 +98,19 @@ - 当面付订单 + 当面付 + + + +
+ +
+
+
+ + + 优惠券 diff --git a/store/shop/list.vue b/store/shop/list.vue index 552159f..8ccc187 100644 --- a/store/shop/list.vue +++ b/store/shop/list.vue @@ -150,7 +150,6 @@ const tableLogin = async (id) => { }); if (res.code === 0) { - uni.setStorageSync("token", res.data.access_token); uni.setStorageSync("mall_token", res.data.access_token); uni.setStorageSync("mall_info", res.data.user_info); // uni.showToast({ diff --git a/store/shop/to.vue b/store/shop/to.vue index 98c16a3..1bd68a6 100644 --- a/store/shop/to.vue +++ b/store/shop/to.vue @@ -45,7 +45,6 @@ onLoad((opt) => { }); if (res.code === 0) { - uni.setStorageSync("token", res.data.access_token); uni.setStorageSync("mall_token", res.data.access_token); uni.setStorageSync("mall_info", res.data.user_info); // uni.showToast({