diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml index 6cd8b80df..fb2eb4aff 100644 --- a/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml +++ b/stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml @@ -141,7 +141,7 @@ and (sc.name like concat('%',#{customer},'%') or sc.phone like concat('%',#{customer},'%')) and cus_id = #{cusId} - + and phone = #{phone} and status = #{status} and pay_type_id = #{payTypeId} and pre_sale_id = #{preSaleId} diff --git a/stdiet-ui/src/components/ContractDrawer/index.vue b/stdiet-ui/src/components/ContractDrawer/index.vue index 0a98ba014..60dcc8ea8 100644 --- a/stdiet-ui/src/components/ContractDrawer/index.vue +++ b/stdiet-ui/src/components/ContractDrawer/index.vue @@ -7,9 +7,9 @@ @closed="handleOnClosed" size="40%" > -
- - +
+
+
创建合同 - - +
+
+ +
+
- + 复制 - + { - this.contractList = res.rows; - this.visible = true; + fetchContractList() { + this.loading = true; + listContract({ customerId: this.data.id }).then((res) => { + if (res.code === 200) { + this.contractList = res.rows; + } + this.loading = false; }); }, handleAdd() { @@ -207,4 +220,12 @@ export default { /deep/ :focus { outline: 0; } +.contract_drawer_wrapper { + .header { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 8px; + } +} diff --git a/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue index b2058ef51..c8af6d54f 100644 --- a/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue +++ b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue @@ -7,26 +7,45 @@ @closed="handleOnClosed" size="40%" > -
- - +
+
+
外食计算器外食计算器 + + - - - - 二维码 - - - + + 二维码 + + +
+
+ +
+
+ + { this.foodHeatStatisticsList = response.rows; this.total = response.total; - this.visible = true; + this.loading = false; }); }, handleAdd() {}, @@ -205,4 +227,13 @@ export default { /deep/ :focus { outline: 0; } + +.heat_statisitcs_wrapper { + .header { + margin-bottom: 8px; + display: flex; + align-items: center; + justify-content: space-between; + } +} diff --git a/stdiet-ui/src/components/OrderDrawer/index.vue b/stdiet-ui/src/components/OrderDrawer/index.vue index b9d63ebae..585bc5c5d 100644 --- a/stdiet-ui/src/components/OrderDrawer/index.vue +++ b/stdiet-ui/src/components/OrderDrawer/index.vue @@ -7,9 +7,9 @@ @closed="handleOnClosed" size="40%" > -
- - +
+
+
创建订单 - - +
+
+ +
+
{ + fetchOrderList() { + this.loading = true; + listOrder({ cusId: this.data.id }).then((res) => { this.orderList = res.rows.reduce((arr, cur) => { const tarOrder = arr.find((ord) => ord.startTime === cur.startTime); if (tarOrder) { @@ -171,8 +184,7 @@ export default { return arr; }, []); // console.log(this.orderList); - - this.visible = true; + this.loading = false; }); }, handleAdd() { @@ -228,4 +240,12 @@ export default { /deep/ :focus { outline: 0; } +.order_drawer_wrapper { + .header { + margin-bottom: 8px; + display: flex; + justify-content: space-between; + align-items: center; + } +} diff --git a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue index 67decb0d7..cec0839d7 100644 --- a/stdiet-ui/src/components/RecipesPlanDrawer/index.vue +++ b/stdiet-ui/src/components/RecipesPlanDrawer/index.vue @@ -7,8 +7,8 @@ size="45%" >
- - +
+
- 生成1天体验计划 + 生成7天体验计划 - - +
+
+ +
+
@@ -140,6 +148,7 @@ import { listRecipesPlanByCusId } from "@/api/custom/recipesPlan"; import { addRecipesPlan } from "@/api/custom/recipesPlan"; import PlanPauseDrawer from "./PlanPauseDrawer"; import VueQr from "vue-qr"; +import dayjs from "dayjs"; const logo = require("@/assets/logo/logo_b.png"); export default { name: "RecipesPlanDrawer", @@ -167,7 +176,7 @@ export default { }, fanPickerOptions: { disabledDate(time) { - return time.getTime() < Date.now(); + return time.getTime() < Date.now() - 24 * 60 * 60 * 1000; }, }, }; @@ -240,9 +249,9 @@ export default { addRecipesPlan({ cusId: id, startNumDay: 1, - endNumDay: 1, + endNumDay: 7, startDate: this.form.startDate, - endDate: this.form.startDate, + endDate: dayjs(this.form.startDate).add(6, "day").format("YYYY-MM-DD"), }) .then((res) => { if (res.code === 200) { @@ -270,5 +279,12 @@ export default { .recipes_plan_drawer_wrapper { height: calc(100vh - 77px); + + .header { + margin-bottom: 8px; + display: flex; + align-items: center; + justify-content: space-between; + } } diff --git a/stdiet-ui/src/utils/healthyData.js b/stdiet-ui/src/utils/healthyData.js index c2c6ee0da..f915a3242 100644 --- a/stdiet-ui/src/utils/healthyData.js +++ b/stdiet-ui/src/utils/healthyData.js @@ -270,7 +270,7 @@ export const makeFoodTypeArray = [ { name: "运动饮食", value: "5" } ]; -export const yesNoDict = { 0: "是", 1: "否" }; +export const yesNoDict = { 0: "否", 1: "是" }; export const sexDict = { 0: "男", 1: "女" }; export const positionDict = { 0: "南方", 1: "北方" }; export const makeFoodTypeDict = { 0: "自己做", 1: "外面吃" }; @@ -409,13 +409,15 @@ export const bloodDataArray = [ ]; export const moistureDateArray = [ - { value: "1", name: "1.体质虚弱，免疫力差" }, - { value: "2", name: "2.畏寒肢冷，自汗，头晕耳鸣" }, - { value: "3", name: "3.心悸气短，神疲乏力，气短懒言" }, - { value: "4", name: "4.失眠多梦，健忘，精神恍惚" }, - { value: "5", name: "5.面色淡白或萎黄，皮肤干燥，毛发枯萎" }, - { value: "6", name: "6.女性月经量少，延期或闭经" }, - { value: "7", name: "7.唇甲色淡，舌淡脉虚" } + { value: "1", name: "1.头发爱出油,头一天刚洗头第二天就油油的" }, + { value: "2", name: "2.面部油亮" }, + { value: "3", name: "3.睡觉流口水" }, + { value: "4", name: "4.排便粘稠且多便" }, + { value: "5", name: "5.小肚子大" }, + { value: "6", name: "6.耳内湿" }, + { value: "7", name: "7.头重脚轻" }, + { value: "8", name: "8.头晕没精神，特别疲劳" }, + { value: "9", name: "9.经常感觉很累很困，怎么都睡不够" } ]; const moduleObj = { diff --git a/stdiet-ui/src/views/custom/recipesBuild/BarChart.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/BarChart/index.vue similarity index 100% rename from stdiet-ui/src/views/custom/recipesBuild/BarChart.vue rename to stdiet-ui/src/views/custom/recipesBuild/InfoView/BarChart/index.vue diff --git a/stdiet-ui/src/views/custom/recipesBuild/PieChart.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue similarity index 100% rename from stdiet-ui/src/views/custom/recipesBuild/PieChart.vue rename to stdiet-ui/src/views/custom/recipesBuild/InfoView/PieChart/index.vue diff --git a/stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/TemplateInfoView/index.vue similarity index 100% rename from stdiet-ui/src/views/custom/recipesBuild/TemplateInfoView/index.vue rename to stdiet-ui/src/views/custom/recipesBuild/InfoView/TemplateInfoView/index.vue diff --git a/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue b/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue new file mode 100644 index 000000000..ee195cb3c --- /dev/null +++ b/stdiet-ui/src/views/custom/recipesBuild/InfoView/index.vue @@ -0,0 +1,78 @@ + + + diff --git a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue index 6adf8fe54..b39c6285e 100644 --- a/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue +++ b/stdiet-ui/src/views/custom/recipesBuild/RecipesView/RecipesHeaderCom/index.vue @@ -1,7 +1,8 @@