fixed bug

Furniture/page/homePage/detail/conment/conment.js

@@ -6,6 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    is_login:false,
     next_page_url: '',
     newsid: '',
     reply_id: 0,

Furniture/page/homePage/detail/conment/conment.wxml

@@ -29,7 +29,7 @@
       <view class='container1' style='margin-left:100rpx;margin-top:5rpx;font-size:24rpx;color:#d3d3d3'>
         {{item.created_at}}
       </view>
-      <view style='font-size:35rpx;margin-left:100rpx;margin-top:50rpx;word-break:break-all;'>
+      <view style='font-size:35rpx;margin-left:100rpx;margin-top:50rpx;word-break:break-all;' id='{{item.id}}' bindtap='re_reply' data-name='{{item.username}}'>
         {{item.content}}
       </view>
       <view style='margin-top:5rpx;background-color:#f5f5f5;margin-left:100rpx;height:50rpx;padding:5rpx' id='{{item.id}}' bindtap='toConment' wx:if='{{item.replys.total != 0}}'>

Furniture/pages/index/index.js

@@ -531,9 +531,20 @@ Page({
           method: 'POST',
           success: function (res) {
             console.log(res.data)
-            that.setData({
-              mobile: res.data.data.decryptedData.phoneNumber
-            })
+            if(res.data.status_code == 0){
+              that.setData({
+                mobile: res.data.data.decryptedData.phoneNumber
+              })
+            }else{
+              wx.showToast({
+                title: '登录过期',
+                icon:'none',
+                duration:1000,
+              })
+              that.setData({
+                is_login: true
+              })
+            }
           }
         })
       },

Furniture/pages/infor/details.wxml

@@ -1,5 +1,6 @@
 <!--pages/infor/details.wxml-->
 <!-- <include src="detail_head.wxml"/> -->
+<view style='background-color:#fff'>
 <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'>
   <image src='{{pic_url}}' class='show_pic'></image>
 </view>
@@ -29,7 +30,7 @@
     <text>{{gDescription}}</text>
   </zan-cell>
 </zan-cell-group>
-<view wx:if="{{theimgs}}" class='pic-box'>
+<view wx:if="{{theimgs}}" class='pic-box' style='background-color:#fff'>
   <image wx:for='{{theimgs}}' src="{{item}}" data-list="{{theimgs}}" data-src='{{item}}' bindtap='preImg'></image>
 </view>
 <zan-cell-group title-width="90">
@@ -54,7 +55,7 @@
   </zan-cell>
   <zan-cell title="备注" value="" style="color:#666;" wx:if="{{status>3}}">{{msg}}</zan-cell>
 </zan-cell-group>
-<zan-row>
+<zan-row style='background-color:#fff'>
   <zan-col col="10" wx:if='{{status==0}}'>
     <text style='color:rgba(0,0,0,0)'>0</text>
   </zan-col>
@@ -93,4 +94,5 @@
 </view> -->
 <view class='float-icon'>
     <view class='dial' style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'></view>
-  </view>
+</view>
+</view>

Furniture/pages/infor/infor.wxml

@@ -83,6 +83,7 @@
         </zan-row>
       </zan-cell-group>
     </view>
+    <view style='width:100%;height:200rpx;color:#EBEBEB'>0</view>
   </view>
 </view>
 <view class='foot'>

Furniture/pages/make/make-detail.wxml

@@ -1,5 +1,6 @@
 
 <!-- <include src="../infor/detail_head.wxml"/> -->
+<view style='background-color:#fff'>
 <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'><image src='{{pic_url}}' class='show_pic'></image></view>
 <zan-cell-group title-width="90">
   <zan-cell title="订单编号" value="{{order_status}}">
@@ -25,7 +26,7 @@
     <text>{{gDescription}}</text>
   </zan-cell>
 </zan-cell-group>
-  <view wx:if="{{theimgs}}" class='pic-box'>
+  <view wx:if="{{theimgs}}" class='pic-box' style='background-color:#fff'>
     <image wx:for='{{theimgs}}' src="{{item}}" data-list="{{theimgs}}" data-src='{{item}}' bindtap='preImg'></image>
   </view>
   <zan-cell-group title-width="90">
