beautify the UI

Furniture/app.json

@@ -1,7 +1,9 @@
 {
   "pages": [
-    "pages/logs/guanggao",
+    
+    
     "page/homePage/homePage",
+    "pages/logs/guanggao",
     "page/user/user",
     "page/lifeCircle/lifeCircle",
     "page/contact/contact",
@@ -28,7 +30,7 @@
     "navigationBarTextStyle": "black",
     "navigationBarTitleText": "天天家居惠",
     "navigationBarBackgroundColor": "#fff",
-    "backgroundColor": "#dcdcdc"
+    "backgroundColor": "#fff"
   },
   "networkTimeout": {
     "request": 10000,

Furniture/app.wxss

@@ -44,7 +44,7 @@ page{
 }
 .float-icon {
     position: fixed;
-    z-index: 20;
+    z-index: 999;
     right: 20rpx;
     bottom: 110rpx;
 }

Furniture/bower_components/zanui-weapp/dist/cell/index.wxss

@@ -1 +1,113 @@
-.zan-cell{position:relative;padding:12px 15px;display:-webkit-box;display:flex;-webkit-box-align:center;align-items:center;line-height:1.4;background-color:#fff;font-size:14px}.zan-cell::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-bottom-width:1px;left:15px;right:0}.zan-cell__icon{margin-right:5px}.zan-cell__icon:empty{display:none}.zan-cell__title{padding-right:10px}.zan-cell__title:empty{display:none}.zan-cell__bd{-webkit-box-flex:1;flex:1}.zan-cell__text{line-height:24px;font-size:14px}.zan-cell__desc{line-height:1.2;font-size:12px;color:#666}.zan-cell__ft{position:relative;text-align:right;color:#666}.zan-cell__no-pading{padding:0}.zan-cell__no-pading .zan-cell__bd_padding{padding:12px 0 12px 15px}.zan-cell__no-pading .zan-cell__bd_padding .zan-form__input{height:26px}.zan-cell__no-pading .zan-cell__ft_padding{padding:12px 15px 12px 0}.zan-cell.last-cell::after,.zan-cell.no-border::after{display:none}.zan-cell--access .zan-cell__ft{padding-right:13px}.zan-cell--access .zan-cell__ft::after{position:absolute;top:50%;right:2px;content:" ";display:inline-block;height:6px;width:6px;border-width:2px 2px 0 0;border-color:#c8c8c8;border-style:solid;-webkit-transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0);transform:translateY(-50%) matrix(.71,.71,-.71,.71,0,0)}.zan-cell--switch{padding-top:6px;padding-bottom:6px}
+.zan-cell {
+  position: relative;
+  padding: 1px 15px;
+  display: -webkit-box;
+  display: flex;
+  -webkit-box-align: center;
+  align-items: center;
+  line-height: 1.4;
+  background-color: #fff;
+  font-size: 14px;
+}
+
+.zan-cell::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 200%;
+  height: 200%;
+  -webkit-transform: scale(0.5);
+  transform: scale(0.5);
+  -webkit-transform-origin: 0 0;
+  transform-origin: 0 0;
+  pointer-events: none;
+  box-sizing: border-box;
+  border: 0 solid #e5e5e5;
+  border-bottom-width: 1px;
+  left: 15px;
+  right: 0;
+}
+
+.zan-cell__icon {
+  margin-right: 5px;
+}
+
+.zan-cell__icon:empty {
+  display: none;
+}
+
+.zan-cell__title {
+  padding-right: 10px;
+
+}
+
+.zan-cell__title:empty {
+  display: none;
+}
+
+.zan-cell__bd {
+  -webkit-box-flex: 1;
+  flex: 1;
+}
+
+.zan-cell__text {
+  line-height: 24px;
+  font-size: 14px;
+}
+
+.zan-cell__desc {
+  line-height: 1.2;
+  font-size: 12px;
+  color: #666;
+}
+
+.zan-cell__ft {
+  position: relative;
+  text-align: right;
+  color: #666;
+}
+
+.zan-cell__no-pading {
+  padding: 0;
+}
+
+.zan-cell__no-pading .zan-cell__bd_padding {
+  padding: 12px 0 12px 15px;
+}
+
+.zan-cell__no-pading .zan-cell__bd_padding .zan-form__input {
+  height: 26px;
+}
+
+.zan-cell__no-pading .zan-cell__ft_padding {
+  padding: 12px 15px 12px 0;
+}
+
+.zan-cell.last-cell::after, .zan-cell.no-border::after {
+  display: none;
+}
+
+.zan-cell--access .zan-cell__ft {
+  padding-right: 13px;
+}
+
+.zan-cell--access .zan-cell__ft::after {
+  position: absolute;
+  top: 50%;
+  right: 2px;
+  content: " ";
+  display: inline-block;
+  height: 6px;
+  width: 6px;
+  border-width: 2px 2px 0 0;
+  border-color: #c8c8c8;
+  border-style: solid;
+  -webkit-transform: translateY(-50%) matrix(0.71, 0.71, -.71, 0.71, 0, 0);
+  transform: translateY(-50%) matrix(0.71, 0.71, -.71, 0.71, 0, 0);
+}
+
+.zan-cell--switch {
+  padding-top: 6px;
+  padding-bottom: 6px;
+}

Furniture/bower_components/zanui-weapp/dist/field/index.wxss

@@ -1 +1,77 @@
-.zan-field{display:block;position:relative;color:#333}.zan-field::after{content:'';position:absolute;top:0;left:0;width:200%;height:200%;-webkit-transform:scale(.5);transform:scale(.5);-webkit-transform-origin:0 0;transform-origin:0 0;pointer-events:none;box-sizing:border-box;border:0 solid #e5e5e5;border-bottom-width:1px;left:15px;right:0}.zan-field--no-border::after{border-bottom-width:0}.zan-cell--field{padding:7px 15px}.zan-field--wrapped{margin:10px 15px;background-color:#fff}.zan-field--wrapped::after{left:0;border-width:1px;border-radius:4px}.zan-field--wrapped::after{display:block}.zan-field--error{color:#f40}.zan-field--wrapped.zan-field--error::after{border-color:#f40}.zan-field__title{color:#333;min-width:65px;padding-right:10px}.zan-field__input{-webkit-box-flex:1;flex:1;line-height:1.6;padding:4px 0;min-height:22px;height:auto;font-size:14px}.zan-field__placeholder{font-size:14px}.zan-field__input--right{text-align:right}
+.zan-field {
+  display: block;
+  position: relative;
+  color: #333;
+}
+
+.zan-field::after {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 200%;
+  height: 200%;
+  -webkit-transform: scale(0.5);
+  transform: scale(0.5);
+  -webkit-transform-origin: 0 0;
+  transform-origin: 0 0;
+  pointer-events: none;
+  box-sizing: border-box;
+  left: 15px;
+  right: 0;
+}
+
+.zan-field--no-border::after {
+  border-bottom-width: 0;
+}
+
+.zan-cell--field {
+  padding: 7px 15px;
+}
+
+.zan-field--wrapped {
+  margin: 10px 15px;
+  background-color: #fff;
+}
+
+.zan-field--wrapped::after {
+  left: 0;
+  border-width: 1px;
+  border-radius: 4px;
+}
+
+.zan-field--wrapped::after {
+  display: block;
+}
+
+.zan-field--error {
+  color: #f40;
+}
+
+.zan-field--wrapped.zan-field--error::after {
+  border-color: #f40;
+}
+
+.zan-field__title {
+  color: #999;
+  min-width: 65px;
+  padding-right: 10px;
+}
+
+.zan-field__input {
+  -webkit-box-flex: 1;
+  flex: 1;
+  line-height: 1.6;
+  padding: 4px 0;
+  min-height: 22px;
+  height: auto;
+  font-size: 14px;
+}
+
+.zan-field__placeholder {
+  font-size: 14px;
+}
+
+.zan-field__input--right {
+  text-align: right;
+}

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

@@ -6,9 +6,13 @@ Page({
    * 页面的初始数据
    */
   data: {
+    focus: false,
+    placeholder: '说些什么...',
+    is_reply: false,
     is_login:false,
     next_page_url: '',
     newsid: '',
+    re_reply_id:0,
     reply_id: 0,
     reply_content: '',
     replys: []
@@ -17,6 +21,14 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
+  toConment: function (e) {
+    var that = this
+    console.log(e)
+    var id = e.currentTarget.id
+    wx.navigateTo({
+      url: 'conment?id=' + id + '&newsid=' + that.data.newsid,
+    })
+  },
   onLoad: function(options) {
     var id = options.id
     var newsid = options.newsid
@@ -203,74 +215,176 @@ Page({
       url: '/page/homePage/homePage',
     })
   },
+  set_is_reply_false: function () {
+    var that = this
+    that.setData({
+      focus: true,
+      is_reply: false,
+      placeholder: '说些什么...'
+    })
+  },
+  re_reply: function (e) {
+    var that = this
+    that.setData({
+      focus: true,
+      is_reply: true,
+      re_reply_id: e.currentTarget.id,
+      reply_content: '回复 @' + e.currentTarget.dataset.name+'：',
+    })
+  },
   reply: function(e) {
     var that = this
     var text = e.detail.value
     if (text != '') {
-      app.request({
-        url: 'https://t6.9026.com/api/furniture/add_comments',
-        data: {
-          store_id: app.globalData.store_id,
-          news_id: that.data.newsid,
-          content: text,
-          comments_id: that.data.reply_id
-        },
-        method: 'post',
-        success: function(res) {
-          if (res.data == 'Unauthorized .') {
-            that.setData({
-              is_login: true
-            })
-          } else {
-            app.request({
-              url: 'https://t6.9026.com/api/furniture/getmorecomments',
-              data: {
-                store_id: app.globalData.store_id,
-                id: that.data.reply_id
-              },
-              method: 'get',
-              success: function(res) {
-                console.log(res.data)
-                that.setData({
-                  comments: res.data.data.comments,
-                  next_page_url: res.data.data.comments_replys.next_page_url,
-                  reply_content: '',
-                  comments_replys: res.data.data.comments_replys,
-                  replys: res.data.data.comments_replys.data,
-                })
-                var c = that.data.replys
-                for (var i = 0; i < c.length; i++) {
-                  console.log(c[i].created_at.replace(/\-/g, "/"))
-                  var d = new Date(c[i].created_at.replace(/\-/g, "/")).getTime()
-                  var n = new Date().getTime()
-                  var t = n - d
-                  if (t < 60000) {
-                    var x = Math.round(t / 1000)
-                    c[i].created_at = '' + x + '秒前'
-                  } else if (t >= 60000 && t < 3600000) {
-                    var x = Math.round(t / 60000)
-                    c[i].created_at = '' + x + '分钟前'
-                  } else if (t >= 3600000 && t < 86400000) {
-                    var x = Math.round(t / 3600000)
-                    c[i].created_at = '' + x + '小时前'
-                  } else if (t >= 86400000 && t < 86400000 * 3) {
-                    var x = Math.round(t / 86400000)
-                    c[i].created_at = '' + x + '天前'
-                  } else {
-                    var e = new Date(d)
-                    var x = '' + e.getFullYear() + '-' + (e.getMonth() + 1) + '-' + e.getDate()
-                    c[i].created_at = '' + x
+      if(that.data.is_reply == false){
+        app.request({
+          url: 'https://t6.9026.com/api/furniture/add_comments',
+          data: {
+            store_id: app.globalData.store_id,
+            news_id: that.data.newsid,
+            content: text,
+            comments_id: that.data.reply_id
+          },
+          method: 'post',
+          success: function (res) {
+            if (res.data == 'Unauthorized .') {
+              that.setData({
+                is_login: true
+              })
+            } else {
+              app.request({
+                url: 'https://t6.9026.com/api/furniture/getmorecomments',
+                data: {
+                  store_id: app.globalData.store_id,
+                  id: that.data.reply_id
+                },
+                method: 'get',
+                success: function (res) {
+                  console.log(res.data)
+                  that.setData({
+                    comments: res.data.data.comments,
+                    next_page_url: res.data.data.comments_replys.next_page_url,
+                    reply_content: '',
+                    comments_replys: res.data.data.comments_replys,
+                    replys: res.data.data.comments_replys.data,
+                  })
+                  var c = that.data.replys
+                  for (var i = 0; i < c.length; i++) {
+                    console.log(c[i].created_at.replace(/\-/g, "/"))
+                    var d = new Date(c[i].created_at.replace(/\-/g, "/")).getTime()
+                    var n = new Date().getTime()
+                    var t = n - d
+                    if (t < 60000) {
+                      var x = Math.round(t / 1000)
+                      c[i].created_at = '' + x + '秒前'
+                    } else if (t >= 60000 && t < 3600000) {
+                      var x = Math.round(t / 60000)
+                      c[i].created_at = '' + x + '分钟前'
+                    } else if (t >= 3600000 && t < 86400000) {
+                      var x = Math.round(t / 3600000)
+                      c[i].created_at = '' + x + '小时前'
+                    } else if (t >= 86400000 && t < 86400000 * 3) {
+                      var x = Math.round(t / 86400000)
+                      c[i].created_at = '' + x + '天前'
+                    } else {
+                      var e = new Date(d)
+                      var x = '' + e.getFullYear() + '-' + (e.getMonth() + 1) + '-' + e.getDate()
+                      c[i].created_at = '' + x
+                    }
                   }
+                  that.setData({
+                    replys: c
+                  })
+                  that.comments_time()
                 }
+              })
+            }
+          }
+        })
+      }else if(that.data.is_reply == true){
+        if (text != '') {
+          app.request({
+            url: 'https://t6.9026.com/api/furniture/add_comments',
+            data: {
+              store_id: app.globalData.store_id,
+              news_id: that.data.newsid,
+              content: text,
+              comments_id: that.data.reply_id
+            },
+            method: 'post',
+            success: function (res) {
+              var id = that.data.reply_id
+              if (res.data == 'Unauthorized .') {
                 that.setData({
-                  replys: c
+                  is_login: true
+                })
+              } else {
+                app.request({
+                  url: 'https://t6.9026.com/api/furniture/getmorecomments',
+                  data: {
+                    store_id: app.globalData.store_id,
+                    id: id
+                  },
+                  method: 'get',
+                  success: function (res) {
+                    console.log(res.data)
+                    that.setData({
+                      is_reply:false,
+                      focus:false,
+                      placeholder:'说些什么...',
+                      re_reply_id:0,
+                      next_page_url: res.data.data.comments_replys.next_page_url,
+                      comments: res.data.data.comments,
+                      comments_replys: res.data.data.comments_replys,
+                      replys: res.data.data.comments_replys.data,
+                      reply_content: '',
+                    })
+                    var c = that.data.replys
+                    for (var i = 0; i < c.length; i++) {
+                      console.log(c[i].created_at.replace(/\-/g, "/"))
+                      var d = new Date(c[i].created_at.replace(/\-/g, "/")).getTime()
+                      var n = new Date().getTime()
+                      var t = n - d
+                      if (t < 60000) {
+                        var x = Math.round(t / 1000)
+                        c[i].created_at = '' + x + '秒前'
+                      } else if (t >= 60000 && t < 3600000) {
+                        var x = Math.round(t / 60000)
+                        c[i].created_at = '' + x + '分钟前'
+                      } else if (t >= 3600000 && t < 86400000) {
+                        var x = Math.round(t / 3600000)
+                        c[i].created_at = '' + x + '小时前'
+                      } else if (t >= 86400000 && t < 86400000 * 3) {
+                        var x = Math.round(t / 86400000)
+                        c[i].created_at = '' + x + '天前'
+                      } else {
+                        var e = new Date(d)
+                        var x = '' + e.getFullYear() + '-' + (e.getMonth() + 1) + '-' + e.getDate()
+                        c[i].created_at = '' + x
+                      }
+                    }
+                    that.setData({
+                      replys: c
+                    })
+                    that.comments_time()
+                    wx.showToast({
+                      title: '回复成功',
+                      icon: 'success',
+                      duration: 1000
+                    })
+                  }
                 })
-                that.comments_time()
               }
-            })
-          }
+            }
+          })
+        } else {
+          that.setData({
+            is_reply: false,
+            reply_id: 0,
+            placeholder: '随便说些什么...',
+          })
         }
-      })
+      }
     }
   },
   close_login: function() {

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

@@ -39,11 +39,12 @@
         <image src='/images/huifufengexian.png ' style='width:630rpx;height:1rpx;margin-top:0rpx；margin-left:0rpx'></image>
       </view>
     </view>
-    <view class='sousuo'>
-      <input class='findit' placeholder='说点什么...' bindblur='reply' value='{{reply_content}}'></input>
+    <view class='sousuo' bindtap='set_is_reply_false'>
+      <input class='findit' placeholder='{{placeholder}}' bindblur='reply' value='{{reply_content}}' focus='{{focus}}'></input>
     </view>
   </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>
+<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>

Furniture/page/homePage/detail/detail.wxml

@@ -19,9 +19,8 @@
       </view>
 
       <view style='height:80rpx;width:100%;position:relative;display:flex'>
-        <view class='container1' style='margin-top:45rpx'>{{news.viewed}}</view>
-        <image src='../../../images/eyes.png' style='width:50rpx;height:50rpx;margin-top:40rpx'></image>
-
+        <view class='container1' style='margin-top:50rpx'>{{news.viewed}}</view>
+        <image src='../../../images/eyes.png' style='width:50rpx;height:50rpx;margin-top:46rpx'></image>
         <view class='like' bindtap='like' wx:if="{{like}}">
           <view style='margin-top:10rpx'>
             <image src='../../../images/like1.png' style='width:60rpx;height:60rpx;margin-left:20rpx'></image>
@@ -43,11 +42,10 @@
         </view>
       </view>
 
-
-
-      <view style='margin-top:80rpx;'>
+      
+    </view>
+    <view style='margin-top:80rpx;background-color:#eee;width:100%;height:50rpx;padding:10rpx 0 5rpx 15rpx;color:#999;'>
         全部评论({{news_comments.total}})
-      </view>
     </view>
     <view class='conment' wx:for='{{comments}}'>
       <view class='container1' style='margin-left:0rpx;margin-top:0rpx'>
@@ -60,7 +58,7 @@
       <view style='font-size:35rpx;margin-left:100rpx;margin-top:50rpx;word-break:break-all;' id='{{item.id}}' bindtap='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}}'>
+      <view style='margin-top:5rpx;background-color:#f5f5f5;margin-left:100rpx;height:50rpx;padding:5rpx 0 0 20rpx;border-radius:10rpx' id='{{item.id}}' bindtap='toConment' wx:if='{{item.replys.total != 0}}'>
         <text style='color:#1E90FF;font-size:30rpx' decode="{{true}}" space="{{true}}">共{{item.replys.total}}条回复  ></text>
       </view>
       <view class='container1' style='margin-top:0rpx;margin-left:100rpx'>
@@ -82,7 +80,8 @@
       </view>
     </view>
   </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>
+<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>

Furniture/page/homePage/detail/detail.wxss

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

Furniture/page/homePage/homePage.js

@@ -237,22 +237,22 @@ Page({
     if (wx.getStorageSync('user')) {
       var u = wx.getStorageSync('user')
       if (u.role == 0) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/index/index',
         })
       }
       if (u.role == 1) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/make/make',
         })
       }
       if (u.role == 2) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/packing/packing',
         })
       }
       if (u.role == 3) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/manager/manage',
         })
       }
@@ -268,22 +268,22 @@ Page({
     if (wx.getStorageSync('user')) {
       var u = wx.getStorageSync('user')
       if (u.role == 0) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/infor/infor',
         })
       }
       if (u.role == 1) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/make/make',
         })
       }
       if (u.role == 2) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/packing/packing',
         })
       }
       if (u.role == 3) {
-        wx.navigateTo({
+        wx.redirectTo({
           url: '/pages/manager/manage',
         })
       }

Furniture/page/homePage/homePage.wxml

@@ -15,15 +15,16 @@
       <view class="container1">
         现代简约沙发
       </view>
+      <view class="container1" style='width:2rpx;height:40rpx;background-color:#1E90FF;margin-left:484rpx;'>
+      </view>
       <view class="container1" style="margin-left:500rpx;color:#1E90FF;margin-top:20rpx">
-        |{{ weather }}
+        {{ weather }}
       </view>
       <view class='container1' style='margin-left:560rpx'>
         <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">
         {{ temp }}°

Furniture/page/user/user.json

@@ -1,4 +1,5 @@
 {
+  "navigationBarTitleText": "个人中心",
   "component": true,
   "usingComponents": {}
 }

Furniture/page/user/user.wxml

@@ -24,6 +24,7 @@
     <view class='btn daili' bindtap='daili'><image src='/img/daili.png'></image></view>
   </view>
 </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>
+<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>

Furniture/pages/index/index.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "售后登记",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/index/index.wxml

@@ -1,81 +1,110 @@
 <!-- <view class='sp' wx:if='{{show}}' bindtap='hidepic'><image src='{{pic_url}}' mdoe='aspectFit' style='width:100%;z-index:10'></image></view> -->
-<include src="../login/login.wxml" />
-<zan-dialog id="zan-dialog-test"></zan-dialog>
-<zan-cell-group title-width="90">
-  <zan-cell title="产品信息" style="color:#999;"></zan-cell>
-</zan-cell-group>
-<zan-cell-group>
-  <view class="weui-cell weui-cell_select">
-    <view class="weui-cell__hd weui-cell__hd_in-select-after">
-      <view class="weui-label" style='font-size:14px'>产品品类</view>
+<view style='overflow-x:hidden'>
+  <include src="../login/login.wxml" />
+  <zan-dialog id="zan-dialog-test"></zan-dialog>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee'>
+    产品信息
+  </view>
+  <zan-cell-group>
+
+    <view class="weui-cell weui-cell_select" style='margin-right:25rpx;'>
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view class="weui-label" style='font-size:14px;color:#999'>产品品类</view>
+      </view>
+      <view class="weui-cell__bd">
+        <picker bindchange="bindCategoryChange" value="{{categoryIndex}}" range="{{categorys}}">
+          <view class="weui-select weui-select_in-select-after" style='font-size:14px'>{{categorys[categoryIndex]}}</view>
+        </picker>
+      </view>
     </view>
-    <view class="weui-cell__bd">
-      <picker bindchange="bindCategoryChange" value="{{categoryIndex}}" range="{{categorys}}">
-        <view class="weui-select weui-select_in-select-after" style='font-size:14px'>{{categorys[categoryIndex]}}</view>
-      </picker>
+    <view class="weui-cell weui-cell_select" style='margin-right:25rpx;'>
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view class="weui-label" style='font-size:14px;color:#999'>产品型号</view>
+      </view>
+      <view class="weui-cell__bd">
+        <picker bindchange="bindGtypeChange" value="{{gtypeIndex}}" range="{{gtypes}}">
+          <view class="weui-select weui-select_in-select-after" style='font-size:14px'>{{gtypes[gtypeIndex]}}</view>
+        </picker>
+      </view>
     </view>
-  </view>
-  <view class="weui-cell weui-cell_select">
-    <view class="weui-cell__hd weui-cell__hd_in-select-after">
-      <view class="weui-label" style='font-size:14px'>产品型号</view>
+    <view class="weui-cell weui-cell_select" style='margin-right:25rpx;'>
+      <view class="weui-cell__hd weui-cell__hd_in-select-after">
+        <view class="weui-label" style='font-size:14px;color:#999'>产品颜色</view>
+      </view>
+      <view class="weui-cell__bd">
+        <picker bindchange="bindGcolorChange" value="{{gcolorIndex}}" range="{{gcolors}}">
+          <view class="weui-select weui-select_in-select-after" style='font-size:14px'>{{gcolors[gcolorIndex]}}</view>
+        </picker>
+      </view>
     </view>
-    <view class="weui-cell__bd">
-      <picker bindchange="bindGtypeChange" value="{{gtypeIndex}}" range="{{gtypes}}">
-        <view class="weui-select weui-select_in-select-after" style='font-size:14px'>{{gtypes[gtypeIndex]}}</view>
-      </picker>
+
+    <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee'>
+      问题描述
     </view>
+    <textarea class='desIn' placeholder='请输入问题...(限140)' value='{{miaoshu}}' bindblur='wenti'></textarea>
+  </zan-cell-group>
+  <zan-dialog id="zan-dialog-test"></zan-dialog>
+  <zan-toast id="zan-toast-test"></zan-toast>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#fff'>
+    上传图片
   </view>
-  <view class="weui-cell weui-cell_select">
-    <view class="weui-cell__hd weui-cell__hd_in-select-after">
-      <view class="weui-label" style='font-size:14px'>产品颜色</view>
-    </view>
-    <view class="weui-cell__bd">
-      <picker bindchange="bindGcolorChange" value="{{gcolorIndex}}" range="{{gcolors}}">
-        <view class="weui-select weui-select_in-select-after" style='font-size:14px'>{{gcolors[gcolorIndex]}}</view>
-      </picker>
+  <view class='img'>
+    <view wx:for="{{urlArr}}" class='pic'>
+      <image src='../../img/del.png' class='del' bindtap='del_pic' id='{{item}}'></image>
+      <image src='{{item}}' id='{{item}}' bindtap='showpic' data-list="{{urlArr}}" data-src='{{item}}'></image>
     </view>
+    <image class='add' src='../../img/add.png' bindtap='addimg'></image>
   </view>
-  <zan-cell title="问题描述"></zan-cell>
-  <zan-field bindblur='wenti' placeholder='请在这里写入' value='{{miaoshu}}'></zan-field>
-</zan-cell-group>
-<zan-dialog id="zan-dialog-test"></zan-dialog>
-<zan-toast id="zan-toast-test"></zan-toast>
-<view class='img'>
-  <view wx:for="{{urlArr}}" class='pic'>
-    <image src='../../img/del.png' class='del' bindtap='del_pic' id='{{item}}'></image>
-    <image src='{{item}}' id='{{item}}' bindtap='showpic' data-list="{{urlArr}}" data-src='{{item}}'></image>
+  <zan-cell-group title-width="90">
+    <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin-top:20rpx'>
+      收货地址
+    </view>
+  </zan-cell-group>
+
+
+  <zan-cell-group title-width="90">
+    <zan-field title="姓名" bindblur="namein" value="{{urname}}" style='color:#999' placeholder="请输入姓名"></zan-field>
+  </zan-cell-group>
+
+  <view style='width:700rpx;height:3rpx;background-color:#eee;margin:0 25rpx 0 25rpx'></view>
+  <view style='display:flex;margin-top:0rpx'>
+    <zan-cell-group title-width="90">
+      <zan-field title="联系方式" bindblur="mobilein" placeholder="请输入手机号码" value='{{mobile}}' style='color:#999'></zan-field>
+    </zan-cell-group>
+    <button style='color:white;background-color:RGB(233,59,61);margin-top:10rpx;font-size:22rpx;height:52rpx;text-align:center;padding-left:24rpx;float:left;padding-top:0rpx;width:200rpx;margin-left:1rpx;' open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">获取手机号</button>
   </view>
-  <image class='add' src='../../img/add.png' bindtap='addimg'></image>
-</view>
-<zan-cell-group title-width="90">
-  <zan-cell title="客户信息" style="color:#999;"></zan-cell>
-  <zan-field title="姓名" bindblur="namein" value="{{urname}}"></zan-field>
-  <view style='display:flex;'>
-    <zan-field title="联系方式" bindblur="mobilein" placeholder="请输入您的联系方式" value='{{mobile}}'></zan-field>
-    <button class="weui-vcode-btn" style='color:white;background-color:#E93B3D;margin:10rpx;font-size:36rpx' open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">获取手机号</button>
+  <view style='width:700rpx;height:3rpx;background-color:#eee;margin:0 25rpx 0 25rpx'></view>
+  <view style='display:flex;padding:0rpx;padding-left:0rpx;margin-top:0rpx'>
+    <zan-cell-group title-width="90">
+      <zan-field title="收货地址" placeholder="请输入地址" value="{{address}}" bindblur="addressin" style='color:#999'></zan-field>
+    </zan-cell-group>
+    <view style='height:100%;width:auto;padding-top:10rpx;'>
+      <view bindtap="add" class="dt" style='background-image:url("https://t6.9026.com/upload/images/20180817/5202ba6dc73123aede977ff9f993c0ad.png");background-size:100% 100%'></view>
+    </view>
   </view>
-  <view style='display:flex;padding:10rpx;padding-left:0rpx'>
-    <zan-field title="收货地址" placeholder="输入地址或点击地图选择-->" value="{{address}}" bindblur="addressin">
-    </zan-field>
-    <image bindtap="add" class="dt" src="../../img/address3.png"></image>
+  <view style='width:700rpx;height:3rpx;background-color:#eee;margin:0 25rpx 0 25rpx'></view>
+  <form bindsubmit='upFormID' report-submit='true'>
+    <button form-type="submit" bindtap='orderup' style='background-color:RGB(233,59,61);color:white;width:280rpx;height:70rpx;margin:20rpx 230rpx 20rpx 230rpx;font-size:14px'>提交订单</button>
+  </form>
+  <view style='width:100%;height:100rpx;color:white'>0</view>
+  <view class='foot'>
+    <zan-row>
+      <zan-col col="5">
+        <image src='https://t6.9026.com/upload/images/20180817/205562795ef4c635cb10454e82043655.png' class='img'></image>
+      </zan-col>
+      <zan-col col="7">
+        <text class='index'>售后登记</text>
+      </zan-col>
+      <zan-col col="5" bindtap="goUser">
+        <image src='https://t6.9026.com/upload/images/20180817/af64cd744b004399edffb3abbf3e6ee7.png' class='img2'></image>
+      </zan-col>
+      <zan-col col="7" bindtap="goUser">
+        <text class='user'>我的订单</text>
+      </zan-col>
+    </zan-row>
   </view>
-</zan-cell-group>
-<form bindsubmit='upFormID' report-submit='true'>
-  <button form-type="submit" bindtap='orderup' style='background-color:#E93B3D;color:white'>提交售后订单</button>
-</form>
-<view style='width:100%;height:100rpx;color:white'>0</view>
-<view class='foot'>
-  <zan-row>
-  <zan-col col="12">
-    <image src='/img/home_on.png' class='img'></image>
-    <text  class='index'>主页</text>
-  </zan-col>
-  <zan-col col="12" bindtap="goUser">
-    <image src='/img/mytb.png' class='img'></image>
-    <text class='user'>我的</text>
-  </zan-col>
-  </zan-row>
-</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>
+  <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/index/index.wxss

@@ -7,9 +7,9 @@ page{
 .dt {
     width: 50rpx;
     height: 50rpx;
-    float: right;
-    margin:30rpx;
-    margin-right: 0rpx;
+    float: left;
+    margin-left: 150rpx;
+    margin-top: 5rpx; 
 }
 page{
   padding: 0;
@@ -24,6 +24,7 @@ page{
 }
 
 .img{
+  margin-top: 10rpx;
   width: 100%;
   height: 115rpx;
   display: flex;
@@ -31,13 +32,15 @@ page{
 .img image{
   width: 110rpx;
   height: 110rpx;
-  border: 1rpx solid #999;
-  margin-left: 20rpx;
+  border: 1px solid #ddd;
+  border-radius: 15rpx;
+  margin-left: 15px;
 }
 .img .pic{
 width: 110rpx;
 height: 110rpx;
-border: 1rpx solid #999;
+border: 1px solid #ddd;
+border-radius: 15rpx;
 margin-left: 20rpx;
 position: relative;
 }
@@ -99,6 +102,7 @@ z-index: 99;
   overflow-y: hidden;
 }
 .foot{
+  display: flex;
   border-top:1px #eee solid;
   position: fixed;
   bottom: 0;
@@ -108,21 +112,38 @@ z-index: 99;
   background-color: #fff;
 }
 .foot .img{
-  width:65rpx;
-  height: 65rpx;
-  margin-left: 130rpx;
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 110rpx;
+  margin-top: 40rpx;
+}
+.foot .img2{
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 370rpx;
+  margin-top: 40rpx;
 }
 .foot .index{
   position: fixed;
   color: #E93B3D;
-  font-size: 30rpx;
-  bottom: 0;
-  left: 130rpx
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 160rpx
 }
 .foot .user{
   position: fixed;
   color: #ccc;
-  font-size: 30rpx;
-  bottom: 0;
-  left: 505rpx
-}
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 540rpx
+}
+.desIn{
+  margin-top: 10rpx;
+  font-size:14px;
+  height: 120rpx;
+  width: 675rpx;
+  margin-left: 15px;
+  border: 1px solid #ddd;
+  padding: 10rpx;
+  border-radius: 10rpx;
+}

Furniture/pages/infor/assess.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "评价",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/infor/assess.wxml

@@ -1,6 +1,7 @@
 <!--pages/infor/assess.wxml-->
+<view style='overflow-x:hidden;background-color:#fff'>
 <zan-cell-group title-width="90">
-        <zan-cell title="客服态度" value=""><radio-group class='radio-group' bindchange="radioChange">
+        <zan-cell title="客服态度" value="" style='padding:24rpx 30rpx;'><radio-group class='radio-group' bindchange="radioChange" style='margin-top:-20rpx'>
             <label class='good'>
               <radio name='good' value='kgood' />好评
             </label>
@@ -11,7 +12,7 @@
               <radio name='bad'  value='kbad'/>差评
             </label>
           </radio-group></zan-cell>
-          <zan-cell title="产品质量" value=""><radio-group class='radio-group' bindchange="radioChange">
+          <zan-cell title="产品质量" value="" style='padding:24rpx 30rpx;'><radio-group class='radio-group' bindchange="radioChange" style='margin-top:-20rpx'>
             <label class='good'>
               <radio name='good' value='cgood' />好评
             </label>
@@ -22,7 +23,7 @@
               <radio name='bad'  value='cbad'/>差评
             </label>
           </radio-group></zan-cell>
-          <zan-cell title="包装服务" value=""><radio-group class='radio-group' bindchange="radioChange">
+          <zan-cell title="包装服务" value="" style='padding:24rpx 30rpx;'><radio-group class='radio-group' bindchange="radioChange" style='margin-top:-20rpx'>
             <label class='good'>
               <radio name='good' value='bgood' />好评
             </label>
@@ -47,6 +48,8 @@
   <image class='add' src='../../img/add.png' bindtap='addimg'></image>
 </view>
 <button class='sub' bindtap='tijiao'>提交</button>
-<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>
+<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/assess.wxss

@@ -1,5 +1,6 @@
 /* pages/infor/assess.wxss */
-.assess-box{
+
+.assess-box {
   width: 720rpx;
   height: 300rpx;
   margin-left: 15rpx;
@@ -8,7 +9,8 @@
   flex-direction: column;
   /* border: 1rpx solid #999; */
 }
-.assess-box view{
+
+.assess-box view {
   width: 700rpx;
   height: 100rpx;
   line-height: 100rpx;
@@ -19,7 +21,8 @@
   display: flex;
   position: relative;
 }
-.assess-box view radio-group{
+
+.assess-box view radio-group {
   display: block;
   width: 500rpx;
   height: 100rpx;
@@ -30,77 +33,94 @@
   top: 0;
   right: 0;
 }
-.assess-box view radio-group .good{
+
+.assess-box view radio-group .good {
   color: red;
 }
-.assess-box view radio-group .soso{
-  color:#E6941A;
+
+.assess-box view radio-group .soso {
+  color: #e6941a;
 }
-.assess-box view radio-group .bad{
+
+.assess-box view radio-group .bad {
   color: #669971;
 }
-.assess-box view radio-group radio{
-  transform: scale(0.6)
+
+.assess-box view radio-group radio {
+  transform: scale(0.6);
 }
-.txt-box{
+
+.txt-box {
   display: block;
   width: 700rpx;
   height: 270rpx;
-  border: 1rpx solid #bbb;
-  margin: 20rpx 0 20rpx 25rpx; 
+  margin: 0rpx 0 20rpx 25rpx;
 }
-.txt-box textarea{
+
+.txt-box textarea {
   display: inline-block;
-  width: 700rpx;
+  width: 680rpx;
   height: 270rpx;
   overflow: hidden;
   font-size: 32rpx;
+  border: 1px solid #ddd;
+  padding: 10rpx;
+  border-radius: 10rpx;
 }
-.img{
+
+.img {
   width: 100%;
   height: 115rpx;
   display: flex;
 }
-.img image{
+
+.img image {
+  margin-top: 15rpx;
+  width: 110rpx;
+  height: 110rpx;
+  border: 1px solid #ddd;
+  border-radius: 15rpx;
+  margin-left: 25rpx;
+}
+
+.img .pic {
+  margin-top: 15rpx;
   width: 110rpx;
   height: 110rpx;
-  border: 1rpx solid #999;
-  margin-left: 20rpx;
-}
-.img .pic{
-width: 110rpx;
-height: 110rpx;
-border: 1rpx solid #999;
-margin-left: 20rpx;
-position: relative;
-}
-.img .pic image{
-margin-left: 0;
-border: none;
-}
-.img .pic .del{
-position: absolute;
-width: 40rpx;
-height: 40rpx;
-border-radius: 40rpx;
-background: #eee;
-top: -20rpx;
-right: -20rpx;
-z-index: 99;
-}
-button{
+  border: 1px solid #ddd;
+  border-radius: 15rpx;
+  margin-left: 25rpx;
+  position: relative;
+}
+
+.img .pic image {
+  margin-left: 0;
+  border: none;
+}
+
+.img .pic .del {
+  position: absolute;
+  width: 40rpx;
+  height: 40rpx;
+  border-radius: 40rpx;
+  background: #eee;
+  top: -20rpx;
+  right: -20rpx;
+  z-index: 99;
+}
+
+button {
   display: block;
   width: 220rpx;
   height: 60rpx;
   font-size: 36rpx;
   line-height: 60rpx;
-  background: #669971;
+  background: #E93B3D;
   color: #fff;
   margin-top: 80rpx;
 }
 
-
-radio-group{
+radio-group {
   display: block;
   width: 500rpx;
   height: 100rpx;
@@ -111,15 +131,19 @@ radio-group{
   top: 0;
   right: 0;
 }
-radio-group .good{
+
+radio-group .good {
   color: red;
 }
-radio-group .soso{
-  color:#E6941A;
+
+radio-group .soso {
+  color: #e6941a;
 }
-radio-group .bad{
+
+radio-group .bad {
   color: #669971;
 }
-radio-group radio{
-  transform: scale(0.6)
-}
+
+radio-group radio {
+  transform: scale(0.6);
+}

Furniture/pages/infor/detail_head.wxss

@@ -47,14 +47,14 @@
 
 .pic-box{
   width: 720rpx;
-  height: 115rpx;
+  height: 95rpx;
   margin: 0 auto;
   /* border: 1rpx solid #999; */
 }
 .pic-box image{
-  width: 110rpx;
-  height: 110rpx;
-  border: 2rpx solid #aaa;
+  width: 80rpx;
+  height: 80rpx;
+  border: 2rpx solid #ccc;
   margin-left: 15rpx;
 }
 
@@ -67,7 +67,7 @@
 .infor-box .pic-box image{
   width: 140rpx;
   height: 140rpx;
-  border: 2rpx solid #aaa;
+  border: 2rpx solid #ccc;
   margin-left: 15rpx;
 }
 .user-box{

Furniture/pages/infor/details.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "订单详情",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/infor/details.wxml

@@ -1,71 +1,99 @@
 <!--pages/infor/details.wxml-->
 <!-- <include src="detail_head.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>
-<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' 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">
-  <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-cell-group title-width="130" wx:if='{{status!=0&&status!=7}}'>
-  <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 style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee'>
+    订单信息
+  </view>
+  <view style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单编号" value="{{}}" style='color:#777;'>
+      <text style='color:red;'>{{order_num}}</text>
+      <image src='{{pic_url}}' class='qrcode' bindtap='showPic' data-src='{{pic_url}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="交易时间" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{order_created_time}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单状态" value="" style='color:#777;'>
+      <text style='color:red;'>{{order_status}}</text>
+    </zan-cell>
+    <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+      产品信息
+    </view>
+  </zan-cell-group>
+  <view style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <zan-cell title="商品名称" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gCategory}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="品类" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gType}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="颜色" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gColor}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="问题描述" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gDescription}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <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>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+    客户信息
   </view>
-  <zan-cell title="预计厂家完成时间" value="" style="color:#666;">
-    <text>{{expected_time}}</text>
-  </zan-cell>
-  <zan-cell title="备注" value="" style="color:#666;" wx:if="{{status>3}}">{{msg}}</zan-cell>
-</zan-cell-group>
+  <view style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <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 title="联系方式" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uMobile}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="收货地址" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uAddress}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="130" wx:if='{{status!=0&&status!=7}}'>
+      <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+        订单进度
+      </view>
+      <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:#777;" wx:if='{{status>0}}'>
+        <text style='color:#2a2121'>{{expected_time}}</text>
+      </zan-cell>
+      <zan-cell title="备注" value="" style="color:#777;" wx:if='{{msg!=null}}'><text style='color:#2a2121'>{{msg}}</text></zan-cell>
+    </zan-cell-group>
 <zan-row style='background-color:#fff'>
-  <zan-col col="10" wx:if='{{status==0}}'>
+  <zan-col col="17" wx:if='{{status==0}}'>
     <text style='color:rgba(0,0,0,0)'>0</text>
   </zan-col>
-  <zan-col col="10" wx:if='{{status==4}}'>
+  <zan-col col="17" wx:if='{{status==4}}'>
     <text style='color:rgba(0,0,0,0)'>0</text>
   </zan-col>
-  <zan-col col="10" wx:if='{{status==5}}'>
+  <zan-col col="17" wx:if='{{status==5}}'>
     <text style='color:rgba(0,0,0,0)'>0</text>
   </zan-col>
-  <zan-col col="17" wx:if='{{status==1||status==2||status==3||status==6||status==7}}'>
+  <zan-col col="24" wx:if='{{status==1||status==2||status==3||status==6||status==7}}'>
     <text style='color:rgba(0,0,0,0)'>0</text>
   </zan-col>
   <zan-col col="6" offset="1">
@@ -83,16 +111,15 @@
       <button form-type="submit" wx:if="{{status==5}}" bindtap='assess' id='vorder-id'>评价</button>
     </form>
   </zan-col>
-  <zan-col col="6" offset="1">
-    <button class='back' bindtap='fanhui'>返回</button>
-  </zan-col>
 </zan-row>
 <!-- <view class='foot-btn'>
   <button wx:if="{{status==1}}" bindtap='quxiao'>取消订单</button>
   <button wx:if="{{status==2}}" bindtap='shouhuo'>确认收货</button>
   <button wx:if="{{status==3&&!pingjia}}" bindtap='assess' id='vorder-id'>评价</button> 
 </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>
+<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.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "我的订单",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/infor/infor.wxml

@@ -1,5 +1,7 @@
 <!--pages/infor/infor.wxml-->
-<view class='sp' wx:if='{{showpic}}' bindtap='hidepic'><image src='{{pic_url}}' class='show_pic'></image></view>
+<view class='sp' wx:if='{{showpic}}' bindtap='hidepic'>
+  <image src='{{pic_url}}' class='show_pic'></image>
+</view>
 <view class='all'>
   <view class='head'>
     <view class='mybox'>
@@ -19,85 +21,126 @@
         <view class='sweep'><image src='../../img/icon-offline.png'></image></view>
       </view> -->
       <view class='vorder-infor'>
-        <navigator class="{{selected==0?'active':''}}" >
-          <image src='../../img/order.png' bindtap='allOrder'></image>
+        <navigator class="{{selected==0?'active':''}}" bindtap='allOrder'>
+          <image src='https://t6.9026.com/upload/images/20180816/697bf1a4e1efe55ee87f4bf9022ab831.png'></image>
           <view>全部订单</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==0}}'></view>
         </navigator>
-        <navigator class="{{selected==1?'active':''}}" >
-          <image src='../../img/qiuqiu.png' bindtap='TobeAudited'></image>
+        <navigator class="{{selected==1?'active':''}}" bindtap='TobeAudited'>
+          <image src='https://t6.9026.com/upload/images/20180816/c9545721eba25f814df8ee4d3c519854.png'></image>
           <view>待审核</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==1}}'></view>
           <text class='num' wx:if='{{examine!=0}}'>{{examine}}</text>
         </navigator>
 
-        <navigator class="{{selected==2?'active':''}}" >
-          <image src='../../img/upload.png' bindtap='TobeSend'></image>
+        <navigator class="{{selected==2?'active':''}}" bindtap='TobeSend'>
+          <image src='https://t6.9026.com/upload/images/20180816/c8af5cb1c7807de7a1b8b6f08817a0aa.png'></image>
           <view>待发货</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==2}}'></view>
           <text class='num' wx:if="{{send!=0}}">{{send}}</text>
         </navigator>
 
-        <navigator class="{{selected==3?'active':''}}" >
-          <image src='../../img/ding.png' bindtap='TobeReceived'></image>
+        <navigator class="{{selected==3?'active':''}}"  bindtap='TobeReceived'>
+          <image src='https://t6.9026.com/upload/images/20180816/d41cedb9eb36d0635995942a9e243a8f.png'></image>
           <view>待收货</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==3}}'></view>
           <text class='num' wx:if="{{sending!=0}}">{{sending}}</text>
         </navigator>
-        <navigator class="{{selected==4?'active':''}}" >
-          <image src='../../img/edit.png' bindtap='TobeEvaluated'></image>
+        <navigator class="{{selected==4?'active':''}}" bindtap='TobeEvaluated'>
+          <image src='https://t6.9026.com/upload/images/20180816/750a1fb4b5c32d06c2e5c97e92fd0288.png'></image>
           <view>待评价</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==4}}'></view>
           <text class='num' wx:if='{{comment!=0}}'>{{comment}}</text>
         </navigator>
       </view>
     </view>
     <view class='vorder' wx:key="index" id='{{index}}' wx:for='{{infor}}'>
       <zan-cell-group title-width="90">
-        <zan-cell title="订单编号" value="{{item.state}}"><text style='color:red;'>{{item.vorderid}}</text></zan-cell>
-        <zan-cell title="二维码" value=""><image src='{{item.qrcode}}' class = 'qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}'></image></zan-cell> 
-        
-        <zan-cell title="交易时间" value=""><text>{{item.vordertime}}</text></zan-cell> 
-        <zan-cell title="品类" value=""><text>{{item.cate}}</text></zan-cell>
-        <zan-cell title="产品型号" value=""><text>{{item.model}}</text></zan-cell>
-        <zan-cell title="问题描述" value=""><text>{{item.problem}}</text></zan-cell>  
-        <zan-cell title="预计完成时间 " value="" wx:if='{{item.state!="待审核"&&item.state!="已取消"}}'><text>{{item.expected_time}}</text></zan-cell>  
-        <zan-row>
-          <zan-col col="17" wx:if='{{ item.state == "待生产" ||  item.state == "生产中" || item.state == "待发货" || item.state == "已评价" || item.state == "已取消"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
-          <zan-col col="10" wx:if='{{ item.state == "待审核" ||  item.state == "未签收" || item.state == "待评价" }}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
-          <zan-col  col="7" wx:if='{{item.state == "待审核"}}'>
-          <form  bindsubmit='upFormID' report-submit='true'>
-          <button form-type="submit" id='{{item.detail_order_id}}' bindtap='quxiao'>取消订单</button>
+        <zan-cell title="订单编号" value="{{}}">
+          <text style='color:red;'>{{item.vorderid}}</text>
+          <image src='{{item.qrcode}}' class='qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="交易时间" value="">
+          <text>{{item.vordertime}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="订单状态" value="">
+          <text style='color:red;'>{{item.state}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <view style='width:100%;height:2rpx;background:#eee;margin:10rpx 0'></view>
+      <zan-cell-group title-width="90">
+        <zan-cell title="品类" value="">
+          <text>{{item.cate}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="产品型号" value="">
+          <text>{{item.model}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="问题描述" value="">
+          <text>{{item.problem}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="预计完成时间 " value="" wx:if='{{item.state!="待审核"&&item.state!="已取消"}}'>
+          <text>{{item.expected_time}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-row>
+        <zan-col col="17" wx:if='{{ item.state == "待生产" ||  item.state == "生产中" || item.state == "待发货" || item.state == "已评价" || item.state == "已取消"}}'>
+          <text style='color:rgba(0,0,0,0)'>0</text>
+        </zan-col>
+        <zan-col col="10" wx:if='{{ item.state == "待审核" ||  item.state == "未签收" || item.state == "待评价" }}'>
+          <text style='color:rgba(0,0,0,0)'>0</text>
+        </zan-col>
+        <zan-col col="7" wx:if='{{item.state == "待审核"}}'>
+          <form bindsubmit='upFormID' report-submit='true'>
+            <button form-type="submit" id='{{item.detail_order_id}}' bindtap='quxiao'>取消订单</button>
           </form>
-          </zan-col>
-          <zan-col col="7" wx:if='{{item.state == "未签收"}}'>
-          <form  bindsubmit='upFormID' report-submit='true'>
-          <button form-type="submit" id='{{item.detail_order_id}}' bindtap='shouhuo'>确认收货</button>
+        </zan-col>
+        <zan-col col="7" wx:if='{{item.state == "未签收"}}'>
+          <form bindsubmit='upFormID' report-submit='true'>
+            <button form-type="submit" id='{{item.detail_order_id}}' bindtap='shouhuo'>确认收货</button>
           </form>
-          </zan-col>
-          <zan-col col="7" wx:if='{{item.state == "待评价"}}'>
-          <form  bindsubmit='upFormID' report-submit='true'>
-          <button form-type="submit" id='{{item.detail_order_id}}' bindtap='pingjia'>评价</button>
+        </zan-col>
+        <zan-col col="7" wx:if='{{item.state == "待评价"}}'>
+          <form bindsubmit='upFormID' report-submit='true'>
+            <button form-type="submit" id='{{item.detail_order_id}}' bindtap='pingjia'>评价</button>
           </form>
-          </zan-col>
-          <zan-col col="7">
-          <form  bindsubmit='upFormID' report-submit='true'>
-          <button form-type="submit" bindtap='detail' id='{{item.detail_order_id}}'>查看详情</button>
+        </zan-col>
+        <zan-col col="7">
+          <form bindsubmit='upFormID' report-submit='true'>
+            <button form-type="submit" bindtap='detail' id='{{item.detail_order_id}}'>查看详情</button>
           </form>
-          </zan-col> 
-        </zan-row>
-      </zan-cell-group>
+        </zan-col>
+      </zan-row>
     </view>
     <view style='width:100%;height:200rpx;color:#EBEBEB'>0</view>
   </view>
 </view>
 <view class='foot'>
   <zan-row>
-  <zan-col col="12" bindtap='goIndex'>
-    <image src='/img/home.png' class='img'></image>
-    <text  class='index'>主页</text>
-  </zan-col>
-  <zan-col col="12">
-    <image src='/img/mytb_on.png' class='img'></image>
-    <text class='user'>我的</text>
-  </zan-col>
+    <zan-col col="5" bindtap='goIndex'>
+      <image src='https://t6.9026.com/upload/images/20180817/c30b30f090f34fa9a18398c3691b2dca.png' class='img'></image>
+    </zan-col>
+    <zan-col col="7" bindtap='goIndex'>
+      <text class='index'>售后登记</text>
+    </zan-col>
+    <zan-col col="5">
+      <image src='https://t6.9026.com/upload/images/20180817/8db9f05bd4c9a73f2d6ebb16c3f546a5.png' class='img2'></image>
+    </zan-col>
+    <zan-col col="7">
+      <text class='user'>我的订单</text>
+    </zan-col>
   </zan-row>
 </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>
+<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>

Furniture/pages/infor/infor.wxss

@@ -18,7 +18,7 @@ page{
   width: 680rpx;
   height: 200rpx;
   position: absolute;
-  margin-top: 40rpx;
+  margin-top: 70rpx;
   margin-left: 50rpx;
   display: inline-flex;
   overflow: hidden;
@@ -52,6 +52,7 @@ page{
   background:rgba(0,0,0,0.1);
   line-height: 60rpx;
   padding-right: 20rpx;
+  border-radius: 15rpx;
 }
 .head .mybox .userlevel image{
   width: 46rpx;
@@ -73,6 +74,7 @@ page{
   margin-left: 35rpx;
 }
 .body .list{
+  margin-top: 50rpx;
   width: 680rpx;
   height: 200rpx;
   background: #fff;
@@ -125,9 +127,16 @@ page{
   color: #aaa;
 }
 .body .list .vorder-infor .active{
-  background: #ddd;
+  color:RGB(233,59,61);
+}
+.body .list .vorder-infor .mana-list{
+  flex: 1;
+  width: 100%;
+  height: 120rpx;
+  display: flex;
 }
 .body .list .vorder-infor navigator{
+  width: 120rpx;
   height: 160rpx;
   text-align: center;
   flex: 1;
@@ -135,9 +144,9 @@ page{
   position: relative;
 }
 .body .list .vorder-infor navigator image{
-  width: 100rpx;
-  height: 100rpx;
-  margin-top: 10rpx;
+  width: 80rpx;
+  height: 80rpx;
+  margin-top: 5rpx;
 }
 
 .body .vorder{
@@ -272,6 +281,7 @@ border-radius: 20rpx;
   overflow-y: hidden;
 }
 .foot{
+  display: flex;
   border-top:1px #eee solid;
   position: fixed;
   bottom: 0;
@@ -281,21 +291,28 @@ border-radius: 20rpx;
   background-color: #fff;
 }
 .foot .img{
-  width:65rpx;
-  height: 65rpx;
-  margin-left: 130rpx;
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 110rpx;
+  margin-top: 40rpx;
+}
+.foot .img2{
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 370rpx;
+  margin-top: 40rpx;
 }
 .foot .index{
   position: fixed;
   color: #ccc;
-  font-size: 30rpx;
-  bottom: 0;
-  left: 130rpx
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 160rpx
 }
 .foot .user{
   position: fixed;
   color: #E93B3D;
-  font-size: 30rpx;
-  bottom: 0;
-  left: 505rpx
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 540rpx
 }

Furniture/pages/make/make-detail.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "订单详情",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/make/make-detail.wxml

@@ -1,60 +1,89 @@
 
 <!-- <include src="../infor/detail_head.wxml"/> -->
-<view style='background-color:#fff'>
+<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>
-<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 style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee'>
+    订单信息
+  </view>
+  <view style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单编号" value="{{}}" style='color:#777;'>
+      <text style='color:red;'>{{order_num}}</text>
+      <image src='{{pic_url}}' class='qrcode' bindtap='showPic' data-src='{{pic_url}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="交易时间" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{order_created_time}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单状态" value="" style='color:#777;'>
+      <text style='color:red;'>{{order_status}}</text>
+    </zan-cell>
+    <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+      产品信息
+    </view>
+  </zan-cell-group>
+  <view style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <zan-cell title="商品名称" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gCategory}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="品类" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gType}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="颜色" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gColor}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="问题描述" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gDescription}}</text>
+    </zan-cell>
+  </zan-cell-group>
   <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>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+    客户信息
+  </view>
+  <view style='margin-top:20rpx'></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 title="姓名" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uName}}</text>
+    </zan-cell>
+  </zan-cell-group>
   <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 title="预计完成时间" value="" style="color:#666;"><text>{{expected_time}}</text></zan-cell>
+    <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 title="收货地址" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uAddress}}</text>
+    </zan-cell>
+  </zan-cell-group>
+<zan-dialog id="zan-dialog-test"></zan-dialog>
+<zan-toast id="zan-toast-test"></zan-toast>
+<view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+      配件清单
+    </view>
+    <view style='margin-top:20rpx'></view>
+    <zan-cell-group title-width="90" wx:for="{{parts}}">
+      <zan-cell title="{{item.name}}" value="" style='color:#777;'>
+        <text style='color:#2a2121'>{{item.count}}个</text>
+      </zan-cell>
+    </zan-cell-group>
+    <zan-cell title="预计完成时间" value="" style="color:#777;"><text style='color:#2a2121'>{{expected_time}}</text></zan-cell>
   <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="16" wx:if='{{status == 1 || status == 2}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
+    <zan-col col="24" wx:if='{{status > 2}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
     <zan-col col="7" offset="1">
     <form bindsubmit='upFormID' report-submit='true'>
     <button form-type="submit" wx:if="{{status==1}}" bindtap='makestart'>开始生产</button>
@@ -65,9 +94,10 @@
     <button form-type="submit" wx:if="{{status==2}}" bindtap='makeok'>生产完毕并入库</button>
     </form>
     </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>
+<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

@@ -51,22 +51,47 @@ Page({
     if(that.data.selected == 0){
       s = '8'
       e = ''
+      that.setData({
+        selected: 0,
+        status: '8',
+        expecte: ''
+      })
     }
     if (that.data.selected == 1) {
       s = '1'
       e = ''
+      that.setData({
+        selected: 1,
+        status: '1',
+        expecte: ''
+      })
     }
     if (that.data.selected == 2) {
       s = '2'
       e = ''
+      that.setData({
+        selected: 2,
+        status: '2',
+        expecte: ''
+      })
     }
     if (that.data.selected == 3) {
       s = '3'
       e = ''
+      that.setData({
+        selected: 3,
+        status: '3',
+        expecte: ''
+      })
     }
     if (that.data.selected == 4) {
       s = ''
       e = '1'
+      that.setData({
+        selected: 4,
+        status: '',
+        expecte: '1'
+      })
     }
     app.request({
       url: 'https://t6.9026.com/api/furniture/getorder',
@@ -572,6 +597,7 @@ Page({
     that.setData({
       keyword: e.detail.value,
     })
+    that.search()
   },
   search: function () {
     wx.setStorageSync('ma', 0)

Furniture/pages/make/make.json

@@ -1,6 +1,8 @@
 
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "我的订单",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/make/make.wxml

@@ -19,58 +19,85 @@
         <view class='sweep' bindtap='scanqrCode'><image src='../../img/icon-offline.png'></image></view>
       </view>
       <view class='vorder-infor'>
-        <navigator class="{{selected==0?'active':''}}" >
-          <image src='../../img/order.png' bindtap='allOrder'></image>
+        <navigator class="{{selected==0?'active':''}}" bindtap='allOrder'>
+          <image src='https://t6.9026.com/upload/images/20180816/697bf1a4e1efe55ee87f4bf9022ab831.png'></image>
           <view>全部</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==0}}'></view>
         </navigator>
-        <navigator class="{{selected==1?'active':''}}" >
-          <image src='../../img/gongju.png' bindtap='TobeMake'></image>
+        <navigator class="{{selected==1?'active':''}}" bindtap='TobeMake'>
+          <image src='https://t6.9026.com/upload/images/20180816/8ea54e333c81d0cca01a26a9fc23b3e3.png' ></image>
           <view>待生产</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==1}}'></view>
           <text class='num' wx:if='{{make!=0}}'>{{make}}</text>
         </navigator>
-        <navigator class="{{selected==2?'active':''}}" >
-          <image src='../../img/weixiu.png' bindtap='BeingMaking'></image>
+        <navigator class="{{selected==2?'active':''}}" bindtap='BeingMaking'>
+          <image src='https://t6.9026.com/upload/images/20180816/7fb5b97adeef584976ad463fb49aca47.png' ></image>
           <view>生产中</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==2}}'></view>
            <text class='num' wx:if='{{making!=0}}'>{{making}}</text>
         </navigator>
-        <navigator class="{{selected==3?'active':''}}" >
-          <image src='../../img/radio.png' bindtap='Done'></image>
+        <navigator class="{{selected==3?'active':''}}" bindtap='Done'>
+          <image src='https://t6.9026.com/upload/images/20180816/4f02e040e54af69b14a8b4a9f83ddbfd.png' ></image>
           <view>已完成</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==3}}'></view>
         </navigator>
-        <navigator class="{{selected==4?'active':''}}" >
-          <image src='../../img/life.png' bindtap='Expected'></image>
+        <navigator class="{{selected==4?'active':''}}" bindtap='Expected'>
+          <image src='https://t6.9026.com/upload/images/20180816/4b90775eff22cedb51b77be1dc039a9d.png' ></image>
           <view>逾期</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==4}}'></view>
            <text class='num' wx:if='{{expected!=0}}'>{{expected}}</text>
         </navigator> 
       </view>
     </view>
     <view class='vorder' wx:key="index" id='{{index}}' wx:for='{{infor}}'>
       <zan-cell-group title-width="90">
-        <zan-cell title="订单编号" value="{{item.state}}"><text style='color:red;'>{{item.vorderid}}</text></zan-cell>
-              <zan-cell title="二维码" value=""><image src='{{item.qrcode}}' class = 'qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}'></image></zan-cell> 
-        <zan-cell title="交易时间" value=""><text>{{item.vordertime}}</text></zan-cell> 
-        <zan-cell title="品类" value=""><text>{{item.cate}}</text></zan-cell>
-        <zan-cell title="产品型号" value=""><text>{{item.model}}</text></zan-cell>
-        <zan-cell title="问题描述" value=""><text>{{item.problem}}</text></zan-cell>  
+        <zan-cell title="订单编号" value="{{}}">
+          <text style='color:red;'>{{item.vorderid}}</text>
+          <image src='{{item.qrcode}}' class='qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
+        </zan-cell>
       </zan-cell-group>
       <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.num}}个</view>
