Z1hgq 7 éve
szülő
commit
c2f4dc96ff
39 módosított fájl, 304 hozzáadás és 90 törlés
  1. 3 2
      Furniture/app.json
  2. 1 1
      Furniture/app.wxss
  3. 0 1
      Furniture/page/homePage/detail/conment/conment.js
  4. 5 1
      Furniture/page/homePage/detail/conment/conment.json
  5. 34 22
      Furniture/page/homePage/detail/conment/conment.wxml
  6. 9 0
      Furniture/page/homePage/detail/conment/conment.wxss
  7. 5 1
      Furniture/page/homePage/detail/detail.json
  8. 32 27
      Furniture/page/homePage/detail/detail.wxml
  9. 10 11
      Furniture/page/homePage/detail/detail.wxss
  10. 7 0
      Furniture/page/homePage/homePage.js
  11. 34 3
      Furniture/page/homePage/homePage.wxml
  12. 11 0
      Furniture/page/public/footer.js
  13. 1 4
      Furniture/page/public/footer.wxml
  14. 59 2
      Furniture/page/user/user.js
  15. 3 1
      Furniture/page/user/user.json
  16. 36 0
      Furniture/page/user/user.wxml
  17. 2 1
      Furniture/pages/fc/fc.wxml
  18. 16 1
      Furniture/pages/index/index.js
  19. 1 0
      Furniture/pages/index/index.json
  20. 8 8
      Furniture/pages/index/index.wxml
  21. 1 0
      Furniture/pages/infor/assess.json
  22. 1 0
      Furniture/pages/infor/detail_head.json
  23. 1 0
      Furniture/pages/infor/details.json
  24. 1 0
      Furniture/pages/infor/infor.json
  25. 1 0
      Furniture/pages/make/make-detail.json
  26. 1 0
      Furniture/pages/make/make.json
  27. 3 1
      Furniture/pages/manager/datacount.json
  28. 1 0
      Furniture/pages/manager/mana-detail.json
  29. 1 0
      Furniture/pages/manager/manage.json
  30. 1 0
      Furniture/pages/manager/thedata/pingjia.json
  31. 3 1
      Furniture/pages/manager/thedata/pinlei-list.json
  32. 1 0
      Furniture/pages/manager/thedata/pinlei.json
  33. 3 1
      Furniture/pages/manager/thedata/shouhou-list.json
  34. 1 0
      Furniture/pages/manager/thedata/shouhou.json
  35. 3 1
      Furniture/pages/manager/thedata/vorder-list.json
  36. 1 0
      Furniture/pages/manager/thedata/vorder.json
  37. 1 0
      Furniture/pages/packing/packing-detail.json
  38. 1 0
      Furniture/pages/packing/packing.json
  39. 1 0
      Furniture/pages/search/search.json

+ 3 - 2
Furniture/app.json

