Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

# Conflicts:
#	app.json

app.json

 {
 {
   "pages": [
   "pages": [
-    "pages/detail/xj/index",
-    "pages/tab/price/price",
+ "pages/detail/xj/index","pages/login/index",    "pages/tab/price/price",
     "pages/tab/home/home",
     "pages/tab/home/home",
     "pages/tab/message/message",
     "pages/tab/message/message",
     "pages/tab/good/good",
     "pages/tab/good/good",

pages/login/index.js

+// pages/login/index.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

pages/login/index.json

+{
+  "usingComponents": {
+    
+  },
+  "navigationBarTitleText": "IC登录",
+  "navigationBarBackgroundColor": "#0D84D1",
+  "navigationBarTextStyle": "white",
+  "backgroundColor": "#0d84d1"
+}
\ No newline at end of file

pages/login/index.wxml

+<view class='person'>
+  <view class='head column verCenter'>
+    <view class='logo'>
+      <cover-image src="/res/images/imgs/iclogo.png" class="img"></cover-image>
+    </view>
+    <text class="t1">IC业务助手</text>
+    <text class='t2'>让询报价更轻松、便捷</text>
+  </view>
+</view>
\ No newline at end of file

pages/login/index.wxss

+/* pages/login/index.wxss */
+
+.person {
+  margin: 108rpx auto 0;
+}
+
+.person .logo .img {
+  width: 225rpx;
+  height: 201rpx;
+}
+
+.person .t1 {
+  margin-top: 50rpx;
+  margin-bottom: 10rpx;
+  font-size: 46rpx;
+  color: #3f3a3a;
+  font-weight:600;
+}
+
+.person .t2 {
+  font-size: 26rpx;
+  color: #9f9fa0;
+}