吃个甘蔗嚼一年 3 年之前
父節點
當前提交
3c2a1ba4b2

二進制
src/assets/icons/UserCenter/Cancel.png 查看文件


+ 26
- 25
src/components/CompoentsOrder/AlreadyUsed/index.jsx 查看文件

6
 import formatTime from '@/utils/formatTime'
6
 import formatTime from '@/utils/formatTime'
7
 import food from '@/assets/icons/ProCard/food.png'
7
 import food from '@/assets/icons/ProCard/food.png'
8
 import Popup from '@/components/Popup'
8
 import Popup from '@/components/Popup'
9
-import {saveEvaluate} from '@/services/mine'
9
+import { saveEvaluate } from '@/services/mine'
10
 import './style.less'
10
 import './style.less'
11
 
11
 
12
 
12
 
16
 
16
 
17
 export default (props) => {
17
 export default (props) => {
18
   const { showCutover, maskClosable, item, onClose } = props
18
   const { showCutover, maskClosable, item, onClose } = props
19
-
20
-  
21
   const scoreList = new Array(5).fill(0)
19
   const scoreList = new Array(5).fill(0)
20
+
22
   const ButtonCancel = () => {
21
   const ButtonCancel = () => {
23
     onClose()
22
     onClose()
24
   }
23
   }
25
   const ButtonOK = (e) => {
24
   const ButtonOK = (e) => {
26
-    if (evaluate.sweetScore==0||evaluate.environmentScore==0||evaluate.serviceScore==0) {
25
+    if (evaluate.sweetScore == 0 || evaluate.environmentScore == 0 || evaluate.serviceScore == 0) {
27
       Taro.showToast({
26
       Taro.showToast({
28
         title: '请您给本店点亮小星星哦',
27
         title: '请您给本店点亮小星星哦',
29
         icon: 'none'
28
         icon: 'none'
30
       })
29
       })
31
       return;
30
       return;
32
     }
31
     }
33
-    else{
34
-      saveEvaluate(evaluate.targetType,evaluate.targetId,evaluate).then((res)=>{
32
+    else {
33
+      saveEvaluate(evaluate.targetType, evaluate.targetId, evaluate).then((res) => {
35
         console.log(res)
34
         console.log(res)
36
-      })    
35
+      })
37
       onClose()
36
       onClose()
38
     }
37
     }
39
   }
38
   }
40
-  const [evaluate,setEvaluate]=useState({
41
-    sweetScore:0,//口味
42
-    environmentScore:0,//环境
43
-    serviceScore:0,//服务
44
-    targetId:'',
45
-    targetType:'shop'
39
+  const [evaluate, setEvaluate] = useState({
40
+    sweetScore: 0,//口味
41
+    environmentScore: 0,//环境
42
+    serviceScore: 0,//服务
43
+    targetId: '',
44
+    targetType: 'shop'
46
   })
45
   })
47
   const [kwCollectNub, setkwCollectNub] = useState(0)
46
   const [kwCollectNub, setkwCollectNub] = useState(0)
48
   const kwChange = (val) => {
47
   const kwChange = (val) => {
49
-    setkwCollectNub(val+1)
50
-    setEvaluate({...evaluate,sweetScore:val+1,targetId:item.shopId})
48
+    setkwCollectNub(val + 1)
49
+    setEvaluate({ ...evaluate, sweetScore: val + 1, targetId: item.shopId })
51
   }
50
   }
51
+
52
   const [hjCollectNub, sethjCollectNub] = useState(0)
52
   const [hjCollectNub, sethjCollectNub] = useState(0)
53
   const hjChange = (val) => {
53
   const hjChange = (val) => {
54
-    sethjCollectNub(val+1)
55
-    setEvaluate({...evaluate,serviceScore:val+1})
54
+    sethjCollectNub(val + 1)
55
+    setEvaluate({ ...evaluate, serviceScore: val + 1 })
56
 
56
 
57
   }
57
   }
58
+
58
   const [fwCollectNub, setfwCollectNub] = useState(0)
59
   const [fwCollectNub, setfwCollectNub] = useState(0)
59
   const fwChange = (val) => {
60
   const fwChange = (val) => {
60
-    setfwCollectNub(val+1)
61
-    setEvaluate({...evaluate,environmentScore:val+1})
61
+    setfwCollectNub(val + 1)
62
+    setEvaluate({ ...evaluate, environmentScore: val + 1 })
62
   }
63
   }
63
 
64
 
64
   return (
65
   return (
99
           {
100
           {
100
             scoreList.map((_, index) => {
101
             scoreList.map((_, index) => {
101
 
102
 
102
-              const src = index  < kwCollectNub ? starOn : starOff
103
+              const src = index < kwCollectNub ? starOn : starOff
103
               return (
104
               return (
104
-                <image className='card-star-image' key={index} src={src} onClick={()=>kwChange(index)} />
105
+                <image className='card-star-image' key={index} src={src} onClick={() => kwChange(index)} />
105
               )
106
               )
106
             })
107
             })
107
           }
108
           }
111
           {
112
           {
112
             scoreList.map((_, index) => {
113
             scoreList.map((_, index) => {
113
 
114
 
114
-              const src = index  < hjCollectNub ? starOn : starOff
115
+              const src = index < hjCollectNub ? starOn : starOff
115
               return (
116
               return (
116
-                <image className='card-star-image' key={index} src={src} onClick={()=>hjChange(index)} />
117
+                <image className='card-star-image' key={index} src={src} onClick={() => hjChange(index)} />
117
               )
118
               )
118
             })
119
             })
119
           }
120
           }
123
           {
124
           {
124
             scoreList.map((_, index) => {
125
             scoreList.map((_, index) => {
125
 
126
 
126
-              const src = index  < fwCollectNub ? starOn : starOff
127
+              const src = index < fwCollectNub ? starOn : starOff
127
               return (
128
               return (
128
-                <image className='card-star-image' key={index} src={src} onClick={()=>fwChange(index)} />
129
+                <image className='card-star-image' key={index} src={src} onClick={() => fwChange(index)} />
129
               )
130
               )
130
             })
131
             })
131
           }
132
           }

+ 5
- 3
src/components/CompoentsOrder/OrderCard/index.jsx 查看文件

4
 import CouponCard from '@/components/CouponCard'
4
 import CouponCard from '@/components/CouponCard'
5
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
5
 import QRcode from "@/assets/icons/UserCenter/QRcode.png";
6
 import refund from "@/assets/icons/GuideCheck/refund.png";
6
 import refund from "@/assets/icons/GuideCheck/refund.png";
7
+import Cancel from "@/assets/icons/UserCenter/Cancel.png";
7
 import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
8
 import Pay from "@/assets/icons/GuideCheck/Pay_logo.png";
8
 import Null from "@/assets/icons/UserCenter/null_logo.png";
9
 import Null from "@/assets/icons/UserCenter/null_logo.png";
9
 import Evaluated from "@/assets/icons/UserCenter/evaluated.png";
10
 import Evaluated from "@/assets/icons/UserCenter/evaluated.png";
63
       item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
64
       item.status === 0 ? <Action.Icon icon={Pay} text='支付' onClick={handleDetail} /> :
64
         item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
65
         item.status === 1 && item.isVerified == false ? <Action.Icon icon={QRcode} text='扫码核销' onClick={() => onWriteOff(item)} /> :
65
           item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> :
66
           item.status === 2 && item.isVerified == false ? <Action.Image image={refund} /> :
66
-            item.status === 9 ? <Action.Image image={Null} /> :
67
-              item.isVerified == true && item.isEvaluated == 3 ? <Action.Image image={Evaluated} /> :
68
-                item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : ''
67
+            item.status === 7 && item.isVerified == false ? <Action.Image image={Cancel} /> :
68
+              item.status === 9 ? <Action.Image image={Null} /> :
69
+                item.isVerified == true && item.isEvaluated > 0 ? <Action.Image image={Evaluated} /> :
70
+                  item.isVerified == true ? <Action.Icon icon={Evaluation} text='评价' onClick={() => evaluation(item)} /> : <Action.Icon icon={Evaluation} />
69
 
71
 
70
 
72
 
71
   return (
73
   return (

+ 14
- 0
src/layouts/Loading.jsx 查看文件

1
+import { View } from '@tarojs/components'
1
 import Spin from '@/components/Spin'
2
 import Spin from '@/components/Spin'
2
 import logo from '@/assets/icons/comm/logo_small.png'
3
 import logo from '@/assets/icons/comm/logo_small.png'
3
 import './style.less'
4
 import './style.less'
13
         logoVisible !== false &&
14
         logoVisible !== false &&
14
         (<image className='loading-logo' src={logo} style={{ width, height }} />)
15
         (<image className='loading-logo' src={logo} style={{ width, height }} />)
15
       }
16
       }
17
+      <View
18
+        style={{
19
+          width: '28vw',
20
+          color: '#4D4D4D',
21
+          padding: '12px',
22
+          position: 'absolute',
23
+          left: '-4vh',
24
+          textAlign: 'center',
25
+          opacity: '0.8'
26
+        }}
27
+      >
28
+        收集人间美好
29
+      </View>
16
     </view>
30
     </view>
17
   )
31
   )
18
 }
32
 }

