diff --git a/app.json b/app.json
index 0bac513..a601e51 100644
--- a/app.json
+++ b/app.json
@@ -3,12 +3,18 @@
     "pages/index/index",
     "pages/logs/logs",
     "pages/submit/submit",
-    "pages/comment/comment"
+    "pages/comment/comment",
+    "pages/newcomment/newcomment"
   ],
+<<<<<<< HEAD
+  "window": {
+    "backgroundTextStyle": "light",
+=======
   "window":{
     "backgroundTextStyle":"light",
+>>>>>>> master
     "navigationBarBackgroundColor": "#abd",
     "navigationBarTitleText": "Eat点点",
-    "navigationBarTextStyle":"black"
+    "navigationBarTextStyle": "black"
   }
 }
\ No newline at end of file
diff --git a/pages/comment/comment.js b/pages/comment/comment.js
index 5b9a74d..b6f8bd3 100644
--- a/pages/comment/comment.js
+++ b/pages/comment/comment.js
@@ -28,4 +28,22 @@ Page({
       unlikeCount: '50'
     }]
   },  
+<<<<<<< HEAD
+  //保留当前页面，跳转到应用内的某个页面，使用wx.navigateBack可以返回到原页面。
+  to_newcomment: function () {
+    wx.navigateTo({
+      url: '../newcomment/newcomment',
+      success: function (res) {
+        // success
+      },
+      fail: function () {
+        // fail
+      },
+      complete: function () {
+        // complete
+      }
+    })
+  },
+=======
+>>>>>>> master
 });
\ No newline at end of file
diff --git a/pages/comment/comment.wxml b/pages/comment/comment.wxml
index 917c213..102948a 100644
--- a/pages/comment/comment.wxml
+++ b/pages/comment/comment.wxml
@@ -39,7 +39,11 @@
         <view class="weui-panel__ft">
             <view class="weui-cell weui-cell_access weui-cell_link">
                 <view class="weui-cell__bd">我也要评论</view>
+<<<<<<< HEAD
+                <view class="weui-cell__ft weui-cell__ft_in-access" bindtap="to_newcomment"></view>
+=======
                 <view class="weui-cell__ft weui-cell__ft_in-access"></view>
+>>>>>>> master
             </view>
         </view>
     </view>
diff --git a/pages/index/index.js b/pages/index/index.js
index fa4875f..1347300 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -9,20 +9,30 @@ Page({
     hasUserInfo: false,
     canIUse: wx.canIUse('button.open-type.getUserInfo'), 
     menu:[{
+<<<<<<< HEAD
+=======
       index: '0',
+>>>>>>> master
       name: '板烧鸡腿堡',
       price: '5',
       dsp: '香嫩多汁',
       pic: '../../images/汉堡.png'
     }, {
+<<<<<<< HEAD
+=======
       index: '1',
+>>>>>>> master
       name: '薯条',
       price: '10',
       dsp: '新鲜出炉',
       pic: '../../images/薯条.png'
+<<<<<<< HEAD
+    }]
+=======
     }],
     totalPrice: '0',
     latestPrice: '0'
