From 30263a98da34e875f3e359fa86cae1a7ef711e5f Mon Sep 17 00:00:00 2001 From: ccl <2206612655@qq.com> Date: Wed, 20 Nov 2024 10:12:01 +0800 Subject: [PATCH 1/9] ccl 10:11 --- yuan ma/mp-shop/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/yuan ma/mp-shop/app.js b/yuan ma/mp-shop/app.js index 002db75..12f79f0 100644 --- a/yuan ma/mp-shop/app.js +++ b/yuan ma/mp-shop/app.js @@ -17,3 +17,4 @@ App({ userInfo: null } }) +//2024.11.20 \ No newline at end of file From 9d2f91b5bd4e4bc31410f6469a2832919e215f98 Mon Sep 17 00:00:00 2001 From: fjc <2499842112@qq.com> Date: Wed, 20 Nov 2024 10:44:18 +0800 Subject: [PATCH 2/9] 111 --- yuan ma/mp-shop/pages/buy/buy.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/yuan ma/mp-shop/pages/buy/buy.js b/yuan ma/mp-shop/pages/buy/buy.js index 035ed1b..8772b92 100644 --- a/yuan ma/mp-shop/pages/buy/buy.js +++ b/yuan ma/mp-shop/pages/buy/buy.js @@ -4,18 +4,6 @@ Page({ data: { goodsData:{} }, - onLoad(options) { - getBuy({ id:options.id }).then(res =>{ - console.log(res.data); - this.setData({ - goodsData:res.data.data[0] - }) - }) - }, - onSubmit(){ - wx.showToast({ - title: '购买完成', - icon:"success" - }) + } }) \ No newline at end of file From 5f902c23ec585876bf89a5d2474a80453a7ed9c9 Mon Sep 17 00:00:00 2001 From: fjc <2499842112@qq.com> Date: Wed, 20 Nov 2024 10:45:57 +0800 Subject: [PATCH 3/9] 222 --- yuan ma/mp-shop/pages/buy/buy.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/yuan ma/mp-shop/pages/buy/buy.js b/yuan ma/mp-shop/pages/buy/buy.js index 8772b92..035ed1b 100644 --- a/yuan ma/mp-shop/pages/buy/buy.js +++ b/yuan ma/mp-shop/pages/buy/buy.js @@ -4,6 +4,18 @@ Page({ data: { goodsData:{} }, - + onLoad(options) { + getBuy({ id:options.id }).then(res =>{ + console.log(res.data); + this.setData({ + goodsData:res.data.data[0] + }) + }) + }, + onSubmit(){ + wx.showToast({ + title: '购买完成', + icon:"success" + }) } }) \ No newline at end of file From 127e54895f615b6e808441a282e53222f24e7fb8 Mon Sep 17 00:00:00 2001 From: dengzeyu <2429874273@qq.com> Date: Wed, 20 Nov 2024 10:58:43 +0800 Subject: [PATCH 4/9] 123456 --- yuan ma/mp-shop/pages/buy/buy.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yuan ma/mp-shop/pages/buy/buy.js b/yuan ma/mp-shop/pages/buy/buy.js index 035ed1b..9d1a4b4 100644 --- a/yuan ma/mp-shop/pages/buy/buy.js +++ b/yuan ma/mp-shop/pages/buy/buy.js @@ -1,3 +1,8 @@ +hint: Updates were rejected because the remote contains work that you do not +hint: have locally. This is usually caused by another repository pushing to +hint: the same ref. If you want to integrate the remote changes, use +hint: 'git pull' before pushing again. +hint: See the 'Note about fast-forwards' in 'git push --help' for details. const { getBuy } = require("../../api/index.js") Page({ From 7da4a3e6532961a0d7093933542aeeef074cb6a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E5=86=9B=E4=BB=81?= <3115324624@qq.com> Date: Wed, 20 Nov 2024 11:00:31 +0800 Subject: [PATCH 5/9] 333 --- yuan ma/mp-shop/pages/buy/buy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuan ma/mp-shop/pages/buy/buy.js b/yuan ma/mp-shop/pages/buy/buy.js index 035ed1b..362fff5 100644 --- a/yuan ma/mp-shop/pages/buy/buy.js +++ b/yuan ma/mp-shop/pages/buy/buy.js @@ -1,4 +1,4 @@ -const { getBuy } = require("../../api/index.js") +const { getBuy } = require("../../api/index.js")//商品购买 Page({ data: { From 0bb767b01a5b82465329aac04e297277f9681b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E5=86=9B=E4=BB=81?= <3115324624@qq.com> Date: Wed, 20 Nov 2024 11:04:45 +0800 Subject: [PATCH 6/9] 111 --- yuan ma/mp-shop/pages/cart/cart.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/yuan ma/mp-shop/pages/cart/cart.js b/yuan ma/mp-shop/pages/cart/cart.js index 42eba0a..0d63c11 100644 --- a/yuan ma/mp-shop/pages/cart/cart.js +++ b/yuan ma/mp-shop/pages/cart/cart.js @@ -1,6 +1,5 @@ const { getCart,delGoodsCart } = require("../../api/index.js") - -Page({ +//123 /** * 页面的初始数据 From 75991f356093dc3eaa6190af4d5eaa8a674128c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E8=AF=97=E9=B9=8F?= <1102686850@qq.com> Date: Wed, 20 Nov 2024 11:08:19 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E6=BA=90=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuan ma/mp-shop-server/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuan ma/mp-shop-server/index.js b/yuan ma/mp-shop-server/index.js index ec02bdd..3d0278b 100644 --- a/yuan ma/mp-shop-server/index.js +++ b/yuan ma/mp-shop-server/index.js @@ -15,4 +15,4 @@ app.use("/api",router); app.listen(3001,() =>{ console.log("服务器运行在3001端口上"); -}) \ No newline at end of file +})//123 \ No newline at end of file From 9e1f9891fb1028c5916371face4653f452128cf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=94=A1=E5=86=9B=E4=BB=81?= <3115324624@qq.com> Date: Wed, 20 Nov 2024 11:09:18 +0800 Subject: [PATCH 8/9] 111 --- yuan ma/mp-shop/pages/cart/cart.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuan ma/mp-shop/pages/cart/cart.js b/yuan ma/mp-shop/pages/cart/cart.js index 0d63c11..9b1def4 100644 --- a/yuan ma/mp-shop/pages/cart/cart.js +++ b/yuan ma/mp-shop/pages/cart/cart.js @@ -1,5 +1,5 @@ const { getCart,delGoodsCart } = require("../../api/index.js") -//123 +//111111 /** * 页面的初始数据 From d3c073aeb9c90b15a488ba4ec6749ba8147d7260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BA=9A?= <14945720+ligengrose@user.noreply.gitee.com> Date: Wed, 20 Nov 2024 11:15:19 +0800 Subject: [PATCH 9/9] first commit --- yuan ma/mp-shop/api/base.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yuan ma/mp-shop/api/base.js b/yuan ma/mp-shop/api/base.js index 8419a49..95e7819 100644 --- a/yuan ma/mp-shop/api/base.js +++ b/yuan ma/mp-shop/api/base.js @@ -1,5 +1,5 @@ /** - * 存储接口地址 + * 定义存储接口地址 */ module.exports = { baseUrl:"http://iwenwiki.com:3001", // 公共地址