-        </view> -->
-        <zan-cell title="预计完成时间" value="" style="color:#999;"><text style='color:#999;'>{{item.expected_time}}</text></zan-cell>
-        <zan-row>
-          <zan-col col="17" wx:if='{{ item.state == "待发货" || item.state == "运输中"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
-          <zan-col col="10" wx:if='{{ item.state == "待生产" ||  item.state == "生产中"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
-          <zan-col col="7" wx:if='{{item.state == "待生产"}}'>
+        <zan-cell title="交易时间" value="">
+          <text>{{item.vordertime}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="订单状态" value="">
+          <text style='color:red;'>{{item.state}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <view style='width:100%;height:2rpx;background:#eee;margin:10rpx 0'></view>
+      <zan-cell-group title-width="90">
+        <zan-cell title="品类" value="">
+          <text>{{item.cate}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="产品型号" value="">
+          <text>{{item.model}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="问题描述" value="">
+          <text>{{item.problem}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="预计完成时间" value="" style="color:#666;">
+          <text style='color:#666;'>{{item.expected_time}}</text>
+        </zan-cell>
+        <zan-row style='background-color:#fff'>
+          <zan-col col="10" wx:if='{{item.state == "待生产"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
+          <zan-col col="10" wx:if='{{item.state == "生产中"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
+          <zan-col col="17" wx:if='{{ item.state != "待生产"&&item.state != "生产中"}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
+          <zan-col col="7" wx:if='{{ item.state == "生产中"}}'>
           <form bindsubmit='upFormID' report-submit='true'>
-          <button form-type="submit" id='{{item.detail_order_id}}' bindtap='makestart'>开始生产</button>
+          <button form-type="submit" id='{{item.detail_order_id}}' bindtap='makeok'>结束生产</button>
           </form>
           </zan-col>
-          <zan-col col="7" wx:if='{{item.state == "生产中"}}'>
+          <zan-col col="7" wx:if='{{item.state == "待生产"}}'>
           <form bindsubmit='upFormID' report-submit='true'>
-          <button form-type="submit" id='{{item.detail_order_id}}' bindtap='makeok'>生产完毕</button>
+          <button form-type="submit" id='{{item.detail_order_id}}' bindtap='makestart'>开始生产</button>
           </form>
           </zan-col>
           <zan-col col="7">
@@ -79,10 +106,11 @@
           </form>
           </zan-col> 
         </zan-row>
-      </zan-cell-group>   
+      </zan-cell-group>
     </view>
   </view>
 </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>
+<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>

Furniture/pages/make/make.wxss

@@ -52,6 +52,7 @@ page{
   display: flex;
   background:rgba(0,0,0,0.1);
   line-height: 60rpx;
+  border-radius: 15rpx;
   padding-right: 20rpx;
 }
 .head .mybox .userlevel image{
@@ -126,9 +127,16 @@ page{
   color: #aaa;
 }
 .body .list .vorder-infor .active{
-  background: #ddd;
+  color:RGB(233,59,61);
+}
+.body .list .vorder-infor .mana-list{
+  flex: 1;
+  width: 100%;
+  height: 120rpx;
+  display: flex;
 }
 .body .list .vorder-infor navigator{
+  width: 120rpx;
   height: 160rpx;
   text-align: center;
   flex: 1;
@@ -136,11 +144,10 @@ page{
   position: relative;
 }
 .body .list .vorder-infor navigator image{
-  width: 100rpx;
-  height: 100rpx;
-  margin-top: 10rpx;
+  width: 80rpx;
+  height: 80rpx;
+  margin-top: 5rpx;
 }
-
 .body .vorder{
   width: 680rpx;
   background: #fff;

Furniture/pages/manager/datacount.json

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "数据统计",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {}
 }

Furniture/pages/manager/datacount.wxml

@@ -21,7 +21,24 @@
     </navigator>
   </view>
 </view>
-<include src='foot.wxml'/>
-<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 class='foot'>
+  <zan-row>
+    <zan-col col="5" bindtap='vorder'>
+      <image src='https://t6.9026.com/upload/images/20180817/c30b30f090f34fa9a18398c3691b2dca.png' class='img'></image>
+    </zan-col>
+    <zan-col col="7" bindtap='vorder'>
+      <text class='index'>售后订单</text>
+    </zan-col>
+    <zan-col col="5">
+      <image src='https://t6.9026.com/upload/images/20180817/c94196b665272f40846e462ad5834dcf.png' class='img2'></image>
+    </zan-col>
+    <zan-col col="7">
+      <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>
+

Furniture/pages/manager/datacount.wxss

@@ -47,4 +47,40 @@ page{
 }
 .box view .left{
   border-right: 1rpx solid #ccc;
+}
+.foot{
+  display: flex;
+  border-top:1px #eee solid;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  height:100rpx;
+  z-index: 100;
+  background-color: #fff;
+}
+.foot .img{
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 110rpx;
+  margin-top: 40rpx;
+}
+.foot .img2{
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 340rpx;
+  margin-top: 40rpx;
+}
+.foot .index{
+  position: fixed;
+  color: #ccc;
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 160rpx
+}
+.foot .user{
+  position: fixed;
+  color: #E93B3D;
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 540rpx
 }

Furniture/pages/manager/foot.wxml

@@ -1,11 +1,17 @@
 <!--pages/manager/foot.wxml-->
 <view class='foot'>
-  <view  bindtap='vorder' class='qwe'>
-    <image src="{{select==0?'../../img/img_4.png':'../../img/img_3.png'}}"></image>
-    <view style="color:{{select==0?'#3CC4C4':'black'}};">售后订单</view>
-  </view>
-  <view bindtap='datacount' class='qwe'>
-    <image src="{{select==0?'../../img/todo.png':'../../img/todoselect.png'}}"></image>
-    <view style="color:{{select==0?'black':'#3CC4C4'}};">数据统计</view>
-  </view>
+  <zan-row>
+    <zan-col col="5" bindtap='vorder'>
+      <image src="{{select==0?'../../img/img_4.png':'../../img/img_3.png'}}" class='img'></image>
+    </zan-col>
+    <zan-col col="7" bindtap='vorder'>
+      <text class='index' style="color:{{select==0?'#E93B3D':'#ccc'}}">售后订单</text>
+    </zan-col>
+    <zan-col col="5" bindtap='datacount'>
+      <image src="{{select==0?'../../img/todo.png':'../../img/todoselect.png'}}" class='img2'></image>
+    </zan-col>
+    <zan-col col="7" bindtap='datacount'>
+      <text class='user' style="color:{{select==0?'#ccc':'#E93B3D'}}">数据统计</text>
+    </zan-col>
+  </zan-row>
 </view>

Furniture/pages/manager/foot.wxss

@@ -1,29 +1,37 @@
 /* pages/manager/foot.wxss */
 .foot{
+  display: flex;
+  border-top:1px #eee solid;
   position: fixed;
   bottom: 0;
   width: 100%;
-  height: 130rpx;
-  padding-top:10rpx; 
-  border-top: 1rpx solid #aaa;
-  z-index: 999;
-  background: #fff;
-  display: -webkit-box;
-  display: flex;
+  height:100rpx;
+  z-index: 100;
+  background-color: #fff;
 }
-.foot .qwe{
-  /* width: 340rpx; */
-  height: 120rpx;
-  flex: 1;
-  text-align: center;
+.foot .img{
+  width:65rpx;
+  height: 65rpx;
+  margin-left: 80rpx;
+  margin-top: 20rpx;
 }
-.foot view image{
-  width: 60rpx;
-  height: 60rpx;
+.foot .img2{
+  width:65rpx;
+  height: 65rpx;
+  margin-left: 340rpx;
+  margin-top: 20rpx;
 }
-.foot .qwe view{
-  width: 100%;
-  height: 60rpx;
-  font-size: 38rpx;
+.foot .index{
+  position: fixed;
+  color: #E93B3D;
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 160rpx
 }
-
+.foot .user{
+  position: fixed;
+  color: #ccc;
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 540rpx
+}

Furniture/pages/manager/mana-detail.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "订单详情",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/manager/mana-detail.wxml

@@ -1,62 +1,87 @@
 
 <!-- <include src="../infor/detail_head.wxml"/> -->
-<view style='background-color:#fff'>
+<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>
+<view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee'>
+  订单信息
+</view>
 <zan-cell-group title-width="90">
-  <zan-cell title="订单编号" value="{{order_status}}">
+  <zan-cell title="订单编号" value="{{}}" style='color:#777;'>
     <text style='color:red;'>{{order_num}}</text>
+    <image src='{{pic_url}}' class = 'qrcode' bindtap='showPic' data-src='{{pic_url}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
   </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-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="交易时间" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{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-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="订单状态" value="" style='color:#777;'>
+    <text style='color:red;'>{{order_status}}</text>
   </zan-cell>
-  <zan-cell title="品类" value="">
-    <text>{{gType}}</text>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+        产品信息
+  </view>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="商品名称" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{gCategory}}</text>
   </zan-cell>
-  <zan-cell title="颜色" value="">
-    <text>{{gColor}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="品类" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{gType}}</text>
   </zan-cell>
-  <zan-cell title="问题描述" value="">
-    <text>{{gDescription}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="颜色" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{gColor}}</text>
+  </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="问题描述" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{gDescription}}</text>
   </zan-cell>
 </zan-cell-group>
   <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>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+  客户信息
+  </view>
   <zan-cell-group title-width="90">
-  <zan-cell title="客户信息" style="color:#666;"></zan-cell>
-  <zan-cell title="姓名" value="">
-    <text>{{uName}}</text>
+  <zan-cell title="姓名" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{uName}}</text>
   </zan-cell>
-  <zan-cell title="联系方式" value="">
-    <text>{{uMobile}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="联系方式" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{uMobile}}</text>
   </zan-cell>
-  <zan-cell title="收货地址" value="">
-    <text>{{uAddress}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+  <zan-cell title="收货地址" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{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" wx:if="{{status!=0 && status!=7}}">
-     <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='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+        配件清单
         </view>
-
-    <zan-cell title="预计完成时间" value="" style="color:#666;"><text>{{expected_time}}</text></zan-cell>
-  </zan-cell-group>
-  <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>
+        <zan-cell-group title-width="90" wx:for="{{parts}}">
+  <zan-cell title="{{item.name}}" value="" style='color:#777;'>
+    <text style='color:#2a2121'>{{item.count}}个</text>
+  </zan-cell>
+  </zan-cell-group>
+    <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>

Furniture/pages/manager/mana-detail.wxss

@@ -4,25 +4,26 @@
   width: 100%;
   height: 60rpx;
   line-height: 60rpx;
-  font-size: 30rpx;
+  font-size: 14px;
   color: #555;
   display: flex;
   position: relative;
 }
 .list-box .thing{
   position: absolute;
-  left: 20rpx;
+  left: 15px;
   height: 60rpx;
-  font-size: 30rpx;
+  float: left;
+  font-size: 14px;
   line-height: 60rpx;
-  margin-left: 20rpx;
+  width: 90px;
 }
 .list-box .num{
-  position: absolute;
-  right: 40rpx;
+  position: relative;
   height: 60rpx;
-  font-size: 30rpx;
+  font-size: 14px;
   line-height: 60rpx;
+  left:228rpx;
 }
 button{
   display: box;

Furniture/pages/manager/manage.js

@@ -142,16 +142,6 @@ Page({
           gObj.qrcode = obj[i].qrcode
           gObj.expected_time = obj[i].expected_time
           gObj.detail_order_id = obj[i].id
-          // if (gObj.state == '已取消') {
-          //   that.setData({
-          //     selected: 8
-          //   })
-          // }
-          // if (gObj.state == '待审核') {
-          //   that.setData({
-          //     selected: 8
-          //   })
-          // }
           gArr.push(gObj)
         }
         that.setData({
@@ -801,6 +791,7 @@ Page({
     that.setData({
       keyword: e.detail.value,
     })
+    that.search()
   },
   search: function() {
     var that = this

Furniture/pages/manager/manage.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "售后订单",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/manager/manage.wxml

@@ -1,5 +1,7 @@
 <!--pages/manager/manage.wxml-->
-<view class='sp' wx:if='{{showpic}}' bindtap='hidepic'><image src='{{pic_url}}' class='show_pic'></image></view>
+<view class='sp' wx:if='{{showpic}}' bindtap='hidepic'>
+  <image src='{{pic_url}}' class='show_pic'></image>
+</view>
 <view class='all'>
   <view class='head'>
     <view class='mybox'>
@@ -14,87 +16,138 @@
   <view class='body'>
     <view class='list'>
       <view class='sousuo'>
-        <view class='pic' bindtap='search'><image src='../../img/search.png'></image></view>      
+        <view class='pic' bindtap='search'>
+          <image src='../../img/search.png'></image>
+        </view>
         <input class='findit' placeholder='请输入商品名称或者编号' bindblur='searchin'></input>
-        <view class='sweep' bindtap='scanqrCode'><image src='../../img/icon-offline.png'></image></view>
+        <view class='sweep' bindtap='scanqrCode'>
+          <image src='../../img/icon-offline.png'></image>
+        </view>
       </view>
-      <view class='vorder-infor'>       
+      <view class='vorder-infor'>
         <view class='mana-list'>
           <navigator class="{{selected==0?'active':''}}" bindtap='tap1'>
-            <image src='../../img/order.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/697bf1a4e1efe55ee87f4bf9022ab831.png'></image>
             <view>全部</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==0}}'></view>
           </navigator>
           <navigator class="{{selected==1?'active':''}}" bindtap='tap2'>
-            <image src='../../img/qiuqiu.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/c9545721eba25f814df8ee4d3c519854.png'></image>
             <view>待审核</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==1}}'></view>
             <text class='num' wx:if='{{examine!=0}}'>{{examine}}</text>
           </navigator>
           <navigator class="{{selected==2?'active':''}}" bindtap='tap3'>
-            <image src='../../img/gongju.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/8ea54e333c81d0cca01a26a9fc23b3e3.png'></image>
             <view>待生产</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==2}}'></view>
             <text class='num' wx:if='{{make!=0}}'>{{make}}</text>
           </navigator>
           <navigator class="{{selected==3?'active':''}}" bindtap='tap4'>
-            <image src='../../img/weixiu.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/7fb5b97adeef584976ad463fb49aca47.png'></image>
             <view>生产中</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==3}}'></view>
             <text class='num' wx:if='{{making!=0}}'>{{making}}</text>
           </navigator>
         </view>
         <view class='mana-list'>
           <navigator class="{{selected==4?'active':''}}" bindtap='tap5'>
-            <image src='../../img/upload.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/c8af5cb1c7807de7a1b8b6f08817a0aa.png'></image>
             <view>待发货</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==4}}'></view>
             <text class='num' wx:if='{{send!=0}}'>{{send}}</text>
           </navigator>
           <navigator class="{{selected==5?'active':''}}" bindtap='tap6'>
-            <image src='../../img/mine_car.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/cb11d2123192fb141812da4cfdb70b10.png'></image>
             <view>运输中</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==5}}'></view>
             <text class='num' wx:if='{{sending!=0}}'>{{sending}}</text>
           </navigator>
           <navigator class="{{selected==6?'active':''}}" bindtap='tap7'>
-            <image src='../../img/radio.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/2f8645a5bd048b33053e16f65ddf9ae7.png'></image>
             <view>已签收</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==6}}'></view>
           </navigator>
           <navigator class="{{selected==7?'active':''}}" bindtap='tap8'>
-            <image src='../../img/life.png'></image>
+            <image src='https://t6.9026.com/upload/images/20180816/4b90775eff22cedb51b77be1dc039a9d.png'></image>
             <view>逾期</view>
+            <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==7}}'></view>
             <text class='num' wx:if='{{expeced!=0}}'>{{expected}}</text>
           </navigator>
