Merge branch 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program

pages/person/person.js

@@ -40,6 +40,7 @@ Page({
    */
   onShow: function () {
     const count = this.data.login_count;
+    console.log(app.globalData.userInfo);
       if (!app.globalData.userInfo && count <= 2) {
         this.setData({
           login_count: this.data.login_count+1

pages/shopCart/shopCart.js

@@ -14,6 +14,16 @@ Page({
 
   },
   onShow: function () {
+    this.setData({
+      free_info: [],
+      summary: [],
+      cart_list: [],
+      all_checked: false,
+      allPrice: 0,
+      allGoodsPrice: 0,
+      hasmore: false,
+      curpage: 0
+    });
     this.req_datas();
   },
   req_datas(){

pages/shopCart/shopCart.wxss

@@ -135,7 +135,7 @@
 .num_handle {
   position: absolute;
   bottom: 13rpx;
-  right: 0;
+  right: 10rpx;
 }
 .handle_btn {
     color: #ff4e4e;
@@ -155,7 +155,7 @@
 }
 .cancal_btn {
   position: absolute;
-  right: 10rpx;
+  right: 20rpx;
   top: 15rpx;
   width: 40rpx;
   height: 40rpx;

project.config.json

@@ -64,8 +64,13 @@
 				},
 				{
 					"id": -1,
+<<<<<<< HEAD
+					"name": "fcode",
+					"pathName": "pages/fcode/fcode",
+=======
 					"name": "addAddress",
 					"pathName": "pages/addAddress/addAddress",
+>>>>>>> f778d35752c4b95547a4aa0ef9c201110699ad04
 					"query": ""
 				}
 			]