开门

app.js

@@ -1,5 +1,5 @@
 // app.js
-var projectMode = 1;//0代表开发模式（本地环境），1代表测试模式（线上测r试环境）,2代表线上模式（正式运行环境）
+var projectMode = 2;//0代表开发模式（本地环境），1代表测试模式（线上测r试环境）,2代表线上模式（正式运行环境）
 var info = wx.getSystemInfoSync();
 if (info.platform != "devtools" && projectMode == 0) { projectMode = 1 }
 var envVersion = `${__wxConfig.envVersion}`;//develop	开发版，trial	体验版，release	正式版
@@ -45,7 +45,7 @@ App({
     userInfo: null,
     btnInfo: null,
     status: ['可下单', '服务中', '已满柜', '暂停服务'],
-    baseAppUrl: projectMode == 2 ? 'https://hx.xishuashua.art/' : (projectMode == 1 ? 'https://hx.xishuashua.art/' : 'http://wash.nanodreamtech.com/'),
+    baseAppUrl: projectMode == 2 ? 'https://hx.xishuashua.art/' : (projectMode == 1 ? 'https://hx.xishuashua.art/' : 'http://127.0.0.1:8000/'),
     location: "",
     token:"",
     nid:0,

pages/order/deposit/deposit.js

@@ -61,6 +61,8 @@ Page({
         var type = e.currentTarget.dataset.type
         var device_id = e.currentTarget.dataset.device_id
         var spout_device_id = e.currentTarget.dataset.spout_device_id
+        var external_cabinet = e.currentTarget.dataset.external_cabinet
+
         wx.nextTick(() => {
             this.setData({
                 show: !this.data.show
@@ -70,7 +72,8 @@ Page({
             if (this.data.spot_id == 0) {
                 this.setData({
                     spot_id: spout_device_id,
-                    device_no: device_id
+                    device_no: device_id,
+                    external_cabinet:external_cabinet
                 });
             }
             this.opentask1(no, type, this.data.device_no, this.data.spot_id)

pages/order/deposit/deposit.wxml

@@ -52,7 +52,7 @@
         <view class="footerBoxs flex ju-e" wx:if="{{!is_something }}">
 
             <view class="btn bg" bindtap="onClose" data-no="{{item.order_no}}" data-type="{{item.logistics_status}}" wx:if="{{item.logistics_status==1}}">开柜存衣</view>
-            <view class="btn bg" bindtap="onClose"  data-type="{{item.logistics_status}}" wx:if="{{item.logistics_status==6}}"  data-no="{{item.order_no}}" data-device_id="{{item.device_id}}" data-spout_device_id="{{item.spout_device_id}}"  >开柜取衣</view>
+            <view class="btn bg" bindtap="onClose"  data-type="{{item.logistics_status}}" wx:if="{{item.logistics_status==6}}"  data-no="{{item.order_no}}" data-device_id="{{item.device_id}}" data-spout_device_id="{{item.spout_device_id}}"  data-external_cabinet="{{item.external_cabinet}}" >开柜取衣</view>
 
         </view>
         <view class="footerBoxs flex ju-b"  wx:else>