-        </view>       
+        </view>
       </view>
     </view>
 
     <view class='vorder' wx:key="index" id='{{index}}' wx:for='{{infor}}'>
       <zan-cell-group title-width="90">
-        <zan-cell title="订单编号" value="{{item.state}}"><text style='color:red;'>{{item.vorderid}}</text></zan-cell>
-        <zan-cell title="二维码" value=""><image src='{{item.qrcode}}' class = 'qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}'></image></zan-cell> 
-        <zan-cell title="交易时间" value=""><text>{{item.vordertime}}</text></zan-cell> 
+        <zan-cell title="订单编号" value="{{}}">
+          <text style='color:red;'>{{item.vorderid}}</text>
+          <image src='{{item.qrcode}}' class='qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="交易时间" value="">
+          <text>{{item.vordertime}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="订单状态" value="">
+          <text style='color:red;'>{{item.state}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <view style='width:100%;height:2rpx;background:#eee;margin:10rpx 0'></view>
+      <zan-cell-group title-width="90">
+        <zan-cell title="品类" value="">
+          <text>{{item.cate}}</text>
+        </zan-cell>
       </zan-cell-group>
       <zan-cell-group title-width="90">
-        <zan-cell title="品类" value=""><text>{{item.cate}}</text></zan-cell>
-        <zan-cell title="产品型号" value=""><text>{{item.model}}</text></zan-cell>
-        <zan-cell title="问题描述" value=""><text>{{item.problem}}</text></zan-cell>  
+        <zan-cell title="产品型号" value="">
+          <text>{{item.model}}</text>
+        </zan-cell>
       </zan-cell-group>
       <zan-cell-group title-width="90">
-        <zan-cell title="预计完成时间" value="" style="color:#999;" wx:if="{{item.state!='待审核'&&item.state!='已取消'}}"><text style='color:#999;'>{{item.expected_time}}</text></zan-cell>
+        <zan-cell title="问题描述" value="">
+          <text>{{item.problem}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="预计完成时间" value="" style="color:#999;" wx:if="{{item.state!='待审核'&&item.state!='已取消'}}">
+          <text style='color:#999;'>{{item.expected_time}}</text>
+        </zan-cell>
         <zan-row>
-          <zan-col col="15"><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
+          <zan-col col="15">
+            <text style='color:rgba(0,0,0,0)'>0</text>
+          </zan-col>
           <!-- <zan-col col="7"><zan-button bindtap='detail'>开始生产</zan-button></zan-col> -->
           <zan-col col="7" offset="1">
-          <form bindsubmit='upFormID' report-submit='true'>
-          <button bindtap='detail' form-type="submit" id='{{item.detail_order_id}}'>查看详情</button>
-          </form>
+            <form bindsubmit='upFormID' report-submit='true'>
+              <button bindtap='detail' form-type="submit" id='{{item.detail_order_id}}'>查看详情</button>
+            </form>
           </zan-col>
         </zan-row>
-      </zan-cell-group>   
+      </zan-cell-group>
     </view>
     <view style='width:100%;height:200rpx;color:#EBEBEB'>0</view>
   </view>
 </view>
-<include src="foot.wxml"/>
-<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 class='foot'>
+  <zan-row>
+    <zan-col col="5">
+      <image src='https://t6.9026.com/upload/images/20180817/205562795ef4c635cb10454e82043655.png' class='img'></image>
+    </zan-col>
+    <zan-col col="7">
+      <text class='index'>售后订单</text>
+    </zan-col>
+    <zan-col col="5" bindtap='datacount'>
+      <image src='https://t6.9026.com/upload/images/20180817/b68d884785f406c1ba1ef1ffdc1c7fd4.png' class='img2'></image>
+    </zan-col>
+    <zan-col col="7" bindtap='datacount'>
+      <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>

Furniture/pages/manager/manage.wxss

@@ -55,6 +55,7 @@ page{
   background:rgba(0,0,0,0.1);
   line-height: 60rpx;
   padding-right: 20rpx;
+  border-radius: 15rpx;
 }
 .head .mybox .userlevel image{
   width: 46rpx;
@@ -130,15 +131,16 @@ page{
   color: #aaa;
 }
 .body .list .vorder-infor .active{
-  background: #ddd;
+  color:RGB(233,59,61);
 }
 .body .list .vorder-infor .mana-list{
-    flex: 1;
+  flex: 1;
   width: 100%;
-  height: 160rpx;
+  height: 120rpx;
   display: flex;
 }
 .body .list .vorder-infor navigator{
+  width: 120rpx;
   height: 160rpx;
   text-align: center;
   flex: 1;
@@ -146,8 +148,8 @@ page{
   position: relative;
 }
 .body .list .vorder-infor navigator image{
-  width: 100rpx;
-  height: 100rpx;
+  width: 80rpx;
+  height: 80rpx;
   margin-top: 5rpx;
 }
 
@@ -358,3 +360,39 @@ border-radius: 20rpx;
   z-index: 9;
   overflow-y: hidden;
 }
+.foot{
+  display: flex;
+  border-top:1px #eee solid;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  height:100rpx;
+  z-index: 100;
+  background-color: #fff;
+}
+.foot .img{
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 110rpx;
+  margin-top: 40rpx;
+}
+.foot .img2{
+  width:35rpx;
+  height: 35rpx;
+  margin-left: 370rpx;
+  margin-top: 40rpx;
+}
+.foot .index{
+  position: fixed;
+  color: #E93B3D;
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 160rpx
+}
+.foot .user{
+  position: fixed;
+  color: #ccc;
+  font-size: 35rpx;
+  bottom: 15rpx;
+  left: 540rpx
+}

Furniture/pages/manager/thedata/pingjia.json

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "评价统计",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",

Furniture/pages/manager/thedata/pingjia.wxml

@@ -7,6 +7,7 @@
 <view class='zz'>
   <canvas canvas-id="columnCanvas" class="canvas" bindtouchstart="touchHandler"></canvas>
 </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>
+<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>

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

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "品类统计",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {}
 }

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

@@ -5,6 +5,7 @@
   <view class='zz'>
     <canvas canvas-id="columnCanvas" disable-scroll="true" class="canvas" bindtouchstart="touchHandler" bindtouchmove="moveHandler" bindtouchend="touchEndHandler"></canvas>
   </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>
+<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>

Furniture/pages/manager/thedata/pinlei.json

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "品类统计",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",

Furniture/pages/manager/thedata/pinlei.wxml

@@ -15,6 +15,7 @@
     <zan-cell id='{{item}}' wx:for="{{list}}" wx:key="{{index}}" title="{{item}}"  is-link bindtap='list'></zan-cell>
   </zan-cell-group>
 </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>
+<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>

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

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "售后产品",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {}
 }

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

@@ -5,6 +5,7 @@
   <view class='zz'>
     <canvas canvas-id="columnCanvas" disable-scroll="true" class="canvas" bindtouchstart="touchHandler" bindtouchmove="moveHandler" bindtouchend="touchEndHandler"></canvas>
   </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>
+<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>

Furniture/pages/manager/thedata/shouhou.json

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "售后产品",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",

Furniture/pages/manager/thedata/shouhou.wxml

@@ -15,8 +15,8 @@
     <zan-cell id='{{item}}' wx:for="{{list}}" wx:key="{{index}}" title="{{item}}"  is-link bindtap='list'></zan-cell>
   </zan-cell-group>
 </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>
-
+<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>
 

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

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "订单进度",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {}
 }

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

@@ -5,6 +5,7 @@
   <view class='zz'>
     <canvas canvas-id="columnCanvas" disable-scroll="true" class="canvas" bindtouchstart="touchHandler" bindtouchmove="moveHandler" bindtouchend="touchEndHandler"></canvas>
   </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>
+<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>

Furniture/pages/manager/thedata/vorder.json

@@ -1,4 +1,7 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "订单进度",
+  "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",

Furniture/pages/manager/thedata/vorder.wxml

@@ -5,12 +5,18 @@
     <canvas canvas-id="columnCanvas" class="canvas" bindtouchstart="touchHandler"></canvas>
   <zan-cell-group>
     <zan-cell title="待审核" id='1' is-link bindtap='list'></zan-cell>
+    <view style='height:15rpx;'></view>
     <zan-cell title="待生产" id='2' is-link bindtap='list'></zan-cell>
+    <view style='height:15rpx;'></view>
     <zan-cell title="生产中" id='3' is-link bindtap='list'></zan-cell>
+    <view style='height:15rpx;'></view>
     <zan-cell title="待发货" id='4' is-link bindtap='list'></zan-cell>
+    <view style='height:15rpx;'></view>
     <zan-cell title="未签收" id='5' is-link bindtap='list'></zan-cell>
+    <view style='height:15rpx;'></view>
     <zan-cell title="逾期" id='6' is-link bindtap='list'></zan-cell>
   </zan-cell-group>
-  <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>
+<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>

Furniture/pages/packing/packing-detail.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "订单详情",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/packing/packing-detail.wxml

@@ -1,100 +1,124 @@
 <!--pages/packing/packing-detail.wxml-->
 <!-- <zan-dialog id="zan-dialog-test"></zan-dialog>
 <include src="../infor/detail_head.wxml"/> -->
-<view style='background-color:#fff'>
+<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>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee'>
+    订单信息
+  </view>
+  <view style='margin-top:20rpx'></view>
   <zan-cell-group title-width="90">
-    <zan-cell title="订单编号" value="{{order_status}}">
+    <zan-cell title="订单编号" value="{{}}" style='color:#777;'>
       <text style='color:red;'>{{order_num}}</text>
+      <image src='{{pic_url}}' class='qrcode' bindtap='showPic' data-src='{{pic_url}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
     </zan-cell>
-    <zan-cell title="二维码" value="">
-      <image src='{{pic_url}}' class='qrcode' bindtap='showPic' data-src='{{pic_url}}'></image>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="交易时间" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{order_created_time}}</text>
     </zan-cell>
