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

* 'master' of https://gitee.com/huangg/panda_beauty_makeup_small_program:
  F码

# Conflicts:
#	project.config.json

app.js

@@ -112,8 +112,9 @@ App({
       openid:'',
       unionid:''
     },
-    userInfo: null,
+    userInfo: {},
     defaultAddress: null,
+    fcodeErr: '',
     backLogin:false
   },
   checkDefaultAddress(address) {

pages/confirmOrder/confirmOrder.js

@@ -73,12 +73,15 @@ Page({
 
       }
       else {
+        
         wx.showToast({
           icon: 'none',
           title: res.message,
           duration: 2000
         })
-        wx.navigateBack()
+        appInstance.globalData.fcodeErr = res.message
+        wx.navigateBack()      
+
       }
     }, function () {
       wx.navigateBack()

pages/details/details.js

@@ -1,7 +1,7 @@
 // pages/details/details.js
+
 const getReq = require('./../../config.js').getReq;
 const app = getApp();
-
 Page({
 
   /**
@@ -225,6 +225,14 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
+    if (app.globalData.fcodeErr) {
+      wx.showToast({
+        icon: 'none',
+        title: app.globalData.fcodeErr,
+        duration: 2000
+      })
+      app.globalData.fcodeErr = ''
+    }
     if (app.globalData.backLogin) {
       this.getDatas(this.data.getOneSummary.goods_id);
     } 

project.config.json

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