Merge remote-tracking branch 'origin/master'

# Conflicts:
#	yuan ma/mp-shop/pages/buy/buy.js

yuan ma/mp-shop/pages/buy/buy.js

@@ -1,8 +1,3 @@
-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({

yuan ma/mp-shop/pages/cart/cart.js

@@ -1,6 +1,5 @@
 const { getCart,delGoodsCart } = require("../../api/index.js")
-
+//111111
-Page({
 
     /**
      * 页面的初始数据