@@ -51,7 +52,7 @@
 
     <zan-cell title="预计完成时间" value="" style="color:#666;"><text>{{expected_time}}</text></zan-cell>
   </zan-cell-group>
-  <zan-row>
+  <zan-row style='background-color:#fff'> 
     <zan-col col="8" wx:if='{{status == 1 || status == 2}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
     <zan-col col="16" wx:if='{{status > 2}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
     <zan-col col="7" offset="1">
@@ -69,4 +70,4 @@
 <view class='float-icon'>
     <view class='dial' style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'></view>
   </view>
-
+</view>

Furniture/pages/make/make.wxml

@@ -19,7 +19,6 @@
         <view class='sweep' bindtap='scanqrCode'><image src='../../img/icon-offline.png'></image></view>
       </view>
       <view class='vorder-infor'>
-<!-- <<<<<<< HEAD -->
         <navigator class="{{selected==0?'active':''}}" >
           <image src='../../img/order.png' bindtap='allOrder'></image>
           <view>全部</view>

Furniture/pages/manager/mana-detail.wxml

@@ -1,5 +1,6 @@
 
 <!-- <include src="../infor/detail_head.wxml"/> -->
+<view style='background-color:#fff'>
 <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'><image src='{{pic_url}}' class='show_pic'></image></view>
 <zan-cell-group title-width="90">
   <zan-cell title="订单编号" value="{{order_status}}">
@@ -25,7 +26,7 @@
     <text>{{gDescription}}</text>
   </zan-cell>
 </zan-cell-group>
-  <view wx:if="{{theimgs}}" class='pic-box'>
+  <view wx:if="{{theimgs}}" class='pic-box' style='background-color:#fff'>
     <image wx:for='{{theimgs}}' src="{{item}}" data-list="{{theimgs}}" data-src='{{item}}' bindtap='preImg'></image>
   </view>
   <zan-cell-group title-width="90">
@@ -51,11 +52,11 @@
 
     <zan-cell title="预计完成时间" value="" style="color:#666;"><text>{{expected_time}}</text></zan-cell>
   </zan-cell-group>
-  <zan-row>
+  <zan-row style='background-color:#fff'>
     <zan-col col="16"><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
     <zan-col col="7" offset="1"><button class='back' bindtap='fanhui'>返回</button></zan-col>
   </zan-row>
   <view class='float-icon'>
     <view class='dial' style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'></view>
   </view>
-
+</view>

Furniture/pages/manager/manage.wxml

@@ -36,7 +36,6 @@
           </navigator>
           <navigator class="{{selected==3?'active':''}}" bindtap='tap4'>
             <image src='../../img/weixiu.png'></image>
-<!-- >>>>>>> 601fcb59c1773a1ffbe24c5d9ab395529140ff5f -->
             <view>生产中</view>
             <text class='num' wx:if='{{making!=0}}'>{{making}}</text>
           </navigator>
@@ -89,6 +88,7 @@
         </zan-row>
       </zan-cell-group>   
     </view>
+    <view style='width:100%;height:200rpx;color:#EBEBEB'>0</view>
   </view>
 </view>
 <include src="foot.wxml"/>

Furniture/pages/packing/packing-detail.wxml

@@ -1,94 +1,100 @@
 <!--pages/packing/packing-detail.wxml-->
 <!-- <zan-dialog id="zan-dialog-test"></zan-dialog>
 <include src="../infor/detail_head.wxml"/> -->
