for express interface

src/api/index.js

@@ -96,7 +96,8 @@ let requestLoading = (url, method, params, showLoading = true) => {
 
 
 // const TestSrv = process.env.NODE_ENV == 'production' ? 'http://39.97.239.116:8080' : '/api';
-const StanleyLocal = process.env.NODE_ENV == 'production' ? 'http://api.zng.com:8080' : '/api';
+// const StanleyLocal = process.env.NODE_ENV == 'production' ? 'http://api.zng.com:8080' : '/api';
+const StanleyLocal = process.env.NODE_ENV == 'production' ? 'http://192.168.1.200:8080' : '/api';
 
 const Prefix = StanleyLocal;
 

src/pages/subPages/express.vue

@@ -33,7 +33,7 @@
                 <el-col :span="6" :key="k">
                   <el-card class="box-card">
                     <div slot="header" class="clearfix">
-                      <span>{{v.box_number}}号箱</span>
+                      <span>{{v.box_number}}号箱   已{{v.status_text}}</span>
                       <el-dropdown>
                         <span class="el-dropdown-link">
                           箱子操作
@@ -44,20 +44,24 @@
                         </el-dropdown-menu>
                       </el-dropdown>
                     </div>
-                    <div style="height:72px;" v-if="v.box_status == 1">
+					
+<!--                    <div style="height:72px;">
                       <el-row type="flex" align="middle" style="height:100%;">
-                        <el-tag effect="dark">{{v.status_text}}</el-tag>
+                        <el-tag effect="dark">箱子已{{v.status_text}}</el-tag>
                       </el-row>
-                    </div>
+                    </div> -->
+					<el-row type="flex" justify="space-between" v-if="v.order_sn == ''">
+						<h4>空闲中</h4>
+					</el-row>
 
-                    <el-row type="flex" justify="space-between" v-if="v.box_status == 2">
-                      <el-row type="flex" align="middle">
+                    <el-row type="flex" justify="space-between" v-if="v.order_sn != ''">
+<!--                      <el-row type="flex" align="middle">
                         <el-tag type="danger" effect="dark">{{v.status_text}}</el-tag>
-                      </el-row>
+                      </el-row> -->
                       <div style="height:72px;">
                         <h4>
                           订单号：{{v.order_sn}}
-                          <!-- <el-button style="margin-left:10px;" size="mini" type="primary">通知</el-button> -->
+                          <el-button style="margin-left:10px;" size="mini" type="primary">通知</el-button>
                         </h4>
                         <h4>入柜日期：{{v.enter_time}}</h4>
                         <h4>已使用：{{diffTime(v.enter_time)}}</h4>