+ 1
- 0
src/layouts/index.jsx 查看文件

59
   }
59
   }
60
 
60
 
61
   return loading ? <Loading /> : <Child {...props} person={person} router={router} location={location} />
61
   return loading ? <Loading /> : <Child {...props} person={person} router={router} location={location} />
62
+
62
 }
63
 }

+ 1
- 2
src/pages/MineUserAll/ContactMe/index.jsx 查看文件

30
     }
30
     }
31
   }
31
   }
32
   return (
32
   return (
33
-    <view className='box-content'>      
33
+    <view className='box-content'>
34
       <view className='index-navbar'>
34
       <view className='index-navbar'>
35
         <CustomNav title='联系我们' />
35
         <CustomNav title='联系我们' />
36
       </view>
36
       </view>
41
         <view className='weChate-image' >
41
         <view className='weChate-image' >
42
           <Image mode='aspectFit' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210918145337.png' />
42
           <Image mode='aspectFit' src='https://yz-shigongli.oss-cn-shanghai.aliyuncs.com/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210918145337.png' />
43
         </view>
43
         </view>
44
-
45
         <view className='button-info'>
44
         <view className='button-info'>
46
           <Button className='button-box' onClick={submit}>提交</Button>
45
           <Button className='button-box' onClick={submit}>提交</Button>
47
           <Button className='button-box-Cancel' onClick={back} >取消</Button>
46
           <Button className='button-box-Cancel' onClick={back} >取消</Button>