xqd xqd
@@ -1,8 +1,9 @@
 {
   "pages": [
     
-    "pages/logs/guanggao",
+    
     "page/homePage/homePage",
+    "pages/logs/guanggao",
     "page/user/user",
     "page/lifeCircle/lifeCircle",
     "page/contact/contact",
@@ -28,7 +29,7 @@
   ],
   "plugins": {
     "kyjplugin": {
-    "version": "1.0.9", 
+    "version": "1.0.11", 
     "provider": "wxcd59f21543131f65" } 
     },
   "window": {

+ 1 - 1
Furniture/app.wxss

xqd
@@ -10,7 +10,7 @@
   box-sizing: border-box;
 } 
 page{
-    background-color: #F8F8F8;
+    background-color: #fff;
     font-size: 16px;
     font-family: -apple-system-font,Helvetica Neue,Helvetica,sans-serif;
 }

+ 0 - 1
Furniture/page/homePage/detail/conment/conment.js

xqd
@@ -1,7 +1,6 @@
 // page/homePage/detail/conment/conment.js
 const app = getApp()
 Page({
-
   /**
    * 页面的初始数据
    */

+ 5 - 1
Furniture/page/homePage/detail/conment/conment.json

xqd
@@ -1 +1,5 @@
-{}
+{
+  "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk"
+  }
+}

+ 34 - 22
Furniture/page/homePage/detail/conment/conment.wxml

xqd xqd
@@ -4,39 +4,51 @@
 <view class="page" style='background-color:white'>
   <view class="page__bd">
     <view class="conment" style='margin:20rpx'>
-      <view class='container1' style='margin-left:0rpx;margin-top:0rpx'>
-        <image src='{{comments.avatar}}' style='width:80rpx;height:80rpx'></image>
+      <view class='container1' style='margin-left:0rpx;margin-top:-20rpx'>
+        <image src='{{comments.avatar}}' style='width:80rpx;height:80rpx;border-radius:80rpx;'></image>
       </view>
-      <view class="weui-article__title" style='margin-left:100rpx'>{{comments.username}}</view>
+      <view class="weui-article__title" style='margin-left:102rpx'>{{comments.username}}<text style='float:right;font-size:26rpx;color:#666;'>{{comments.created_at}}</text></view>
 
-      <view class='container1' style='margin-left:100rpx;margin-top:5rpx;font-size:24rpx;color:#d3d3d3'>
-        {{comments.created_at}}
-      </view>
-      <view style='font-size:35rpx;margin-left:0rpx;margin-top:50rpx;word-break:break-all;'>
+      <!-- <view class='container1' style='margin-left:600rpx;margin-top:-35rpx;'>
+        <text style='font-size:22rpx;color:#666;float:left;'>{{comments.created_at}}</text>
+      </view> -->
+      <view style='font-size:32rpx;margin-left:10rpx;margin-top:50rpx;word-break:break-all;margin-top:20rpx;'>
         {{comments.content}}
       </view>
-      <view style='border-bottom: 2rpx #D3D3D3 solid;margin-top:20rpx'>
+      <!-- <view style='margin:10rpx 0 0 10rpx'>
+        <text style='font-size:22rpx;color:#666;float:left;'>{{comments.created_at}}</text>
+        
+      </view> -->
+    </view>
+    <view style='border-bottom: 28rpx #efefef solid;margin-top:20rpx'>
       </view>
-      <view style='margin-top:10rpx;'>
+      <view style='margin-top:10rpx;margin-left:24rpx;font-size:32rpx;color:#111'>
         全部回复({{comments_replys.total}})
       </view>
-    </view>
-    <view class='conment' style='margin:20rpx;margin-top:50rpx' wx:for='{{replys}}' id='{{item.id}}' bindtap='re_reply' data-name='{{item.username}}'>
-      <view class='container1' style='margin-left:0rpx;margin-top:0rpx'>
-        <image src='{{item.avatar}}' style='width:80rpx;height:80rpx'></image>
+      <view style='border-bottom: 2rpx #efefef solid;margin-top:10rpx'>
       </view>
-      <view class="weui-article__title" style='margin-left:100rpx'>{{item.username}}</view>
-      <view class='container1' style='margin-left:100rpx;margin-top:5rpx;font-size:24rpx;color:#d3d3d3'>
-        {{item.created_at}}
+    <view class='conment' style='margin:20rpx;margin-top:30rpx;margin-bottom:10rpx;' wx:for='{{replys}}'>
+      <view class='container1' style='margin-left:0rpx;margin-top:-10rpx'>
+        <image src='{{item.avatar}}' style='width:80rpx;height:80rpx;border-radius:80rpx;'></image>
       </view>
-      <view style='font-size:35rpx;margin-left:100rpx;margin-top:50rpx;word-break:break-all;'>
+      <view class="weui-article__title" style='margin-left:102rpx;font-size:32rpx;color:#222'>{{item.username}}<text style='float:right;font-size:26rpx;color:#666;'>{{item.created_at}}</text></view>
+      <!-- <view class='container1' style='margin-left:600rpx;margin-top:-35rpx;'>
+        <text style='font-size:22rpx;color:#666;float:left;'>{{item.created_at}}</text>
+      </view> -->
+      <view style='font-size:32rpx;margin-left:102rpx;margin-top:30rpx;word-break:break-all;width:606rpx;height:auto;'>
+        <view id='{{item.id}}' bindtap='re_reply' data-name='{{item.username}}'>
         {{item.content}}
+        </view>
       </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}}'>