-    <zan-cell title="交易时间" value="">
-      <text>{{order_created_time}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单状态" value="" style='color:#777;'>
+      <text style='color:red;'>{{order_status}}</text>
     </zan-cell>
+    <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+      产品信息
+    </view>
   </zan-cell-group>
-  <hr/>
+  <view style='margin-top:20rpx'></view>
   <zan-cell-group title-width="90">
-    <zan-cell title="商品名称" value="">
-      <text>{{gCategory}}</text>
+    <zan-cell title="商品名称" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gCategory}}</text>
     </zan-cell>
-    <zan-cell title="品类" value="">
-      <text>{{gType}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="品类" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gType}}</text>
     </zan-cell>
-    <zan-cell title="颜色" value="">
-      <text>{{gColor}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="颜色" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gColor}}</text>
     </zan-cell>
-    <zan-cell title="问题描述" value="">
-      <text>{{gDescription}}</text>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="问题描述" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{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>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+    客户信息
+  </view>
+  <view style='margin-top:20rpx'></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 title="姓名" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uName}}</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 title="联系方式" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uMobile}}</text>
+    </zan-cell>
   </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-group title-width="90">
+    <zan-cell title="收货地址" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uAddress}}</text>
     </zan-cell>
-    <zan-cell title="备注" value="" style="color:#666;">{{msg}}</zan-cell>
   </zan-cell-group>