+>>>>>>> master
   },
   //事件处理函数
   bindViewTap: function() {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 65987fe..9d9a58e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -1,5 +1,9 @@
 <!--index.wxml-->
+<<<<<<< HEAD
+<template name="menuItem">
+=======
 <template name="menuItem" >
+>>>>>>> master
   <view class="weui-cell">
     <view class="weui-cell__hd"> <image src="{{pic}}" style="width: 150rpx; height: 150rpx;"></image>
     </view>
@@ -9,7 +13,11 @@
     </view>
     <view class="weui-cell__ft">
       <view class="food-price">￥{{price}}</view>
+<<<<<<< HEAD
+      <image src="../../images/add.png" style="width: 50rpx; height: 50rpx;"></image>
+=======
       <image src="../../images/add.png" style="width: 50rpx; height: 50rpx;" data-index="{{index}}" bindtap='addDish'></image>
+>>>>>>> master
     </view>
   </view>
 </template>
@@ -31,9 +39,15 @@
       </view>
   
       <scroll-view class="weui-cells" scroll-y="true" style="height: 1000rpx;">
+<<<<<<< HEAD
+      <view wx:for="{{menu}}" wx:key="menu_block">
+        <template is="menuItem" data="{{...item}}"/>
+      </view>                         
+=======
         <view wx:for="{{menu}}" wx:key="menu_block">
           <template is="menuItem" data="{{...item}}"/>
         </view>                         
+>>>>>>> master
       </scroll-view>
 
       <view class="bar">
diff --git a/pages/newcomment/newcomment.js b/pages/newcomment/newcomment.js
new file mode 100644
index 0000000..be50ad3
--- /dev/null
+++ b/pages/newcomment/newcomment.js
@@ -0,0 +1,67 @@
+// pages/newcomment/newcomment.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})
\ No newline at end of file
diff --git a/pages/newcomment/newcomment.json b/pages/newcomment/newcomment.json
new file mode 100644
index 0000000..9e26dfe
--- /dev/null
+++ b/pages/newcomment/newcomment.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file
diff --git a/pages/newcomment/newcomment.wxml b/pages/newcomment/newcomment.wxml
new file mode 100644
index 0000000..8d7aaaf
--- /dev/null
+++ b/pages/newcomment/newcomment.wxml
@@ -0,0 +1,2 @@
+<!--pages/newcomment/newcomment.wxml-->
+<text>pages/newcomment/newcomment.wxml</text>
diff --git a/pages/newcomment/newcomment.wxss b/pages/newcomment/newcomment.wxss
new file mode 100644
index 0000000..9e54194
--- /dev/null
+++ b/pages/newcomment/newcomment.wxss
@@ -0,0 +1 @@
+/* pages/newcomment/newcomment.wxss */
\ No newline at end of file
diff --git a/pages/submit/submit.wxml b/pages/submit/submit.wxml
index d6f73d0..fce37ea 100644
--- a/pages/submit/submit.wxml
+++ b/pages/submit/submit.wxml
@@ -16,6 +16,35 @@
   </view>
 </template>
 
+<<<<<<< HEAD
+<view class='order_detail'>
+    <view class='order_detail_txt'>订单详情</view>
+</view>
+
+<scroll-view class="cart-list ma_pay_list" scroll-y="true" scroll-x="false">   
+  <view wx:for="{{order}}" wx:key="order_block">
+    <template is="orderItem" data="{{...item}}"/>
+  </view>   
+</scroll-view>
+
+<view class="ps">
+	<text class="z">备注：</text>
+    <input class="ps_txt z" type="text" placeholder="请输入你对菜品的要求" />
+</view>
+
+
+<view class="bottom">
+    <view class="price">
+        <view>总计： ￥<text class="price_num">100.00</text></view>
+    </view>
+    <view class="pay">
+	      <button type="default">去支付</button>
+    </view>
+</view>
+
+
+
+=======
 <view class="page">
     <view class="page__bd">
         <view class="weui-panel weui-panel_access">
@@ -45,4 +74,5 @@
         </view>
         
     </view>
-</view>
\ No newline at end of file
+</view>
+>>>>>>> master
diff --git a/utils/cookie/Cookie.js b/utils/cookie/Cookie.js
index c800ce8..75f4cee 100644
--- a/utils/cookie/Cookie.js
+++ b/utils/cookie/Cookie.js
@@ -1,78 +1,78 @@
-class Cookie {
-  constructor(storageKey) {
-    this._cookie = {};
-    this._storageKey = storageKey;
-    this.setCookieFromStorage(storageKey);
-  }
-  setRawCookie(str) {
-    let cookie = this.parseRawCookie(str);
-    let expires = parseInt(cookie['Max-Age']) + parseInt(Date.now());
-    this.setCookie(cookie.key, cookie.value, expires);
-    this.setCookieToStorage(this._storageKey)
-  }
-  setCookie(key, value, expires) {
-    // console.log('cookie', this._cookie)
-    this._cookie[key] = {
-      value: value,
-      expires: expires
-    }
-  }
-  getCookie(key) {
-    if (this._cookie[key] && this.isValid(this._cookie[key])) {
-      return this._cookie[key].value;
-    } else {
-      return null;
-    }
-  }
-  isValid(CookieProp) {
-    let expires = CookieProp.expires;
-    if (expires > Date.now()) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-  parseRawCookie(str) {
-    let props = str.split(/;\s*/);
-    let cookie = {};
-    props.forEach(function(item, index) {
-      let pair = item.split('=');
-      if (index === 0) {
-        cookie.key = pair[0];
-        cookie.value = pair[1];
-      } else {
-        cookie[pair[0]] = pair[1];
-      }
-    })
-    // console.log(cookie)
-    return cookie;
-  }
-  setCookieFromStorage(storageKey) {
-    this._cookie = wx.getStorageSync(storageKey);
-    if (this._cookie === '') {
-      this._cookie = {}
-      wx.setStorageSync(storageKey, {})
-    }
-  }
-  setCookieToStorage(storageKey) {
-    // console.log(this._cookie)
-    wx.setStorage({
-      key: storageKey,
-      data: this._cookie
-    })
-  }
-  toString() {
-    let keys = Object.keys(this._cookie);
-    let key = keys[0];
-    let value = this.getCookie(key);
-    if (value === null) {
-      return ''
-    } else {
-      return `${key}=${value}`
-    }
-  }
-}
-
-module.exports = {
-  cookie: new Cookie('cookie')
+class Cookie {
+  constructor(storageKey) {
+    this._cookie = {};
+    this._storageKey = storageKey;
+    this.setCookieFromStorage(storageKey);
+  }
+  setRawCookie(str) {
+    let cookie = this.parseRawCookie(str);
+    let expires = parseInt(cookie['Max-Age']) + parseInt(Date.now());
+    this.setCookie(cookie.key, cookie.value, expires);
+    this.setCookieToStorage(this._storageKey)
+  }
+  setCookie(key, value, expires) {
+    // console.log('cookie', this._cookie)
+    this._cookie[key] = {
+      value: value,
+      expires: expires
+    }
+  }
+  getCookie(key) {
+    if (this._cookie[key] && this.isValid(this._cookie[key])) {
+      return this._cookie[key].value;
+    } else {
+      return null;
+    }
+  }
+  isValid(CookieProp) {
+    let expires = CookieProp.expires;
+    if (expires > Date.now()) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+  parseRawCookie(str) {
+    let props = str.split(/;\s*/);
+    let cookie = {};
+    props.forEach(function(item, index) {
+      let pair = item.split('=');
+      if (index === 0) {
+        cookie.key = pair[0];
+        cookie.value = pair[1];
+      } else {
+        cookie[pair[0]] = pair[1];
+      }
+    })
+    // console.log(cookie)
+    return cookie;
+  }
+  setCookieFromStorage(storageKey) {
+    this._cookie = wx.getStorageSync(storageKey);
+    if (this._cookie === '') {
+      this._cookie = {}
+      wx.setStorageSync(storageKey, {})
+    }
+  }
+  setCookieToStorage(storageKey) {
+    // console.log(this._cookie)
+    wx.setStorage({
+      key: storageKey,
+      data: this._cookie
+    })
+  }
+  toString() {
+    let keys = Object.keys(this._cookie);
+    let key = keys[0];
+    let value = this.getCookie(key);
+    if (value === null) {
+      return ''
+    } else {
+      return `${key}=${value}`
+    }
+  }
+}
+
+module.exports = {
+  cookie: new Cookie('cookie')
 }
\ No newline at end of file