Browse Source

合并代码1

xiasongtao 2 years ago
parent
commit
7d29e0bc0a

+ 1 - 1
components/modal/modal.wxss

@@ -50,5 +50,5 @@
   border-right: 2rpx solid #D2D3D5;
 }
 .confirm-btn {
-  color: #09BA07
+  color:#04a6fa
 }

+ 2 - 2
pages/process/process.js

@@ -129,7 +129,7 @@ Page({
       url: app.globalData.localHref + '/ThApi/Chat/addChat.html',
       data: {
         token: that.data.userToken,
-        relation_user_id: that.data.info.th_user_id,
+        relation_user_id: that.data.info.prev_reservation.th_user_id,
       },
       header: {
         "Content-Type": "application/x-www-form-urlencoded"
@@ -157,7 +157,7 @@ Page({
       url: app.globalData.localHref + '/ThApi/Chat/addChat.html',
       data: {
         token: that.data.userToken,
-        relation_user_id: that.data.info.th_user_id,
+        relation_user_id: that.data.info.next_reservation.th_user_id,
       },
       header: {
         "Content-Type": "application/x-www-form-urlencoded"

+ 42 - 5
pages/send/send.js

@@ -17,6 +17,10 @@ Page({
     can:false,
     device_send_status:'',
     userToken:'',
+    showModal:false,
+    change1:'',
+    change2: '',
+    change3: '',
 
 
     date:'',
@@ -70,11 +74,14 @@ Page({
     console.log(now2Year, now2Month, now2Day, '2')
   },
   exduit(){
-    wx.navigateTo({
-      url: '../editAddress/index?orderId=' + this.data.reservation_no,
-      success: function (res) { },
-      fail: function (res) { },
-      complete: function (res) { },
+    // wx.navigateTo({
+    //   url: '../changeAddress/changeAddress?orderId=' + this.data.reservation_no,
+    //   success: function (res) { },
+    //   fail: function (res) { },
+    //   complete: function (res) { },
+    // })
+    this.setData({
+      showModal:true
     })
   },
   smqj(){
@@ -395,5 +402,35 @@ Page({
       imageUrl: app.globalData.imageUrl,
     }
   },
+  modalCancel(e) {
+    // 这里面处理点击取消按钮业务逻辑
+    console.log('点击了取消')
+  },
+  // 点击确定按钮的回调函数
+  modalConfirm(e) {
+    var that =this
+    this.setData({
+      showModal:false,
+      'sendAndRece.sender_name':that.data.change1,
+      'sendAndRece.sender_mobile': that.data.change2,
+      'sendAndRece.sender_address': that.data.change3,
+    })
+    console.log(this.data.sendAndRece,'77')
+  },
+  change_name(e){
+    this.setData({
+      change1:e.detail.value
+    })
+  },
+  change_sj(e) {
+    this.setData({
+      change2: e.detail.value
+    })
+  },
+  change_address(e) {
+    this.setData({
+      change3: e.detail.value
+    })
+  },
 
 })

+ 2 - 1
pages/send/send.json

@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "糖化仪设备漂流",
   "usingComponents": {
-    "selectTime": "/components/selecttime/selecttime"
+    "selectTime": "/components/selecttime/selecttime",
+    "modalView": "../../components/modal/modal"
   }
 }

+ 17 - 0
pages/send/send.wxml

@@ -81,3 +81,20 @@
  <view class="btm_bottom" bindtap="showModule" wx:if="{{sendAndRece.datetime ==''}}">
   如果你已寄送快递,点击这里输入快递单号
  </view>
+ <modalView show="{{showModal}}" bindcancel="modalCancel" bindconfirm='modalConfirm' single='{{single}}'>
+    <view style="margin:20rpx 0;font-size:28rpx;">编辑寄件人信息</view>
+    <view style="text-align:left;font-size:24rpx;">
+      <view style="display:flex;height:90rpx;line-height:90rpx;width:500rpx;margin-left:50rpx;">
+        <view style="width:140rpx;">寄件人:</view>
+        <input style="width:500rpx;border-bottom:1px solid #ababab;text-align:left;height:60rpx;box-sizing:border-box;margin-top:16rpx;" bindinput="change_name"></input>
+      </view>
+      <view style="display:flex;height:90rpx;line-height:90rpx;width:500rpx;margin-left:50rpx;">
+        <view style="width:140rpx;">手机号:</view>
+        <input style="width:500rpx;border-bottom:1px solid #ababab;text-align:left;height:60rpx;box-sizing:border-box;margin-top:16rpx;" bindinput="change_sj" type="number"></input>
+      </view>
+      <view style="display:flex;height:90rpx;line-height:90rpx;width:500rpx;margin-left:50rpx;">
+        <view style="width:140rpx;">地 址:</view>
+        <input style="width:500rpx;border-bottom:1px solid #ababab;text-align:left;height:60rpx;box-sizing:border-box;margin-top:16rpx;" bindinput="change_address"></input>
+      </view>
+    </view>
+</modalView>

+ 1 - 6
pages/sessionList/sessionList.wxml

@@ -24,9 +24,4 @@
       
     </view>
   </view>
-</view>
-{{test}}
-{{test1}}
-{{test2}}
-{{test3}}
-{{testt}}
+</view>