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

# Conflicts:
#	project.config.json

pages/form/report/index.js

@@ -74,7 +74,7 @@ Page({
    * 验证字段
    */
   calcForm: function () {
-    
+
   },
   /**
    * 表单提交
@@ -90,8 +90,8 @@ Page({
 
       if (res.errcode === 0) {
         wx.navigateTo({
-          url: '/pages/list/sigin/index'
-        });
+          url: "/pages/list/signin/index"
+        })
       } else {
         wx.showToast({
           title: res.errmsg,
@@ -99,7 +99,6 @@ Page({
           duration: 2000
         });
       }
-
     }, true, false, true);
 
 

pages/tab/me/me.js

@@ -161,5 +161,10 @@ Page({
     wx.navigateTo({
       url: "/pages/list/signin/index"
     })
+  },
+  toCompanyData: function () {
+    wx.navigateTo({
+      url: '/pages/detail/company/index?type=1'
+    });
   }
 })
\ No newline at end of file

pages/tab/me/me.wxml

 <view class="mine">
     <view class="head row verCenter">
         <view class="pic">
-            <cover-image class="im" src="{{headPic||'/res/images/imgs/heads.png'}}"></cover-image>
+            <cover-image class="im" src="{{headPic ?  headPic:'/res/images/imgs/heads.png'}}"></cover-image>
         </view>
         <view class="text">
-            <text class="t1">{{userInfo.company_name||'--'}}</text>
+            <text class="t1">
+                {{userInfo.company_name||userInfo.wechat_oauth.oauth_nickname||'--'}}
+            </text>
             <view class="row verCenter">
                 <text class="t2" selectable="false" space="false" decode="false">普通会员</text>
                 <view>
@@ -18,7 +20,7 @@
             <text class="t1">每日签到</text>
         </view>
     </view>
-    <view class="tab-bar row verCenter rowCenter">
+    <view class="tab-bar row verCenter rowCenter" bindtap="toCompanyData">
         <view class="wrap">
             <text class="t1">{{business.goods}}</text>
             <text class="t2">商品</text>

project.config.json

@@ -168,8 +168,8 @@
 				},
 				{
 					"id": -1,
-					"name": "pages/list/blacklist/index",
-					"pathName": "pages/list/blacklist/index",
+					"name": "pages/form/report/index",
+					"pathName": "pages/form/report/index",
 					"scene": null
 				}
 			]