+      <!-- <image src='https://t6.9026.com/upload/images/20180828/844a57817cea7fdce7984288b2974d63.png' style='width:62rpx;height:32rpx;margin-left:102rpx;margin-top:20rpx;' wx:if='{{item.content.length > 53 }}' id='{{item.id}}' bindtap='toConment'></image> -->
+      <!-- <view style='margin:10rpx 0 0 102rpx'>
+        <text style='font-size:22rpx;color:#666;float:left;'>{{item.created_at}}</text><image src='https://t6.9026.com/upload/images/20180828/9e43be028f9e3ba458c63dbbe37900a0.png'style='width:70rpx;height:36rpx;float:left;margin-left:20rpx' id='{{item.id}}' bindtap='re_reply' data-name='{{item.username}}'></image>
+      </view> -->
+      <!-- <view style='margin-top:5rpx;background-color:#f5f5f5;margin-left:102rpx;height:50rpx;padding:5rpx' 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'>
-        <image src='/images/huifufengexian.png ' style='width:630rpx;height:1rpx;margin-top:0rpx;margin-left:0rpx'></image>
+      </view> -->
+      <view style='margin-top:-20rpx;margin-left:100rpx'>
+        <image src='/images/huifufengexian.png ' style='width:620rpx;height:2rpx;margin-top:10rpx;margin-left:0rpx'></image>
       </view>
     </view>
     <view class='sousuo' bindtap='set_is_reply_false'>
@@ -44,4 +56,4 @@
     </view>
   </view>
 </view>
-<include src="/pages/fc/fc.wxml" />
+<include src="/pages/fc/fc.wxml" />

+ 9 - 0
Furniture/page/homePage/detail/conment/conment.wxss

xqd
@@ -48,4 +48,13 @@
   margin: 15rpx 0 15rpx 15rpx;
   border-radius:35rpx; 
   padding-left: 25rpx;
+}
+.disp{
+  display: -webkit-box;
+  word-break: break-all;
+  text-overflow: ellipsis;
+  font-size: 32rpx;
+  overflow: hidden;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp:3;
 }

+ 5 - 1
Furniture/page/homePage/detail/detail.json

xqd
@@ -1 +1,5 @@
-{}
+{
+  "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk"
+  }
+}

+ 32 - 27
Furniture/page/homePage/detail/detail.wxml

xqd xqd
@@ -5,7 +5,7 @@
     <view class="weui-article">
       <view class="weui-article__h1" style='font-size:42rpx;word-break:break-all;'>{{news.title}}</view>
       <view class='container1' style='margin-left:0rpx;margin-top:0rpx'>
-        <image src='{{news.avatar}}' style='width:80rpx;height:80rpx'></image>
+        <image src='{{news.avatar}}' style='width:80rpx;height:80rpx;border-radius:80rpx;'></image>
       </view>
       <view class="weui-article__section">
         <view class="weui-article__title" style='margin-left:100rpx'>天天家居惠</view>
@@ -17,66 +17,71 @@
           </view>
         </view>
       </view>
-
-      <view style='height:80rpx;width:100%;position:relative;display:flex'>
-        <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 style='width:690rpx;margin-left:30rpx;height:50rpx;'>
+      <text style='font-size:24rpx;float:right;margin-right:30rpx'>{{news.viewed}}</text>
+      <image src='../../../images/eyes.png' style='width:40rpx;height:40rpx;float:right;margin-right:10rpx'></image>
+      </view>
+      <!-- <image src='../../../images/eyes.png' style='width:40rpx;height:40rpx;margin-top:10rpx;margin-left:550rpx;'></image>
+      <view class='container1' style='margin-top:-54rpx;margin-left:605rpx;font-size:24rpx'>{{news.viewed}}</view> -->
+      <view style='height:160rpx;width:100%;'>
         <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>
