Merge branch 'master' into dev_master

pages/index/index.js

@@ -871,7 +871,7 @@ Page({
             tag_id: 85,offset: 0,limit: 5,
         }).then(res=>{
             let resData = res.data.list || []
-            (resData).forEach(v=>{ v.pagePoint = {classification: 'hot', key_number: v.id} })
+            resData.forEach(v=>{ v.pagePoint = {classification: 'hot', key_number: v.id} })
             this.setData({ list: resData})
         })
     },

pages/index/index.wxml

@@ -249,11 +249,11 @@
                 <view class="hot-list-item" wx:for="{{2}}" wx:for-index="number" wx:key="number">
                 <view wx:for="{{repurchaseList}}" wx:if="{{index%2==number}}" bindtap="gotoDetail" data-item="{{item}}" wx:key="id">
                     <view class="hot-item">
-                    <view style="position:relative">
-                        <common-image width="100%" src="{{item.headimg}}" mode="widthFix"></common-image>
+                    <view style="position:relative;flex-shrink: 0;">
+                        <common-image width="100%" src="{{item.headimg}}" mode="aspectFill"></common-image>
                     </view>
                     <view class="hot-info">
-                        <view class="hot-title">{{item.title}}</view>
+                        <view class="hot-title textOver2">{{item.title}}</view>
                         <view class="com-flex" style="justify-content: space-between;margin-top: 26rpx;">
                             <view  class="hot-price">
                                 <text>￥</text><text>{{item.price/100}}</text><text>起</text>

pages/index/index.wxss

@@ -477,14 +477,21 @@
   /* box-shadow: -1rpx 1rpx 16rpx 0px rgba(6, 0, 1, 0.1); */
   border-radius: 15rpx;
   margin-bottom: 15rpx;
+  height: 498rpx;
 }
 .hot-item image:nth-child(1) {
   display: block;
   width: 100%;
+  height: 327rpx;
   border-radius: 15rpx 15rpx 0 0;
 }
 .hot-item .hot-info {
   padding: 12rpx;
+  height: 170rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  box-sizing: border-box;
 }
 .hot-item .hot-title {
     font-weight: bold;

pages/order/components/contact/index.js

@@ -433,7 +433,8 @@ Component({
       userApi.user_post("user/getContactOrConsignee",{
         contactType:"CONTACT",
         offset:0,
-        limit:1000
+        limit:1000,
+        tm_flag: true,
       }).then(res=>{
         let list = res.data;
         // list.map(item=>{

pages/order/components/contact/index.wxss

@@ -278,3 +278,35 @@
   color: #000000;
   flex-shrink: 0;
 }
+.input-box {
+    background: white;
+    margin: 20rpx;
+    font-size: 28rpx;
+    padding: 0 25rpx;
+    border-radius: 10rpx;
+  }
+  .input-item {
+    display: flex;
+    align-items: center;
+    height: 106rpx;
+    justify-content: space-between;
+    border-bottom: 1rpx solid #EEE;
+  }
+  .input-label {
+    width: 140rpx;
+  }
+  .input-item .weui-input {
+    flex: 1;
+  }
+  .btn {
+    margin: 0 20rpx;
+    margin-top: 100rpx;
+    width: 700rpx;
+    margin-bottom: 30rpx;
+    line-height: 72rpx;
+    border-radius: 35rpx;
+    text-align: center;
+    color: white;
+    font-size: 36rpx;
+    background: #D62828;
+  }

pages/user/address/index.js

@@ -48,7 +48,7 @@ Page({
     user.user_post("user/getContactOrConsignee",{
       contactType:"CONSIGNEE",
       offset: this.data.list.length,
-      limit:10
+      limit:10,
     }).then(res=>{
       let list = this.data.list.concat(res.data), isMore = true;
       if(res.data.length<10){

pages/user/linkman/index.js

@@ -55,7 +55,8 @@ Page({
     user.user_post("user/getContactOrConsignee", {
       contactType:"CONTACT",
       offset: this.data.list.length,
-      limit: 10
+      limit: 10,
+      tm_flag: true,
     }).then(res => {
       let list = this.data.list.concat(res.data),isMore = true;
       if(res.data.length<10){

pages/user/profile/index.js

@@ -183,7 +183,7 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    userApi.user_post("user/getMyInfo",{}).then(res=>{
+    userApi.user_post("user/getMyInfo",{tm_flag: true}).then(res=>{
       this.setData({
         info:res.data,
         avatar:res.data.avatar,