+  <zan-dialog id="zan-dialog-test"></zan-dialog>
   <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>
+  <!-- <zan-cell-group title-width="90"> -->
+    <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+      配件清单
+    </view>
+    <view style='margin-top:20rpx'></view>
+    <zan-cell-group title-width="90" wx:for="{{parts}}">
+      <zan-cell title="{{item.name}}" value="" style='color:#777;'>
+        <text style='color:#2a2121'>{{item.count}}个</text>
+      </zan-cell>
+    </zan-cell-group>
+    <zan-cell-group title-width="130">
+      <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+        订单进度
+      </view>
+      <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:#777;">
+        <text style='color:#2a2121'>{{expected_time}}</text>
+      </zan-cell>
+      <zan-cell title="备注" value="" style="color:#777;" wx:if='{{msg!=null}}'><text style='color:#2a2121'>{{msg}}</text></zan-cell>
+    </zan-cell-group>
+    <zan-toast id="zan-toast-test"></zan-toast>
+
+    <zan-row>
+      <zan-col col="14">
+        <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-row>
+    <modal hidden="{{hiddenmodalput}}" title="发货" confirm-text="提交" cancel-text="取消" bindcancel="cancel" bindconfirm="confirm">
+      <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>

Furniture/pages/packing/packing.js

@@ -109,22 +109,47 @@ Page({
     if (that.data.selected == 0) {
       s = '9'
       e = ''
+      that.setData({
+        selected: 0,
+        status: '9',
+        expecte: ''
+      })
     }
     if (that.data.selected == 1) {
       s = '3'
       e = ''
+      that.setData({
+        selected: 1,
+        status: '3',
+        expecte: ''
+      })
     }
     if (that.data.selected == 2) {
       s = '4'
       e = ''
+      that.setData({
+        selected: 2,
+        status: '4',
+        expecte: ''
+      })
     }
     if (that.data.selected == 3) {
       s = '5'
       e = ''
+      that.setData({
+        selected: 3,
+        status: '5',
+        expecte: ''
+      })
     }
     if (that.data.selected == 4) {
       s = ''
       e = '1'
+      that.setData({
+        selected: 4,
+        status: '',
+        expecte: '1'
+      })
     }
     app.request({
       url: 'https://t6.9026.com/api/furniture/getorder',
@@ -662,6 +687,7 @@ Page({
     that.setData({
       keyword: e.detail.value,
     })
+    that.search()
   },
   search: function() {
     wx.setStorageSync('pa', 0)

Furniture/pages/packing/packing.json

@@ -1,5 +1,7 @@
 {
-  "navigationBarTitleText": "天天家居惠",
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "我的订单",
+  "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",

Furniture/pages/packing/packing.wxml

@@ -22,26 +22,31 @@
       </view>
       <view class='vorder-infor'>
         <navigator class="{{selected==0?'active':''}}" bindtap='tap1'>
-          <image src='../../img/order.png'></image>
+          <image src='https://t6.9026.com/upload/images/20180816/697bf1a4e1efe55ee87f4bf9022ab831.png'></image>
           <view>全部</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==0}}'></view>
         </navigator>
         <navigator class="{{selected==1?'active':''}}" bindtap='tap2'>
-          <image src='../../img/upload.png'></image>
+          <image src='https://t6.9026.com/upload/images/20180816/c8af5cb1c7807de7a1b8b6f08817a0aa.png'></image>
           <view>待发货</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==1}}'></view>
           <text class='num' wx:if='{{send!=0}}'>{{send}}</text>
         </navigator>
         <navigator class="{{selected==2?'active':''}}" bindtap='tap3'>
-          <image src='../../img/mine_car.png'></image>
+          <image src='https://t6.9026.com/upload/images/20180816/d41cedb9eb36d0635995942a9e243a8f.png'></image>
           <view>运输中</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==2}}'></view>
           <text class='num' wx:if='{{sending!=0}}'>{{sending}}</text>
         </navigator>
         <navigator class="{{selected==3?'active':''}}" bindtap='tap4'>
-          <image src='../../img/radio.png'></image>
+          <image src='https://t6.9026.com/upload/images/20180816/2f8645a5bd048b33053e16f65ddf9ae7.png'></image>
           <view>已签收</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==3}}'></view>
         </navigator>
         <navigator class="{{selected==4?'active':''}}" bindtap='tap5'>