+          <view style=''>
+            <image src='https://t6.9026.com/upload/images/20180831/5e4dfbda11f345e34f448ae508f42455.png' style='width:160rpx;height:160rpx;'></image>
           </view>
-          <view style='margin:15rpx 0 15rpx 20rpx;border-right:1px solid #EA6F5A;padding:0 20rpx 0 0'>喜欢</view>
-          <view style='margin:16rpx 0 15rpx 10rpx'>
+          <view style='margin:-63rpx 0 15rpx -90rpx;text-align:center;font-size:28rpx;color:#fff'>
             {{news.like}}
           </view>
+          <view style='margin:-20rpx 0 14rpx 50rpx;padding:0 20rpx 0 0'>喜欢</view>
+          
         </view>
 
         <view class='like1' bindtap='like' wx:if="{{!like}}">
-          <view style='margin-top:10rpx'>
-            <image src='../../../images/like.png' style='width:60rpx;height:60rpx;margin-left:20rpx'></image>
+          <view style='margin-top:0rpx'>
+            <image src='https://t6.9026.com/upload/images/20180831/18ee9b02643eb4d3a4529329b8f8d66a.png' style='width:160rpx;height:160rpx;'></image>
           </view>
-          <view style='margin:15rpx 0 15rpx 20rpx;border-right:1px solid white;padding:0 20rpx 0 0'>喜欢</view>
-          <view style='margin:16rpx 0 15rpx 10rpx'>
+          <view style='margin:-63rpx 0 15rpx -90rpx;text-align:center;font-size:28rpx;color:#fff'>
             {{news.like+1}}
           </view>
+          <view style='margin:-20rpx 0 14rpx 50rpx;padding:0 20rpx 0 0'>喜欢</view>
+          
         </view>
       </view>
     </view>
-    <view style='margin-top:80rpx;background-color:#f5f5f5;width:100%;height:50rpx;padding:10rpx 0 5rpx 15rpx;color:#999;'>
+    <view style='margin-top:0rpx;background-color:#f5f5f5;width:100%;height:50rpx;padding:10rpx 0 5rpx 15rpx;color:#999;'>
         全部评论({{news_comments.total}})
     </view>
     <view class='conment' wx:for='{{comments}}'>
-      <view class='container1' style='margin-left:0rpx;margin-top:0rpx'>
-        <image src='{{item.avatar}}' style='width:80rpx;height:80rpx'></image>
-      </view>
-      <view class="weui-article__title" style='margin-left:100rpx'>{{item.username}}</view>
-      <view class='container1' style='margin-left:100rpx;margin-top:5rpx;font-size:24rpx;color:#d3d3d3'>
-        {{item.created_at}}
+      <view class='container1' style='margin-left:0rpx;margin-top:-10rpx'>
+        <image src='{{item.avatar}}' style='width:80rpx;height:80rpx;border-radius:80rpx;'></image>
       </view>
-      <view style='font-size:35rpx;margin-left:100rpx;margin-top:50rpx;word-break:break-all;' id='{{item.id}}' bindtap='reply' data-name='{{item.username}}'>
+      <view class="weui-article__title" style='margin-left:100rpx'>{{item.username}}<text style='float:right;font-size:26rpx;color:#666;'>{{item.created_at}}</text></view>
+      <!-- <view class='container1' style='margin-left:600rpx;margin-top:-35rpx;'>
+        <text style='font-size:22rpx;color:#666;float:left;'>{{item.created_at}}</text>
+      </view> -->
+      <view style='font-size:35rpx;margin-left:100rpx;margin-top:30rpx;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 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'>
-        <image src='/images/huifufengexian.png ' style='width:630rpx;height:1rpx;margin-top:0rpx;margin-left:0rpx;'></image>
+      <view style='margin-top:-20rpx;margin-left:100rpx'>
+        <image src='/images/huifufengexian.png ' style='width:620rpx;height:2rpx;margin-top:10rpx;margin-left:0rpx'></image>
       </view>
     </view>
     <view class='sousuo'>
       <input class='findit' placeholder='{{placeholder}}' bindblur='comment' value='{{comment_content}}' focus='{{focus}}'></input>
       <view class='sweep' bindtap='set_is_reply_false'>
         <!-- <image src='/images/查看评论按钮.png'></image> -->