-<view class='sp' wx:if='{{showpic}}' bindtap='hidepic'><image src='{{pic_url}}' class='show_pic'></image></view>
-<zan-cell-group title-width="90">
-  <zan-cell title="订单编号" value="{{order_status}}">
-    <text style='color:red;'>{{order_num}}</text>
-  </zan-cell>
-  <zan-cell title="二维码" value=""><image src='{{pic_url}}' class = 'qrcode' bindtap='showPic' data-src='{{pic_url}}'></image></zan-cell> 
-  <zan-cell title="交易时间" value="">
-    <text>{{order_created_time}}</text>
-  </zan-cell>
-</zan-cell-group>
-<hr/>
-<zan-cell-group title-width="90">
-  <zan-cell title="商品名称" value="">
-    <text>{{gCategory}}</text>
-  </zan-cell>
-  <zan-cell title="品类" value="">
-    <text>{{gType}}</text>
-  </zan-cell>
-  <zan-cell title="颜色" value="">
-    <text>{{gColor}}</text>
-  </zan-cell>
-  <zan-cell title="问题描述" value="">
-    <text>{{gDescription}}</text>
-  </zan-cell>
-</zan-cell-group>
-<view wx:if="{{theimgs}}" class='pic-box'>
-  <image wx:for='{{theimgs}}' src="{{item}}" data-list="{{theimgs}}" data-src='{{item}}' bindtap='preImg'></image>
-</view>
-<zan-cell-group title-width="90">
-  <zan-cell title="客户信息" style="color:#666;"></zan-cell>
-  <zan-cell title="姓名" value="">
-    <text>{{uName}}</text>
-  </zan-cell>
-  <zan-cell title="联系方式" value="">
-    <text>{{uMobile}}</text>
-  </zan-cell>
-  <zan-cell title="收货地址" value="">
-    <text>{{uAddress}}</text>
-  </zan-cell>
-</zan-cell-group>
-<zan-dialog id="zan-dialog-test"></zan-dialog>
-<zan-toast id="zan-toast-test"></zan-toast>
-<zan-cell-group title-width="90">
-  <zan-cell title="配件清单" value="" style="color:#999;"></zan-cell>
-  <view class='list-box' wx:for="{{parts}}">
-    <view class='thing'>{{item.name}}</view>
-    <view class='num'>{{item.count}}个</view>
+<view style='background-color:#fff'>
+  <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'>
+    <image src='{{pic_url}}' class='show_pic'></image>
   </view>
