Fix bug

Furniture/app.json

@@ -1,9 +1,8 @@
 {
   "pages": [
     
-    
-    "page/homePage/homePage",
     "pages/logs/guanggao",
+    "page/homePage/homePage",
     "page/user/user",
     "page/lifeCircle/lifeCircle",
     "page/contact/contact",
@@ -24,7 +23,8 @@
     "pages/infor/details",
     "pages/infor/infor",
     "pages/packing/packing-detail",
-    "pages/infor/detail_head"
+    "pages/infor/detail_head",
+    "pages/fc/fc"
   ],
   "window": {
     "navigationBarTextStyle": "black",

Furniture/app.wxss

@@ -49,8 +49,8 @@ page{
     bottom: 110rpx;
 }
 .dial {
-    width: 130rpx;
-    height: 130rpx;
+    width: 100rpx;
+    height: 100rpx;
     border-radius: 10rpx;
     display: block;
     margin-bottom: 32rpx;

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

@@ -44,7 +44,4 @@
     </view>
   </view>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/page/homePage/detail/detail.wxml

@@ -26,7 +26,7 @@
             <image src='../../../images/like1.png' style='width:60rpx;height:60rpx;margin-left:20rpx'></image>
           </view>
           <view style='margin:15rpx 0 15rpx 20rpx;border-right:1px solid #EA6F5A;padding:0 20rpx 0 0'>喜欢</view>
-          <view style='margin:15rpx 0 15rpx 20rpx'>
+          <view style='margin:16rpx 0 15rpx 10rpx'>
             {{news.like}}
           </view>
         </view>
@@ -36,7 +36,7 @@
             <image src='../../../images/like.png' style='width:60rpx;height:60rpx;margin-left:20rpx'></image>
           </view>
           <view style='margin:15rpx 0 15rpx 20rpx;border-right:1px solid white;padding:0 20rpx 0 0'>喜欢</view>
-          <view style='margin:15rpx 0 15rpx 20rpx'>
+          <view style='margin:16rpx 0 15rpx 10rpx'>
             {{news.like+1}}
           </view>
         </view>
@@ -79,7 +79,4 @@
     </view>
   </view>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/page/homePage/detail/detail.wxss

@@ -95,7 +95,7 @@
 }
 
 .like1 {
-  margin-left: 350rpx;
+  margin-left: 400rpx;
   background-color: #ea6f5a;
   width: 250rpx;
   height: 80rpx;

Furniture/page/homePage/homePage.js

@@ -50,6 +50,7 @@ Page({
               sysinfo: e.data.setting,
               menus: e.data.menus
             }),
+            console.log(that.data.sysinfo)
             app.avatar = e.data.setting.avatar,
             app.username = e.data.setting.name
           wx.setNavigationBarTitle({

Furniture/page/homePage/homePage.wxml

@@ -15,35 +15,46 @@
       <view class="container1">
         现代简约沙发
       </view>
-      <view class="container1" style='width:2rpx;height:40rpx;background-color:#1E90FF;margin-left:484rpx;'>
+      <view class="container1" style='width:2rpx;height:40rpx;background-color:#1E90FF;margin-left:540rpx;'>
       </view>
-      <view class="container1" style="margin-left:500rpx;color:#1E90FF;margin-top:20rpx">
+      <view class="container1" style="margin-left:560rpx;color:#1E90FF;margin-top:20rpx">
         {{ weather }}
       </view>
-      <view class='container1' style='margin-left:560rpx'>
+      <view class='container1' style='margin-left:618rpx'>
         <image wx:if="{{weather=='多云'}}" src="../../images/weather/duoyun.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
         <image wx:if="{{weather=='晴'}}" src="../../images/weather/qing.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
         <image wx:if="{{weather=='阵雨'}}" src="../../images/weather/zhenyu.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
         <image wx:if="{{weather!='多云'&&weather!='晴'&&weather!='阴'&&weather!='阵雨'}}" src="../../images/weather/yu.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
       </view>
-      <view class="container1" style="margin-left:600rpx;color:#1E90FF;margin-top:20rpx">
+      <view class="container1" style="margin-left:660rpx;color:#1E90FF;margin-top:20rpx">
         {{ temp }}°
       </view>
     </view>
 
 
-    <view class='weui-flex' style='border-bottom: 2rpx #D3D3D3 solid'>
+    <!-- <view class='weui-flex' style='border-bottom: 2rpx #D3D3D3 solid'>
       <view class='weui-flex__item'>
        <navigator target="miniProgram" open-type="navigate" app-id="wx605448628d21d682" path="/pages/index/index" extra-data="" version="release">
           <image src='../../images/jiajuhuace.png' style='height:215rpx;width:100%;margin:20rpx;margin-top:0;'></image>
-         </navigator>
+       </navigator>
       </view>
       <view class='weui-flex__item' style='margin-left:45rpx;'>
         <image src='../../images/jiajushouhou.png' style='height:100rpx;width:90%;margin-top:0;' bindtap='goShouhou'></image>
         <image src='../../images/chajindu.png' style='height:100rpx;width:90%;' bindtap='goJingdu'></image>
       </view>
+    </view> -->
+    <view style='width:100%;border-bottom: 2rpx #D3D3D3 solid;height:230rpx;margin-top:8rpx'>
+      <view style='float:left;width:342rpx;'>
+      <navigator target="miniProgram" open-type="navigate" app-id="wx605448628d21d682" path="/pages/index/index" extra-data="" version="release">
+          <image src='../../images/jiajuhuace.png' style='height:210rpx;width:304rpx;margin-left:30rpx;margin-top:0;'></image>
+       </navigator>
+      </view>
+      <view style='float:left;width:408rpx;'>
+       <image src='/images/jiajushouhou.png' style='height:100rpx;width:378rpx;' bindtap='goShouhou'></image>
+       <image src='/images/chajindu.png' style='height:100rpx;width:378rpx;margin-top:-2rpx' bindtap='goJingdu'></image>
+      </view>
     </view>
-    <view class="relative" style='border-bottom: 2rpx #D3D3D3 solid'>
+    <view class="relative" style='border-bottom: 2rpx #D3D3D3 solid;margin-top:0rpx;'>
       <image class="pic_background" src="../../images/xinwenzixun.png"></image>
       <view class="container1" style='color:#000;margin-left:270rpx'>
         {{ sysinfo.notice }}
@@ -92,8 +103,10 @@
       <image class="pic_background" src="../../images/jiajudapei.png"></image>
       <scroll-view  class="marketlist" scrollX="true">
         <view class="marketlist_one" wx:for="{{goods}}" wx:key="{{item.value}}">
-          <image mode="aspectFill" src="{{item.img}}" style="border-radius:10rpx;"></image>
-          <view class="gobyndsingle">¥{{ item.price}}</view>
+          <navigator target="miniProgram" open-type="navigate" app-id="{{sysinfo.goods_app_id}}" path="{{sysinfo.goods_app_path}}" data-id="{{item.goods_id}}" version="release">
+            <image mode="aspectFill" src="{{item.img}}" style="border-radius:10rpx;"></image>
+          <view class="gobyndsingle">{{item.name}}</view>
+          </navigator>
         </view>
       </scroll-view>
     </view>

Furniture/page/homePage/homePage.wxss

@@ -91,12 +91,12 @@
   height: 200rpx;
 }
 
-.marketlist_one>image {
+.marketlist_one image {
   width: 150rpx;
   height: 150rpx;
 }
 
-.marketlist_one>view {
+.marketlist_one view {
   font-size: 26rpx;
   color: #333;
   text-align: center;

Furniture/page/user/user.wxml

@@ -24,7 +24,4 @@
     <view class='btn daili' bindtap='daili'><image src='/img/daili.png'></image></view>
   </view>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/fc/fc.js

@@ -0,0 +1,66 @@
+// pages/fc/fc.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+  
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+  
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+  
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+  
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+  
+  }
+})

Furniture/pages/fc/fc.json

@@ -0,0 +1 @@
+{}

Furniture/pages/fc/fc.wxml

@@ -0,0 +1,5 @@
+<!--pages/fc/fc.wxml-->
+<movable-area style='float:right;right:100rpx;bottom:320rpx;position:fixed;z-index:999'>
+    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180823/09424987ce3105b03c28aca9dee57a6e.png");background-size:100% 100%' catchtap='backhome'>
+    </movable-view>
+</movable-area>

Furniture/pages/fc/fc.wxss

@@ -0,0 +1 @@
+/* pages/fc/fc.wxss */

Furniture/pages/index/index.wxml

@@ -103,8 +103,5 @@
       </zan-col>
     </zan-row>
   </view>
-  <movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-  </movable-area>
-</view>
+</view>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/infor/assess.wxml

@@ -48,8 +48,5 @@
   <image class='add' src='../../img/add.png' bindtap='addimg'></image>
 </view>
 <button class='sub' bindtap='tijiao'>提交</button>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
-</view>
+</view>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/infor/details.js

@@ -12,6 +12,9 @@ Page({
    * 组件的初始数据
    */
   data: {
+    showinfofalse:true,
+    showinfotrue:false,
+    showinfo:false,
     pic_url: '',
     showpic:false,
     expected_time:'',
@@ -54,6 +57,22 @@ Page({
     pingjia: 0,
     status: 0,
   },
+  si:function(){
+    var that = this
+    if(that.data.showinfo == true){
+      that.setData({
+        showinfo:false,
+        showinfofalse: true,
+        showinfotrue: false,
+      })
+    }else{
+      that.setData({
+        showinfo: true,
+        showinfofalse: false,
+        showinfotrue: true,
+      })
+    }
+  },
   onLoad: function() {
     var that = this
     console.log('detailpage')

Furniture/pages/infor/details.wxml

@@ -1,5 +1,6 @@
 <!--pages/infor/details.wxml-->
 <!-- <include src="detail_head.wxml"/> -->
+<include src="/pages/fc/fc.wxml" />
 <view style='overflow-x:hidden'>
 <view style='background-color:#fff'>
 <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'>
@@ -53,20 +54,20 @@
     <image wx:for='{{theimgs}}' src="{{item}}" data-list="{{theimgs}}" data-src='{{item}}' bindtap='preImg'></image>
   </view>
   <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
-    客户信息
+    客户信息<text style='float:right;position:absolute;right:20rpx;color:#349BE1' wx:if='{{showinfotrue}}' bindtap='si'>收起</text><text style='float:right;position:absolute;right:20rpx;color:#349BE1' bindtap='si' wx:if='{{showinfofalse}}'>查看</text>
   </view>
-  <view style='margin-top:20rpx'></view>
-  <zan-cell-group title-width="90">
+  <view style='margin-top:20rpx' wx:if='{{showinfo}}'></view>
+  <zan-cell-group title-width="90" wx:if='{{showinfo}}'>
     <zan-cell title="姓名" value="" style='color:#777;'>
       <text style='color:#2a2121'>{{uName}}</text>
     </zan-cell>
   </zan-cell-group>
-  <zan-cell-group title-width="90">
+  <zan-cell-group title-width="90" wx:if='{{showinfo}}'>
     <zan-cell title="联系方式" value="" style='color:#777;'>
       <text style='color:#2a2121'>{{uMobile}}</text>
     </zan-cell>
   </zan-cell-group>
-  <zan-cell-group title-width="90">
+  <zan-cell-group title-width="90" wx:if='{{showinfo}}'>
     <zan-cell title="收货地址" value="" style='color:#777;'>
       <text style='color:#2a2121'>{{uAddress}}</text>
     </zan-cell>
@@ -118,8 +119,4 @@
   <button wx:if="{{status==3&&!pingjia}}" bindtap='assess' id='vorder-id'>评价</button> 
 </view> -->
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
 </view>

Furniture/pages/infor/infor.wxml

@@ -1,4 +1,5 @@
 <!--pages/infor/infor.wxml-->
+<include src="/pages/fc/fc.wxml" />
 <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'>
   <image src='{{pic_url}}' class='show_pic'></image>
 </view>
@@ -139,8 +140,4 @@
       <text class='user'>我的订单</text>
     </zan-col>
   </zan-row>
-</view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+</view>

Furniture/pages/make/make-detail.wxml

@@ -1,5 +1,6 @@
 
 <!-- <include src="../infor/detail_head.wxml"/> -->
+<include src="/pages/fc/fc.wxml" />
 <view style='overflow-x:hidden'>
 <view style='background-color:#fff;'>
 <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'><image src='{{pic_url}}' class='show_pic'></image></view>
@@ -96,8 +97,4 @@
     </zan-col>
   </zan-row>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
 </view>

Furniture/pages/make/make.js

@@ -652,9 +652,9 @@ Page({
       scanType: ['qrCode'],
       success: (res) => {
         console.log(res.result)
-        wx.navigateTo({
-          url: '../search/search?order_id=35',
-        })
+        // wx.navigateTo({
+        //   url: '../search/search?order_id=35',
+        // })
       }
     })
   },

Furniture/pages/make/make.wxml

@@ -1,4 +1,5 @@
 <!--pages/make/make.wxml-->
+<include src="/pages/fc/fc.wxml" />
 <view class='sp' wx:if='{{showpic}}' bindtap='hidepic'><image src='{{pic_url}}' class='show_pic'></image></view>
 <view class='all'>
   <view class='head'>
@@ -109,8 +110,4 @@
       </zan-cell-group>
     </view>
   </view>
-</view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+</view>

Furniture/pages/manager/datacount.wxml

@@ -37,8 +37,5 @@
     </zan-col>
   </zan-row>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />
 

Furniture/pages/manager/mana-detail.wxml

@@ -80,8 +80,5 @@
     <zan-cell title="预计完成时间" value="" style='color:#777;'><text style='color:#2a2121'>{{expected_time}}</text></zan-cell>
   </zan-cell-group>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
-</view>
+</view>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/manager/manage.js

@@ -846,9 +846,10 @@ Page({
       scanType: ['qrCode'],
       success:(res)=>{
         console.log(res.result)
-        wx.navigateTo({
-          url: '../search/search?order_id=35',
-        })
+        var str = '' + res.result
+        // wx.navigateTo({
+        //    url: str,
+        // })
       }
     })
   }

Furniture/pages/manager/manage.wxml

@@ -147,7 +147,4 @@
     </zan-col>
   </zan-row>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/manager/thedata/pingjia.wxml

@@ -7,7 +7,4 @@
 <view class='zz'>
   <canvas canvas-id="columnCanvas" class="canvas" bindtouchstart="touchHandler"></canvas>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/manager/thedata/pinlei-list.wxml

@@ -5,7 +5,4 @@
   <view class='zz'>
     <canvas canvas-id="columnCanvas" disable-scroll="true" class="canvas" bindtouchstart="touchHandler" bindtouchmove="moveHandler" bindtouchend="touchEndHandler"></canvas>
   </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/manager/thedata/pinlei.wxml

@@ -15,7 +15,4 @@
     <zan-cell id='{{item}}' wx:for="{{list}}" wx:key="{{index}}" title="{{item}}"  is-link bindtap='list'></zan-cell>
   </zan-cell-group>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/manager/thedata/shouhou-list.wxml

@@ -5,7 +5,4 @@
   <view class='zz'>
     <canvas canvas-id="columnCanvas" disable-scroll="true" class="canvas" bindtouchstart="touchHandler" bindtouchmove="moveHandler" bindtouchend="touchEndHandler"></canvas>
   </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/manager/thedata/shouhou.wxml

@@ -15,8 +15,5 @@
     <zan-cell id='{{item}}' wx:for="{{list}}" wx:key="{{index}}" title="{{item}}"  is-link bindtap='list'></zan-cell>
   </zan-cell-group>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />
 

Furniture/pages/manager/thedata/vorder-list.wxml

@@ -5,7 +5,4 @@
   <view class='zz'>
     <canvas canvas-id="columnCanvas" disable-scroll="true" class="canvas" bindtouchstart="touchHandler" bindtouchmove="moveHandler" bindtouchend="touchEndHandler"></canvas>
   </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/manager/thedata/vorder.wxml

@@ -16,7 +16,4 @@
     <view style='height:15rpx;'></view>
     <zan-cell title="逾期" id='6' is-link bindtap='list'></zan-cell>
   </zan-cell-group>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/packing/packing-detail.wxml

@@ -117,8 +117,5 @@
       <input type='text' placeholder="请添加备注" bindblur='getRemark' />
     </modal>
 </view>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
-</view>
+</view>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/packing/packing.js

@@ -743,9 +743,9 @@ Page({
       scanType: ['qrCode'],
       success: (res) => {
         console.log(res.result)
-        wx.navigateTo({
-          url: '../search/search?order_id=35',
-        })
+        // wx.navigateTo({
+        //   url: '../search/search?order_id=35',
+        // })
       }
     })
   },

Furniture/pages/packing/packing.wxml

@@ -117,7 +117,4 @@
   <input form-type="submit" type='text' placeholder="请添加备注" bindblur='getRemark'/>
 </form>
 </modal>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
+<include src="/pages/fc/fc.wxml" />

Furniture/pages/search/search.wxml

@@ -122,8 +122,5 @@
 <modal hidden="{{hiddenmodalput}}" title="发货" confirm-text="提交" cancel-text="取消" bindcancel="cancel" bindconfirm="confirm">
 <input type='text' placeholder="请添加备注" bindblur='getRemark'/>
 </modal>
-<movable-area style='float:right;right:100rpx;bottom:440rpx;position:fixed'>
-    <movable-view class='dial' direction="all" style='background-image:url("https://t6.9026.com/upload/images/20180815/884b8b528800f9fdecd901bb5b871f4a.png");background-size:100% 100%' catchtap='backhome'>
-    </movable-view>
-</movable-area>
 </view>
+<include src="/pages/fc/fc.wxml" />