Merge branch 'online' of http://gogs.efunbox.cn:3000/LImengbo/efunbox-schedule-miniApps into online

compontents/tarbar/tarbar.js

@@ -6,7 +6,6 @@ Component({
    * 第一次进入课程的nav
    */
   properties: {
-    
   },
 
   /**

pages/art/art.wxml

@@ -16,35 +16,37 @@
             <preview 
             materialData="{{materialData}}"
             height="{{previewHeight}}"/>
+            <view id="upload-position">
+                <chat id="upload"
+                    ind="7"
+                    id="chat"
+                    productionData="{{productionData}}" 
+                    title="作品展示"
+                    query="上传作品"
+                    type="2"
+                    columnType="6"
+                    bind:myevent="onMyEvent"
+                    bind:getHeight="onGetHeight"
+                    data-type="2"
+                    more="{{productionMore}}"/>
+            </view>
+            <view id="questions-position">
+                <chat id="questions"
+                    productionData="{{questionsData}}" 
+                    title="答疑讨论"
+                    query="我有疑问"
+                    type="1"
+                    columnType="6"
+                    bind:myevent="onMyEvent"
+                    data-type="1"
+                    more="{{questionsMore}}"/>
+            </view>
 
-            <chat id="upload"
-                ind="7"
-                id="chat"
-                productionData="{{productionData}}" 
-                title="作品展示"
-                query="上传作品"
-                type="2"
-                columnType="6"
-                bind:myevent="onMyEvent"
-                bind:getHeight="onGetHeight"
-                data-type="2"
-                more="{{productionMore}}"/>
-
-            <chat id="questions"
-                productionData="{{questionsData}}" 
-                title="答疑讨论"
-                query="我有疑问"
-                type="1"
-                columnType="6"
-                bind:myevent="onMyEvent"
-                data-type="1"
-                more="{{questionsMore}}"/>
-
-            <view class="upload-one" data-id="upload" bindtap="location">
+            <view class="upload-one" data-id="upload-position" bindtap="location">
                 <image src="../image/works.png" ></image>
             </view>  
 
-            <view class="questions-one" data-id="questions" bindtap="location">
+            <view class="questions-one" data-id="questions-position" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
                 <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>

pages/science/science.wxml

@@ -16,36 +16,39 @@
             <preview 
             materialData="{{materialData}}"
             height="{{previewHeight}}"/>
-
-            <chat id="upload"
-                id="chat"
-                productionData="{{productionData}}" 
-                title="作品展示"
-                query="上传作品"
-                type="2"
-                columnType="5"
-                bind:getHeight="onGetHeight"
-                bind:myevent="onMyEvent"
-                data-type="2"
-                more="{{productionMore}}"/>
+            <view id="upload-position">
+                <chat id="upload"
+                    id="chat"
+                    productionData="{{productionData}}" 
+                    title="作品展示"
+                    query="上传作品"
+                    type="2"
+                    columnType="5"
+                    bind:getHeight="onGetHeight"
+                    bind:myevent="onMyEvent"
+                    data-type="2"
+                    more="{{productionMore}}"/>            
+            </view>
 
 
-            <chat id="questions"
-                productionData="{{questionsData}}" 
-                title="答疑讨论"
-                query="我有疑问"
-                type="1"
-                columnType="5"
-                bind:myevent="onMyEvent"
-                data-type="1"
-                more="{{questionsMore}}"/>
+            <view id="questions-position">
+                <chat id="questions"
+                    productionData="{{questionsData}}" 
+                    title="答疑讨论"
+                    query="我有疑问"
+                    type="1"
+                    columnType="5"
+                    bind:myevent="onMyEvent"
+                    data-type="1"
+                    more="{{questionsMore}}"/>
+            </view>
 
-            <view class="questions-one" data-id="questions" bindtap="location">
+            <view class="questions-one" data-id="questions-position" bindtap="location">
                 <image src="../image/q_discuss.png" ></image>
                 <text class="row" wx:if="{{questionsdian > 0}}"></text>
             </view>
 
-            <view class="upload-one" data-id="upload" bindtap="location">
+            <view class="upload-one" data-id="upload-position" bindtap="location">
                 <image src="../image/works.png" ></image>
             </view>
           </view>

utils/APIClient.js

@@ -116,7 +116,9 @@ module.exports = {
 	//获取二维码
 	getqrCode(data) {
 		let url = genAPIUrl('wx/qrCode/postsCache');
-		return request.getInstance().url(url).data(data).method('GET').send();
+		return request.getInstance().url(url).header({
+			uid: wx.getStorageSync('uid')
+		}).data(data).method('GET').send();
 	},
 	/**另一个小程序接口调用从此处开始 */
 	// 获取课程表列表