Leon 2 年之前
父節點
當前提交
39a8b82ca7

+ 4 - 3
src/components/input/Slider.scss

@@ -109,12 +109,12 @@
 
 .tooltip_bg {
     width: 578px;
-    height: 200px;
+    height: 400px;
     pointer-events: none;
     z-index: 1;
     position: absolute;
     left: 0;
-    top: -210px;
+    top: -410px;
     display: flex;
     flex-direction: column;
 }
@@ -141,7 +141,8 @@
 }
 
 .tooltip_desc {
-    font-size: 24px;
+    margin-top: 20px;
+    font-size: 28px;
     line-height: 40px;
     letter-spacing: 0.05em;
     color: #fff;

+ 2 - 2
src/components/input/Slider.tsx

@@ -62,7 +62,7 @@ export default function (props: { onChanged?: Function, value?: number, edit?: b
 
         setIsSliding(false);
         Taro.vibrateShort({
-            type: 'heavy'
+            type: 'light'
         })
         if (props.onChanged) {
 
@@ -100,7 +100,7 @@ export default function (props: { onChanged?: Function, value?: number, edit?: b
             //     title: '请先上传!'
             // })
             Taro.showModal({
-                title: '提示',
+                title: t('feature.common.prompt'),
                 content: t('feature.food.pre_meal_enforce_order_alert'),
                 showCancel: false,
                 confirmText: '好的',

+ 1 - 0
src/context/locales/zh.js

@@ -82,6 +82,7 @@ export default {
     },
     feature: {
         common: {
+            prompt: '提示',
             action_sheet_cancel: '取消',
             picker_cancel_btn: '取消',
             picker_confirm_btn: '确定',

+ 12 - 7
src/features/food/FoodConsole.tsx

@@ -246,21 +246,26 @@ export default function Component(props: { addItem: Function, firstItem: any })
 
     function getLineBottom(){
         if (user.isLogin){
-            return -rpxToPx(60)
+            return props.firstItem?-rpxToPx(60):0
         }
         else {
-            if (modeOn){
-                return 0//-rpxToPx(60)
-            }
-            else {
-                return 0
-            }
+            return props.firstItem?0:rpxToPx(60)
+            // if (modeOn){
+            //     return 0//-rpxToPx(60)
+            // }
+            // else {
+            //     return 0
+            // }
         }
     }
 
     function clickSwitch(){
         if (lastUnFinished){
+            Taro.vibrateShort({
+                type:'heavy'
+            })
             Taro.showModal({
+                title: t('feature.common.prompt'),
                 content:t('feature.food.disable_switch_modal_title'),
                 confirmText:t('feature.food.disable_switch_modal_btn'),
                 showCancel:false

+ 1 - 1
src/services/http/api.js

@@ -1,4 +1,4 @@
-let online = false;
+let online = true;
 export let baseUrl = online ? 'https://api.fast.liveplus.fun' : 'https://api.fast.dev.liveplus.fun';
 export let imgUrl = online
     ? 'https://api.fast.liveplus.fun/static/image/'