Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java

@@ -526,7 +526,7 @@ public class WechatAppletController extends BaseController {
         }
 
         // 更新时间超过7天，重新登录获取最新信息
-        if (StringUtils.isEmpty(curWxUserInfo.getAvatarUrl()) || ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(curWxUserInfo.getUpdateTime()), LocalDate.now()) >= 7) {
+        if (StringUtils.isEmpty(curWxUserInfo.getAvatarUrl()) || ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(curWxUserInfo.getUpdateTime()), LocalDate.now()) >= 21) {
             return AjaxResult.error(5001, "信息缺失或者过期需要重新登录");
         }
 

stdiet-ui/src/views/custom/customer/index.vue

@@ -42,7 +42,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="营养师" prop="mainDietitian" v-if="!isPartner">
-        <el-select v-model="queryParams.mainDietitian" clearable filterable  placeholder="请选择">
+        <el-select
+          v-model="queryParams.mainDietitian"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in nutritionistIdOptions"
             :key="dict.dictValue"
@@ -71,7 +76,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="销售人员" prop="salesman" v-if="!isPartner">
-        <el-select v-model="queryParams.salesman" clearable filterable  placeholder="请选择">
+        <el-select
+          v-model="queryParams.salesman"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in preSaleIdOptions"
             :key="dict.dictValue"
@@ -80,8 +90,13 @@
           />
         </el-select>
       </el-form-item>
-       <el-form-item label="售中人员" prop="onSaleId" v-if="!isPartner">
+      <el-form-item label="售中人员" prop="onSaleId" v-if="!isPartner">
-        <el-select v-model="queryParams.onSaleId" clearable filterable placeholder="请选择">
+        <el-select
+          v-model="queryParams.onSaleId"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in onSaleIdOptions"
             :key="dict.dictValue"
@@ -91,7 +106,12 @@
         </el-select>
       </el-form-item>
       <el-form-item label="售后营养师" prop="afterDietitian" v-if="!isPartner">
-        <el-select v-model="queryParams.afterDietitian" clearable filterable  placeholder="请选择">
+        <el-select
+          v-model="queryParams.afterDietitian"
+          clearable
+          filterable
+          placeholder="请选择"
+        >
           <el-option
             v-for="dict in afterSaleIdOptions"
             :key="dict.dictValue"
@@ -195,7 +215,7 @@
         :formatter="channelFormat"
       />
       <el-table-column label="客户姓名" align="center" prop="name" />
-      <el-table-column label="手机号" align="center" prop="phone" width="120"/>
+      <el-table-column label="手机号" align="center" prop="phone" width="120" />
       <el-table-column
         label="主营养师"
         align="center"
@@ -268,20 +288,6 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column
-        label="外食热量"
-        align="center"
-        v-hasPermi="['custom:foodHeatStatistics:list']"
-      >
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleClickHeatStatistics(scope.row)"
-            >详情
-          </el-button>
-        </template>
-      </el-table-column>
       <el-table-column
         label="食谱计划"
         align="center"
@@ -296,6 +302,20 @@
           </el-button>
         </template>
       </el-table-column>
+      <el-table-column
+        label="外食热量"
+        align="center"
+        v-hasPermi="['custom:foodHeatStatistics:list']"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleClickHeatStatistics(scope.row)"
+            >详情
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column
         label="打卡记录"
         align="center"