-        <button class="share-btn" plain="true">
-          <image src="/images/chakanpinglun.png" style="width: 50rpx;height: 50rpx"></image>
+        <button class="share-btn" plain="true" style='border:none;'>
+          <image src="https://t6.9026.com/upload/images/20180831/3bad223d3d57118306c3a7bd4a85e361.png" style="width: 50rpx;height: 50rpx"></image>
         </button>
       </view>
       <view class='sweep' style='margin-left:10rpx'>
-        <button open-type='share' class="share-btn" plain="true">
+        <button open-type='share' class="share-btn" plain="true" style='border:none;'>
           <image src="/images/fenxiang.png" style="width: 50rpx;height: 50rpx"></image>
         </button>
       </view>
     </view>
   </view>
 </view>
-<include src="/pages/fc/fc.wxml" />
+<include src="/pages/fc/fc.wxml" />

+ 10 - 11
Furniture/page/homePage/detail/detail.wxss

xqd
@@ -85,22 +85,21 @@
 }
 
 .like {
-  margin-left: 400rpx;
+  margin-left: 270rpx;
   width: 250rpx;
   height: 80rpx;
-  color: #ea6f5a;
-  border: 1px solid #ea6f5a;
-  border-radius: 50rpx;
-  display: flex;
+  color: #dcdcdc;
 }
 
 .like1 {
-  margin-left: 400rpx;
-  background-color: #ea6f5a;
+  margin-left: 270rpx;
+  /* background-color: #ea6f5a; */
   width: 250rpx;
   height: 80rpx;
-  color: #fff;
-  border: 1px solid #ea6f5a;
-  border-radius: 50rpx;
-  display: flex;
+  color:#ea6f5a;
+}
+.wxParse-p>image{
+  max-width:690rpx;
 }
+
+

+ 7 - 0
Furniture/page/homePage/homePage.js

xqd xqd
@@ -17,6 +17,10 @@ Page({
     inputVal: "",
     takeup: true,
     more: false,
+    color:'#666',
+    route:'',
+    color1: 'RGB(233,59,61)',
+    color2: '#666'
   },
 
   /**
@@ -24,6 +28,9 @@ Page({
    */
   onLoad: function(options) {
     var that = this
+    that.setData({
+      route: that.route
+    })
     var myAmapFun = new amapFile.AMapWX({
       key: 'f74da0d1484bbbefb69059efa771b01d'
     });

+ 34 - 3
Furniture/page/homePage/homePage.wxml

xqd xqd
@@ -1,5 +1,5 @@
 <!--page/homePage/homePage.wxml-->
-<import src="../public/footer.wxml" />
+<!-- <import src="../public/footer.wxml" /> -->
 <include src="/pages/login/login.wxml" />
 <view class="page" style='background-color:white'>
   <view class="page__bd">
@@ -136,7 +136,38 @@
     </view>
   </view>
 </view>
-<block>
+<!-- <block>
    <template data="{{nav:nav}}" is="foot" />
-</block>
+</block> -->
+<view class="we7-bottom" style="background-color:{{blist.background_color}};border-color:{{blist.border_color}};">
+    <block wx:for="{{nav}}" wx:for-item="item" wx:for-index="index">
+        <block wx:if="{{blist.m4_name!=''}}">
+          <view class="we7-bottom-item">
+            <block wx:if="{{blist.m4_path=='custom'||blist.m4_path=='tel'||blist.m4_path=='driver'}}">
+              <button bindtap="{{blist.m4_path=='tel'?'tel':''}}{{blist.m4_path=='driver'?'driver':''}}" openType="{{blist.m4_path=='custom'?'contact':''}}"></button>
+            </block>
+            <block wx:if="{{item.open_type == 3}}">
+                <view class="aview">
+                <navigator target="miniProgram" open-type="navigate" app-id="{{item.app_id}}" path="{{item.url}}" extra-data="" version="release">
+         </navigator>
+                </view>
+            </block>
+            <block wx:if="{{item.open_type == 4}}">
+                <view class="aview" bindtap="navigatorClick" data-url="{{item.url}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+
+            <block wx:if="{{item.open_type == 1}}">
+                <view class="aview" bindtap="navigatorClick" data-phone="{{item.mobile}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+
+            <block wx:if="{{item.open_type == 2}}">
+                <view class="aview" bindtap="navigatorClick" data-address="{{item.address}}" data-lon="{{item.lon}}" data-lat="{{item.lat}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+            <image class="item-img" mode="widthFix" src="{{ index==0 ? item.pic_url_active:item.pic_url }}"></image>
+            <view class="item-text" style="color: {{ index==0 ? color1:color2 }}   ">{{item.name}}</view>
+          </view>
+        </block>
+    </block>
+  </view>
+  <view class="we7-bottom-placeholder"></view>
 <minitalk />

+ 11 - 0
Furniture/page/public/footer.js

xqd
@@ -0,0 +1,11 @@
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    
+  },
+
+  
+})

