ccjgmwz 3 rokov pred
rodič
commit
657b451dcb

+ 1 - 1
unimall-admin-api/src/main/java/com/iotechn/unimall/admin/api/admin/AdminServiceImpl.java

@@ -110,7 +110,7 @@ public class AdminServiceImpl implements AdminService {
 		loginUserInfo.put("browser", browserName + "(" + browserVersion + ")");
 		loginUserInfo.put("osName", osName);
 		userRedisTemplate.opsForValue().set(Const.ADMIN_REDIS_PREFIX + accessToken,
-				JSONObject.toJSONString(loginUserInfo), 30, TimeUnit.MINUTES);
+				JSONObject.toJSONString(loginUserInfo), 30, TimeUnit.DAYS);
 		return accessToken;
 	}
 

+ 6 - 7
unimall-admin/src/views/shop/order/index.vue

@@ -110,12 +110,11 @@
       <el-table-column label="店铺名称" align="center" prop="shopAccount.dangName" />
       <el-table-column label="孔网订单" align="center" prop="orderId" />
       <el-table-column label="当当订单" align="center" prop="dangOrder" />
-      <el-table-column
-        label="收件人详细信息"
-        align="center"
-        prop="receiver"
-        width="380"
-      />
+      <el-table-column type="index" label="收件人信息" width="180" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.receiverName }}-{{ scope.row.mobile }}
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="省" align="center" prop="provName" />
       <el-table-column label="市" align="center" prop="cityName" />
       <el-table-column label="区" align="center" prop="areaName" />
@@ -129,7 +128,7 @@
         width="120"
       />
       <!-- <el-table-column label="付款状态" align="center" prop="payStatus" /> -->
-      <el-table-column label="孔网付款时间" align="center" width="120" prop="createdTime" />
+      <el-table-column label="孔网下单时间" align="center" width="120" prop="createdTime" />
       <el-table-column label="快递公司" align="center" prop="shippingComName" />
       <el-table-column label="快递单号" align="center" prop="shipmentNum" />
       <!-- <el-table-column label="运费" align="center" prop="shippingFee" /> -->