-          <image src='../../img/life.png'></image>
+          <image src='https://t6.9026.com/upload/images/20180816/4b90775eff22cedb51b77be1dc039a9d.png'></image>
           <view>逾期</view>
+          <view style='width:80rpx;margin-left:30rpx;height:4rpx;background-color:RGB(233,59,61);margin-top:10rpx' wx:if='{{selected==4}}'></view>
           <text class='num' wx:if='{{expected!=0}}'>{{expected}}</text>
         </navigator>
       </view>
@@ -49,20 +54,33 @@
     <zan-dialog id="zan-dialog-test"></zan-dialog>
     <view class='vorder' wx:key="index" id='{{index}}' wx:for='{{infor}}'>
       <zan-cell-group title-width="90">
-        <zan-cell title="订单编号" value="{{item.state}}">
+        <zan-cell title="订单编号" value="{{}}">
           <text style='color:red;'>{{item.vorderid}}</text>
+          <image src='{{item.qrcode}}' class='qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
         </zan-cell>
-              <zan-cell title="二维码" value=""><image src='{{item.qrcode}}' class = 'qrcode' id='{{item.qrcode}}' bindtap='showPic' data-src='{{item.qrcode}}'></image></zan-cell> 
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
         <zan-cell title="交易时间" value="">
           <text>{{item.vordertime}}</text>
         </zan-cell>