+ 1 - 4
Furniture/page/public/footer.wxml

xqd xqd
@@ -8,14 +8,11 @@
               <button bindtap="{{blist.m4_path=='tel'?'tel':''}}{{blist.m4_path=='driver'?'driver':''}}" openType="{{blist.m4_path=='custom'?'contact':''}}"></button>
             </block>
             <block wx:if="{{item.open_type == 3}}">
-          
                 <view class="aview">
                 <navigator target="miniProgram" open-type="navigate" app-id="{{item.app_id}}" path="{{item.url}}" extra-data="" version="release">
-    
          </navigator>
                 </view>
             </block>
-
             <block wx:if="{{item.open_type == 4}}">
                 <view class="aview" bindtap="navigatorClick" data-url="{{item.url}}" data-open_type="{{item.open_type}}"></view>
             </block>
@@ -28,7 +25,7 @@
                 <view class="aview" bindtap="navigatorClick" data-address="{{item.address}}" data-lon="{{item.lon}}" data-lat="{{item.lat}}" data-open_type="{{item.open_type}}"></view>
             </block>
             <image class="item-img" mode="widthFix" src="{{item.pic_url}}"></image>
-            <view class="item-text" style="color: #666666">{{item.name}}</view>
+            <view class="item-text" style="color: {{route}}=={{item.url}}? #000:#666   ">{{item.name}}</view>
           </view>
         </block>
     </block>

+ 59 - 2
Furniture/page/user/user.js

xqd xqd
@@ -1,4 +1,5 @@
 var app = getApp()
