ai-chat-bot-interface 1.6.8 → 1.6.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ai-chat-bot-interface",
   "private": false,
-  "version": "1.6.8",
+  "version": "1.6.10",
   "type": "module",
   "main": "index.js",
   "description": "A AI chat bot interface. (private)",

package/src/components/DishesCard.vue

@@ -12,7 +12,7 @@
       />
       <div>
         <div class="name">
-          <span>{{ info.skuname }}{{ contentHeight }}</span>
+          <span>{{ info.skuname }}</span>
           <span>×1</span>
         </div>
         <div class="sub">{{ subStr }}</div>
@@ -117,7 +117,9 @@ const subStr = computed(() => {
   return `${props.defMsg.energy}${props.info.energy}kcal，${props.defMsg.protein}${props.info.protein}g，${props.defMsg.fat}${props.info.fat}g，${props.defMsg.carbonwater}${props.info.carbonwater}g`;
 });
 const materialText = computed(() => {
-  const list = props.info?.makeMaterialList?.map((item) => item.material);
+  const list = props.info?.makeMaterialList?.map(
+    (item) => item.material + item.usage + 'g',
+  );
   return (list || []).join('、');
 });
 const hasDetails = computed(() => {

package/src/components/DishesList.vue

@@ -26,7 +26,7 @@
     </template>
     <div v-if="isMini" class="btn_group">
       <div class="btn btn_2" @click.stop="handleBtn('ship_order')">
-        <span class="name">立即下单</span>
+        <span class="name">去订餐</span>
       </div>
     </div>
     <div v-else class="btn_group">

package/src/components/OperateModule.less

@@ -24,7 +24,7 @@
       width: fit-content;
       white-space: nowrap;
       font-weight: 400;
-      font-size: 12px;
+      font-size: 14px;
       color: #333;
       line-height: 16px;
       text-align: left;
@@ -33,7 +33,7 @@
       border: 1px solid #d0d0d0;
     }
     .icon {
-      font-size: 16px;
+      font-size: 18px;
       color: @primary-color;
     }
   }

package/src/components/personalForm/personalForm.vue

@@ -3,6 +3,7 @@ import { computed, onMounted, ref } from 'vue';
 import ArrowRight from '../icons/ArrowRight.vue';
 import Popup from '../popup/popup.vue';
 import { showToast } from 'vant';
+import { Field } from 'vant';
 
 const showPopup = ref(false);
 