-
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
+        <zan-cell title="订单状态" value="">
+          <text style='color:red;'>{{item.state}}</text>
+        </zan-cell>
+      </zan-cell-group>
+      <view style='width:100%;height:2rpx;background:#eee;margin:10rpx 0'></view>
+      <zan-cell-group title-width="90">
         <zan-cell title="品类" value="">
           <text>{{item.cate}}</text>
         </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
         <zan-cell title="产品型号" value="">
           <text>{{item.model}}</text>
         </zan-cell>
+      </zan-cell-group>
+      <zan-cell-group title-width="90">
         <zan-cell title="问题描述" value="">
           <text>{{item.problem}}</text>
         </zan-cell>
@@ -99,7 +117,7 @@
   <input form-type="submit" type='text' placeholder="请添加备注" bindblur='getRemark'/>
 </form>
 </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>
-
+<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>

Furniture/pages/packing/packing.wxss

@@ -53,6 +53,7 @@ page{
   background:rgba(0,0,0,0.1);
   line-height: 60rpx;
   padding-right: 20rpx;
+  border-radius: 15rpx;
 }
 .head .mybox .userlevel image{
   width: 46rpx;
@@ -126,19 +127,26 @@ page{
   color: #aaa;
 }
 .body .list .vorder-infor .active{
-  background: #ddd;
+  color:RGB(233,59,61);
+}
+.body .list .vorder-infor .mana-list{
+  flex: 1;
+  width: 100%;
+  height: 120rpx;
+  display: flex;
 }
 .body .list .vorder-infor navigator{
+  width: 120rpx;
   height: 160rpx;
   text-align: center;
-  font-size: 30rpx;
   flex: 1;
+  font-size: 30rpx;
   position: relative;
 }
 .body .list .vorder-infor navigator image{
-  width: 100rpx;
-  height: 100rpx;
-  margin-top: 10rpx;
+  width: 80rpx;
+  height: 80rpx;
+  margin-top: 5rpx;
 }
 
 .body .vorder{

Furniture/pages/search/search.json

@@ -1,4 +1,8 @@
 {
+  "navigationBarTextStyle": "white",
+  "navigationBarTitleText": "订单详情",
+  "navigationBarBackgroundColor": "#E93B3D",
+  "backgroundColor": "#fff",
   "component": true,
   "usingComponents": {
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",

Furniture/pages/search/search.wxml

@@ -1,64 +1,97 @@
 <!--pages/search/search.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='overflow-x:hidden;background-color:#fff'>
+<view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee'>
+    订单信息
   </view>
-</zan-cell-group>
-<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 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 style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单编号" value="{{}}" style='color:#777;'>
+      <text style='color:red;'>{{order_num}}</text>
+      <image src='{{pic_url}}' class='qrcode' bindtap='showPic' data-src='{{pic_url}}' style='width:40rpx;height:40rpx;margin: -8rpx -8rpx -8rpx 20rpx'></image>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="交易时间" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{order_created_time}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="订单状态" value="" style='color:#777;'>
+      <text style='color:red;'>{{order_status}}</text>
+    </zan-cell>
+    <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+      产品信息
+    </view>
+  </zan-cell-group>
+  <view style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <zan-cell title="商品名称" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gCategory}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="品类" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gType}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="颜色" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gColor}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="问题描述" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{gDescription}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <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>
+  <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+    客户信息
+  </view>
+  <view style='margin-top:20rpx'></view>
+  <zan-cell-group title-width="90">
+    <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 title="联系方式" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uMobile}}</text>
+    </zan-cell>
+  </zan-cell-group>
+  <zan-cell-group title-width="90">
+    <zan-cell title="收货地址" value="" style='color:#777;'>
+      <text style='color:#2a2121'>{{uAddress}}</text>
+    </zan-cell>
+  </zan-cell-group>
+<zan-dialog id="zan-dialog-test"></zan-dialog>
 <zan-toast id="zan-toast-test"></zan-toast>