+var api = require("../../api.js");
 Page({
 
   /**
@@ -8,15 +9,71 @@ Page({
     is_login: 'false',
     nikename: '',
     avatar: '',
+    route:'',
+    color1:'RGB(233,59,61)',
+    color2:'#666'
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    var that = this
+    that.setData({
+      route:that.route
+    })
+    app.request1({
+      url: api.setting,
+      success: function (e) {
+        console.log(e.data)
+        that.setData({
+          nav: e.data.navbar,
+        })
+      }
+      //console.log(e.data)
+    })
+  },
+  navigatorClick: function (e) {
+    console.log(1)
+    var page = this;
+    var open_type = e.currentTarget.dataset.open_type;
+    if (open_type == 3) {
+      var url = e.currentTarget.dataset.url;
+      var appid = e.currentTarget.dataset.appid;
+      var user_info = wx.getStorageSync("user_info");
+      //return true;
+      //console.log(url);
+      console.log(appid);
+      wx.navigateToMiniProgram({
+        appId: appid,
+        path: url + '?user_id=' + user_info.user_id,
+        complete: function (e) {
+          console.log(e);
+        }
+      });
+    } else if (open_type == 1) {
+      var phone = e.currentTarget.dataset.phone;
+      wx.makePhoneCall({
+        phoneNumber: phone,
+      })
+    } else if (open_type == 2) {
+      var address = e.currentTarget.dataset.address;
+      var lon = parseFloat(e.currentTarget.dataset.lon);
+      var lat = parseFloat(e.currentTarget.dataset.lat);
+
+      wx.openLocation({
+        name: address,
+        latitude: lat,
+        longitude: lon,
+        scale: 28
+      })
+    } else if (open_type == 4) {
+      var url = e.currentTarget.dataset.url;
+      wx.navigateTo({
+        url: url
+      })
+    }
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

+ 3 - 1
Furniture/page/user/user.json

xqd
@@ -1,5 +1,7 @@
 {
   "navigationBarTitleText": "个人中心",
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+      "minitalk": "plugin://kyjplugin/minitalk"
+  }
 }

+ 36 - 0
Furniture/page/user/user.wxml

xqd xqd
@@ -1,4 +1,5 @@
 <!--pages/mine.wxml-->
+<!-- <import src="../public/footer.wxml" /> -->
 <include src="/pages/login/login.wxml" />
 <view class='pic'>
   <image src='../img/banner.png'></image>
@@ -24,4 +25,39 @@
     <view class='btn daili' bindtap='daili'><image src='/img/daili.png'></image></view>
   </view>
 </view>
+
+
+<!-- <template name="foot"> -->
+  <view class="we7-bottom" style="background-color:{{blist.background_color}};border-color:{{blist.border_color}};">
+    <block wx:for="{{nav}}" wx:for-item="item" wx:for-index="index">
+        <block wx:if="{{blist.m4_name!=''}}">
+          <view class="we7-bottom-item">
+            <block wx:if="{{blist.m4_path=='custom'||blist.m4_path=='tel'||blist.m4_path=='driver'}}">
+              <button bindtap="{{blist.m4_path=='tel'?'tel':''}}{{blist.m4_path=='driver'?'driver':''}}" openType="{{blist.m4_path=='custom'?'contact':''}}"></button>
+            </block>
+            <block wx:if="{{item.open_type == 3}}">
+                <view class="aview">
+                <navigator target="miniProgram" open-type="navigate" app-id="{{item.app_id}}" path="{{item.url}}" extra-data="" version="release">
+         </navigator>
+                </view>
+            </block>
+            <block wx:if="{{item.open_type == 4}}">
+                <view class="aview" bindtap="navigatorClick" data-url="{{item.url}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+
+            <block wx:if="{{item.open_type == 1}}">
+                <view class="aview" bindtap="navigatorClick" data-phone="{{item.mobile}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+
+            <block wx:if="{{item.open_type == 2}}">
+                <view class="aview" bindtap="navigatorClick" data-address="{{item.address}}" data-lon="{{item.lon}}" data-lat="{{item.lat}}" data-open_type="{{item.open_type}}"></view>
+            </block>
+            <image class="item-img" mode="widthFix" src="{{ index==3 ? item.pic_url_active:item.pic_url }}"></image>
+            <view class="item-text" style="color: {{ index==3 ? color1:color2 }}   ">{{item.name}}</view>
+          </view>
+        </block>
+    </block>
+  </view>
+  <view class="we7-bottom-placeholder"></view>
+<!-- </template> -->
 <include src="/pages/fc/fc.wxml" />

+ 2 - 1
Furniture/pages/fc/fc.wxml

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

+ 16 - 1
Furniture/pages/index/index.js

xqd
@@ -621,5 +621,20 @@ Page({
     wx.redirectTo({
       url: '../infor/infor',
     })
-  }
+  },
+  getWechatAddress: function (t) {
+    var i = this;
+    wx.chooseAddress({
+      success: function (a) {
+        if ("chooseAddress:ok" == a.errMsg){
+          console.log(a)
+          i.setData({
+            urname:a.userName,
+            mobile:a.telNumber,
+            address:a.provinceName+a.cityName+a.countyName+a.detailInfo
+          })
+        }
+      }
+    });
+  },
 })

+ 1 - 0
Furniture/pages/index/index.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "售后登记",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 8 - 8
Furniture/pages/index/index.wxml

xqd xqd
@@ -57,7 +57,7 @@
   </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-top:20rpx'>
-      收货地址
+      收货地址<text style='postion:absolute;float:right;margin-right:80rpx;color:RGB(233,59,61)' bindtap='getWechatAddress'>添加地址   ></text>
     </view>
   </zan-cell-group>
 
@@ -67,21 +67,21 @@
   </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'>
+  <!-- <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>
+    <!-- <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> -->
   <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'>
+  <!-- <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 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> -->
+  <!-- </view> -->
   <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>

+ 1 - 0
Furniture/pages/infor/assess.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "评价",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/infor/detail_head.json

xqd
@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "天天家居惠",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/infor/details.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "订单详情",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/infor/infor.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "我的订单",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/make/make-detail.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "订单详情",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/make/make.json

xqd
@@ -4,6 +4,7 @@
   "navigationBarTitleText": "我的订单",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 3 - 1
Furniture/pages/manager/datacount.json

xqd
@@ -3,5 +3,7 @@
   "navigationBarTitleText": "数据统计",
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk"
+  }
 }

+ 1 - 0
Furniture/pages/manager/mana-detail.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "订单详情",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/manager/manage.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "售后订单",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/manager/thedata/pingjia.json

xqd
@@ -4,6 +4,7 @@
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",
     "zan-cell-group": "../../../bower_components/zanui-weapp/dist/cell-group/index"
   }

+ 3 - 1
Furniture/pages/manager/thedata/pinlei-list.json

xqd
@@ -3,5 +3,7 @@
   "navigationBarTitleText": "品类统计",
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk"
+  }
 }

+ 1 - 0
Furniture/pages/manager/thedata/pinlei.json

xqd
@@ -4,6 +4,7 @@
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",
     "zan-cell-group": "../../../bower_components/zanui-weapp/dist/cell-group/index"
   }

+ 3 - 1
Furniture/pages/manager/thedata/shouhou-list.json

xqd
@@ -3,5 +3,7 @@
   "navigationBarTitleText": "售后产品",
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk"
+  }
 }

+ 1 - 0
Furniture/pages/manager/thedata/shouhou.json

xqd
@@ -4,6 +4,7 @@
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",
     "zan-cell-group": "../../../bower_components/zanui-weapp/dist/cell-group/index"
   }

+ 3 - 1
Furniture/pages/manager/thedata/vorder-list.json

xqd
@@ -3,5 +3,7 @@
   "navigationBarTitleText": "订单进度",
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
-  "usingComponents": {}
+  "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk"
+  }
 }

+ 1 - 0
Furniture/pages/manager/thedata/vorder.json

xqd
@@ -4,6 +4,7 @@
   "navigationBarBackgroundColor": "#E93B3D",
   "component": true,
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-cell": "../../../bower_components/zanui-weapp/dist/cell/index",
     "zan-cell-group": "../../../bower_components/zanui-weapp/dist/cell-group/index"
   }

+ 1 - 0
Furniture/pages/packing/packing-detail.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "订单详情",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/packing/packing.json

xqd
@@ -3,6 +3,7 @@
   "navigationBarTitleText": "我的订单",
   "navigationBarBackgroundColor": "#E93B3D",
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",

+ 1 - 0
Furniture/pages/search/search.json

xqd
@@ -5,6 +5,7 @@
   "backgroundColor": "#fff",
   "component": true,
   "usingComponents": {
+    "minitalk": "plugin://kyjplugin/minitalk",
     "zan-icon": "../../bower_components/zanui-weapp/dist/icon/index",
     "zan-button": "../../bower_components/zanui-weapp/dist/btn/index",
     "zan-button-group": "../../bower_components/zanui-weapp/dist/btn-group/index",