@@ -18,6 +19,9 @@ const dialogInfo = ref({
   title: '标题',
   unit: '',
   dialogHeight: '50vh',
+  min: 0,
+  max: 100,
+  type: 'digit',
 });
 
 const sportList = [
@@ -62,13 +66,20 @@ const tasteList = [
 const tabooList = ['高GI', '高饱和脂肪酸', '高嘌呤', '高盐', '高胆固醇'];
 
 const pfForm = ref([
-  { key: 'sex', label: '性别', value: '', placeholder: '请输选择' },
+  {
+    key: 'sex',
+    label: '性别',
+    value: '',
+    placeholder: '请输选择',
+    required: true,
+  },
   {
     key: 'age',
     label: '年龄',
     value: '',
     placeholder: '请输入年龄',
     unit: '岁',
+    required: true,
   },
   {
     key: 'height',
@@ -76,6 +87,7 @@ const pfForm = ref([
     value: '',
     placeholder: '请输入身高',
     unit: 'cm',
+    required: true,
   },
   {
     key: 'weight',
@@ -83,8 +95,15 @@ const pfForm = ref([
     value: '',
     placeholder: '请输入体重',
     unit: 'kg',
+    required: true,
+  },
+  {
+    key: 'sport',
+    label: '日常运动水平',
+    value: '',
+    placeholder: '请输入',
+    required: true,
   },
-  { key: 'sport', label: '日常运动水平', value: '', placeholder: '请输入' },
   {
     key: 'taste',
     label: '口味偏好及饮食禁忌',
@@ -92,6 +111,7 @@ const pfForm = ref([
     taste: [],
     taboo: [],
     placeholder: '请输入',
+    required: false,
   },
 ]);
 
@@ -100,7 +120,11 @@ const Emits = defineEmits(['submit']);
 onMounted(() => {
   const form = localStorage.getItem('personalInfo');
   if (form) {
-    pfForm.value = JSON.parse(form);
+    const formData = JSON.parse(form);
+    for (let i = 0; i < pfForm.value.length; i++) {
+      const idx = formData.findIndex((con) => con.key === pfForm.value[i].key);
+      pfForm.value[i] = { ...pfForm.value[i], ...formData[idx] };
+    }
   }
 });
 
@@ -124,18 +148,27 @@ const handleSelect = (item) => {
       dialogInfo.value.dialogHeight = '240px';
       dialogInfo.value.unit = item.unit;
       dialogInfo.value.age = item.value;
+      dialogInfo.value.min = 0;
+      dialogInfo.value.max = 100;
+      dialogInfo.value.type = 'number';
       break;
     case 'height':
       dialogInfo.value.title = '设置身高';
       dialogInfo.value.dialogHeight = '240px';
       dialogInfo.value.unit = item.unit;
       dialogInfo.value.height = item.value;
+      dialogInfo.value.min = 0;
+      dialogInfo.value.max = 300;
+      dialogInfo.value.type = 'digit';
       break;
     case 'weight':
       dialogInfo.value.title = '设置体重';
       dialogInfo.value.dialogHeight = '240px';
       dialogInfo.value.unit = item.unit;
       dialogInfo.value.weight = item.value;
+      dialogInfo.value.min = 0;
+      dialogInfo.value.max = 300;
+      dialogInfo.value.type = 'digit';
       break;
     case 'sport':
       dialogInfo.value.title = '日常运动水平';
@@ -245,13 +278,25 @@ const selectTag = (item, type) => {
     dialogInfo.value[type].push(item);
   }
 };
+
+const selectSport = (item) => {
+  dialogInfo.value.sport = item.name;
+  handleConfirm();
+};
+
+const selectSex = (item) => {
+  dialogInfo.value.sex = item;
+  handleConfirm();
+};
 </script>
 
 <template>
   <div class="pf_wrap">
     <div class="pf_form">
       <div v-for="item in pfForm" :key="item.key" class="pf_row">
-        <div class="title">{{ item.label }}</div>
+        <div class="title" :class="{ is_required: item.required }">
+          {{ item.label }}
+        </div>
         <div class="content" @click="handleSelect(item)">
           <span
             class="text_row"
@@ -269,7 +314,7 @@ const selectTag = (item, type) => {
       :class="{ disabled: !isValid }"
       @click.stop="handleSubmit"
     >
-      确定
+      按身体数据领取7天食谱
     </div>
   </div>
 
@@ -283,13 +328,13 @@ const selectTag = (item, type) => {
       <div v-if="dialogInfo.key === 'sex'" class="sex_wrap">
         <div
           :class="{ sex: true, selected: dialogInfo.sex === '男' }"
-          @click="dialogInfo.sex = '男'"
+          @click.stop="selectSex('男')"
         >
           男
         </div>
         <div
           :class="{ sex: true, selected: dialogInfo.sex === '女' }"
-          @click="dialogInfo.sex = '女'"
+          @click.stop="selectSex('女')"
         >
           女
         </div>
@@ -298,10 +343,13 @@ const selectTag = (item, type) => {
         v-if="['age', 'height', 'weight'].includes(dialogInfo.key)"
         class="input_wrap"
       >
-        <input
+        <Field
           v-model="dialogInfo[dialogInfo.key]"
           class="input"
-          type="text"
+          :type="dialogInfo.type"
+          :min="dialogInfo.min"
+          :max="dialogInfo.max"
+          @keyup.enter="handleConfirm"
           placeholder="请输入"
         />
         <div class="unit">{{ dialogInfo.unit }}</div>
@@ -311,7 +359,7 @@ const selectTag = (item, type) => {
           v-for="item in sportList"
           :key="item.key"
           :class="{ row: true, selected: dialogInfo.sport === item.name }"
-          @click.stop="dialogInfo.sport = item.name"
+          @click.stop="selectSport(item)"
         >
           <div class="name">{{ item.name }}</div>
           <div class="sub">{{ item.sub }}</div>
@@ -360,6 +408,7 @@ const selectTag = (item, type) => {
 
   &_row {
     display: flex;
+    gap: 6px;
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
@@ -374,6 +423,19 @@ const selectTag = (item, type) => {
     .title {
       font-size: 14px;
       font-weight: 600;
+      position: relative;
+      line-height: 24px;
+
+      &.is_required {
+        &::after {
+          content: '*';
+          color: #ff0000;
+          font-size: 14px;
+          line-height: 24px;
+          position: absolute;
+          right: -0.6em;
+        }
+      }
     }
 
     .content {
@@ -391,7 +453,7 @@ const selectTag = (item, type) => {
       display: inline-block;
       font-size: 14px;
       text-align: right;
-      width: 160px;
+      width: 156px;
       text-overflow: ellipsis;
       white-space: nowrap;
       overflow: hidden;
@@ -455,6 +517,10 @@ const selectTag = (item, type) => {
       width: 200px;
       outline: none;
       border: none;
+      margin: auto;
+      /deep/ .van-field__control {
+        text-align: center;
+      }
     }
     .unit {
       font-size: 15px;