+<view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+      配件清单
+    </view>
+    <view style='margin-top:20rpx'></view>
+    <zan-cell-group title-width="90" wx:for="{{parts}}">
+      <zan-cell title="{{item.name}}" value="" style='color:#777;'>
+        <text style='color:#2a2121'>{{item.count}}个</text>
+      </zan-cell>
+    </zan-cell-group>
+    <zan-cell-group title-width="130">
+      <view style='width:100%;hight:20px;padding:3px 0 3px 15px;color:#999;font-size:14px;background-color:#eee;margin:20rpx 0 0 0;'>
+        订单进度
+      </view>
+      <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:#777;">
+        <text style='color:#2a2121'>{{expected_time}}</text>
+      </zan-cell>
+      <zan-cell title="备注" value="" style="color:#777;" wx:if='{{msg!=null}}'><text style='color:#2a2121'>{{msg}}</text></zan-cell>
+    </zan-cell-group>
+<zan-toast id="zan-toast-test"></zan-toast>
+
 
   <zan-row>
   <zan-col col="10" wx:if='{{role==1&&(status==1||status==2)}}'><text style='color:rgba(0,0,0,0)'>0</text></zan-col>
@@ -89,7 +122,8 @@
 <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>
-
+<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/style/weui.wxss

@@ -182,7 +182,7 @@ icon {
 }
 
 .weui-label {
-  width: 105px;
+  width: 80px;
   word-wrap: break-word;
   word-break: break-all;
 }
@@ -373,7 +373,7 @@ icon {
   height: 2.58823529em;
   min-height: 2.58823529em;
   line-height: 2.58823529em;
-  border-right: 1rpx solid #d9d9d9;
+  
 }
 
 .weui-select:before {