flx

src/components/CompoentsOrder/AlreadyUsed/index.jsx

@@ -6,7 +6,7 @@ import starOff from '@/assets/icons/GuideCheck/starOff.png'
 import formatTime from '@/utils/formatTime'
 import food from '@/assets/icons/ProCard/food.png'
 import Popup from '@/components/Popup'
-import {saveEvaluate} from '@/services/mine'
+import { saveEvaluate } from '@/services/mine'
 import './style.less'
 
 
@@ -16,49 +16,50 @@ import './style.less'
 
 export default (props) => {
   const { showCutover, maskClosable, item, onClose } = props
-
-  
   const scoreList = new Array(5).fill(0)
+
   const ButtonCancel = () => {
     onClose()
   }
   const ButtonOK = (e) => {
-    if (evaluate.sweetScore==0||evaluate.environmentScore==0||evaluate.serviceScore==0) {
+    if (evaluate.sweetScore == 0 || evaluate.environmentScore == 0 || evaluate.serviceScore == 0) {
       Taro.showToast({
         title: '请您给本店点亮小星星哦',
         icon: 'none'
       })
       return;
     }
-    else{
-      saveEvaluate(evaluate.targetType,evaluate.targetId,evaluate).then((res)=>{
+    else {
+      saveEvaluate(evaluate.targetType, evaluate.targetId, evaluate).then((res) => {
         console.log(res)
-      })    
+      })
       onClose()
     }
   }
-  const [evaluate,setEvaluate]=useState({
-    sweetScore:0,//口味
-    environmentScore:0,//环境
-    serviceScore:0,//服务
-    targetId:'',
-    targetType:'shop'
+  const [evaluate, setEvaluate] = useState({
+    sweetScore: 0,//口味
+    environmentScore: 0,//环境
+    serviceScore: 0,//服务
+    targetId: '',
+    targetType: 'shop'
   })
   const [kwCollectNub, setkwCollectNub] = useState(0)
   const kwChange = (val) => {
-    setkwCollectNub(val+1)
-    setEvaluate({...evaluate,sweetScore:val+1,targetId:item.shopId})
+    setkwCollectNub(val + 1)
+    setEvaluate({ ...evaluate, sweetScore: val + 1, targetId: item.shopId })
   }
+
   const [hjCollectNub, sethjCollectNub] = useState(0)
   const hjChange = (val) => {
-    sethjCollectNub(val+1)
-    setEvaluate({...evaluate,serviceScore:val+1})
+    sethjCollectNub(val + 1)
+    setEvaluate({ ...evaluate, serviceScore: val + 1 })
 
   }
+
   const [fwCollectNub, setfwCollectNub] = useState(0)
   const fwChange = (val) => {
-    setfwCollectNub(val+1)
-    setEvaluate({...evaluate,environmentScore:val+1})
+    setfwCollectNub(val + 1)
+    setEvaluate({ ...evaluate, environmentScore: val + 1 })
   }
 
   return (
@@ -99,9 +100,9 @@ export default (props) => {
           {
             scoreList.map((_, index) => {
 
-              const src = index  < kwCollectNub ? starOn : starOff
+              const src = index < kwCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={()=>kwChange(index)} />
+                <image className='card-star-image' key={index} src={src} onClick={() => kwChange(index)} />
               )
             })
           }
@@ -111,9 +112,9 @@ export default (props) => {
           {
             scoreList.map((_, index) => {
 
-              const src = index  < hjCollectNub ? starOn : starOff
+              const src = index < hjCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={()=>hjChange(index)} />
+                <image className='card-star-image' key={index} src={src} onClick={() => hjChange(index)} />
               )
             })
           }
@@ -123,9 +124,9 @@ export default (props) => {
           {
             scoreList.map((_, index) => {
 
-              const src = index  < fwCollectNub ? starOn : starOff
+              const src = index < fwCollectNub ? starOn : starOff
               return (
-                <image className='card-star-image' key={index} src={src} onClick={()=>fwChange(index)} />
+                <image className='card-star-image' key={index} src={src} onClick={() => fwChange(index)} />
               )
             })
           }

src/components/CompoentsOrder/OrderCard/index.jsx

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

src/layouts/Loading.jsx

@@ -1,3 +1,4 @@
+import { View } from '@tarojs/components'
 import Spin from '@/components/Spin'
 import logo from '@/assets/icons/comm/logo_small.png'
 import './style.less'
@@ -13,6 +14,19 @@ export default (props) => {
         logoVisible !== false &&
         (<image className='loading-logo' src={logo} style={{ width, height }} />)
       }
+      <View
+        style={{
+          width: '28vw',
+          color: '#4D4D4D',
+          padding: '12px',
+          position: 'absolute',
+          left: '-4vh',
+          textAlign: 'center',
+          opacity: '0.8'
+        }}
+      >
+        收集人间美好
+      </View>
     </view>
   )
 }

src/layouts/index.jsx

@@ -59,4 +59,5 @@ export default (Child) => (props) => {
   }
 
   return loading ? <Loading /> : <Child {...props} person={person} router={router} location={location} />
+
 }

src/pages/MineUserAll/ContactMe/index.jsx

@@ -30,7 +30,7 @@ export default withLayout((props) => {
     }
   }
   return (
-    <view className='box-content'>      
+    <view className='box-content'>
       <view className='index-navbar'>
         <CustomNav title='联系我们' />
       </view>
@@ -41,7 +41,6 @@ export default withLayout((props) => {
         <view className='weChate-image' >
           <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' />
         </view>
-
         <view className='button-info'>
           <Button className='button-box' onClick={submit}>提交</Button>
           <Button className='button-box-Cancel' onClick={back} >取消</Button>