-</zan-cell-group>
-<zan-cell-group title-width="130">
-  <zan-cell title="订单进度" value="" style="color:#666;"></zan-cell>
-  <view class='buzou'>
-    <zan-steps type="vertical" hasDesc="true" steps-class="my-class" icon-class="gray" desc-class="desc" title-class="white" steps="{{steps}}"></zan-steps>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单编号" value="{{order_status}}">
+      <text style='color:red;'>{{order_num}}</text>
+    </zan-cell>
+    <zan-cell title="二维码" value="">
+      <image src='{{pic_url}}' class='qrcode' bindtap='showPic' data-src='{{pic_url}}'></image>
+    </zan-cell>
+    <zan-cell title="交易时间" value="">
+      <text>{{order_created_time}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <hr/>
+  <zan-cell-group title-width="90">
+    <zan-cell title="商品名称" value="">
+      <text>{{gCategory}}</text>
+    </zan-cell>
+    <zan-cell title="品类" value="">
+      <text>{{gType}}</text>
+    </zan-cell>
+    <zan-cell title="颜色" value="">
+      <text>{{gColor}}</text>
+    </zan-cell>
+    <zan-cell title="问题描述" value="">
+      <text>{{gDescription}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <view wx:if="{{theimgs}}" class='pic-box'>
+    <image wx:for='{{theimgs}}' src="{{item}}" data-list="{{theimgs}}" data-src='{{item}}' bindtap='preImg'></image>
   </view>
-  <zan-cell title="预计完成时间" value="" style="color:#666;">
-    <text>{{expected_time}}</text>
-  </zan-cell>
-  <zan-cell title="备注" value="" style="color:#666;">{{msg}}</zan-cell>
-</zan-cell-group>
-<zan-toast id="zan-toast-test"></zan-toast>
-<!-- <zan-row wx:if="{{who!='manage'}}">    -->
-<zan-row>
-  <zan-col col="4">
-    <text style='color:rgba(0,0,0,0)'>0</text>
-  </zan-col>
-  <zan-col col="5">
-    <text wx:if="{{status==2}}" style='color:rgba(0,0,0,0)'>0</text>
-  </zan-col>
-  <zan-col col="15">
-    <text wx:if="{{status==!2}}" style='color:rgba(0,0,0,0)'>0</text>
-  </zan-col>
-  <zan-col col="4" offset="1">
-  <form bindsubmit='upFormID' report-submit='true'>
-    <button form-type="submit" bindtap='dayin' class='dayin' wx:if='{{status==2}}'>打印</button>
-    </form>
-  </zan-col>
-  <zan-col col="4" offset="1">
-  <form bindsubmit='upFormID' report-submit='true'>
-    <button form-type="submit" wx:if="{{status==2}}" bindtap='fahuo' class='fahuo'>发货</button>
-    </form>
-  </zan-col>
-  <zan-col col="4" offset="1">
-    <button class='back' bindtap='fanhui'>返回</button>
-  </zan-col>
-</zan-row>
-<modal hidden="{{hiddenmodalput}}" title="发货" confirm-text="提交" cancel-text="取消" bindcancel="cancel" bindconfirm="confirm">
-<input type='text' placeholder="请添加备注" bindblur='getRemark'/>
-</modal>
-<view class='float-icon'>
+  <zan-cell-group title-width="90">
+    <zan-cell title="客户信息" style="color:#666;"></zan-cell>
+    <zan-cell title="姓名" value="">
+      <text>{{uName}}</text>
+    </zan-cell>
+    <zan-cell title="联系方式" value="">
+      <text>{{uMobile}}</text>
+    </zan-cell>
+    <zan-cell title="收货地址" value="">
+      <text>{{uAddress}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-dialog id="zan-dialog-test"></zan-dialog>
+  <zan-toast id="zan-toast-test"></zan-toast>
+  <zan-cell-group title-width="90">
+    <zan-cell title="配件清单" value="" style="color:#999;"></zan-cell>
+    <view class='list-box' wx:for="{{parts}}">
+      <view class='thing'>{{item.name}}</view>
+      <view class='num'>{{item.count}}个</view>
+    </view>
+  </zan-cell-group>
+  <zan-cell-group title-width="130">
+    <zan-cell title="订单进度" value="" style="color:#666;"></zan-cell>
+    <view class='buzou'>
+      <zan-steps type="vertical" hasDesc="true" steps-class="my-class" icon-class="gray" desc-class="desc" title-class="white" steps="{{steps}}"></zan-steps>
+    </view>
+    <zan-cell title="预计完成时间" value="" style="color:#666;">
+      <text>{{expected_time}}</text>
+    </zan-cell>
+    <zan-cell title="备注" value="" style="color:#666;">{{msg}}</zan-cell>
+  </zan-cell-group>
+  <zan-toast id="zan-toast-test"></zan-toast>
+  <!-- <zan-row wx:if="{{who!='manage'}}">    -->
+  <zan-row>
+    <zan-col col="4">
+      <text style='color:rgba(0,0,0,0)'>0</text>
+    </zan-col>
+    <zan-col col="5">
+      <text wx:if="{{status==2}}" style='color:rgba(0,0,0,0)'>0</text>
+    </zan-col>
+    <zan-col col="15">
+      <text wx:if="{{status==!2}}" style='color:rgba(0,0,0,0)'>0</text>
+    </zan-col>
+    <zan-col col="4" offset="1">
+      <form bindsubmit='upFormID' report-submit='true'>
+        <button form-type="submit" bindtap='dayin' class='dayin' wx:if='{{status==2}}'>打印</button>
+      </form>
+    </zan-col>
+    <zan-col col="4" offset="1">
+      <form bindsubmit='upFormID' report-submit='true'>
+        <button form-type="submit" wx:if="{{status==2}}" bindtap='fahuo' class='fahuo'>发货</button>
+      </form>
+    </zan-col>
+    <zan-col col="4" offset="1">
+      <button class='back' bindtap='fanhui'>返回</button>
+    </zan-col>
+  </zan-row>
+  <modal hidden="{{hiddenmodalput}}" title="发货" confirm-text="提交" cancel-text="取消" bindcancel="cancel" bindconfirm="confirm">
+    <input type='text' placeholder="请添加备注" bindblur='getRemark' />
+  </modal>
+  <view class='float-icon'>
     <view class='dial' style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'></view>
-  </view>
+  </view>
+</view>

Furniture/pages/packing/packing.wxml

@@ -71,7 +71,7 @@
         <zan-cell title="预计完成时间" value="" style="color:#666;">
           <text style='color:#666;'>{{item.expected_time}}</text>
         </zan-cell>
-        <zan-row>
+        <zan-row style='background-color:#fff'>
           <zan-col col="3" wx:if='{{item.state == "待发货"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
           <zan-col col="17" wx:if='{{ item.state != "待发货"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
           <zan-col col="7" wx:if='{{ item.state == "待发货"}}'>